diff options
266 files changed, 17054 insertions, 14656 deletions
diff --git a/.gitignore b/.gitignore index 7615fe3915..85ddf3871f 100644 --- a/.gitignore +++ b/.gitignore @@ -34,6 +34,7 @@ src/qt/test/moc*.cpp *.rej *.orig *.o +*.o-* *.patch .bitcoin *.a diff --git a/Makefile.am b/Makefile.am index 4f623f6c64..0b3a822bff 100644 --- a/Makefile.am +++ b/Makefile.am @@ -15,6 +15,7 @@ OSX_DEPLOY_SCRIPT=$(top_srcdir)/contrib/macdeploy/macdeployqtplus 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 +OSX_QT_TRANSLATIONS = da,de,es,hu,ru,uk,zh_CN,zh_TW DIST_DOCS = $(wildcard doc/*.md) $(wildcard doc/release-notes/*.md) @@ -24,7 +25,8 @@ WINDOWS_PACKAGING = $(top_srcdir)/share/pixmaps/bitcoin.ico \ $(top_srcdir)/doc/README_windows.txt OSX_PACKAGING = $(OSX_DEPLOY_SCRIPT) $(OSX_FANCY_PLIST) $(OSX_INSTALLER_ICONS) \ - $(top_srcdir)/contrib/macdeploy/background.png + $(top_srcdir)/contrib/macdeploy/background.png \ + $(top_srcdir)/contrib/macdeploy/DS_Store COVERAGE_INFO = baseline_filtered_combined.info baseline.info block_test.info \ leveldb_baseline.info test_bitcoin_filtered.info total_coverage.info \ @@ -45,9 +47,9 @@ distcleancheck: $(BITCOIN_WIN_INSTALLER): $(BITCOIND_BIN) $(BITCOIN_QT_BIN) $(BITCOIN_CLI_BIN) $(MKDIR_P) $(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 + STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIND_BIN) $(top_builddir)/release + STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_QT_BIN) $(top_builddir)/release + STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_CLI_BIN) $(top_builddir)/release @test -f $(MAKENSIS) && $(MAKENSIS) $(top_builddir)/share/setup.nsi || \ echo error: could not build $@ @@ -64,23 +66,33 @@ $(OSX_APP)/Contents/Resources/empty.lproj: $(OSX_APP)/Contents/Info.plist: $(OSX_PLIST) $(MKDIR_P) $(@D) - $(INSTALL) $< $@ + $(INSTALL_DATA) $< $@ $(OSX_APP)/Contents/Resources/bitcoin.icns: $(OSX_INSTALLER_ICONS) $(MKDIR_P) $(@D) - $(INSTALL) $< $@ + $(INSTALL_DATA) $< $@ $(OSX_APP)/Contents/MacOS/Bitcoin-Qt: $(BITCOIN_QT_BIN) $(MKDIR_P) $(@D) - $(INSTALL_STRIP_PROGRAM) $< $@ + STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $< $@ OSX_APP_BUILT=$(OSX_APP)/Contents/PkgInfo $(OSX_APP)/Contents/Resources/empty.lproj \ $(OSX_APP)/Contents/Resources/bitcoin.icns $(OSX_APP)/Contents/Info.plist \ $(OSX_APP)/Contents/MacOS/Bitcoin-Qt +if BUILD_DARWIN $(OSX_DMG): $(OSX_APP_BUILT) $(OSX_PACKAGING) - $(OSX_DEPLOY_SCRIPT) $(OSX_APP) -add-qt-tr da,de,es,hu,ru,uk,zh_CN,zh_TW -dmg -fancy $(OSX_FANCY_PLIST) -verbose 2 + $(OSX_DEPLOY_SCRIPT) $(OSX_APP) -add-qt-tr $(OSX_QT_TRANSLATIONS) -dmg -fancy $(OSX_FANCY_PLIST) -verbose 2 +else +$(OSX_DMG): $(OSX_APP_BUILT) $(OSX_PACKAGING) + INSTALLNAMETOOL=$(INSTALLNAMETOOL) OTOOL=$(OTOOL) STRIP=$(STRIP) $(OSX_DEPLOY_SCRIPT) $(OSX_APP) -add-qt-tr $(OSX_QT_TRANSLATIONS) -verbose 2 + $(MKDIR_P) dist/.background + $(INSTALL) contrib/macdeploy/background.png dist/.background + $(INSTALL) contrib/macdeploy/DS_Store dist/.DS_Store + cd dist; $(LN_S) /Applications Applications + $(GENISOIMAGE) -no-cache-inodes -l -probe -V "Bitcoin-Qt" -no-pad -r -apple -o $@ dist +endif if TARGET_DARWIN appbundle: $(OSX_APP_BUILT) @@ -150,7 +162,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 $(DIST_DOCS) $(WINDOWS_PACKAGING) $(OSX_PACKAGING) +EXTRA_DIST = $(top_srcdir)/share/genbuild.sh qa/pull-tester/pull-tester.sh qa/rpc-tests $(DIST_DOCS) $(WINDOWS_PACKAGING) $(OSX_PACKAGING) CLEANFILES = $(OSX_DMG) $(OSX_APP) $(BITCOIN_WIN_INSTALLER) diff --git a/README b/README deleted file mode 100644 index 9edd5a2121..0000000000 --- a/README +++ /dev/null @@ -1,21 +0,0 @@ -AuthServiceProxy is an improved version of python-jsonrpc. - -It includes the following generic improvements: - -- HTTP connections persist for the life of the AuthServiceProxy object -- sends protocol 'version', per JSON-RPC 1.1 -- sends proper, incrementing 'id' -- uses standard Python json lib - -It also includes the following bitcoin-specific details: - -- sends Basic HTTP authentication headers -- parses all JSON numbers that look like floats as Decimal - -Installation: - -- change the first line of setup.py to point to the directory of your installation of python 2.* -- run setup.py - -Note: This will only install bitcoinrpc. If you also want to install jsonrpc to preserve -backwards compatibility, you have to replace 'bitcoinrpc' with 'jsonrpc' in setup.py and run it again. @@ -3,7 +3,7 @@ Bitcoin Core integration/staging tree http://www.bitcoin.org -Copyright (c) 2009-2013 Bitcoin Core Developers +Copyright (c) 2009-2014 Bitcoin Core Developers What is Bitcoin? ---------------- @@ -69,3 +69,15 @@ for the build/test scripts. Large changes should have a test plan, and should be tested by somebody other than the developer who wrote the code. See https://github.com/bitcoin/QA/ for how to create a test plan. + +Translations +------------ + +Changes to translations as well as new translations can be submitted to +[Bitcoin Core's Transifex page](https://www.transifex.com/projects/p/bitcoin/). + +Periodically the translations are pulled from Transifex and merged into the git repository. See the +[translation process](doc/translation_process.md) for details on how this works. + +**Important**: We do not accept translation changes as github pull request because the next +pull from Transifex would automatically overwrite them again. diff --git a/configure.ac b/configure.ac index 9d5457f03b..45cd023bb1 100644 --- a/configure.ac +++ b/configure.ac @@ -121,6 +121,7 @@ AC_PROG_CPP AC_PROG_CXXCPP AC_PROG_INSTALL AC_PROG_OBJC +AC_PROG_LN_S m4_ifdef([AC_PROG_OBJCXX],[AC_PROG_OBJCXX]) AC_PROG_MKDIR_P AC_PROG_SED @@ -137,6 +138,23 @@ AC_PATH_PROG(XGETTEXT,xgettext) AC_PATH_PROG(HEXDUMP,hexdump) PKG_PROG_PKG_CONFIG +# Enable debug +AC_ARG_ENABLE([debug], + [AS_HELP_STRING([--enable-debug], + [use debug compiler flags and macros (default is no)])], + [enable_debug=$enableval], + [enable_debug=no]) + +if test "x$enable_debug" = xyes; then + if test "x$GCC" = xyes; then + CFLAGS="-g3 -O0 -DDEBUG" + fi + + if test "x$GXX" = xyes; then + CXXFLAGS="-g3 -O0 -DDEBUG" + fi +fi + ## TODO: Remove these hard-coded paths and flags. They are here for the sake of ## compatibility with the legacy buildsystem. ## @@ -205,6 +223,7 @@ case $host in TARGET_OS=darwin LEVELDB_TARGET_FLAGS="TARGET_OS=Darwin" if test x$cross_compiling != xyes; then + BUILD_OS=darwin AC_CHECK_PROG([PORT],port, port) if test x$PORT = xport; then dnl add default macports paths @@ -221,6 +240,17 @@ case $host in CPPFLAGS="$CPPFLAGS -I$bdb_prefix/include" LIBS="$LIBS -L$bdb_prefix/lib" fi + else + case $build_os in + *darwin*) + BUILD_OS=darwin + ;; + *) + AC_PATH_TOOL([INSTALLNAMETOOL], [install_name_tool], install_name_tool) + AC_PATH_TOOL([OTOOL], [otool], otool) + AC_PATH_PROGS([GENISOIMAGE], [genisoimage mkisofs],genisoimage) + ;; + esac fi CPPFLAGS="$CPPFLAGS -DMAC_OSX" @@ -654,6 +684,7 @@ if test "x$use_tests$build_bitcoind$use_qt" = "xnonono"; then fi AM_CONDITIONAL([TARGET_DARWIN], [test x$TARGET_OS = xdarwin]) +AM_CONDITIONAL([BUILD_DARWIN], [test x$BUILD_OS = xdarwin]) AM_CONDITIONAL([TARGET_WINDOWS], [test x$TARGET_OS = xwindows]) AM_CONDITIONAL([ENABLE_WALLET],[test x$enable_wallet == xyes]) AM_CONDITIONAL([USE_QRCODE], [test x$use_qr = xyes]) diff --git a/contrib/bitcoind.bash-completion b/contrib/bitcoind.bash-completion index dd6c1ce819..03ef173c09 100644 --- a/contrib/bitcoind.bash-completion +++ b/contrib/bitcoind.bash-completion @@ -1,5 +1,5 @@ -# bash programmable completion for bitcoind(1) -# Copyright (c) 2012 Christian von Roques <roques@mti.ag> +# bash programmable completion for bitcoind(1) and bitcoin-cli(1) +# Copyright (c) 2012,2014 Christian von Roques <roques@mti.ag> # Distributed under the MIT/X11 software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -37,9 +37,35 @@ _bitcoind() { COMPREPLY=() _get_comp_words_by_ref -n = cur prev words cword + if ((cword > 4)); then + case ${words[cword-4]} in + signrawtransaction) + COMPREPLY=( $( compgen -W "ALL NONE SINGLE ALL|ANYONECANPAY NONE|ANYONECANPAY SINGLE|ANYONECANPAY" -- "$cur" ) ) + return 0 + ;; + esac + fi + + if ((cword > 3)); then + case ${words[cword-3]} in + addmultisigaddress) + _bitcoin_accounts + return 0 + ;; + gettxout|importprivkey) + COMPREPLY=( $( compgen -W "true false" -- "$cur" ) ) + return 0 + ;; + esac + fi + if ((cword > 2)); then case ${words[cword-2]} in - listreceivedbyaccount|listreceivedbyaddress) + addnode) + COMPREPLY=( $( compgen -W "add remove onetry" -- "$cur" ) ) + return 0 + ;; + getblock|getrawtransaction|listreceivedbyaccount|listreceivedbyaddress|sendrawtransaction) COMPREPLY=( $( compgen -W "true false" -- "$cur" ) ) return 0 ;; @@ -51,11 +77,11 @@ _bitcoind() { fi case "$prev" in - backupwallet) + backupwallet|dumpwallet|importwallet) _filedir return 0 ;; - setgenerate) + getmempool|lockunspent|setgenerate) COMPREPLY=( $( compgen -W "true false" -- "$cur" ) ) return 0 ;; @@ -66,7 +92,7 @@ _bitcoind() { esac case "$cur" in - -conf=*|-pid=*|-rpcsslcertificatechainfile=*|-rpcsslprivatekeyfile=*) + -conf=*|-pid=*|-loadblock=*|-wallet=*|-rpcsslcertificatechainfile=*|-rpcsslprivatekeyfile=*) cur="${cur#*=}" _filedir return 0 @@ -103,7 +129,7 @@ _bitcoind() { esac } -complete -F _bitcoind bitcoind +complete -F _bitcoind bitcoind bitcoin-cli } # Local variables: diff --git a/contrib/bitrpc/bitrpc.py b/contrib/bitrpc/bitrpc.py index b02b299177..a840bc2020 100644 --- a/contrib/bitrpc/bitrpc.py +++ b/contrib/bitrpc/bitrpc.py @@ -10,315 +10,315 @@ rpcpass = "" if rpcpass == "": - access = ServiceProxy("http://127.0.0.1:8332") + access = ServiceProxy("http://127.0.0.1:8332") else: - access = ServiceProxy("http://"+rpcuser+":"+rpcpass+"@127.0.0.1:8332") + access = ServiceProxy("http://"+rpcuser+":"+rpcpass+"@127.0.0.1:8332") cmd = sys.argv[1].lower() if cmd == "backupwallet": - try: - path = raw_input("Enter destination path/filename: ") - print access.backupwallet(path) - except: - print "\n---An error occurred---\n" + try: + path = raw_input("Enter destination path/filename: ") + print access.backupwallet(path) + except: + print "\n---An error occurred---\n" elif cmd == "getaccount": - try: - addr = raw_input("Enter a Bitcoin address: ") - print access.getaccount(addr) - except: - print "\n---An error occurred---\n" + try: + addr = raw_input("Enter a Bitcoin address: ") + print access.getaccount(addr) + except: + print "\n---An error occurred---\n" elif cmd == "getaccountaddress": - try: - acct = raw_input("Enter an account name: ") - print access.getaccountaddress(acct) - except: - print "\n---An error occurred---\n" + try: + acct = raw_input("Enter an account name: ") + print access.getaccountaddress(acct) + except: + print "\n---An error occurred---\n" elif cmd == "getaddressesbyaccount": - try: - acct = raw_input("Enter an account name: ") - print access.getaddressesbyaccount(acct) - except: - print "\n---An error occurred---\n" + try: + acct = raw_input("Enter an account name: ") + print access.getaddressesbyaccount(acct) + except: + print "\n---An error occurred---\n" elif cmd == "getbalance": - try: - acct = raw_input("Enter an account (optional): ") - mc = raw_input("Minimum confirmations (optional): ") - try: - print access.getbalance(acct, mc) - except: - print access.getbalance() - except: - print "\n---An error occurred---\n" + try: + acct = raw_input("Enter an account (optional): ") + mc = raw_input("Minimum confirmations (optional): ") + try: + print access.getbalance(acct, mc) + except: + print access.getbalance() + except: + print "\n---An error occurred---\n" elif cmd == "getblockbycount": - try: - height = raw_input("Height: ") - print access.getblockbycount(height) - except: - print "\n---An error occurred---\n" + try: + height = raw_input("Height: ") + print access.getblockbycount(height) + except: + print "\n---An error occurred---\n" elif cmd == "getblockcount": - try: - print access.getblockcount() - except: - print "\n---An error occurred---\n" + try: + print access.getblockcount() + except: + print "\n---An error occurred---\n" elif cmd == "getblocknumber": - try: - print access.getblocknumber() - except: - print "\n---An error occurred---\n" + try: + print access.getblocknumber() + except: + print "\n---An error occurred---\n" elif cmd == "getconnectioncount": - try: - print access.getconnectioncount() - except: - print "\n---An error occurred---\n" + try: + print access.getconnectioncount() + except: + print "\n---An error occurred---\n" elif cmd == "getdifficulty": - try: - print access.getdifficulty() - except: - print "\n---An error occurred---\n" + try: + print access.getdifficulty() + except: + print "\n---An error occurred---\n" elif cmd == "getgenerate": - try: - print access.getgenerate() - except: - print "\n---An error occurred---\n" + try: + print access.getgenerate() + except: + print "\n---An error occurred---\n" elif cmd == "gethashespersec": - try: - print access.gethashespersec() - except: - print "\n---An error occurred---\n" + try: + print access.gethashespersec() + except: + print "\n---An error occurred---\n" elif cmd == "getinfo": - try: - print access.getinfo() - except: - print "\n---An error occurred---\n" + try: + print access.getinfo() + except: + print "\n---An error occurred---\n" elif cmd == "getnewaddress": - try: - acct = raw_input("Enter an account name: ") - try: - print access.getnewaddress(acct) - except: - print access.getnewaddress() - except: - print "\n---An error occurred---\n" + try: + acct = raw_input("Enter an account name: ") + try: + print access.getnewaddress(acct) + except: + print access.getnewaddress() + except: + print "\n---An error occurred---\n" elif cmd == "getreceivedbyaccount": - try: - acct = raw_input("Enter an account (optional): ") - mc = raw_input("Minimum confirmations (optional): ") - try: - print access.getreceivedbyaccount(acct, mc) - except: - print access.getreceivedbyaccount() - except: - print "\n---An error occurred---\n" + try: + acct = raw_input("Enter an account (optional): ") + mc = raw_input("Minimum confirmations (optional): ") + try: + print access.getreceivedbyaccount(acct, mc) + except: + print access.getreceivedbyaccount() + except: + print "\n---An error occurred---\n" elif cmd == "getreceivedbyaddress": - try: - addr = raw_input("Enter a Bitcoin address (optional): ") - mc = raw_input("Minimum confirmations (optional): ") - try: - print access.getreceivedbyaddress(addr, mc) - except: - print access.getreceivedbyaddress() - except: - print "\n---An error occurred---\n" + try: + addr = raw_input("Enter a Bitcoin address (optional): ") + mc = raw_input("Minimum confirmations (optional): ") + try: + print access.getreceivedbyaddress(addr, mc) + except: + print access.getreceivedbyaddress() + except: + print "\n---An error occurred---\n" elif cmd == "gettransaction": - try: - txid = raw_input("Enter a transaction ID: ") - print access.gettransaction(txid) - except: - print "\n---An error occurred---\n" + try: + txid = raw_input("Enter a transaction ID: ") + print access.gettransaction(txid) + except: + print "\n---An error occurred---\n" elif cmd == "getwork": - try: - data = raw_input("Data (optional): ") - try: - print access.gettransaction(data) - except: - print access.gettransaction() - except: - print "\n---An error occurred---\n" + try: + data = raw_input("Data (optional): ") + try: + print access.gettransaction(data) + except: + print access.gettransaction() + except: + print "\n---An error occurred---\n" elif cmd == "help": - try: - cmd = raw_input("Command (optional): ") - try: - print access.help(cmd) - except: - print access.help() - except: - print "\n---An error occurred---\n" + try: + cmd = raw_input("Command (optional): ") + try: + print access.help(cmd) + except: + print access.help() + except: + print "\n---An error occurred---\n" elif cmd == "listaccounts": - try: - mc = raw_input("Minimum confirmations (optional): ") - try: - print access.listaccounts(mc) - except: - print access.listaccounts() - except: - print "\n---An error occurred---\n" + try: + mc = raw_input("Minimum confirmations (optional): ") + try: + print access.listaccounts(mc) + except: + print access.listaccounts() + except: + print "\n---An error occurred---\n" elif cmd == "listreceivedbyaccount": - try: - mc = raw_input("Minimum confirmations (optional): ") - incemp = raw_input("Include empty? (true/false, optional): ") - try: - print access.listreceivedbyaccount(mc, incemp) - except: - print access.listreceivedbyaccount() - except: - print "\n---An error occurred---\n" + try: + mc = raw_input("Minimum confirmations (optional): ") + incemp = raw_input("Include empty? (true/false, optional): ") + try: + print access.listreceivedbyaccount(mc, incemp) + except: + print access.listreceivedbyaccount() + except: + print "\n---An error occurred---\n" elif cmd == "listreceivedbyaddress": - try: - mc = raw_input("Minimum confirmations (optional): ") - incemp = raw_input("Include empty? (true/false, optional): ") - try: - print access.listreceivedbyaddress(mc, incemp) - except: - print access.listreceivedbyaddress() - except: - print "\n---An error occurred---\n" + try: + mc = raw_input("Minimum confirmations (optional): ") + incemp = raw_input("Include empty? (true/false, optional): ") + try: + print access.listreceivedbyaddress(mc, incemp) + except: + print access.listreceivedbyaddress() + except: + print "\n---An error occurred---\n" elif cmd == "listtransactions": - try: - acct = raw_input("Account (optional): ") - count = raw_input("Number of transactions (optional): ") - frm = raw_input("Skip (optional):") - try: - print access.listtransactions(acct, count, frm) - except: - print access.listtransactions() - except: - print "\n---An error occurred---\n" + try: + acct = raw_input("Account (optional): ") + count = raw_input("Number of transactions (optional): ") + frm = raw_input("Skip (optional):") + try: + print access.listtransactions(acct, count, frm) + except: + print access.listtransactions() + except: + print "\n---An error occurred---\n" elif cmd == "move": - try: - frm = raw_input("From: ") - to = raw_input("To: ") - amt = raw_input("Amount:") - mc = raw_input("Minimum confirmations (optional): ") - comment = raw_input("Comment (optional): ") - try: - print access.move(frm, to, amt, mc, comment) - except: - print access.move(frm, to, amt) - except: - print "\n---An error occurred---\n" + try: + frm = raw_input("From: ") + to = raw_input("To: ") + amt = raw_input("Amount:") + mc = raw_input("Minimum confirmations (optional): ") + comment = raw_input("Comment (optional): ") + try: + print access.move(frm, to, amt, mc, comment) + except: + print access.move(frm, to, amt) + except: + print "\n---An error occurred---\n" elif cmd == "sendfrom": - try: - frm = raw_input("From: ") - to = raw_input("To: ") - amt = raw_input("Amount:") - mc = raw_input("Minimum confirmations (optional): ") - comment = raw_input("Comment (optional): ") - commentto = raw_input("Comment-to (optional): ") - try: - print access.sendfrom(frm, to, amt, mc, comment, commentto) - except: - print access.sendfrom(frm, to, amt) - except: - print "\n---An error occurred---\n" + try: + frm = raw_input("From: ") + to = raw_input("To: ") + amt = raw_input("Amount:") + mc = raw_input("Minimum confirmations (optional): ") + comment = raw_input("Comment (optional): ") + commentto = raw_input("Comment-to (optional): ") + try: + print access.sendfrom(frm, to, amt, mc, comment, commentto) + except: + print access.sendfrom(frm, to, amt) + except: + print "\n---An error occurred---\n" elif cmd == "sendmany": - try: - frm = raw_input("From: ") - to = raw_input("To (in format address1:amount1,address2:amount2,...): ") - mc = raw_input("Minimum confirmations (optional): ") - comment = raw_input("Comment (optional): ") - try: - print access.sendmany(frm,to,mc,comment) - except: - print access.sendmany(frm,to) - except: - print "\n---An error occurred---\n" + try: + frm = raw_input("From: ") + to = raw_input("To (in format address1:amount1,address2:amount2,...): ") + mc = raw_input("Minimum confirmations (optional): ") + comment = raw_input("Comment (optional): ") + try: + print access.sendmany(frm,to,mc,comment) + except: + print access.sendmany(frm,to) + except: + print "\n---An error occurred---\n" elif cmd == "sendtoaddress": - try: - to = raw_input("To (in format address1:amount1,address2:amount2,...): ") - amt = raw_input("Amount:") - comment = raw_input("Comment (optional): ") - commentto = raw_input("Comment-to (optional): ") - try: - print access.sendtoaddress(to,amt,comment,commentto) - except: - print access.sendtoaddress(to,amt) - except: - print "\n---An error occurred---\n" + try: + to = raw_input("To (in format address1:amount1,address2:amount2,...): ") + amt = raw_input("Amount:") + comment = raw_input("Comment (optional): ") + commentto = raw_input("Comment-to (optional): ") + try: + print access.sendtoaddress(to,amt,comment,commentto) + except: + print access.sendtoaddress(to,amt) + except: + print "\n---An error occurred---\n" elif cmd == "setaccount": - try: - addr = raw_input("Address: ") - acct = raw_input("Account:") - print access.setaccount(addr,acct) - except: - print "\n---An error occurred---\n" + try: + addr = raw_input("Address: ") + acct = raw_input("Account:") + print access.setaccount(addr,acct) + except: + print "\n---An error occurred---\n" elif cmd == "setgenerate": - try: - gen= raw_input("Generate? (true/false): ") - cpus = raw_input("Max processors/cores (-1 for unlimited, optional):") - try: - print access.setgenerate(gen, cpus) - except: - print access.setgenerate(gen) - except: - print "\n---An error occurred---\n" + try: + gen= raw_input("Generate? (true/false): ") + cpus = raw_input("Max processors/cores (-1 for unlimited, optional):") + try: + print access.setgenerate(gen, cpus) + except: + print access.setgenerate(gen) + except: + print "\n---An error occurred---\n" elif cmd == "settxfee": - try: - amt = raw_input("Amount:") - print access.settxfee(amt) - except: - print "\n---An error occurred---\n" + try: + amt = raw_input("Amount:") + print access.settxfee(amt) + except: + print "\n---An error occurred---\n" elif cmd == "stop": - try: - print access.stop() - except: - print "\n---An error occurred---\n" + try: + print access.stop() + except: + print "\n---An error occurred---\n" elif cmd == "validateaddress": - try: - addr = raw_input("Address: ") - print access.validateaddress(addr) - except: - print "\n---An error occurred---\n" + try: + addr = raw_input("Address: ") + print access.validateaddress(addr) + except: + print "\n---An error occurred---\n" elif cmd == "walletpassphrase": - try: - pwd = raw_input("Enter wallet passphrase: ") - access.walletpassphrase(pwd, 60) - print "\n---Wallet unlocked---\n" - except: - print "\n---An error occurred---\n" + try: + pwd = raw_input("Enter wallet passphrase: ") + access.walletpassphrase(pwd, 60) + print "\n---Wallet unlocked---\n" + except: + print "\n---An error occurred---\n" elif cmd == "walletpassphrasechange": - try: - pwd = raw_input("Enter old wallet passphrase: ") - pwd2 = raw_input("Enter new wallet passphrase: ") - access.walletpassphrasechange(pwd, pwd2) - print - print "\n---Passphrase changed---\n" - except: - print - print "\n---An error occurred---\n" - print + try: + pwd = raw_input("Enter old wallet passphrase: ") + pwd2 = raw_input("Enter new wallet passphrase: ") + access.walletpassphrasechange(pwd, pwd2) + print + print "\n---Passphrase changed---\n" + except: + print + print "\n---An error occurred---\n" + print else: - print "Command not found or not supported"
\ No newline at end of file + print "Command not found or not supported" diff --git a/contrib/gitian-descriptors/README.md b/contrib/gitian-descriptors/README.md index 3a90b4d038..7a67263ee4 100644 --- a/contrib/gitian-descriptors/README.md +++ b/contrib/gitian-descriptors/README.md @@ -25,30 +25,17 @@ Once you've got the right hardware and software: mkdir gitian-builder/inputs cd gitian-builder/inputs - # Get inputs (see doc/release-process.md for exact inputs needed and where to get them) - ... - cd ../.. - + # Create base images cd gitian-builder - bin/make-base-vm --arch i386 - bin/make-base-vm --arch amd64 + bin/make-base-vm --suite precise --arch i386 + bin/make-base-vm --suite precise --arch amd64 cd .. - # Build Linux release: - cd bitcoin - git pull - cd ../gitian-builder - git pull - ./bin/gbuild --commit bitcoin=HEAD ../bitcoin/contrib/gitian-descriptors/gitian-linux.yml - - # Build Win32 dependencies: (only needs to be done once, or when dependency versions change) - ./bin/gbuild --commit bitcoin=HEAD ../bitcoin/contrib/gitian-descriptors/boost-win32.yml - ./bin/gbuild --commit bitcoin=HEAD ../bitcoin/contrib/gitian-descriptors/deps-win32.yml - ./bin/gbuild --commit bitcoin=HEAD ../bitcoin/contrib/gitian-descriptors/qt-win32.yml - ./bin/gbuild --commit bitcoin=HEAD ../bitcoin/contrib/gitian-descriptors/protobuf-win32.yml - - # Build Win32 release: - ./bin/gbuild --commit bitcoin=HEAD ../bitcoin/contrib/gitian-descriptors/gitian-win32.yml + # Get inputs (see doc/release-process.md for exact inputs needed and where to get them) + ... + + # For further build instructions see doc/release-notes.md + ... --------------------- diff --git a/contrib/gitian-descriptors/deps-linux.yml b/contrib/gitian-descriptors/deps-linux.yml index 908f9321a4..af10461b83 100644 --- a/contrib/gitian-descriptors/deps-linux.yml +++ b/contrib/gitian-descriptors/deps-linux.yml @@ -16,8 +16,8 @@ packages: reference_datetime: "2013-06-01 00:00:00" remotes: [] files: -- "openssl-1.0.1e.tar.gz" -- "miniupnpc-1.8.tar.gz" +- "openssl-1.0.1g.tar.gz" +- "miniupnpc-1.9.tar.gz" - "qrencode-3.4.3.tar.bz2" - "protobuf-2.5.0.tar.bz2" - "db-4.8.30.NC.tar.gz" @@ -30,15 +30,15 @@ script: | export TZ=UTC export LIBRARY_PATH="$STAGING/lib" # Integrity Check - echo "f74f15e8c8ff11aa3d5bb5f276d202ec18d7246e95f961db76054199c69c1ae3 openssl-1.0.1e.tar.gz" | sha256sum -c - echo "bc5f73c7b0056252c1888a80e6075787a1e1e9112b808f863a245483ff79859c miniupnpc-1.8.tar.gz" | sha256sum -c + echo "53cb818c3b90e507a8348f4f5eaedb05d8bfe5358aabb508b7263cc670c3e028 openssl-1.0.1g.tar.gz" | sha256sum -c + echo "2923e453e880bb949e3d4da9f83dd3cb6f08946d35de0b864d0339cf70934464 miniupnpc-1.9.tar.gz" | sha256sum -c echo "dfd71487513c871bad485806bfd1fdb304dedc84d2b01a8fb8e0940b50597a98 qrencode-3.4.3.tar.bz2" | sha256sum -c echo "13bfc5ae543cf3aa180ac2485c0bc89495e3ae711fc6fab4f8ffe90dfb4bb677 protobuf-2.5.0.tar.bz2" | sha256sum -c echo "12edc0df75bf9abd7f82f821795bcee50f42cb2e5f76a6a281b85732798364ef db-4.8.30.NC.tar.gz" | sha256sum -c # - tar xzf openssl-1.0.1e.tar.gz - cd openssl-1.0.1e + tar xzf openssl-1.0.1g.tar.gz + cd openssl-1.0.1g # 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 @@ -46,8 +46,8 @@ script: | make install_sw cd .. # - tar xzfm miniupnpc-1.8.tar.gz - cd miniupnpc-1.8 + tar xzfm miniupnpc-1.9.tar.gz + cd miniupnpc-1.9 # miniupnpc is always built with -fPIC INSTALLPREFIX=$STAGING make $MAKEOPTS install rm -f $STAGING/lib/libminiupnpc.so* # no way to skip shared lib build @@ -95,4 +95,4 @@ script: | done # cd $STAGING - find include lib bin host | sort | zip -X@ $OUTDIR/bitcoin-deps-linux${GBUILD_BITS}-gitian-r3.zip + find include lib bin host | sort | zip -X@ $OUTDIR/bitcoin-deps-linux${GBUILD_BITS}-gitian-r5.zip diff --git a/contrib/gitian-descriptors/deps-win.yml b/contrib/gitian-descriptors/deps-win.yml index 87ebf3e87b..17ac413d80 100644 --- a/contrib/gitian-descriptors/deps-win.yml +++ b/contrib/gitian-descriptors/deps-win.yml @@ -14,9 +14,9 @@ packages: reference_datetime: "2011-01-30 00:00:00" remotes: [] files: -- "openssl-1.0.1e.tar.gz" +- "openssl-1.0.1g.tar.gz" - "db-4.8.30.NC.tar.gz" -- "miniupnpc-1.8.tar.gz" +- "miniupnpc-1.9.tar.gz" - "zlib-1.2.8.tar.gz" - "libpng-1.6.8.tar.gz" - "qrencode-3.4.3.tar.bz2" @@ -28,9 +28,9 @@ script: | INDIR=$HOME/build TEMPDIR=$HOME/tmp # Input Integrity Check - echo "f74f15e8c8ff11aa3d5bb5f276d202ec18d7246e95f961db76054199c69c1ae3 openssl-1.0.1e.tar.gz" | sha256sum -c + echo "53cb818c3b90e507a8348f4f5eaedb05d8bfe5358aabb508b7263cc670c3e028 openssl-1.0.1g.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 "2923e453e880bb949e3d4da9f83dd3cb6f08946d35de0b864d0339cf70934464 miniupnpc-1.9.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 @@ -48,8 +48,8 @@ script: | mkdir -p $INSTALLPREFIX $BUILDDIR cd $BUILDDIR # - tar xzf $INDIR/openssl-1.0.1e.tar.gz - cd openssl-1.0.1e + tar xzf $INDIR/openssl-1.0.1g.tar.gz + cd openssl-1.0.1g if [ "$BITS" == "32" ]; then OPENSSL_TGT=mingw else @@ -67,11 +67,11 @@ script: | make install_lib install_include cd ../.. # - tar xzf $INDIR/miniupnpc-1.8.tar.gz - cd miniupnpc-1.8 + tar xzf $INDIR/miniupnpc-1.9.tar.gz + cd miniupnpc-1.9 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 + --- miniupnpc-1.9/Makefile.mingw.orig 2013-09-29 18:52:51.014087958 -1000 + +++ miniupnpc-1.9/Makefile.mingw 2013-09-29 19:09:29.663318691 -1000 @@ -67,8 +67,8 @@ wingenminiupnpcstrings.o: wingenminiupnpcstrings.c @@ -124,5 +124,5 @@ script: | done # cd $INSTALLPREFIX - find include lib | sort | zip -X@ $OUTDIR/bitcoin-deps-win$BITS-gitian-r10.zip + find include lib | sort | zip -X@ $OUTDIR/bitcoin-deps-win$BITS-gitian-r12.zip done # for BITS in diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml index 01a5c3c0bf..018b6fb26f 100644 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -21,8 +21,8 @@ remotes: - "url": "https://github.com/bitcoin/bitcoin.git" "dir": "bitcoin" files: -- "bitcoin-deps-linux32-gitian-r3.zip" -- "bitcoin-deps-linux64-gitian-r3.zip" +- "bitcoin-deps-linux32-gitian-r5.zip" +- "bitcoin-deps-linux64-gitian-r5.zip" - "boost-linux32-1.55.0-gitian-r1.zip" - "boost-linux64-1.55.0-gitian-r1.zip" script: | @@ -36,21 +36,42 @@ script: | # mkdir -p $STAGING cd $STAGING - unzip ../build/bitcoin-deps-linux${GBUILD_BITS}-gitian-r3.zip + unzip ../build/bitcoin-deps-linux${GBUILD_BITS}-gitian-r5.zip unzip ../build/boost-linux${GBUILD_BITS}-1.55.0-gitian-r1.zip cd ../build + + function do_configure { + ./configure "$@" --enable-upnp-default --prefix=$STAGING --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" + } # cd bitcoin ./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" + do_configure make dist DISTNAME=`echo bitcoin-*.tar.gz` + + # Build dynamic versions of everything + # (with static linking to boost and openssl as well a some non-OS deps) mkdir -p distsrc cd distsrc tar --strip-components=1 -xf ../$DISTNAME - ./configure --enable-upnp-default --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" + do_configure --bindir=$BINDIR make $MAKEOPTS make $MAKEOPTS install-strip + make $MAKEOPTS clean + + # Build fully static versions of bitcoind and bitcoin-cli for older Linux distros + STATIC_BINDIR="$HOME/bindir.static" + mkdir -p $STATIC_BINDIR + # For 32-bit, -pie cannot be used with -static, as invalid executables are generated + # For 64-bit, -pie with -static causes a link error + # Disable hardening in configure and manually pass 'static-safe' hardening flags + OPTFLAGS='-O2 -static -Wstack-protector -fstack-protector-all -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -Wl,-z,relro -Wl,-z,now' + do_configure --bindir=$STATIC_BINDIR --disable-tests --enable-upnp-default --without-gui --disable-hardening + make $MAKEOPTS + make $MAKEOPTS install-strip + cp $STATIC_BINDIR/bitcoind $BINDIR/bitcoind.static + cp $STATIC_BINDIR/bitcoin-cli $BINDIR/bitcoin-cli.static # sort distribution tar file and normalize user/group/mtime information for deterministic output mkdir -p $OUTDIR/src diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml index ecda73e44e..2191fb36c7 100644 --- a/contrib/gitian-descriptors/gitian-win.yml +++ b/contrib/gitian-descriptors/gitian-win.yml @@ -22,12 +22,12 @@ 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" +- "qt-win32-5.2.0-gitian-r3.zip" +- "qt-win64-5.2.0-gitian-r3.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" +- "bitcoin-deps-win32-gitian-r12.zip" +- "bitcoin-deps-win64-gitian-r12.zip" - "protobuf-win32-2.5.0-gitian-r4.zip" - "protobuf-win64-2.5.0-gitian-r4.zip" script: | @@ -59,9 +59,9 @@ script: | mkdir -p $STAGING $BUILDDIR $BINDIR # cd $STAGING - unzip $INDIR/qt-win${BITS}-5.2.0-gitian-r2.zip + unzip $INDIR/qt-win${BITS}-5.2.0-gitian-r3.zip unzip $INDIR/boost-win${BITS}-1.55.0-gitian-r6.zip - unzip $INDIR/bitcoin-deps-win${BITS}-gitian-r10.zip + unzip $INDIR/bitcoin-deps-win${BITS}-gitian-r12.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 diff --git a/contrib/gitian-descriptors/qt-win.yml b/contrib/gitian-descriptors/qt-win.yml index e3de2c02ef..8f24492b53 100644 --- a/contrib/gitian-descriptors/qt-win.yml +++ b/contrib/gitian-descriptors/qt-win.yml @@ -15,8 +15,8 @@ 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" +- "bitcoin-deps-win32-gitian-r12.zip" +- "bitcoin-deps-win64-gitian-r12.zip" script: | # Defines export TZ=UTC @@ -48,7 +48,7 @@ script: | # # Need mingw-compiled openssl from bitcoin-deps: cd $DEPSDIR - unzip $INDIR/bitcoin-deps-win${BITS}-gitian-r10.zip + unzip $INDIR/bitcoin-deps-win${BITS}-gitian-r12.zip # cd $BUILDDIR # @@ -86,7 +86,7 @@ script: | 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 + find | sort | zip -X@ $OUTDIR/qt-win${BITS}-5.2.0-gitian-r3.zip unset LD_PRELOAD unset FAKETIME done # for BITS in diff --git a/contrib/gitian-downloader/aschildbach-key.pgp b/contrib/gitian-downloader/aschildbach-key.pgp Binary files differnew file mode 100644 index 0000000000..df06e19fa4 --- /dev/null +++ b/contrib/gitian-downloader/aschildbach-key.pgp diff --git a/contrib/gitian-downloader/linux-download-config b/contrib/gitian-downloader/linux-download-config index ae0377a704..b5e0561aa3 100644 --- a/contrib/gitian-downloader/linux-download-config +++ b/contrib/gitian-downloader/linux-download-config @@ -8,39 +8,32 @@ rss: pattern: bitcoin-\d+.\d+.\d+-linux-gitian.zip signers: 0A82509767C7D4A5D14DA2301AE1D35043E08E54: - weight: 40 name: BlueMatt key: bluematt BF6273FAEF7CC0BA1F562E50989F6B3048A116B5: - weight: 40 name: Devrandom key: devrandom E463A93F5F3117EEDE6C7316BD02942421F4889F: - weight: 40 name: Luke-Jr key: luke-jr D762373D24904A3E42F33B08B9A408E71DAAC974: - weight: 40 name: "Pieter Wuille" key: sipa 77E72E69DA7EE0A148C06B21B34821D4944DE5F7: - weight: 40 name: tcatm key: tcatm 01CDF4627A3B88AAE4A571C87588242FBE38D3A8: - weight: 40 name: "Gavin Andresen" key: gavinandresen 71A3B16735405025D447E8F274810B012346C9A6: - weight: 40 name: "Wladimir J. van der Laan" key: laanwj AEC1884398647C47413C1C3FB1179EB7347DC10D: - weight: 40 name: "Warren Togami" key: wtogami 9692B91BBF0E8D34DFD33B1882C5C009628ECF0C: - weight: 1 name: michagogo key: michagogo -minimum_weight: 120 + E944AE667CF960B1004BC32FCA662BE18B877A60: + name: "Andreas Schildbach" + key: aschildbach diff --git a/contrib/gitian-downloader/win32-download-config b/contrib/gitian-downloader/win32-download-config index 1ead2fddcb..5d56db863e 100644 --- a/contrib/gitian-downloader/win32-download-config +++ b/contrib/gitian-downloader/win32-download-config @@ -8,39 +8,32 @@ rss: pattern: bitcoin-\d+.\d+.\d+-win32-gitian.zip signers: 0A82509767C7D4A5D14DA2301AE1D35043E08E54: - weight: 40 name: BlueMatt key: bluematt BF6273FAEF7CC0BA1F562E50989F6B3048A116B5: - weight: 40 name: Devrandom key: devrandom E463A93F5F3117EEDE6C7316BD02942421F4889F: - weight: 40 name: Luke-Jr key: luke-jr D762373D24904A3E42F33B08B9A408E71DAAC974: - weight: 40 name: "Pieter Wuille" key: sipa 77E72E69DA7EE0A148C06B21B34821D4944DE5F7: - weight: 40 name: tcatm key: tcatm 01CDF4627A3B88AAE4A571C87588242FBE38D3A8: - weight: 40 name: "Gavin Andresen" key: gavinandresen 71A3B16735405025D447E8F274810B012346C9A6: - weight: 40 name: "Wladimir J. van der Laan" key: laanwj AEC1884398647C47413C1C3FB1179EB7347DC10D: - weight: 40 name: "Warren Togami" key: wtogami 9692B91BBF0E8D34DFD33B1882C5C009628ECF0C: - weight: 1 name: michagogo key: michagogo -minimum_weight: 120 + E944AE667CF960B1004BC32FCA662BE18B877A60: + name: "Andreas Schildbach" + key: aschildbach diff --git a/contrib/macdeploy/DS_Store b/contrib/macdeploy/DS_Store Binary files differnew file mode 100644 index 0000000000..b9a1e14864 --- /dev/null +++ b/contrib/macdeploy/DS_Store diff --git a/contrib/macdeploy/macdeployqtplus b/contrib/macdeploy/macdeployqtplus index 533be6cffa..5c310df1fc 100755 --- a/contrib/macdeploy/macdeployqtplus +++ b/contrib/macdeploy/macdeployqtplus @@ -196,7 +196,8 @@ class DeploymentInfo(object): def getFrameworks(binaryPath, verbose): if verbose >= 3: print "Inspecting with otool: " + binaryPath - otool = subprocess.Popen(["otool", "-L", binaryPath], stdout=subprocess.PIPE, stderr=subprocess.PIPE) + otoolbin=os.getenv("OTOOL", "otool") + otool = subprocess.Popen([otoolbin, "-L", binaryPath], stdout=subprocess.PIPE, stderr=subprocess.PIPE) o_stdout, o_stderr = otool.communicate() if otool.returncode != 0: if verbose >= 1: @@ -221,7 +222,8 @@ def getFrameworks(binaryPath, verbose): return libraries def runInstallNameTool(action, *args): - subprocess.check_call(["install_name_tool", "-"+action] + list(args)) + installnametoolbin=os.getenv("INSTALLNAMETOOL", "install_name_tool") + subprocess.check_call([installnametoolbin, "-"+action] + list(args)) def changeInstallName(oldName, newName, binaryPath, verbose): if verbose >= 3: @@ -239,10 +241,11 @@ def changeIdentification(id, binaryPath, verbose): runInstallNameTool("id", id, binaryPath) def runStrip(binaryPath, verbose): + stripbin=os.getenv("STRIP", "strip") if verbose >= 3: print "Using strip:" print " stripped", binaryPath - subprocess.check_call(["strip", "-x", binaryPath]) + subprocess.check_call([stripbin, "-x", binaryPath]) def copyFramework(framework, path, verbose): if framework.sourceFilePath.startswith("Qt"): @@ -347,6 +350,8 @@ def deployFrameworksForAppBundle(applicationBundle, strip, verbose): def deployPlugins(appBundleInfo, deploymentInfo, strip, verbose): # Lookup available plugins, exclude unneeded plugins = [] + if deploymentInfo.pluginPath is None: + return for dirpath, dirnames, filenames in os.walk(deploymentInfo.pluginPath): pluginDirectory = os.path.relpath(dirpath, deploymentInfo.pluginPath) if pluginDirectory == "designer": @@ -421,8 +426,8 @@ def deployPlugins(appBundleInfo, deploymentInfo, strip, verbose): deployFrameworks([dependency], appBundleInfo.path, destinationPath, strip, verbose, deploymentInfo) qt_conf="""[Paths] -translations=Resources -plugins=PlugIns +Translations=Resources +Plugins=PlugIns """ ap = ArgumentParser(description="""Improved version of macdeployqt. diff --git a/doc/Doxyfile b/doc/Doxyfile index 9bad2d0759..e0339e652e 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile @@ -34,7 +34,7 @@ PROJECT_NAME = Bitcoin # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 0.9.0 +PROJECT_NUMBER = 0.9.99 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer @@ -683,7 +683,7 @@ RECURSIVE = YES # excluded from the INPUT source files. This way you can easily exclude a # subdirectory from a directory tree whose root is specified with the INPUT tag. -EXCLUDE = +EXCLUDE = src/leveldb src/json src/test /src/qt/test # The EXCLUDE_SYMLINKS tag can be used select whether or not files or # directories that are symbolic links (a Unix file system feature) are excluded @@ -705,7 +705,7 @@ EXCLUDE_PATTERNS = # wildcard * is used, a substring. Examples: ANamespace, AClass, # AClass::ANamespace, ANamespace::*Test -EXCLUDE_SYMBOLS = +EXCLUDE_SYMBOLS = boost google # The EXAMPLE_PATH tag can be used to specify one or more files or # directories that contain example code fragments that are included (see @@ -1577,7 +1577,7 @@ HIDE_UNDOC_RELATIONS = YES # toolkit from AT&T and Lucent Bell Labs. The other options in this section # have no effect if this option is set to NO (the default) -HAVE_DOT = NO +HAVE_DOT = YES # The DOT_NUM_THREADS specifies the number of dot invocations doxygen is # allowed to run in parallel. When set to 0 (the default) doxygen will @@ -1659,7 +1659,7 @@ INCLUDED_BY_GRAPH = YES # the time of a run. So in most cases it will be better to enable call graphs # for selected functions only using the \callgraph command. -CALL_GRAPH = NO +CALL_GRAPH = YES # If the CALLER_GRAPH and HAVE_DOT tags are set to YES then # doxygen will generate a caller dependency graph for every global function @@ -1667,7 +1667,7 @@ CALL_GRAPH = NO # the time of a run. So in most cases it will be better to enable caller # graphs for selected functions only using the \callergraph command. -CALLER_GRAPH = NO +CALLER_GRAPH = YES # If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen # will generate a graphical hierarchy of all classes instead of a textual one. @@ -1685,7 +1685,7 @@ DIRECTORY_GRAPH = YES # generated by dot. Possible values are svg, png, jpg, or gif. # If left blank png will be used. -DOT_IMAGE_FORMAT = png +DOT_IMAGE_FORMAT = svg # The tag DOT_PATH can be used to specify the path where the dot tool can be # found. If left blank, it is assumed the dot tool can be found in the path. diff --git a/doc/README.md b/doc/README.md index 148db94214..f5aeb34a3c 100644 --- a/doc/README.md +++ b/doc/README.md @@ -1,4 +1,4 @@ -Bitcoin 0.9.0rc1 BETA +Bitcoin 0.9.99 BETA ===================== Copyright (c) 2009-2014 Bitcoin Developers @@ -6,7 +6,7 @@ Copyright (c) 2009-2014 Bitcoin Developers Setup --------------------- -[Bitcoin Core](http://bitcoin.org/en/download) is the original Bitcoin client and it builds the backbone of the network. However, it downloads and stores the entire history of Bitcoin transactions (which is currently several GBs); depending on the speed of your computer and network connection, the synchronization process can take anywhere from a few hours to a day or more. Thankfully you only have to do this once. If you would like the process to go faster you can [download the blockchain directly](https://bitcointalk.org/index.php?topic=145386.0). +[Bitcoin Core](http://bitcoin.org/en/download) is the original Bitcoin client and it builds the backbone of the network. However, it downloads and stores the entire history of Bitcoin transactions (which is currently several GBs); depending on the speed of your computer and network connection, the synchronization process can take anywhere from a few hours to a day or more. Thankfully you only have to do this once. If you would like the process to go faster you can [download the blockchain directly](bootstrap.md). Running --------------------- diff --git a/doc/README_windows.txt b/doc/README_windows.txt index abca4894e2..18fd4216f9 100644 --- a/doc/README_windows.txt +++ b/doc/README_windows.txt @@ -1,4 +1,4 @@ -Bitcoin 0.9.0rc1 BETA
+Bitcoin 0.9.99 BETA
Copyright (c) 2009-2014 Bitcoin Core Developers
diff --git a/doc/assets-attribution.md b/doc/assets-attribution.md index d42be8fb24..61b457a282 100644 --- a/doc/assets-attribution.md +++ b/doc/assets-attribution.md @@ -78,13 +78,13 @@ Everaldo (Everaldo Coelho) ### Assets Used scripts/img/reload.xcf (modified), src/qt/res/movies/*.png -[Vignoni David](http://www.oxygen-icons.org) +[Vignoni David](http://techbase.kde.org/Projects/Oxygen) ----------------------- ### Info * Designer: Vignoni David * License: Oxygen icon theme is dual licensed. You may copy it under the Creative Common Attribution-ShareAlike 3.0 License or the GNU Library General Public License. -* Site: [http://www.oxygen-icons.org](http://www.oxygen-icons.org) +* Site: [http://techbase.kde.org/Projects/Oxygen](http://techbase.kde.org/Projects/Oxygen) ### Assets Used src/qt/res/icons/debugwindow.png diff --git a/doc/bootstrap.md b/doc/bootstrap.md new file mode 100644 index 0000000000..fefd33831a --- /dev/null +++ b/doc/bootstrap.md @@ -0,0 +1,65 @@ +### Bootstrap the Blockchain Synchronization + +Normally the Bitcoin client will download the transaction and network information, called the blockchain, from network by syncing with the other clients. This can be a process that can take multiple days as the [Bitcoin block chain](https://blockchain.info/charts/blocks-size) has grown to more than 15 gigabytes, and is growing almost a gigabyte every month. Luckily there is a safe and fast way to speed up this process. We’ll show you how to bootstrap your blockchain to bring your client up to speed in just a few simple steps. + +### Requirements + +A fresh install of the Bitcoin client software. + +### Download the blockchain via Bittorent + +Jeff Garzik, Bitcoin core developer, offers an [torrent file](https://bitcointalk.org/index.php?topic=145386.0) for bootstrapping purposes that is updated often. Bittorrent is a protocol that speeds up the downloading of large files by using the other clients in the network. Example free and safe open-source clients are [Deluge](http://deluge-torrent.org/) or [QBittorent](http://www.qbittorrent.org/). A guide to installing and configuring the torrent clients can be found [here](http://dev.deluge-torrent.org/wiki/UserGuide) for Deluge and [here](http://qbforums.shiki.hu/) for QBittorent. A further in-depth tutorial on Bittorent can be found [here](http://www.howtogeek.com/howto/31846/bittorrent-for-beginners-how-get-started-downloading-torrents/). + +With the client installed we’ll proceed to download the blockchain torrent file. Use the following magnet link: + + magnet:?xt=urn:btih:2d4e6c1f96c5d5fb260dff92aea4e600227f1aea&dn=bootstrap.dat&tr=udp://tracker.openbittorrent.com:80&tr=udp://tracker.publicbt.com:80&tr=udp://tracker.ccc.de:80&tr=udp://tracker.istole.it:80 + + or go to [Jeff Garzik's topic](https://bitcointalk.org/index.php?topic=145386.0) for a signed magnet link. Alternately you can use the [.torrent file](http://sourceforge.net/projects/bitcoin/files/Bitcoin/blockchain/bootstrap.dat.torrent/download) found on Sourceforge. + + + +The download page should look like this, with a countdown to the download. If it does not work click the direct download link. + +The torrent client installed will recognize the download of the torrent file. Save the bootstrap.dat file to a folder you use for downloads. The image below shows the torrent download in QBittorent, with current speed and ETA highlighted. + + + +### Download the block chain directly from official repositories +The Bittorent version, see above, of the block chain download is refreshed more often than the direct download available. If Bittorent is blocked on your network then you can use the direct download method. Be sure to only use official repositories as the link displayed below. This download will only update the client to March 2013. + +Click [here](http://sourceforge.net/projects/bitcoin/files/Bitcoin/blockchain/bitcoin_blockchain_170000.zip/download) to download or copy and paste the link below. + + http://sourceforge.net/projects/bitcoin/files/Bitcoin/blockchain/bitcoin_blockchain_170000.zip/download + +The download page should look like this, with a countdown to the download. If it does not work directly click the download. Save the file to a folder you use for downloads. + + +### Importing the blockchain +Exit the Bitcoin Client software if you have it running. Be sure not to have an actively used wallet in use. Now we are going to copy the download of the blockchain to the Bitcoin client data directory. You should run the client software at least once so it can generate the data directory. Copy the downloaded bootstrap.dat file into the Bitcoin data folder. + +**For Windows users:** +Open explorer, and type into the address bar: + + %APPDATA%\Bitcoin + +This will open up the data folder. It should look like the image below. Copy over the bootstrap.dat from your download folder to this directory. + + +**For OSX users:** +Open Finder by pressing Press [shift] + [cmd] + [g] and enter: + + ~/Library/Application Support/Bitcoin/ + +**For Linux users:** +The directory is hidden in your User folder. Go to: + + ~/.bitcoin/ + +### Importing the blockchain +Now start the Bitcoin client software. It should show "Importing blocks from disk" like the image below. + +Wait until the import finishes. The client will download the last days not covered by the import. Congratulations you have successfully imported the blockchain! + +### Is this safe? + +Yes, the above method is safe. The download contains only raw block chain data and the client verifies this on import. Do not download the blockchain from unofficial sources, especially if they provide `*.rev` and `*.sst` files. These files are not verified and can contain malicious edits. diff --git a/doc/build-osx.md b/doc/build-osx.md index faa31cb023..0de5c792e9 100644 --- a/doc/build-osx.md +++ b/doc/build-osx.md @@ -86,7 +86,9 @@ If not, you can ensure that the Homebrew OpenSSL is correctly linked by running brew link openssl --force -Rerunning "openssl version" should now return the correct version. +Rerunning "openssl version" should now return the correct version. If it +doesn't, make sure `/usr/local/bin` comes before `/usr/bin` in your +PATH. ### Building `bitcoind` diff --git a/doc/build-unix.md b/doc/build-unix.md index c11c0138a4..498bfa1e0f 100644 --- a/doc/build-unix.md +++ b/doc/build-unix.md @@ -14,21 +14,21 @@ This will build bitcoin-qt as well if the dependencies are met. Dependencies --------------------- - Library Purpose Description - ------- ------- ----------- - libssl SSL Support Secure communications - libdb4.8 Berkeley DB Wallet storage - libboost Boost C++ Library - miniupnpc UPnP Support Optional firewall-jumping support - qt GUI GUI toolkit - protobuf Payments in GUI Data interchange format used for payment protocol - libqrencode QR codes in GUI Optional for generating QR codes + Library | Purpose | Description + ------------|------------------|---------------------- + libssl | SSL Support | Secure communications + libdb4.8 | Berkeley DB | Wallet storage + libboost | Boost | C++ Library + miniupnpc | UPnP Support | Optional firewall-jumping support + qt | GUI | GUI toolkit + protobuf | Payments in GUI | Data interchange format used for payment protocol + libqrencode | QR codes in GUI | Optional for generating QR codes [miniupnpc](http://miniupnp.free.fr/) may be used for UPnP port mapping. It can be downloaded from [here]( http://miniupnp.tuxfamily.org/files/). UPnP support is compiled in and turned off by default. See the configure options for upnp behavior desired: - --with-miniupnpc No UPnP support miniupnp not required + --without-miniupnpc No UPnP support miniupnp not required --disable-upnp-default (the default) UPnP support turned off by default at runtime --enable-upnp-default UPnP support turned on by default at runtime @@ -42,15 +42,14 @@ Licenses of statically linked libraries: Boost MIT-like license miniupnpc New (3-clause) BSD license -- Versions used in this release: -- GCC 4.3.3 -- OpenSSL 1.0.1c -- Berkeley DB 4.8.30.NC -- Boost 1.37 -- miniupnpc 1.6 -- qt 4.8.3 -- protobuf 2.5.0 -- libqrencode 3.2.0 +- For the versions used in this release, see doc/release-process.md under *Fetch and build inputs*. + +System requirements +-------------------- + +C++ compilers are memory-hungry. It is recommended to have at least 1 GB of +memory available when compiling Bitcoin Core. With 512MB of memory or less +compilation will take much longer due to swap thrashing. Dependency Build Instructions: Ubuntu & Debian ---------------------------------------------- @@ -72,9 +71,10 @@ for Ubuntu 12.04 and later: Ubuntu 12.04 and later have packages for libdb5.1-dev and libdb5.1++-dev, but using these will break binary wallet compatibility, and is not recommended. - -for Ubuntu 13.10: - libboost1.54-all-dev will not work. Remove libboost1.54-all-dev and install libboost1.53-all-dev + +for Ubuntu 13.10: + libboost1.54 will not work, + remove libboost1.54-all-dev and install libboost1.53-all-dev instead. for Debian 7 (Wheezy) and later: The oldstable repository contains db4.8 packages. @@ -82,7 +82,7 @@ for Debian 7 (Wheezy) and later: replacing [mirror] with any official debian mirror. deb http://[mirror]/debian/ oldstable main - + To enable the change run sudo apt-get update @@ -91,8 +91,7 @@ for other Ubuntu & Debian: sudo apt-get install libdb4.8-dev sudo apt-get install libdb4.8++-dev - sudo apt-get install libboost1.37-dev - (If using Boost 1.37, append -mt to the boost libraries in the makefile) + sudo apt-get install libboost1.55-all-dev Optional: @@ -108,15 +107,15 @@ 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 + sudo apt-get install libqt4-dev libprotobuf-dev protobuf-compiler For Qt 5 you need the following: - apt-get install libqt5gui5 libqt5core5 libqt5dbus5 qttools5-dev qttools5-dev-tools libprotobuf-dev + sudo apt-get install libqt5gui5 libqt5core5 libqt5dbus5 qttools5-dev qttools5-dev-tools libprotobuf-dev libqrencode (optional) can be installed with: - apt-get install libqrencode-dev + sudo apt-get install libqrencode-dev Once these are installed, they will be found by configure and a bitcoin-qt executable will be built by default. @@ -138,8 +137,12 @@ miniupnpc Berkeley DB ----------- -You need Berkeley DB 4.8. If you have to build Berkeley DB yourself: +You need Berkeley DB 4.8. If you have to build it yourself: + wget 'http://download.oracle.com/berkeley-db/db-4.8.30.NC.tar.gz' + echo '12edc0df75bf9abd7f82f821795bcee50f42cb2e5f76a6a281b85732798364ef db-4.8.30.NC.tar.gz' | sha256sum -c + # -> db-4.8.30.NC.tar.gz: OK + tar -xzvf db-4.8.30.NC.tar.gz cd build_unix/ ../dist/configure --enable-cxx make diff --git a/doc/coding.md b/doc/coding.md index 3581d7deb2..69388c9ce2 100644 --- a/doc/coding.md +++ b/doc/coding.md @@ -43,8 +43,61 @@ Common types: set set or multiset bn CBigNum -------------------------- +Doxygen comments +----------------- + +To facilitate the generation of documentation, use doxygen-compatible comment blocks for functions, methods and fields. + +For example, to describe a function use: +```c++ +/** + * ... text ... + * @param[in] arg1 A description + * @param[in] arg2 Another argument description + * @pre Precondition for function... + */ +bool function(int arg1, const char *arg2) +``` +A complete list of `@xxx` commands can be found at http://www.stack.nl/~dimitri/doxygen/manual/commands.html. +As Doxygen recognizes the comments by the delimiters (`/**` and `*/` in this case), you don't +*need* to provide any commands for a comment to be valid, just a description text is fine. + +To describe a class use the same construct above the class definition: +```c++ +/** + * Alerts are for notifying old versions if they become too obsolete and + * need to upgrade. The message is displayed in the status bar. + * @see GetWarnings() + */ +class CAlert +{ +``` + +To describe a member or variable use: +```c++ +int var; //!< Detailed description after the member +``` + +Also OK: +```c++ +/// +/// ... text ... +/// +bool function2(int arg1, const char *arg2) +``` + +Not OK (used plenty in the current source, but not picked up): +```c++ +// +// ... text ... +// +``` + +A full list of comment syntaxes picked up by doxygen can be found at http://www.stack.nl/~dimitri/doxygen/manual/docblocks.html, +but if possible use one of the above styles. + Locking/mutex usage notes +------------------------- The code is multi-threaded, and uses mutexes and the LOCK/TRY_LOCK macros to protect data structures. @@ -60,35 +113,35 @@ between the various components is a goal, with any necessary locking done by the components (e.g. see the self-contained CKeyStore class and its cs_KeyStore lock for example). -------- Threads +------- + +- ThreadScriptCheck : Verifies block scripts. + +- ThreadImport : Loads blocks from blk*.dat files or bootstrap.dat. - StartNode : Starts other threads. -- ThreadGetMyExternalIP : Determines outside-the-firewall IP address, sends addr message to connected peers when it determines it. +- ThreadGetMyExternalIP : Determines outside-the-firewall IP address, sends addr message to connected peers when it determines it. + +- ThreadDNSAddressSeed : Loads addresses of peers from the DNS. + +- ThreadMapPort : Universal plug-and-play startup/shutdown - ThreadSocketHandler : Sends/Receives data from peers on port 8333. - -- ThreadMessageHandler : Higher-level message handling (sending and receiving). - + +- ThreadOpenAddedConnections : Opens network connections to added nodes. + - ThreadOpenConnections : Initiates new connections to peers. -- ThreadTopUpKeyPool : replenishes the keystore's keypool. - -- ThreadCleanWalletPassphrase : re-locks an encrypted wallet after user has unlocked it for a period of time. - -- SendingDialogStartTransfer : used by pay-via-ip-address code (obsolete) - -- ThreadDelayedRepaint : repaint the gui +- ThreadMessageHandler : Higher-level message handling (sending and receiving). + +- DumpAddresses : Dumps IP addresses of nodes to peers.dat. - ThreadFlushWalletDB : Close the wallet.dat file if it hasn't been used in 500ms. - + - ThreadRPCServer : Remote procedure call handler, listens on port 8332 for connections and services them. - -- ThreadBitcoinMiner : Generates bitcoins - -- ThreadMapPort : Universal plug-and-play startup/shutdown - -- Shutdown : Does an orderly shutdown of everything - -- ExitTimeout : Windows-only, sleeps 5 seconds then exits application + +- BitcoinMiner : Generates bitcoins (if wallet is enabled). + +- Shutdown : Does an orderly shutdown of everything. diff --git a/doc/gitian-building.md b/doc/gitian-building.md new file mode 100644 index 0000000000..544bbc12c1 --- /dev/null +++ b/doc/gitian-building.md @@ -0,0 +1,410 @@ +Gitian building +================ + +*Setup instructions for a gitian build of Bitcoin using a Debian VM or physical system.* + +Gitian is the deterministic build process that is used to build the Bitcoin +Core executables [1]. It provides a way to be reasonably sure that the +executables are really built from source on github. It also makes sure that +the same, tested dependencies are used and statically built into the executable. + +Multiple developers build the source code by following a specific descriptor +("recipe"), cryptographically sign the result, and upload the resulting signature. +These results are compared and only if they match, the build is accepted and uploaded +to bitcoin.org. + +More independent gitian builders are needed, which is why I wrote this +guide. It is preferred to follow these steps yourself instead of using someone else's +VM image to avoid 'contaminating' the build. + +[1] For all platforms except for MacOSX, at this point. Work for deterministic +builds for Mac is under way here: https://github.com/theuni/osx-cross-depends . + +Table of Contents +------------------ + +- [Create a new VirtualBox VM](#create-a-new-virtualbox-vm) +- [Connecting to the VM](#connecting-to-the-vm) +- [Setting up Debian for gitian building](#setting-up-debian-for-gitian-building) +- [Installing gitian](#installing-gitian) +- [Setting up gitian images](#setting-up-gitian-images) +- [Getting and building the inputs](#getting-and-building-the-inputs) +- [Building Bitcoin](#building-bitcoin) +- [Building an alternative repository](#building-an-alternative-repository) +- [Signing externally](#signing-externally) +- [Uploading signatures](#uploading-signatures) + +Create a new VirtualBox VM +--------------------------- + +The first step is to create a new Virtual Machine, which will be explained in +this section. This VM will be used to do the Gitian builds. In this guide it +will be explained how to set up the environment, and how to get the builds +started. + +Debian Linux was chosen as the host distribution because it has a lightweight install (in +contrast to Ubuntu) and is readily available. We here show the steps for +VirtualBox [1], but any kind of virtualization can be used. You can also install +on actual hardware instead of using a VM, in this case you can skip this section. + +In the VirtualBox GUI click "Create" and choose the following parameters in the wizard: + + + +- Type: Linux, Debian (64 bit) + + + +- Memory Size: at least 1024MB, anything lower will really slow the build down + + + +- Hard Drive: Create a virtual hard drive now + + + +- Hard Drive file type: Use the default, VDI (VirtualBox Disk Image) + + + +- Storage on Physical hard drive: Dynamically Allocated + + + +- Disk size: at least 40GB; as low as 20GB *may* be possible, but better to err on the safe side +- Push the `Create` button + +Get the [Debian 7.4 net installer](http://cdimage.debian.org/debian-cd/7.4.0/amd64/iso-cd/debian-7.4.0-amd64-netinst.iso). +This DVD image can be validated using a SHA256 hashing tool, for example on +Unixy OSes by entering the following in a terminal: + + echo "b712a141bc60269db217d3b3e456179bd6b181645f90e4aac9c42ed63de492e9 /home/orion/Downloads/debian-7.4.0-amd64-netinst.iso" | sha256sum -c + # (must return OK) + +After creating the VM, we need to configure it. + +- Click the `Settings` button, then go to the `Network` tab. Adapter 1 should be attacked to `NAT`. + + + +- Click `Advanced`, then `Port Forwarding`. We want to set up a port through where we can reach the VM to get files in and out. +- Create a new rule by clicking the plus icon. + + + +- Set up the new rule the following way: + - Name: `SSH` + - Protocol: `TCP` + - Leave Host IP empty + - Host Port: `22222` + - Leave Guest IP empty + - Guest Port: `22` + +- Click `Ok` twice to save. + +Then start the VM. On the first launch you will be asked for a CD or DVD image. Choose the downloaded iso. + + + +[1] https://www.virtualbox.org/ + +Installing Debian +------------------ + +In this section it will be explained how to install Debian on the newly created VM. + +- Choose the non-graphical installer. We do not need the graphical environment, it will only increase installation time and disk usage. + + + +**Note**: Navigation in the Debian installer: To keep a setting at the default +and proceed, just press `Enter`. To select a different button, press `Tab`. + +- Choose locale and keyboard settings (doesn't matter, you can just go with the defaults or select your own information) + + + + + +- The VM will detect network settings using DHCP, this should all proceed automatically +- Configure the network: + - System name `debian`. + - Leave domain name empty. + + + +- Choose a root password and enter it twice (and remember it for later) + + + +- Name the new user `debian` (the full name doesn't matter, you can leave it empty) + + + + +- Choose a user password and enter it twice (and remember it for later) + + + +- The installer will set up the clock using a time server, this process should be automatic +- Set up the clock: choose a time zone (depends on the locale settings that you picked earlier; specifics don't matter) + + + +- Disk setup + - Partitioning method: Guided - Use the entire disk + + + + - Select disk to partition: SCSI1 (0,0,0) + + + + - Partitioning scheme: All files in one partition + + + + - Finish partitioning and write changes to disk -> *Yes* (`Tab`, `Enter` to select the `Yes` button) + + + + +- The base system will be installed, this will take a minute or so +- Choose a mirror (any will do) + + + +- Enter proxy information (unless you are on an intranet, you can leave this empty) + + + +- Wait a bit while 'Select and install software' runs +- Participate in popularity contest -> *No* +- Choose software to install. We need just the base system. + + + +- Make sure only 'SSH server' and 'Standard System Utilities' are checked +- Uncheck 'Debian Desktop Environment' and 'Print Server' + + + +- Install the GRUB boot loader to the master boot record? -> Yes + + + +- Installation Complete -> *Continue* +- After installation, the VM will reboot and you will have a working Debian VM. Congratulations! + +Connecting to the VM +---------------------- + +After the VM has booted you can connect to it using SSH, and files can be copied from and to the VM using a SFTP utility. +Connect to `localhost`, port `22222` (or the port configured when installing the VM). +On Windows you can use putty[1] and WinSCP[2]. + +For example to connect as `root` from a Linux command prompt use + + $ ssh root@localhost -p 22222 + The authenticity of host '[localhost]:22222 ([127.0.0.1]:22222)' can't be established. + ECDSA key fingerprint is 8e:71:f9:5b:62:46:de:44:01:da:fb:5f:34:b5:f2:18. + Are you sure you want to continue connecting (yes/no)? yes + Warning: Permanently added '[localhost]:22222' (ECDSA) to the list of known hosts. + root@localhost's password: (enter root password configured during install) + Linux debian 3.2.0-4-amd64 #1 SMP Debian 3.2.54-2 x86_64 + root@debian:~# + +Replace `root` with `debian` to log in as user. + +[1] http://www.chiark.greenend.org.uk/~sgtatham/putty/download.html +[2] http://winscp.net/eng/index.php + +Setting up Debian for gitian building +-------------------------------------- + +In this section we will be setting up the Debian installation for Gitian building. + +First we need to log in as `root` to set up dependencies and make sure that our +user can use the sudo command. Type/paste the following in the terminal: + +```bash +apt-get install git ruby sudo apt-cacher-ng qemu-utils debootstrap lxc python-cheetah parted kpartx bridge-utils +adduser debian sudo +``` + +When you get a colorful screen with a question about the 'LXC directory', just +go with the default (`/var/lib/lxc`). + +Then set up LXC and the rest with the following is a complex jumble of settings and workarounds: + +```bash +# the version of lxc-start in Debian 7.4 needs to run as root, so make sure +# that the build script can exectute it without providing a password +echo "%sudo ALL=NOPASSWD: /usr/bin/lxc-start" > /etc/sudoers.d/gitian-lxc +# add cgroup for LXC +echo "cgroup /sys/fs/cgroup cgroup defaults 0 0" >> /etc/fstab +# make /etc/rc.local script that sets up bridge between guest and host +echo '#!/bin/sh -e' > /etc/rc.local +echo 'brctl addbr br0' >> /etc/rc.local +echo 'ifconfig br0 10.0.3.2/24 up' >> /etc/rc.local +echo 'exit 0' >> /etc/rc.local +# make sure that USE_LXC is always set when logging in as debian, +# and configure LXC IP addresses +echo 'export USE_LXC=1' >> /home/debian/.profile +echo 'export GITIAN_HOST_IP=10.0.3.2' >> /home/debian/.profile +echo 'export LXC_GUEST_IP=10.0.3.5' >> /home/debian/.profile +reboot +``` + +At the end the VM is rebooted to make sure that the changes take effect. The steps in this +section need only to be performed once. + +Installing gitian +------------------ + +Re-login as the user `debian` that was created during installation. +The rest of the steps in this guide will be performed as that user. + +There is no `python-vm-builder` package in Debian, so we need to install it from source ourselves, + +```bash +wget http://archive.ubuntu.com/ubuntu/pool/universe/v/vm-builder/vm-builder_0.12.4+bzr489.orig.tar.gz +echo "ec12e0070a007989561bfee5862c89a32c301992dd2771c4d5078ef1b3014f03 vm-builder_0.12.4+bzr489.orig.tar.gz" | sha256sum -c +# (verification -- must return OK) +tar -zxvf vm-builder_0.12.4+bzr489.orig.tar.gz +cd vm-builder-0.12.4+bzr489 +sudo python setup.py install +cd .. +``` + +**Note**: When sudo asks for a password, enter the password for the user *debian* not for *root*. + +Clone the git repositories for bitcoin and gitian, + +```bash +git clone https://github.com/devrandom/gitian-builder.git +git clone https://github.com/bitcoin/bitcoin +``` + +Setting up gitian images +------------------------- + +Gitian needs virtual images of the operating system to build in. +Currently this is Ubuntu Precise for both x86 architectures. +These images will be copied and used every time that a build is started to +make sure that the build is deterministic. +Creating the images will take a while, but only has to be done once. + +Execute the following as user `debian`: + +```bash +cd gitian-builder +bin/make-base-vm --lxc --arch i386 --suite precise +bin/make-base-vm --lxc --arch amd64 --suite precise +``` + +There will be a lot of warnings printed during build of the images. These can be ignored. + +**Note**: When sudo asks for a password, enter the password for the user *debian* not for *root*. + +Getting and building the inputs +-------------------------------- + +In [doc/release-process.md](release-process.md) in the bitcoin repository under 'Fetch and build inputs'. +you will find a list of `wget` commands that can be executed to get the dependencies. + +I needed to add `--no-check-certificate` to the OpenSSL wget line to make it work. +Likely this is because the ca-certificates in Debian 7.4 is fairly old. This does not create a +security issue as the gitian descriptors check integrity of the input archives and refuse to work +if any one is corrupted. + +After downloading the archives, execute the `gbuild` commends to build the dependencies. +This can take a long time, but only has to be done when the dependencies change, for example +to upgrade the used version. + +**Note**: Do not forget to copy the result from `build/out` to `inputs` after every gbuild command! This will save +you a lot of time. + +At any time you can check the package installation and build progress with + +```bash +tail -f var/install.log +tail -f var/build.log +``` + +Building Bitcoin +---------------- + +To build Bitcoin (for Linux and/or Windows) just follow the steps under 'perform +gitian builds' in [doc/release-process.md](release-process.md) in the bitcoin repository. + +Output from `gbuild` will look something like + + Initialized empty Git repository in /home/debian/gitian-builder/inputs/bitcoin/.git/ + remote: Reusing existing pack: 35606, done. + remote: Total 35606 (delta 0), reused 0 (delta 0) + Receiving objects: 100% (35606/35606), 26.52 MiB | 4.28 MiB/s, done. + Resolving deltas: 100% (25724/25724), done. + From https://github.com/bitcoin/bitcoin + ... (new tags, new branch etc) + --- Building for precise i386 --- + Stopping target if it is up + Making a new image copy + stdin: is not a tty + Starting target + Checking if target is up + Preparing build environment + Updating apt-get repository (log in var/install.log) + Installing additional packages (log in var/install.log) + Grabbing package manifest + stdin: is not a tty + Creating build script (var/build-script) + lxc-start: Connection refused - inotify event with no name (mask 32768) + Running build script (log in var/build.log) + +As when building the dependencies, the progress of package installation and building +can be inspected in `var/install.log` and `var/build.log`. + +Building an alternative repository +----------------------------------- + +If you want to do a test build of a pull on github it can be useful to point +the gitian builder at an alternative repository, using the same descriptors +and inputs. + +For example: +```bash +URL=https://github.com/laanwj/bitcoin.git +COMMIT=2014_03_windows_unicode_path +./bin/gbuild --commit bitcoin=${COMMIT} --url bitcoin=${URL} ../bitcoin/contrib/gitian-descriptors/gitian-linux.yml +./bin/gbuild --commit bitcoin=${COMMIT} --url bitcoin=${URL} ../bitcoin/contrib/gitian-descriptors/gitian-win.yml +``` + +Signing externally +------------------- + +If you want to do the PGP signing on another device that's possible too; just define `SIGNER` as mentioned +and follow the steps in the build process as normally. + + gpg: skipped "laanwj": secret key not available + +When you execute `gsign` you will get an error from GPG, which can be ignored. Copy the resulting `.assert` files +in `gitian.sigs` to your signing machine and do + +```bash + gpg --detach-sign ${VERSION}/${SIGNER}/bitcoin-build.assert + gpg --detach-sign ${VERSION}-win/${SIGNER}/bitcoin-build.assert +``` + +This will create the `.sig` files that can be committed together with the `.assert` files to assert your +gitian build. + +Uploading signatures +--------------------- + +After building and signing you can push your signatures (both the `.assert` and +`.assert.sig` files) to the +[bitcoin/gitian.sigs](https://github.com/bitcoin/gitian.sigs/) repository, or +if not possible create a pull request. You can also mail the files to me +(laanwj@gmail.com) and I'll commit them. + diff --git a/doc/gitian-building/create_vm_file_location_size.png b/doc/gitian-building/create_vm_file_location_size.png Binary files differnew file mode 100644 index 0000000000..14aef5abae --- /dev/null +++ b/doc/gitian-building/create_vm_file_location_size.png diff --git a/doc/gitian-building/create_vm_hard_drive.png b/doc/gitian-building/create_vm_hard_drive.png Binary files differnew file mode 100644 index 0000000000..a1706e14fd --- /dev/null +++ b/doc/gitian-building/create_vm_hard_drive.png diff --git a/doc/gitian-building/create_vm_hard_drive_file_type.png b/doc/gitian-building/create_vm_hard_drive_file_type.png Binary files differnew file mode 100644 index 0000000000..251b8ee3e2 --- /dev/null +++ b/doc/gitian-building/create_vm_hard_drive_file_type.png diff --git a/doc/gitian-building/create_vm_memsize.png b/doc/gitian-building/create_vm_memsize.png Binary files differnew file mode 100644 index 0000000000..33717867a5 --- /dev/null +++ b/doc/gitian-building/create_vm_memsize.png diff --git a/doc/gitian-building/create_vm_page1.png b/doc/gitian-building/create_vm_page1.png Binary files differnew file mode 100644 index 0000000000..edaebc6223 --- /dev/null +++ b/doc/gitian-building/create_vm_page1.png diff --git a/doc/gitian-building/create_vm_storage_physical_hard_drive.png b/doc/gitian-building/create_vm_storage_physical_hard_drive.png Binary files differnew file mode 100644 index 0000000000..987efaa40c --- /dev/null +++ b/doc/gitian-building/create_vm_storage_physical_hard_drive.png diff --git a/doc/gitian-building/debian_install_10_configure_clock.png b/doc/gitian-building/debian_install_10_configure_clock.png Binary files differnew file mode 100644 index 0000000000..467c79018e --- /dev/null +++ b/doc/gitian-building/debian_install_10_configure_clock.png diff --git a/doc/gitian-building/debian_install_11_partition_disks.png b/doc/gitian-building/debian_install_11_partition_disks.png Binary files differnew file mode 100644 index 0000000000..18110734df --- /dev/null +++ b/doc/gitian-building/debian_install_11_partition_disks.png diff --git a/doc/gitian-building/debian_install_12_choose_disk.png b/doc/gitian-building/debian_install_12_choose_disk.png Binary files differnew file mode 100644 index 0000000000..a00d4abf17 --- /dev/null +++ b/doc/gitian-building/debian_install_12_choose_disk.png diff --git a/doc/gitian-building/debian_install_13_partition_scheme.png b/doc/gitian-building/debian_install_13_partition_scheme.png Binary files differnew file mode 100644 index 0000000000..2f80f19b63 --- /dev/null +++ b/doc/gitian-building/debian_install_13_partition_scheme.png diff --git a/doc/gitian-building/debian_install_14_finish.png b/doc/gitian-building/debian_install_14_finish.png Binary files differnew file mode 100644 index 0000000000..411d457e95 --- /dev/null +++ b/doc/gitian-building/debian_install_14_finish.png diff --git a/doc/gitian-building/debian_install_15_write_changes.png b/doc/gitian-building/debian_install_15_write_changes.png Binary files differnew file mode 100644 index 0000000000..f26093982c --- /dev/null +++ b/doc/gitian-building/debian_install_15_write_changes.png diff --git a/doc/gitian-building/debian_install_16_choose_a_mirror.png b/doc/gitian-building/debian_install_16_choose_a_mirror.png Binary files differnew file mode 100644 index 0000000000..d2c2e9523b --- /dev/null +++ b/doc/gitian-building/debian_install_16_choose_a_mirror.png diff --git a/doc/gitian-building/debian_install_17_choose_a_mirror2.png b/doc/gitian-building/debian_install_17_choose_a_mirror2.png Binary files differnew file mode 100644 index 0000000000..cef2db0781 --- /dev/null +++ b/doc/gitian-building/debian_install_17_choose_a_mirror2.png diff --git a/doc/gitian-building/debian_install_18_proxy_settings.png b/doc/gitian-building/debian_install_18_proxy_settings.png Binary files differnew file mode 100644 index 0000000000..24ba25c109 --- /dev/null +++ b/doc/gitian-building/debian_install_18_proxy_settings.png diff --git a/doc/gitian-building/debian_install_19_software_selection.png b/doc/gitian-building/debian_install_19_software_selection.png Binary files differnew file mode 100644 index 0000000000..d462757aff --- /dev/null +++ b/doc/gitian-building/debian_install_19_software_selection.png diff --git a/doc/gitian-building/debian_install_1_boot_menu.png b/doc/gitian-building/debian_install_1_boot_menu.png Binary files differnew file mode 100644 index 0000000000..27fd849b4f --- /dev/null +++ b/doc/gitian-building/debian_install_1_boot_menu.png diff --git a/doc/gitian-building/debian_install_20_install_grub.png b/doc/gitian-building/debian_install_20_install_grub.png Binary files differnew file mode 100644 index 0000000000..de4f9be0c9 --- /dev/null +++ b/doc/gitian-building/debian_install_20_install_grub.png diff --git a/doc/gitian-building/debian_install_21_finish_installation.png b/doc/gitian-building/debian_install_21_finish_installation.png Binary files differnew file mode 100644 index 0000000000..b967c3550d --- /dev/null +++ b/doc/gitian-building/debian_install_21_finish_installation.png diff --git a/doc/gitian-building/debian_install_2_select_a_language.png b/doc/gitian-building/debian_install_2_select_a_language.png Binary files differnew file mode 100644 index 0000000000..1c9e0bcfc1 --- /dev/null +++ b/doc/gitian-building/debian_install_2_select_a_language.png diff --git a/doc/gitian-building/debian_install_3_select_location.png b/doc/gitian-building/debian_install_3_select_location.png Binary files differnew file mode 100644 index 0000000000..005c395656 --- /dev/null +++ b/doc/gitian-building/debian_install_3_select_location.png diff --git a/doc/gitian-building/debian_install_4_configure_keyboard.png b/doc/gitian-building/debian_install_4_configure_keyboard.png Binary files differnew file mode 100644 index 0000000000..580c8af7c5 --- /dev/null +++ b/doc/gitian-building/debian_install_4_configure_keyboard.png diff --git a/doc/gitian-building/debian_install_5_configure_the_network.png b/doc/gitian-building/debian_install_5_configure_the_network.png Binary files differnew file mode 100644 index 0000000000..a7fdffc66b --- /dev/null +++ b/doc/gitian-building/debian_install_5_configure_the_network.png diff --git a/doc/gitian-building/debian_install_6_domain_name.png b/doc/gitian-building/debian_install_6_domain_name.png Binary files differnew file mode 100644 index 0000000000..7a986d92f4 --- /dev/null +++ b/doc/gitian-building/debian_install_6_domain_name.png diff --git a/doc/gitian-building/debian_install_6a_set_up_root_password.png b/doc/gitian-building/debian_install_6a_set_up_root_password.png Binary files differnew file mode 100644 index 0000000000..31bd210f38 --- /dev/null +++ b/doc/gitian-building/debian_install_6a_set_up_root_password.png diff --git a/doc/gitian-building/debian_install_7_set_up_user_fullname.png b/doc/gitian-building/debian_install_7_set_up_user_fullname.png Binary files differnew file mode 100644 index 0000000000..bffc6ccd7a --- /dev/null +++ b/doc/gitian-building/debian_install_7_set_up_user_fullname.png diff --git a/doc/gitian-building/debian_install_8_set_up_username.png b/doc/gitian-building/debian_install_8_set_up_username.png Binary files differnew file mode 100644 index 0000000000..9e2750ad4e --- /dev/null +++ b/doc/gitian-building/debian_install_8_set_up_username.png diff --git a/doc/gitian-building/debian_install_9_user_password.png b/doc/gitian-building/debian_install_9_user_password.png Binary files differnew file mode 100644 index 0000000000..a26d30cba5 --- /dev/null +++ b/doc/gitian-building/debian_install_9_user_password.png diff --git a/doc/gitian-building/network_settings.png b/doc/gitian-building/network_settings.png Binary files differnew file mode 100644 index 0000000000..1d9b6428a7 --- /dev/null +++ b/doc/gitian-building/network_settings.png diff --git a/doc/gitian-building/port_forwarding_rules.png b/doc/gitian-building/port_forwarding_rules.png Binary files differnew file mode 100644 index 0000000000..e45c9efffc --- /dev/null +++ b/doc/gitian-building/port_forwarding_rules.png diff --git a/doc/gitian-building/select_startup_disk.png b/doc/gitian-building/select_startup_disk.png Binary files differnew file mode 100644 index 0000000000..729b368fd1 --- /dev/null +++ b/doc/gitian-building/select_startup_disk.png diff --git a/doc/img/bootstrap1.png b/doc/img/bootstrap1.png Binary files differnew file mode 100644 index 0000000000..075930791b --- /dev/null +++ b/doc/img/bootstrap1.png diff --git a/doc/img/bootstrap2.png b/doc/img/bootstrap2.png Binary files differnew file mode 100644 index 0000000000..6461f81810 --- /dev/null +++ b/doc/img/bootstrap2.png diff --git a/doc/img/bootstrap3.png b/doc/img/bootstrap3.png Binary files differnew file mode 100644 index 0000000000..8a6754e3e0 --- /dev/null +++ b/doc/img/bootstrap3.png diff --git a/doc/img/bootstrap4.png b/doc/img/bootstrap4.png Binary files differnew file mode 100644 index 0000000000..ad69737922 --- /dev/null +++ b/doc/img/bootstrap4.png diff --git a/doc/img/bootstrap5.png b/doc/img/bootstrap5.png Binary files differnew file mode 100644 index 0000000000..d8d9baaf37 --- /dev/null +++ b/doc/img/bootstrap5.png diff --git a/doc/release-notes/release-notes-0.9.0.md b/doc/release-notes/release-notes-0.9.0.md new file mode 100644 index 0000000000..170410ca40 --- /dev/null +++ b/doc/release-notes/release-notes-0.9.0.md @@ -0,0 +1,411 @@ +Bitcoin Core version 0.9.0 is now available from: + + https://bitcoin.org/bin/0.9.0/ + +This is a new major version release, bringing 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. + +NOTE: Release candidate 2 Windows binaries are not code-signed; use PGP +and the SHA256SUMS.asc file to make sure your binaries are correct. +In the final 0.9.0 release, Windows setup.exe binaries will be code-signed. + +OSX 10.5 / 32-bit no longer supported +------------------------------------- + +0.9.0 drops support for older Macs. The minimum requirements are now: +* A 64-bit-capable CPU (see http://support.apple.com/kb/ht3696); +* Mac OS 10.6 or later (see https://support.apple.com/kb/ht1633). + +Downgrading warnings +-------------------- + +The 'chainstate' for this release is not always compatible with previous +releases, so if you run 0.9 and then decide to switch back to a +0.8.x release you might get a blockchain validation error when starting the +old release (due to 'pruned outputs' being omitted from the index of +unspent transaction outputs). + +Running the old release with the -reindex option will rebuild the chainstate +data structures and correct the problem. + +Also, the first time you run a 0.8.x release on a 0.9 wallet it will rescan +the blockchain for missing spent coins, which will take a long time (tens +of minutes on a typical machine). + +Rebranding to Bitcoin Core +--------------------------- + +To reduce confusion between Bitcoin-the-network and Bitcoin-the-software we +have renamed the reference client to Bitcoin Core. + + +OP_RETURN and data in the block chain +------------------------------------- +On OP_RETURN: There was been some confusion and misunderstanding in +the community, regarding the OP_RETURN feature in 0.9 and data in the +blockchain. This change is not an endorsement of storing data in the +blockchain. The OP_RETURN change creates a provably-prunable output, +to avoid data storage schemes -- some of which were already deployed -- +that were storing arbitrary data such as images as forever-unspendable +TX outputs, bloating bitcoin's UTXO database. + +Storing arbitrary data in the blockchain is still a bad idea; it is less +costly and far more efficient to store non-currency data elsewhere. + +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) + +Transaction malleability-related fixes +-------------------------------------- + +This release contains a few fixes for transaction ID (TXID) malleability +issues: + +- -nospendzeroconfchange command-line option, to avoid spending + zero-confirmation change +- IsStandard() transaction rules tightened to prevent relaying and mining of + mutated transactions +- Additional information in listtransactions/gettransaction output to + report wallet transactions that conflict with each other because + they spend the same outputs. +- Bug fixes to the getbalance/listaccounts RPC commands, which would report + incorrect balances for double-spent (or mutated) transactions. +- New option: -zapwallettxes to rebuild the wallet's transaction information + +Transaction Fees +---------------- + +This release drops the default fee required to relay transactions across the +network and for miners to consider the transaction in their blocks to +0.01mBTC per kilobyte. + +Note that getting a transaction relayed across the network does NOT guarantee +that the transaction will be accepted by a miner; by default, miners fill +their blocks with 50 kilobytes of high-priority transactions, and then with +700 kilobytes of the highest-fee-per-kilobyte transactions. + +The minimum relay/mining fee-per-kilobyte may be changed with the +minrelaytxfee option. Note that previous releases incorrectly used +the mintxfee setting to determine which low-priority transactions should +be considered for inclusion in blocks. + +The wallet code still uses a default fee for low-priority transactions of +0.1mBTC per kilobyte. During periods of heavy transaction volume, even this +fee may not be enough to get transactions confirmed quickly; the mintxfee +option may be used to override the default. + +0.9.0 Release notes +======================= + +RPC: + +- New notion of 'conflicted' transactions, reported as confirmations: -1 +- 'listreceivedbyaddress' now provides tx ids +- Add raw transaction hex to 'gettransaction' output +- 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: + +- New option: -nospendzeroconfchange to never spend unconfirmed change outputs +- New option: -zapwallettxes to rebuild the wallet's transaction information +- 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: + +- Bug fixes and new regression tests to correctly compute + the balance of wallets containing double-spent (or mutated) transactions +- 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 +- Mining code fee policy now matches relay fee policy + +Protocol and network: + +- Drop the fee required to relay a transaction to 0.01mBTC per kilobyte +- 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 +- OS X: Make use of the 10.8+ user notification center to display Growl-like + notifications +- OS X: Added NSHighResolutionCapable flag to Info.plist for better font + rendering on Retina displays. +- OS X: 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 +- Ashley Holman +- b6393ce9-d324-4fe1-996b-acf82dbc3d53 +- bitsofproof +- Brandon Dahler +- Calvin Tam +- Christian Decker +- Christian von Roques +- Christopher Latham +- Chuck +- coblee +- constantined +- Cory Fields +- Cozz Lovan +- daniel +- Daniel Larimer +- David Hill +- Dmitry Smirnov +- Drak +- Eric Lombrozo +- fanquake +- fcicq +- Florin +- frewil +- Gavin Andresen +- Gregory Maxwell +- gubatron +- Guillermo Céspedes Tabárez +- Haakon Nilsen +- HaltingState +- Han Lin Yap +- harry +- Ian Kelling +- 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 +- Midnight Magic +- Mike Hearn +- Nils Schneider +- Noel Tiernan +- Olivier Langlois +- patrick s +- Patrick Strateman +- paveljanik +- Peter Todd +- phantomcircuit +- phelixbtc +- Philip Kaufmann +- Pieter Wuille +- Rav3nPL +- R E Broadley +- regergregregerrge +- Robert Backhaus +- Roman Mindalev +- Rune K. Svendsen +- Ryan Niebur +- Scott Ellis +- Scott Willeke +- Sergey Kazenyuk +- Shawn Wilkinson +- Sined +- sje +- Subo1978 +- super3 +- Tamas Blummer +- theuni +- Thomas Holenstein +- Timon Rapp +- Timothy Stranex +- Tom Geller +- Torstein Husebø +- Vaclav Vobornik +- vhf / victor felder +- Vinnie Falco +- Warren Togami +- Wil Bown +- Wladimir J. van der Laan diff --git a/doc/release-process.md b/doc/release-process.md index 095d20f9ea..cd60684f42 100644 --- a/doc/release-process.md +++ b/doc/release-process.md @@ -8,8 +8,6 @@ Release Process ###update (commit) version in sources - - bitcoin-qt.pro contrib/verifysfbinaries/verify.sh doc/README* share/setup.nsi @@ -39,8 +37,8 @@ Release Process Fetch and build inputs: (first time, or when dependency versions change) mkdir -p inputs; cd inputs/ - wget 'http://miniupnp.free.fr/files/download.php?file=miniupnpc-1.8.tar.gz' -O miniupnpc-1.8.tar.gz - wget 'https://www.openssl.org/source/openssl-1.0.1e.tar.gz' + wget 'http://miniupnp.free.fr/files/download.php?file=miniupnpc-1.9.tar.gz' -O miniupnpc-1.9.tar.gz + wget 'https://www.openssl.org/source/openssl-1.0.1g.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/history/libpng16/libpng-1.6.8.tar.gz' @@ -64,6 +62,21 @@ Release Process ./bin/gbuild ../bitcoin/contrib/gitian-descriptors/protobuf-win.yml mv build/out/protobuf-*.zip inputs/ + The expected SHA256 hashes of the intermediate inputs are: + + 35c3dfd8b9362f59e81b51881b295232e3bc9e286f1add193b59d486d9ac4a5c bitcoin-deps-linux32-gitian-r5.zip + 571789867d172500fa96d63d0ba8c5b1e1a3d6f44f720eddf2f93665affc88b3 bitcoin-deps-linux64-gitian-r5.zip + f29b7d9577417333fb56e023c2977f5726a7c297f320b175a4108cf7cd4c2d29 boost-linux32-1.55.0-gitian-r1.zip + 88232451c4104f7eb16e469ac6474fd1231bd485687253f7b2bdf46c0781d535 boost-linux64-1.55.0-gitian-r1.zip + 60dc2d3b61e9c7d5dbe2f90d5955772ad748a47918ff2d8b74e8db9b1b91c909 boost-win32-1.55.0-gitian-r6.zip + f65fcaf346bc7b73bc8db3a8614f4f6bee2f61fcbe495e9881133a7c2612a167 boost-win64-1.55.0-gitian-r6.zip + 97e62002d338885336bb24e7cbb9471491294bd8857af7a83d18c0961f864ec0 bitcoin-deps-win32-gitian-r11.zip + ee3ea2d5aac1a67ea6bfbea2c04068a7c0940616ce48ee4f37c264bb9d4438ef bitcoin-deps-win64-gitian-r11.zip + 963e3e5e85879010a91143c90a711a5d1d5aba992e38672cdf7b54e42c56b2f1 qt-win32-5.2.0-gitian-r3.zip + 751c579830d173ef3e6f194e83d18b92ebef6df03289db13ab77a52b6bc86ef0 qt-win64-5.2.0-gitian-r3.zip + e2e403e1a08869c7eed4d4293bce13d51ec6a63592918b90ae215a0eceb44cb4 protobuf-win32-2.5.0-gitian-r4.zip + a0999037e8b0ef9ade13efd88fee261ba401f5ca910068b7e0cd3262ba667db0 protobuf-win64-2.5.0-gitian-r4.zip + Build bitcoind and bitcoin-qt on Linux32, Linux64, and Win32: ./bin/gbuild --commit bitcoin=v${VERSION} ../bitcoin/contrib/gitian-descriptors/gitian-linux.yml diff --git a/doc/translation_process.md b/doc/translation_process.md index 9fb7622868..4b7b19f82f 100644 --- a/doc/translation_process.md +++ b/doc/translation_process.md @@ -70,7 +70,7 @@ We are using https://transifex.com as a frontend for translating the client. https://www.transifex.com/projects/p/bitcoin/resource/tx/ -The "Transifex client" (see: http://help.transifex.com/features/client/) +The "Transifex client" (see: http://support.transifex.com/customer/portal/topics/440187-transifex-client/articles) will help with fetching new translations from Transifex. Use the following config to be able to connect with the client: diff --git a/jsonrpc/__init__.py b/jsonrpc/__init__.py deleted file mode 100644 index 8441fa3120..0000000000 --- a/jsonrpc/__init__.py +++ /dev/null @@ -1,2 +0,0 @@ -from .json import loads, dumps, JSONEncodeException, JSONDecodeException -from jsonrpc.proxy import ServiceProxy, JSONRPCException diff --git a/jsonrpc/authproxy.py b/jsonrpc/authproxy.py deleted file mode 100644 index e90ef361d0..0000000000 --- a/jsonrpc/authproxy.py +++ /dev/null @@ -1,3 +0,0 @@ -from bitcoinrpc.authproxy import AuthServiceProxy, JSONRPCException - -__all__ = ['AuthServiceProxy', 'JSONRPCException'] diff --git a/jsonrpc/json.py b/jsonrpc/json.py deleted file mode 100644 index 95398630f7..0000000000 --- a/jsonrpc/json.py +++ /dev/null @@ -1,9 +0,0 @@ -_json = __import__('json') -loads = _json.loads -dumps = _json.dumps -if hasattr(_json, 'JSONEncodeException'): - JSONEncodeException = _json.JSONEncodeException - JSONDecodeException = _json.JSONDecodeException -else: - JSONEncodeException = TypeError - JSONDecodeException = ValueError diff --git a/jsonrpc/proxy.py b/jsonrpc/proxy.py deleted file mode 100644 index 0d2be1e93b..0000000000 --- a/jsonrpc/proxy.py +++ /dev/null @@ -1 +0,0 @@ -from bitcoinrpc.authproxy import AuthServiceProxy as ServiceProxy, JSONRPCException diff --git a/qa/pull-tester/build-tests.sh.in b/qa/pull-tester/build-tests.sh.in index 86d4d9d0e9..ebf377a489 100755 --- a/qa/pull-tester/build-tests.sh.in +++ b/qa/pull-tester/build-tests.sh.in @@ -1,4 +1,8 @@ #!/bin/bash +# Copyright (c) 2013 The Bitcoin Core developers +# Distributed under the MIT/X11 software license, see the accompanying +# file COPYING or http://www.opensource.org/licenses/mit-license.php. +# # Param1: The prefix to mingw staging # Param2: Path to java comparison tool # Param3: Number of make jobs. Defaults to 1. @@ -70,6 +74,9 @@ make check # Run RPC integration test on Linux: @abs_top_srcdir@/qa/rpc-tests/wallet.sh @abs_top_srcdir@/linux-build/src +@abs_top_srcdir@/qa/rpc-tests/listtransactions.py --srcdir @abs_top_srcdir@/linux-build/src +# Clean up cache/ directory that the python regression tests create +rm -rf cache if [ $RUN_EXPENSIVE_TESTS = 1 ]; then # Run unit tests and blockchain-tester on Windows: diff --git a/qa/pull-tester/pull-tester.py b/qa/pull-tester/pull-tester.py index b05ac2c527..61ce813d80 100755 --- a/qa/pull-tester/pull-tester.py +++ b/qa/pull-tester/pull-tester.py @@ -1,4 +1,8 @@ #!/usr/bin/python +# Copyright (c) 2013 The Bitcoin Core developers +# Distributed under the MIT/X11 software license, see the accompanying +# file COPYING or http://www.opensource.org/licenses/mit-license.php. +# import json from urllib import urlopen import requests diff --git a/qa/pull-tester/pull-tester.sh b/qa/pull-tester/pull-tester.sh index 13c800c16a..bbee92967d 100755 --- a/qa/pull-tester/pull-tester.sh +++ b/qa/pull-tester/pull-tester.sh @@ -1,4 +1,8 @@ #!/bin/sh +# Copyright (c) 2013 The Bitcoin Core developers +# Distributed under the MIT/X11 software license, see the accompanying +# file COPYING or http://www.opensource.org/licenses/mit-license.php. +# # Helper script for pull-tester. #Param 1: path to bitcoin srcroot #Param ...: arguments for build-test.sh diff --git a/qa/pull-tester/run-bitcoind-for-test.sh.in b/qa/pull-tester/run-bitcoind-for-test.sh.in index 25faf9c42d..391046ab85 100755 --- a/qa/pull-tester/run-bitcoind-for-test.sh.in +++ b/qa/pull-tester/run-bitcoind-for-test.sh.in @@ -1,4 +1,8 @@ #!/bin/bash +# Copyright (c) 2013 The Bitcoin Core developers +# Distributed under the MIT/X11 software license, see the accompanying +# file COPYING or http://www.opensource.org/licenses/mit-license.php. +# DATADIR="@abs_top_builddir@/.bitcoin" rm -rf "$DATADIR" mkdir -p "$DATADIR"/regtest diff --git a/qa/rpc-tests/conflictedbalance.sh b/qa/rpc-tests/conflictedbalance.sh index 9d854d2d87..849ad31fb8 100755 --- a/qa/rpc-tests/conflictedbalance.sh +++ b/qa/rpc-tests/conflictedbalance.sh @@ -1,4 +1,7 @@ #!/usr/bin/env bash +# Copyright (c) 2014 The Bitcoin Core developers +# Distributed under the MIT/X11 software license, see the accompanying +# file COPYING or http://www.opensource.org/licenses/mit-license.php. # Test marking of spent outputs diff --git a/qa/rpc-tests/listtransactions.py b/qa/rpc-tests/listtransactions.py index fec3acfbb3..f16095c125 100755 --- a/qa/rpc-tests/listtransactions.py +++ b/qa/rpc-tests/listtransactions.py @@ -1,4 +1,7 @@ #!/usr/bin/env python +# Copyright (c) 2014 The Bitcoin Core developers +# Distributed under the MIT/X11 software license, see the accompanying +# file COPYING or http://www.opensource.org/licenses/mit-license.php. # Exercise the listtransactions API @@ -115,6 +118,7 @@ def main(): check_json_precision() success = False + nodes = [] try: print("Initializing test directory "+options.tmpdir) if not os.path.isdir(options.tmpdir): @@ -124,6 +128,7 @@ def main(): nodes = start_nodes(2, options.tmpdir) connect_nodes(nodes[1], 0) sync_blocks(nodes) + run_test(nodes) success = True @@ -132,12 +137,12 @@ def main(): print("Assertion failed: "+e.message) except Exception as e: print("Unexpected exception caught during testing: "+str(e)) - stack = traceback.extract_tb(sys.exc_info()[2]) - print(stack[-1]) + traceback.print_tb(sys.exc_info()[2]) if not options.nocleanup: print("Cleaning up") - stop_nodes() + stop_nodes(nodes) + wait_bitcoinds() shutil.rmtree(options.tmpdir) if success: diff --git a/bitcoinrpc/.gitignore b/qa/rpc-tests/python-bitcoinrpc/bitcoinrpc/.gitignore index 2f78cf5b66..0d20b6487c 100644 --- a/bitcoinrpc/.gitignore +++ b/qa/rpc-tests/python-bitcoinrpc/bitcoinrpc/.gitignore @@ -1,2 +1 @@ *.pyc - diff --git a/bitcoinrpc/__init__.py b/qa/rpc-tests/python-bitcoinrpc/bitcoinrpc/__init__.py index e69de29bb2..e69de29bb2 100644 --- a/bitcoinrpc/__init__.py +++ b/qa/rpc-tests/python-bitcoinrpc/bitcoinrpc/__init__.py diff --git a/bitcoinrpc/authproxy.py b/qa/rpc-tests/python-bitcoinrpc/bitcoinrpc/authproxy.py index 2914477170..c2e5406c2f 100644 --- a/bitcoinrpc/authproxy.py +++ b/qa/rpc-tests/python-bitcoinrpc/bitcoinrpc/authproxy.py @@ -78,9 +78,9 @@ class AuthServiceProxy(object): pass authpair = user + b':' + passwd self.__auth_header = b'Basic ' + base64.b64encode(authpair) - - if connection: - # Callables re-use the connection of the original proxy + + if connection: + # Callables re-use the connection of the original proxy self.__conn = connection elif self.__url.scheme == 'https': self.__conn = httplib.HTTPSConnection(self.__url.hostname, port, diff --git a/setup.py b/qa/rpc-tests/python-bitcoinrpc/setup.py index b5a217bf93..b5a217bf93 100644 --- a/setup.py +++ b/qa/rpc-tests/python-bitcoinrpc/setup.py diff --git a/qa/rpc-tests/send.sh b/qa/rpc-tests/send.sh index 2c0d5375c0..bfbf791d07 100755 --- a/qa/rpc-tests/send.sh +++ b/qa/rpc-tests/send.sh @@ -1,4 +1,7 @@ #!/bin/bash +# Copyright (c) 2014 The Bitcoin Core developers +# Distributed under the MIT/X11 software license, see the accompanying +# file COPYING or http://www.opensource.org/licenses/mit-license.php. TIMEOUT=10 SIGNAL=HUP PIDFILE=.send.pid diff --git a/qa/rpc-tests/skeleton.py b/qa/rpc-tests/skeleton.py index 0bace6f4eb..126b6bfaf4 100755 --- a/qa/rpc-tests/skeleton.py +++ b/qa/rpc-tests/skeleton.py @@ -1,4 +1,7 @@ #!/usr/bin/env python +# Copyright (c) 2014 The Bitcoin Core developers +# Distributed under the MIT/X11 software license, see the accompanying +# file COPYING or http://www.opensource.org/licenses/mit-license.php. # Skeleton for python-based regression tests using # JSON-RPC @@ -42,6 +45,7 @@ def main(): check_json_precision() success = False + nodes = [] try: print("Initializing test directory "+options.tmpdir) if not os.path.isdir(options.tmpdir): @@ -60,12 +64,12 @@ def main(): print("Assertion failed: "+e.message) except Exception as e: print("Unexpected exception caught during testing: "+str(e)) - stack = traceback.extract_tb(sys.exc_info()[2]) - print(stack[-1]) + traceback.print_tb(sys.exc_info()[2]) if not options.nocleanup: print("Cleaning up") - stop_nodes() + stop_nodes(nodes) + wait_bitcoinds() shutil.rmtree(options.tmpdir) if success: diff --git a/qa/rpc-tests/txnmall.sh b/qa/rpc-tests/txnmall.sh index 11e0276494..bd36967a63 100755 --- a/qa/rpc-tests/txnmall.sh +++ b/qa/rpc-tests/txnmall.sh @@ -1,4 +1,7 @@ #!/usr/bin/env bash +# Copyright (c) 2014 The Bitcoin Core developers +# Distributed under the MIT/X11 software license, see the accompanying +# file COPYING or http://www.opensource.org/licenses/mit-license.php. # Test proper accounting with malleable transactions diff --git a/qa/rpc-tests/util.py b/qa/rpc-tests/util.py index fbb27ae2df..1d0896a3fb 100644 --- a/qa/rpc-tests/util.py +++ b/qa/rpc-tests/util.py @@ -1,3 +1,6 @@ +# Copyright (c) 2014 The Bitcoin Core developers +# Distributed under the MIT/X11 software license, see the accompanying +# file COPYING or http://www.opensource.org/licenses/mit-license.php. # # Helpful routines for regression testing # @@ -52,6 +55,8 @@ def sync_mempools(rpc_connections): time.sleep(1) +bitcoind_processes = [] + def initialize_chain(test_dir): """ Create (or copy from cache) a 200-block-long chain and @@ -60,8 +65,8 @@ def initialize_chain(test_dir): """ if not os.path.isdir(os.path.join("cache", "node0")): + devnull = open("/dev/null", "w+") # Create cache directories, run bitcoinds: - bitcoinds = [] for i in range(4): datadir = os.path.join("cache", "node"+str(i)) os.makedirs(datadir) @@ -74,10 +79,10 @@ def initialize_chain(test_dir): args = [ "bitcoind", "-keypool=1", "-datadir="+datadir ] if i > 0: args.append("-connect=127.0.0.1:"+str(START_P2P_PORT)) - bitcoinds.append(subprocess.Popen(args)) - subprocess.check_output([ "bitcoin-cli", "-datadir="+datadir, - "-rpcwait", "getblockcount"]) - + bitcoind_processes.append(subprocess.Popen(args)) + subprocess.check_call([ "bitcoin-cli", "-datadir="+datadir, + "-rpcwait", "getblockcount"], stdout=devnull) + devnull.close() rpcs = [] for i in range(4): try: @@ -87,8 +92,6 @@ def initialize_chain(test_dir): sys.stderr.write("Error connecting to "+url+"\n") sys.exit(1) - import pdb; pdb.set_trace() - # Create a 200-block-long chain; each of the 4 nodes # gets 25 mature blocks and 25 immature. for i in range(4): @@ -97,25 +100,28 @@ def initialize_chain(test_dir): for i in range(4): rpcs[i].setgenerate(True, 25) sync_blocks(rpcs) - # Shut them down + + # Shut them down, and remove debug.logs: + stop_nodes(rpcs) + wait_bitcoinds() for i in range(4): - rpcs[i].stop() + os.remove(debug_log("cache", i)) for i in range(4): from_dir = os.path.join("cache", "node"+str(i)) to_dir = os.path.join(test_dir, "node"+str(i)) shutil.copytree(from_dir, to_dir) -bitcoind_processes = [] - def start_nodes(num_nodes, dir): # Start bitcoinds, and wait for RPC interface to be up and running: + devnull = open("/dev/null", "w+") for i in range(num_nodes): datadir = os.path.join(dir, "node"+str(i)) args = [ "bitcoind", "-datadir="+datadir ] bitcoind_processes.append(subprocess.Popen(args)) - subprocess.check_output([ "bitcoin-cli", "-datadir="+datadir, - "-rpcwait", "getblockcount"]) + subprocess.check_call([ "bitcoin-cli", "-datadir="+datadir, + "-rpcwait", "getblockcount"], stdout=devnull) + devnull.close() # Create&return JSON-RPC connections rpc_connections = [] for i in range(num_nodes): @@ -123,9 +129,19 @@ def start_nodes(num_nodes, dir): rpc_connections.append(AuthServiceProxy(url)) return rpc_connections -def stop_nodes(): - for process in bitcoind_processes: - process.kill() +def debug_log(dir, n_node): + return os.path.join(dir, "node"+str(n_node), "regtest", "debug.log") + +def stop_nodes(nodes): + for i in range(len(nodes)): + nodes[i].stop() + del nodes[:] # Emptying array closes connections as a side effect + +def wait_bitcoinds(): + # Wait for all bitcoinds to cleanly exit + for bitcoind in bitcoind_processes: + bitcoind.wait() + del bitcoind_processes[:] def connect_nodes(from_connection, node_num): ip_port = "127.0.0.1:"+str(START_P2P_PORT+node_num) diff --git a/qa/rpc-tests/util.sh b/qa/rpc-tests/util.sh index 9001c42fbc..1e7bd6a7ee 100644 --- a/qa/rpc-tests/util.sh +++ b/qa/rpc-tests/util.sh @@ -1,4 +1,7 @@ #!/usr/bin/env bash +# Copyright (c) 2014 The Bitcoin Core developers +# Distributed under the MIT/X11 software license, see the accompanying +# file COPYING or http://www.opensource.org/licenses/mit-license.php. # Functions used by more than one test diff --git a/qa/rpc-tests/wallet.sh b/qa/rpc-tests/wallet.sh index 2940566af9..98532fa858 100755 --- a/qa/rpc-tests/wallet.sh +++ b/qa/rpc-tests/wallet.sh @@ -1,4 +1,7 @@ #!/usr/bin/env bash +# Copyright (c) 2013-2014 The Bitcoin Core developers +# Distributed under the MIT/X11 software license, see the accompanying +# file COPYING or http://www.opensource.org/licenses/mit-license.php. # Test block generation and basic wallet sending diff --git a/qa/rpc-tests/walletbackup.sh b/qa/rpc-tests/walletbackup.sh index 9207243b62..7444670980 100755 --- a/qa/rpc-tests/walletbackup.sh +++ b/qa/rpc-tests/walletbackup.sh @@ -1,4 +1,7 @@ #!/usr/bin/env bash +# Copyright (c) 2014 The Bitcoin Core developers +# Distributed under the MIT/X11 software license, see the accompanying +# file COPYING or http://www.opensource.org/licenses/mit-license.php. # Test wallet backup / dump / restore functionality diff --git a/share/genbuild.sh b/share/genbuild.sh index afa4b4ccb9..6890a6eba0 100755 --- a/share/genbuild.sh +++ b/share/genbuild.sh @@ -14,13 +14,21 @@ else fi DESC="" +SUFFIX="" 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 - # get a string like "v0.6.0-66-g59887e8-dirty" - DESC="$(git describe --dirty 2>/dev/null)" + # if latest commit is tagged and not dirty, then override using the tag name + RAWDESC=$(git describe --abbrev=0 2>/dev/null) + if [ "$(git rev-parse HEAD)" = "$(git rev-list -1 $RAWDESC)" ]; then + git diff-index --quiet HEAD -- && DESC=$RAWDESC + fi + + # otherwise generate suffix from git, i.e. string like "59887e8-dirty" + SUFFIX=$(git rev-parse --short HEAD) + git diff-index --quiet HEAD -- || SUFFIX="$SUFFIX-dirty" # get a string like "2012-04-10 16:27:19 +0200" LAST_COMMIT_DATE="$(git log -n 1 --format="%ci")" @@ -28,6 +36,8 @@ fi if [ -n "$DESC" ]; then NEWINFO="#define BUILD_DESC \"$DESC\"" +elif [ -n "$SUFFIX" ]; then + NEWINFO="#define BUILD_SUFFIX $SUFFIX" else NEWINFO="// No build information available" fi diff --git a/share/qt/Info.plist.in b/share/qt/Info.plist.in index 4ed1f1be50..e352af1427 100644 --- a/share/qt/Info.plist.in +++ b/share/qt/Info.plist.in @@ -90,5 +90,8 @@ <key>NSHighResolutionCapable</key> <string>True</string> + + <key>LSApplicationCategoryType</key> + <string>public.app-category.finance</string> </dict> </plist> diff --git a/src/.gitignore b/src/.gitignore deleted file mode 100644 index c45f62adf5..0000000000 --- a/src/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ - -test_bitcoin - diff --git a/src/Makefile.am b/src/Makefile.am index da842a9e6f..c725c4f1c2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -90,9 +90,7 @@ version.o: obj/build.h libbitcoin_server_a_SOURCES = \ addrman.cpp \ alert.cpp \ - rpcserver.cpp \ bloom.cpp \ - chainparams.cpp \ checkpoints.cpp \ coins.cpp \ init.cpp \ @@ -107,6 +105,7 @@ libbitcoin_server_a_SOURCES = \ rpcmisc.cpp \ rpcnet.cpp \ rpcrawtransaction.cpp \ + rpcserver.cpp \ txdb.cpp \ txmempool.cpp \ $(JSON_H) \ diff --git a/src/alert.cpp b/src/alert.cpp index 46e861be9e..99164d63e5 100644 --- a/src/alert.cpp +++ b/src/alert.cpp @@ -10,6 +10,7 @@ #include "ui_interface.h" #include "util.h" +#include <stdint.h> #include <algorithm> #include <map> diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp index 51a746f84f..ca6950a162 100644 --- a/src/bitcoin-cli.cpp +++ b/src/bitcoin-cli.cpp @@ -27,7 +27,12 @@ static bool AppInitRPC(int argc, char* argv[]) fprintf(stderr, "Error: Specified data directory \"%s\" does not exist.\n", mapArgs["-datadir"].c_str()); return false; } - ReadConfigFile(mapArgs, mapMultiArgs); + try { + ReadConfigFile(mapArgs, mapMultiArgs); + } catch(std::exception &e) { + fprintf(stderr,"Error reading configuration file: %s\n", e.what()); + return false; + } // Check for -testnet or -regtest parameter (TestNet() calls are only valid after this clause) if (!SelectParamsFromCommandLine()) { fprintf(stderr, "Error: Invalid combination of -regtest and -testnet.\n"); @@ -37,9 +42,9 @@ static bool AppInitRPC(int argc, char* argv[]) if (argc<2 || mapArgs.count("-?") || mapArgs.count("--help")) { // First part of help message is specific to RPC client - std::string strUsage = _("Bitcoin RPC client version") + " " + FormatFullVersion() + "\n\n" + + std::string strUsage = _("Bitcoin Core RPC client version") + " " + FormatFullVersion() + "\n\n" + _("Usage:") + "\n" + - " bitcoin-cli [options] <command> [params] " + _("Send command to Bitcoin server") + "\n" + + " bitcoin-cli [options] <command> [params] " + _("Send command to Bitcoin Core") + "\n" + " bitcoin-cli [options] help " + _("List commands") + "\n" + " bitcoin-cli [options] help <command> " + _("Get help for a command") + "\n"; diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp index 5d87218844..17aa0c9d4b 100644 --- a/src/bitcoind.cpp +++ b/src/bitcoind.cpp @@ -70,7 +70,13 @@ bool AppInit(int argc, char* argv[]) fprintf(stderr, "Error: Specified data directory \"%s\" does not exist.\n", mapArgs["-datadir"].c_str()); return false; } - ReadConfigFile(mapArgs, mapMultiArgs); + try + { + ReadConfigFile(mapArgs, mapMultiArgs); + } catch(std::exception &e) { + fprintf(stderr,"Error reading configuration file: %s\n", e.what()); + return false; + } // Check for -testnet or -regtest parameter (TestNet() calls are only valid after this clause) if (!SelectParamsFromCommandLine()) { fprintf(stderr, "Error: Invalid combination of -regtest and -testnet.\n"); @@ -82,9 +88,9 @@ bool AppInit(int argc, char* argv[]) // First part of help message is specific to bitcoind / RPC client std::string strUsage = _("Bitcoin Core Daemon") + " " + _("version") + " " + FormatFullVersion() + "\n\n" + _("Usage:") + "\n" + - " bitcoind [options] " + _("Start Bitcoin server") + "\n" + + " bitcoind [options] " + _("Start Bitcoin Core Daemon") + "\n" + _("Usage (deprecated, use bitcoin-cli):") + "\n" + - " bitcoind [options] <command> [params] " + _("Send command to Bitcoin server") + "\n" + + " bitcoind [options] <command> [params] " + _("Send command to Bitcoin Core") + "\n" + " bitcoind [options] help " + _("List commands") + "\n" + " bitcoind [options] help <command> " + _("Get help for a command") + "\n"; diff --git a/src/bloom.cpp b/src/bloom.cpp index cbb8cf4a82..1bfcbd406f 100644 --- a/src/bloom.cpp +++ b/src/bloom.cpp @@ -15,8 +15,6 @@ using namespace std; -static const unsigned char bit_mask[8] = {0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80}; - CBloomFilter::CBloomFilter(unsigned int nElements, double nFPRate, unsigned int nTweakIn, unsigned char nFlagsIn) : // The ideal size for a bloom filter with a given number of elements and false positive rate is: // - nElements * log(fp rate) / ln(2)^2 @@ -47,7 +45,7 @@ void CBloomFilter::insert(const vector<unsigned char>& vKey) { unsigned int nIndex = Hash(i, vKey); // Sets bit nIndex of vData - vData[nIndex >> 3] |= bit_mask[7 & nIndex]; + vData[nIndex >> 3] |= (1 << (7 & nIndex)); } isEmpty = false; } @@ -76,7 +74,7 @@ bool CBloomFilter::contains(const vector<unsigned char>& vKey) const { unsigned int nIndex = Hash(i, vKey); // Checks bit nIndex of vData - if (!(vData[nIndex >> 3] & bit_mask[7 & nIndex])) + if (!(vData[nIndex >> 3] & (1 << (7 & nIndex)))) return false; } return true; diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 5e6566a7ac..b52774ee20 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -144,6 +144,7 @@ public: vSeeds.push_back(CDNSSeedData("bluematt.me", "dnsseed.bluematt.me")); vSeeds.push_back(CDNSSeedData("dashjr.org", "dnsseed.bitcoin.dashjr.org")); vSeeds.push_back(CDNSSeedData("bitcoinstats.com", "seed.bitcoinstats.com")); + vSeeds.push_back(CDNSSeedData("bitnodes.io", "seed.bitnodes.io")); vSeeds.push_back(CDNSSeedData("xf2.org", "bitseed.xf2.org")); base58Prefixes[PUBKEY_ADDRESS] = list_of(0); diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp index 9db1f5e100..9ab8b68443 100644 --- a/src/checkpoints.cpp +++ b/src/checkpoints.cpp @@ -21,7 +21,7 @@ namespace Checkpoints // every system. When reindexing from a fast disk with a slow CPU, it // can be up to 20, while when downloading from a slow network with a // fast multicore CPU, it won't be much higher than 1. - static const double fSigcheckVerificationFactor = 5.0; + static const double SIGCHECK_VERIFICATION_FACTOR = 5.0; struct CCheckpointData { const MapCheckpoints *mapCheckpoints; @@ -104,12 +104,13 @@ namespace Checkpoints } // Guess how far we are in the verification process at the given block index - double GuessVerificationProgress(CBlockIndex *pindex) { + double GuessVerificationProgress(CBlockIndex *pindex, bool fSigchecks) { if (pindex==NULL) return 0.0; int64_t nNow = time(NULL); + double fSigcheckVerificationFactor = fSigchecks ? SIGCHECK_VERIFICATION_FACTOR : 1.0; double fWorkBefore = 0.0; // Amount of work done before pindex double fWorkAfter = 0.0; // Amount of work left after pindex (estimated) // Work is defined as: 1.0 per transaction before the last checkpoint, and diff --git a/src/checkpoints.h b/src/checkpoints.h index 3724c57533..1b4aacee20 100644 --- a/src/checkpoints.h +++ b/src/checkpoints.h @@ -24,7 +24,7 @@ namespace Checkpoints // Returns last CBlockIndex* in mapBlockIndex that is a checkpoint CBlockIndex* GetLastCheckpoint(const std::map<uint256, CBlockIndex*>& mapBlockIndex); - double GuessVerificationProgress(CBlockIndex *pindex); + double GuessVerificationProgress(CBlockIndex *pindex, bool fSigchecks = true); extern bool fEnabled; } diff --git a/src/clientversion.h b/src/clientversion.h index 8d0f89c715..29b4aa3764 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -11,8 +11,8 @@ // These need to be macros, as version.cpp's and bitcoin-qt.rc's voodoo requires it #define CLIENT_VERSION_MAJOR 0 #define CLIENT_VERSION_MINOR 9 -#define CLIENT_VERSION_REVISION 0 -#define CLIENT_VERSION_BUILD 99 +#define CLIENT_VERSION_REVISION 99 +#define CLIENT_VERSION_BUILD 0 // Set to true for release, false for prerelease or test build #define CLIENT_VERSION_IS_RELEASE false diff --git a/src/db.cpp b/src/db.cpp index 521562fe69..eb40f3cc40 100644 --- a/src/db.cpp +++ b/src/db.cpp @@ -42,7 +42,7 @@ void CDBEnv::EnvShutdown() fDbEnvInit = false; int ret = dbenv.close(0); if (ret != 0) - LogPrintf("EnvShutdown exception: %s (%d)\n", DbEnv::strerror(ret), ret); + LogPrintf("CDBEnv::EnvShutdown : Error %d shutting down database environment: %s\n", ret, DbEnv::strerror(ret)); if (!fMockDb) DbEnv(0).remove(path.string().c_str(), 0); } @@ -72,9 +72,9 @@ bool CDBEnv::Open(const boost::filesystem::path& pathIn) path = pathIn; filesystem::path pathLogDir = path / "database"; - filesystem::create_directory(pathLogDir); + TryCreateDirectory(pathLogDir); filesystem::path pathErrorFile = path / "db.log"; - LogPrintf("dbenv.open LogDir=%s ErrorFile=%s\n", pathLogDir.string(), pathErrorFile.string()); + LogPrintf("CDBEnv::Open : LogDir=%s ErrorFile=%s\n", pathLogDir.string(), pathErrorFile.string()); unsigned int nEnvFlags = 0; if (GetBoolArg("-privdb", true)) @@ -101,7 +101,7 @@ bool CDBEnv::Open(const boost::filesystem::path& pathIn) nEnvFlags, S_IRUSR | S_IWUSR); if (ret != 0) - return error("CDB() : error %s (%d) opening database environment", DbEnv::strerror(ret), ret); + return error("CDBEnv::Open : Error %d opening database environment: %s\n", ret, DbEnv::strerror(ret)); fDbEnvInit = true; fMockDb = false; @@ -111,11 +111,11 @@ bool CDBEnv::Open(const boost::filesystem::path& pathIn) void CDBEnv::MakeMock() { if (fDbEnvInit) - throw runtime_error("CDBEnv::MakeMock(): already initialized"); + throw runtime_error("CDBEnv::MakeMock : Already initialized"); boost::this_thread::interruption_point(); - LogPrint("db", "CDBEnv::MakeMock()\n"); + LogPrint("db", "CDBEnv::MakeMock\n"); dbenv.set_cachesize(1, 0, 1); dbenv.set_lg_bsize(10485760*4); @@ -134,7 +134,7 @@ void CDBEnv::MakeMock() DB_PRIVATE, S_IRUSR | S_IWUSR); if (ret > 0) - throw runtime_error(strprintf("CDBEnv::MakeMock(): error %d opening database environment", ret)); + throw runtime_error(strprintf("CDBEnv::MakeMock : Error %d opening database environment.", ret)); fDbEnvInit = true; fMockDb = true; @@ -172,16 +172,16 @@ bool CDBEnv::Salvage(std::string strFile, bool fAggressive, int result = db.verify(strFile.c_str(), NULL, &strDump, flags); if (result == DB_VERIFY_BAD) { - LogPrintf("Error: Salvage found errors, all data may not be recoverable.\n"); + LogPrintf("CDBEnv::Salvage : Database salvage found errors, all data may not be recoverable.\n"); if (!fAggressive) { - LogPrintf("Error: Rerun with aggressive mode to ignore errors and continue.\n"); + LogPrintf("CDBEnv::Salvage : Rerun with aggressive mode to ignore errors and continue.\n"); return false; } } if (result != 0 && result != DB_VERIFY_BAD) { - LogPrintf("ERROR: db salvage failed: %d\n",result); + LogPrintf("CDBEnv::Salvage : Database salvage failed with result %d.\n", result); return false; } @@ -237,7 +237,7 @@ CDB::CDB(const char *pszFile, const char* pszMode) : { LOCK(bitdb.cs_db); if (!bitdb.Open(GetDataDir())) - throw runtime_error("env open failed"); + throw runtime_error("CDB : Failed to open database environment."); strFile = pszFile; ++bitdb.mapFileUseCount[strFile]; @@ -252,7 +252,7 @@ CDB::CDB(const char *pszFile, const char* pszMode) : DbMpoolFile*mpf = pdb->get_mpf(); ret = mpf->set_flags(DB_MPOOL_NOFILE, 1); if (ret != 0) - throw runtime_error(strprintf("CDB() : failed to configure for no temp file backing for database %s", pszFile)); + throw runtime_error(strprintf("CDB : Failed to configure for no temp file backing for database %s", pszFile)); } ret = pdb->open(NULL, // Txn pointer @@ -268,7 +268,7 @@ CDB::CDB(const char *pszFile, const char* pszMode) : pdb = NULL; --bitdb.mapFileUseCount[strFile]; strFile = ""; - throw runtime_error(strprintf("CDB() : can't open database file %s, error %d", pszFile, ret)); + throw runtime_error(strprintf("CDB : Error %d, can't open database %s", ret, pszFile)); } if (fCreate && !Exists(string("version"))) @@ -352,7 +352,7 @@ bool CDB::Rewrite(const string& strFile, const char* pszSkip) bitdb.mapFileUseCount.erase(strFile); bool fSuccess = true; - LogPrintf("Rewriting %s...\n", strFile); + LogPrintf("CDB::Rewrite : Rewriting %s...\n", strFile); string strFileRes = strFile + ".rewrite"; { // surround usage of db with extra {} CDB db(strFile.c_str(), "r"); @@ -366,7 +366,7 @@ bool CDB::Rewrite(const string& strFile, const char* pszSkip) 0); if (ret > 0) { - LogPrintf("Cannot create database file %s\n", strFileRes); + LogPrintf("CDB::Rewrite : Can't create database file %s\n", strFileRes); fSuccess = false; } @@ -422,7 +422,7 @@ bool CDB::Rewrite(const string& strFile, const char* pszSkip) fSuccess = false; } if (!fSuccess) - LogPrintf("Rewriting of %s FAILED!\n", strFileRes); + LogPrintf("CDB::Rewrite : Failed to rewrite database file %s\n", strFileRes); return fSuccess; } } @@ -435,9 +435,8 @@ bool CDB::Rewrite(const string& strFile, const char* pszSkip) void CDBEnv::Flush(bool fShutdown) { int64_t nStart = GetTimeMillis(); - // Flush log data to the actual data file - // on all files that are not in use - LogPrint("db", "Flush(%s)%s\n", fShutdown ? "true" : "false", fDbEnvInit ? "" : " db not started"); + // Flush log data to the actual data file on all files that are not in use + LogPrint("db", "CDBEnv::Flush : Flush(%s)%s\n", fShutdown ? "true" : "false", fDbEnvInit ? "" : " database not started"); if (!fDbEnvInit) return; { @@ -447,23 +446,23 @@ void CDBEnv::Flush(bool fShutdown) { string strFile = (*mi).first; int nRefCount = (*mi).second; - LogPrint("db", "%s refcount=%d\n", strFile, nRefCount); + LogPrint("db", "CDBEnv::Flush : Flushing %s (refcount = %d)...\n", strFile, nRefCount); if (nRefCount == 0) { // Move log data to the dat file CloseDb(strFile); - LogPrint("db", "%s checkpoint\n", strFile); + LogPrint("db", "CDBEnv::Flush : %s checkpoint\n", strFile); dbenv.txn_checkpoint(0, 0, 0); - LogPrint("db", "%s detach\n", strFile); + LogPrint("db", "CDBEnv::Flush : %s detach\n", strFile); if (!fMockDb) dbenv.lsn_reset(strFile.c_str(), 0); - LogPrint("db", "%s closed\n", strFile); + LogPrint("db", "CDBEnv::Flush : %s closed\n", strFile); mapFileUseCount.erase(mi++); } else mi++; } - LogPrint("db", "DBFlush(%s)%s ended %15dms\n", fShutdown ? "true" : "false", fDbEnvInit ? "" : " db not started", GetTimeMillis() - nStart); + LogPrint("db", "CDBEnv::Flush : Flush(%s)%s took %15dms\n", fShutdown ? "true" : "false", fDbEnvInit ? "" : " database not started", GetTimeMillis() - nStart); if (fShutdown) { char** listp; diff --git a/src/init.cpp b/src/init.cpp index 372f5db297..6e6e4beed9 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -190,33 +190,47 @@ std::string HelpMessage(HelpMessageMode hmm) { string strUsage = _("Options:") + "\n"; strUsage += " -? " + _("This help message") + "\n"; + strUsage += " -alertnotify=<cmd> " + _("Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)") + "\n"; + strUsage += " -blocknotify=<cmd> " + _("Execute command when the best block changes (%s in cmd is replaced by block hash)") + "\n"; + strUsage += " -checkblocks=<n> " + _("How many blocks to check at startup (default: 288, 0 = all)") + "\n"; + strUsage += " -checklevel=<n> " + _("How thorough the block verification of -checkblocks is (0-4, default: 3)") + "\n"; strUsage += " -conf=<file> " + _("Specify configuration file (default: bitcoin.conf)") + "\n"; + if (hmm == HMM_BITCOIND) + { +#if !defined(WIN32) + strUsage += " -daemon " + _("Run in the background as a daemon and accept commands") + "\n"; +#endif + } strUsage += " -datadir=<dir> " + _("Specify data directory") + "\n"; - 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> " + 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"; - strUsage += " -onion=<ip:port> " + _("Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)") + "\n"; - strUsage += " -dns " + _("Allow DNS lookups for -addnode, -seednode and -connect") + "\n"; - strUsage += " -port=<port> " + _("Listen for connections on <port> (default: 8333 or testnet: 18333)") + "\n"; - strUsage += " -maxconnections=<n> " + _("Maintain at most <n> connections to peers (default: 125)") + "\n"; + strUsage += " -keypool=<n> " + _("Set key pool size to <n> (default: 100)") + "\n"; + strUsage += " -loadblock=<file> " + _("Imports blocks from external blk000??.dat file") + " " + _("on startup") + "\n"; + strUsage += " -par=<n> " + strprintf(_("Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)"), -(int)boost::thread::hardware_concurrency(), MAX_SCRIPTCHECK_THREADS, DEFAULT_SCRIPTCHECK_THREADS) + "\n"; + strUsage += " -pid=<file> " + _("Specify pid file (default: bitcoind.pid)") + "\n"; + strUsage += " -reindex " + _("Rebuild block chain index from current blk000??.dat files") + " " + _("on startup") + "\n"; + strUsage += " -txindex " + _("Maintain a full transaction index (default: 0)") + "\n"; + + strUsage += "\n" + _("Connection options:") + "\n"; strUsage += " -addnode=<ip> " + _("Add a node to connect to and attempt to keep the connection open") + "\n"; + strUsage += " -banscore=<n> " + _("Threshold for disconnecting misbehaving peers (default: 100)") + "\n"; + strUsage += " -bantime=<n> " + _("Number of seconds to keep misbehaving peers from reconnecting (default: 86400)") + "\n"; + strUsage += " -bind=<addr> " + _("Bind to given address and always listen on it. Use [host]:port notation for IPv6") + "\n"; strUsage += " -connect=<ip> " + _("Connect only to the specified node(s)") + "\n"; - strUsage += " -seednode=<ip> " + _("Connect to a node to retrieve peer addresses, and disconnect") + "\n"; - strUsage += " -externalip=<ip> " + _("Specify your own public address") + "\n"; - strUsage += " -onlynet=<net> " + _("Only connect to nodes in network <net> (IPv4, IPv6 or Tor)") + "\n"; strUsage += " -discover " + _("Discover own IP address (default: 1 when listening and no -externalip)") + "\n"; - strUsage += " -checkpoints " + _("Only accept block chain matching built-in checkpoints (default: 1)") + "\n"; - strUsage += " -listen " + _("Accept connections from outside (default: 1 if no -proxy or -connect)") + "\n"; - strUsage += " -bind=<addr> " + _("Bind to given address and always listen on it. Use [host]:port notation for IPv6") + "\n"; + strUsage += " -dns " + _("Allow DNS lookups for -addnode, -seednode and -connect") + " " + _("(default: 1)") + "\n"; strUsage += " -dnsseed " + _("Find peers using DNS lookup (default: 1 unless -connect)") + "\n"; - strUsage += " -banscore=<n> " + _("Threshold for disconnecting misbehaving peers (default: 100)") + "\n"; - strUsage += " -bantime=<n> " + _("Number of seconds to keep misbehaving peers from reconnecting (default: 86400)") + "\n"; + strUsage += " -externalip=<ip> " + _("Specify your own public address") + "\n"; + strUsage += " -listen " + _("Accept connections from outside (default: 1 if no -proxy or -connect)") + "\n"; + strUsage += " -maxconnections=<n> " + _("Maintain at most <n> connections to peers (default: 125)") + "\n"; strUsage += " -maxreceivebuffer=<n> " + _("Maximum per-connection receive buffer, <n>*1000 bytes (default: 5000)") + "\n"; strUsage += " -maxsendbuffer=<n> " + _("Maximum per-connection send buffer, <n>*1000 bytes (default: 1000)") + "\n"; + strUsage += " -onion=<ip:port> " + _("Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)") + "\n"; + strUsage += " -onlynet=<net> " + _("Only connect to nodes in network <net> (IPv4, IPv6 or Tor)") + "\n"; + strUsage += " -port=<port> " + _("Listen for connections on <port> (default: 8333 or testnet: 18333)") + "\n"; + strUsage += " -proxy=<ip:port> " + _("Connect through SOCKS proxy") + "\n"; + strUsage += " -seednode=<ip> " + _("Connect to a node to retrieve peer addresses, and disconnect") + "\n"; + strUsage += " -socks=<n> " + _("Select SOCKS version for -proxy (4 or 5, default: 5)") + "\n"; + strUsage += " -timeout=<n> " + _("Specify connection timeout in milliseconds (default: 5000)") + "\n"; #ifdef USE_UPNP #if USE_UPNP strUsage += " -upnp " + _("Use UPnP to map the listening port (default: 1 when listening)") + "\n"; @@ -224,64 +238,78 @@ std::string HelpMessage(HelpMessageMode hmm) strUsage += " -upnp " + _("Use UPnP to map the listening port (default: 0)") + "\n"; #endif #endif + +#ifdef ENABLE_WALLET + strUsage += "\n" + _("Wallet options:") + "\n"; + 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") + " " + _("on startup") + "\n"; + strUsage += " -salvagewallet " + _("Attempt to recover private keys from a corrupt wallet.dat") + " " + _("on startup") + "\n"; + strUsage += " -spendzeroconfchange " + _("Spend unconfirmed change when sending transactions (default: 1)") + "\n"; + strUsage += " -upgradewallet " + _("Upgrade wallet to latest format") + " " + _("on startup") + "\n"; + strUsage += " -wallet=<file> " + _("Specify wallet file (within data directory)") + " " + _("(default: wallet.dat)") + "\n"; + strUsage += " -walletnotify=<cmd> " + _("Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)") + "\n"; + strUsage += " -zapwallettxes " + _("Clear list of wallet transactions (diagnostic tool; implies -rescan)") + "\n"; +#endif + + strUsage += "\n" + _("Debugging/Testing options:") + "\n"; + if (GetBoolArg("-help-debug", false)) + { + strUsage += " -benchmark " + _("Show benchmark information (default: 0)") + "\n"; + strUsage += " -checkpoints " + _("Only accept block chain matching built-in checkpoints (default: 1)") + "\n"; + strUsage += " -dblogsize=<n> " + _("Flush database activity from memory pool to disk log every <n> megabytes (default: 100)") + "\n"; + strUsage += " -disablesafemode " + _("Disable safemode, override a real safe mode event (default: 0)") + "\n"; + strUsage += " -testsafemode " + _("Force safe mode (default: 0)") + "\n"; + strUsage += " -dropmessagestest=<n> " + _("Randomly drop 1 of every <n> network messages") + "\n"; + strUsage += " -fuzzmessagestest=<n> " + _("Randomly fuzz 1 of every <n> network messages") + "\n"; + strUsage += " -flushwallet " + _("Run a thread to flush wallet periodically (default: 1)") + "\n"; + } strUsage += " -debug=<category> " + _("Output debugging information (default: 0, supplying <category> is optional)") + "\n"; strUsage += " " + _("If <category> is not supplied, output all debugging information.") + "\n"; strUsage += " " + _("<category> can be:"); strUsage += " addrman, alert, coindb, db, lock, rand, rpc, selectcoins, mempool, net"; // Don't translate these and qt below if (hmm == HMM_BITCOIN_QT) + strUsage += ", qt"; + strUsage += ".\n"; + strUsage += " -gen " + _("Generate coins (default: 0)") + "\n"; + strUsage += " -genproclimit=<n> " + _("Set the processor limit for when generation is on (-1 = unlimited, default: -1)") + "\n"; + strUsage += " -help-debug " + _("Show all debugging options (usage: --help -help-debug)") + "\n"; + strUsage += " -logtimestamps " + _("Prepend debug output with timestamp (default: 1)") + "\n"; + if (GetBoolArg("-help-debug", false)) { - strUsage += ", qt.\n"; + strUsage += " -limitfreerelay=<n> " + _("Continuously rate-limit free transactions to <n>*1000 bytes per minute (default:15)") + "\n"; + strUsage += " -maxsigcachesize=<n> " + _("Limit size of signature cache to <n> entries (default: 50000)") + "\n"; } - else + strUsage += " -mintxfee=<amt> " + _("Fees smaller than this are considered zero fee (for transaction creation) (default:") + " " + FormatMoney(CTransaction::nMinTxFee) + ")" + "\n"; + strUsage += " -minrelaytxfee=<amt> " + _("Fees smaller than this are considered zero fee (for relaying) (default:") + " " + FormatMoney(CTransaction::nMinRelayTxFee) + ")" + "\n"; + strUsage += " -printtoconsole " + _("Send trace/debug info to console instead of debug.log file") + "\n"; + if (GetBoolArg("-help-debug", false)) { - strUsage += ".\n"; + strUsage += " -printblock=<hash> " + _("Print block on startup, if found in block index") + "\n"; + strUsage += " -printblocktree " + _("Print block tree on startup (default: 0)") + "\n"; + strUsage += " -printpriority " + _("Log transaction priority and fee per kB when mining blocks (default: 0)") + "\n"; + strUsage += " -privdb " + _("Sets the DB_PRIVATE flag in the wallet db environment (default: 1)") + "\n"; + strUsage += " -regtest " + _("Enter regression test mode, which uses a special chain in which blocks can be solved instantly.") + "\n"; + strUsage += " " + _("This is intended for regression testing tools and app development.") + "\n"; + strUsage += " " + _("In this mode -genproclimit controls how many blocks are generated immediately.") + "\n"; } - strUsage += " -logtimestamps " + _("Prepend debug output with timestamp (default: 1)") + "\n"; strUsage += " -shrinkdebugfile " + _("Shrink debug.log file on client startup (default: 1 when no -debug)") + "\n"; - strUsage += " -printtoconsole " + _("Send trace/debug info to console instead of debug.log file") + "\n"; - strUsage += " -regtest " + _("Enter regression test mode, which uses a special chain in which blocks can be solved instantly.") + "\n"; - strUsage += " " + _("This is intended for regression testing tools and app development.") + "\n"; - strUsage += " -server " + _("Accept command line and JSON-RPC commands") + "\n"; + strUsage += " -testnet " + _("Use the test network") + "\n"; - if (hmm == HMM_BITCOIND) - { -#if !defined(WIN32) - strUsage += " -daemon " + _("Run in the background as a daemon and accept commands") + "\n"; -#endif - } + strUsage += "\n" + _("Block creation options:") + "\n"; + strUsage += " -blockminsize=<n> " + _("Set minimum block size in bytes (default: 0)") + "\n"; + strUsage += " -blockmaxsize=<n> " + strprintf(_("Set maximum block size in bytes (default: %d)"), DEFAULT_BLOCK_MAX_SIZE) + "\n"; + strUsage += " -blockprioritysize=<n> " + strprintf(_("Set maximum size of high-priority/low-fee transactions in bytes (default: %d)"), DEFAULT_BLOCK_PRIORITY_SIZE) + "\n"; + strUsage += "\n" + _("RPC server options:") + "\n"; + strUsage += " -server " + _("Accept command line and JSON-RPC commands") + "\n"; strUsage += " -rpcuser=<user> " + _("Username for JSON-RPC connections") + "\n"; strUsage += " -rpcpassword=<pw> " + _("Password for JSON-RPC connections") + "\n"; strUsage += " -rpcport=<port> " + _("Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)") + "\n"; strUsage += " -rpcallowip=<ip> " + _("Allow JSON-RPC connections from specified IP address") + "\n"; strUsage += " -rpcthreads=<n> " + _("Set the number of threads to service RPC calls (default: 4)") + "\n"; - strUsage += " -blocknotify=<cmd> " + _("Execute command when the best block changes (%s in cmd is replaced by block hash)") + "\n"; - strUsage += " -alertnotify=<cmd> " + _("Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)") + "\n"; - strUsage += " -keypool=<n> " + _("Set key pool size to <n> (default: 100)") + "\n"; - strUsage += " -checkblocks=<n> " + _("How many blocks to check at startup (default: 288, 0 = all)") + "\n"; - strUsage += " -checklevel=<n> " + _("How thorough the block verification is (0-4, default: 3)") + "\n"; - strUsage += " -txindex " + _("Maintain a full transaction index (default: 0)") + "\n"; - strUsage += " -loadblock=<file> " + _("Imports blocks from external blk000??.dat file") + "\n"; - strUsage += " -reindex " + _("Rebuild block chain index from current blk000??.dat files") + "\n"; - strUsage += " -par=<n> " + _("Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)") + "\n"; -#ifdef ENABLE_WALLET - strUsage += "\n" + _("Wallet options:") + "\n"; - 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"; - strUsage += " -blockmaxsize=<n> " + strprintf(_("Set maximum block size in bytes (default: %d)"), DEFAULT_BLOCK_MAX_SIZE) + "\n"; - strUsage += " -blockprioritysize=<n> " + strprintf(_("Set maximum size of high-priority/low-fee transactions in bytes (default: %d)"), DEFAULT_BLOCK_PRIORITY_SIZE) + "\n"; - strUsage += "\n" + _("SSL options: (see the Bitcoin Wiki for SSL setup instructions)") + "\n"; + strUsage += "\n" + _("RPC SSL options: (see the Bitcoin Wiki for SSL setup instructions)") + "\n"; strUsage += " -rpcssl " + _("Use OpenSSL (https) for JSON-RPC connections") + "\n"; strUsage += " -rpcsslcertificatechainfile=<file.cert> " + _("Server certificate file (default: server.cert)") + "\n"; strUsage += " -rpcsslprivatekeyfile=<file.pem> " + _("Server private key (default: server.pem)") + "\n"; @@ -491,7 +519,7 @@ bool AppInit2(boost::thread_group& threadGroup) Checkpoints::fEnabled = GetBoolArg("-checkpoints", true); // -par=0 means autodetect, but nScriptCheckThreads==0 means no concurrency - nScriptCheckThreads = GetArg("-par", 0); + nScriptCheckThreads = GetArg("-par", DEFAULT_SCRIPTCHECK_THREADS); if (nScriptCheckThreads <= 0) nScriptCheckThreads += boost::thread::hardware_concurrency(); if (nScriptCheckThreads <= 1) @@ -547,7 +575,7 @@ bool AppInit2(boost::thread_group& threadGroup) { if (!ParseMoney(mapArgs["-paytxfee"], nTransactionFee)) return InitError(strprintf(_("Invalid amount for -paytxfee=<amount>: '%s'"), mapArgs["-paytxfee"])); - if (nTransactionFee > 0.25 * COIN) + if (nTransactionFee > nHighTransactionFeeWarning) InitWarning(_("Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.")); } bSpendZeroConfChange = GetArg("-spendzeroconfchange", true); @@ -568,7 +596,7 @@ 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)); + return InitError(strprintf(_("Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running."), strDataDir)); if (GetBoolArg("-shrinkdebugfile", !fDebug)) ShrinkDebugFile(); diff --git a/src/keystore.h b/src/keystore.h index 0d55e6c81e..79d8661aca 100644 --- a/src/keystore.h +++ b/src/keystore.h @@ -32,7 +32,7 @@ public: virtual void GetKeys(std::set<CKeyID> &setAddress) const =0; virtual bool GetPubKey(const CKeyID &address, CPubKey& vchPubKeyOut) const; - // Support for BIP 0013 : see https://en.bitcoin.it/wiki/BIP_0013 + // Support for BIP 0013 : see https://github.com/bitcoin/bips/blob/master/bip-0013.mediawiki virtual bool AddCScript(const CScript& redeemScript) =0; virtual bool HaveCScript(const CScriptID &hash) const =0; virtual bool GetCScript(const CScriptID &hash, CScript& redeemScriptOut) const =0; diff --git a/src/leveldbwrapper.cpp b/src/leveldbwrapper.cpp index 43c737a599..5b4a9c147b 100644 --- a/src/leveldbwrapper.cpp +++ b/src/leveldbwrapper.cpp @@ -51,7 +51,7 @@ CLevelDBWrapper::CLevelDBWrapper(const boost::filesystem::path &path, size_t nCa LogPrintf("Wiping LevelDB in %s\n", path.string()); leveldb::DestroyDB(path.string(), options); } - boost::filesystem::create_directory(path); + TryCreateDirectory(path); LogPrintf("Opening LevelDB in %s\n", path.string()); } leveldb::Status status = leveldb::DB::Open(options, path.string(), &pdb); diff --git a/src/m4/ax_boost_base.m4 b/src/m4/ax_boost_base.m4 index f941b27ec4..4f93a0e094 100644 --- a/src/m4/ax_boost_base.m4 +++ b/src/m4/ax_boost_base.m4 @@ -33,7 +33,7 @@ # and this notice are preserved. This file is offered as-is, without any # warranty. -#serial 22 +#serial 23 AC_DEFUN([AX_BOOST_BASE], [ @@ -103,6 +103,12 @@ if test "x$want_boost" = "xyes"; then AC_REQUIRE([AC_CANONICAL_HOST]) libsubdirs="lib/${host_cpu}-${host_os} $libsubdirs" + case ${host_cpu} in + i?86) + libsubdirs="lib/i386-${host_os} $libsubdirs" + ;; + esac + dnl first we check the system location for boost libraries dnl this location ist chosen if boost libraries are installed with the --layout=system option dnl or if you install boost with RPM diff --git a/src/m4/ax_boost_chrono.m4 b/src/m4/ax_boost_chrono.m4 index 9b3958ec74..318ecea17f 100644 --- a/src/m4/ax_boost_chrono.m4 +++ b/src/m4/ax_boost_chrono.m4 @@ -81,6 +81,7 @@ AC_DEFUN([AX_BOOST_CHRONO], LDFLAGS_SAVE=$LDFLAGS if test "x$ax_boost_user_chrono_lib" = "x"; then + ax_lib= for libextension in `ls $BOOSTLIBDIR/libboost_chrono*.so* $BOOSTLIBDIR/libboost_chrono*.dylib* $BOOSTLIBDIR/libboost_chrono*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_chrono.*\)\.so.*$;\1;' -e 's;^lib\(boost_chrono.*\)\.dylib.*$;\1;' -e 's;^lib\(boost_chrono.*\)\.a.*$;\1;'` ; do ax_lib=${libextension} AC_CHECK_LIB($ax_lib, exit, @@ -105,7 +106,7 @@ AC_DEFUN([AX_BOOST_CHRONO], fi if test "x$ax_lib" = "x"; then - AC_MSG_ERROR(Could not find a version of the library!) + AC_MSG_ERROR(Could not find a version of the boost_chrono library!) fi if test "x$link_chrono" = "xno"; then AC_MSG_ERROR(Could not link against $ax_lib !) diff --git a/src/m4/ax_boost_filesystem.m4 b/src/m4/ax_boost_filesystem.m4 index f162163cdc..f5c9d56470 100644 --- a/src/m4/ax_boost_filesystem.m4 +++ b/src/m4/ax_boost_filesystem.m4 @@ -80,6 +80,7 @@ AC_DEFUN([AX_BOOST_FILESYSTEM], if test "x$ax_cv_boost_filesystem" = "xyes"; then AC_DEFINE(HAVE_BOOST_FILESYSTEM,,[define if the Boost::Filesystem library is available]) BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'` + ax_lib= if test "x$ax_boost_user_filesystem_lib" = "x"; then for libextension in `ls -r $BOOSTLIBDIR/libboost_filesystem* 2>/dev/null | sed 's,.*/lib,,' | sed 's,\..*,,'` ; do ax_lib=${libextension} @@ -104,7 +105,7 @@ AC_DEFUN([AX_BOOST_FILESYSTEM], fi if test "x$ax_lib" = "x"; then - AC_MSG_ERROR(Could not find a version of the library!) + AC_MSG_ERROR(Could not find a version of the boost_filesystem library!) fi if test "x$link_filesystem" != "xyes"; then AC_MSG_ERROR(Could not link against $ax_lib !) diff --git a/src/m4/ax_boost_program_options.m4 b/src/m4/ax_boost_program_options.m4 index 65a39c8c70..f591441854 100644 --- a/src/m4/ax_boost_program_options.m4 +++ b/src/m4/ax_boost_program_options.m4 @@ -74,6 +74,7 @@ AC_DEFUN([AX_BOOST_PROGRAM_OPTIONS], AC_DEFINE(HAVE_BOOST_PROGRAM_OPTIONS,,[define if the Boost::PROGRAM_OPTIONS library is available]) BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'` if test "x$ax_boost_user_program_options_lib" = "x"; then + ax_lib= for libextension in `ls $BOOSTLIBDIR/libboost_program_options*.so* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_program_options.*\)\.so.*$;\1;'` `ls $BOOSTLIBDIR/libboost_program_options*.dylib* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_program_options.*\)\.dylib.*$;\1;'` `ls $BOOSTLIBDIR/libboost_program_options*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_program_options.*\)\.a.*$;\1;'` ; do ax_lib=${libextension} AC_CHECK_LIB($ax_lib, exit, @@ -96,7 +97,7 @@ AC_DEFUN([AX_BOOST_PROGRAM_OPTIONS], done fi if test "x$ax_lib" = "x"; then - AC_MSG_ERROR(Could not find a version of the library!) + AC_MSG_ERROR(Could not find a version of the boost_program_options library!) fi if test "x$link_program_options" != "xyes"; then AC_MSG_ERROR([Could not link against [$ax_lib] !]) diff --git a/src/m4/ax_boost_system.m4 b/src/m4/ax_boost_system.m4 index c4c45559d8..9c78280fca 100644 --- a/src/m4/ax_boost_system.m4 +++ b/src/m4/ax_boost_system.m4 @@ -83,6 +83,7 @@ AC_DEFUN([AX_BOOST_SYSTEM], LDFLAGS_SAVE=$LDFLAGS if test "x$ax_boost_user_system_lib" = "x"; then + ax_lib= for libextension in `ls -r $BOOSTLIBDIR/libboost_system* 2>/dev/null | sed 's,.*/lib,,' | sed 's,\..*,,'` ; do ax_lib=${libextension} AC_CHECK_LIB($ax_lib, exit, @@ -107,7 +108,7 @@ AC_DEFUN([AX_BOOST_SYSTEM], fi if test "x$ax_lib" = "x"; then - AC_MSG_ERROR(Could not find a version of the library!) + AC_MSG_ERROR(Could not find a version of the boost_system library!) fi if test "x$link_system" = "xno"; then AC_MSG_ERROR(Could not link against $ax_lib !) diff --git a/src/m4/ax_boost_thread.m4 b/src/m4/ax_boost_thread.m4 index 79e12cdb4e..9f0bd0b23c 100644 --- a/src/m4/ax_boost_thread.m4 +++ b/src/m4/ax_boost_thread.m4 @@ -104,6 +104,7 @@ AC_DEFUN([AX_BOOST_THREAD], ;; esac if test "x$ax_boost_user_thread_lib" = "x"; then + ax_lib= for libextension in `ls -r $BOOSTLIBDIR/libboost_thread* 2>/dev/null | sed 's,.*/lib,,' | sed 's,\..*,,'`; do ax_lib=${libextension} AC_CHECK_LIB($ax_lib, exit, @@ -128,7 +129,7 @@ AC_DEFUN([AX_BOOST_THREAD], fi if test "x$ax_lib" = "x"; then - AC_MSG_ERROR(Could not find a version of the library!) + AC_MSG_ERROR(Could not find a version of the boost_thread library!) fi if test "x$link_thread" = "xno"; then AC_MSG_ERROR(Could not link against $ax_lib !) diff --git a/src/m4/ax_boost_unit_test_framework.m4 b/src/m4/ax_boost_unit_test_framework.m4 index 1115f55121..4efd1e2f18 100644 --- a/src/m4/ax_boost_unit_test_framework.m4 +++ b/src/m4/ax_boost_unit_test_framework.m4 @@ -76,6 +76,7 @@ AC_DEFUN([AX_BOOST_UNIT_TEST_FRAMEWORK], if test "x$ax_boost_user_unit_test_framework_lib" = "x"; then saved_ldflags="${LDFLAGS}" + ax_lib= for monitor_library in `ls $BOOSTLIBDIR/libboost_unit_test_framework*.so* $BOOSTLIBDIR/libboost_unit_test_framework*.dylib* $BOOSTLIBDIR/libboost_unit_test_framework*.a* 2>/dev/null` ; do if test -r $monitor_library ; then libextension=`echo $monitor_library | sed 's,.*/,,' | sed -e 's;^lib\(boost_unit_test_framework.*\)\.so.*$;\1;' -e 's;^lib\(boost_unit_test_framework.*\)\.dylib.*$;\1;' -e 's;^lib\(boost_unit_test_framework.*\)\.a.*$;\1;'` @@ -124,7 +125,7 @@ AC_DEFUN([AX_BOOST_UNIT_TEST_FRAMEWORK], done fi if test "x$ax_lib" = "x"; then - AC_MSG_ERROR(Could not find a version of the library!) + AC_MSG_ERROR(Could not find a version of the boost_unit_test_framework library!) fi if test "x$link_unit_test_framework" != "xyes"; then AC_MSG_ERROR(Could not link against $ax_lib !) diff --git a/src/m4/bitcoin_qt.m4 b/src/m4/bitcoin_qt.m4 index 068371e83a..e71ecd7172 100644 --- a/src/m4/bitcoin_qt.m4 +++ b/src/m4/bitcoin_qt.m4 @@ -124,12 +124,12 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[ if test x$have_qt_test = xno; then bitcoin_enable_qt_test=no fi - bitcoin_enable_qt_dbus=yes - if test x$have_qt_dbus = xno; then - bitcoin_enable_qt_dbus=no - if test x$use_dbus = xyes; then - AC_MSG_ERROR("libQtDBus not found. Install libQtDBus or remove --with-qtdbus.") - fi + bitcoin_enable_qt_dbus=no + if test x$use_dbus != xno && test x$have_qt_dbus = xyes; then + bitcoin_enable_qt_dbus=yes + fi + if test x$use_dbus = xyes && test x$have_qt_dbus = xno; then + AC_MSG_ERROR("libQtDBus not found. Install libQtDBus or remove --with-qtdbus.") fi if test x$LUPDATE == x; then AC_MSG_WARN("lupdate is required to update qt translations") diff --git a/src/main.cpp b/src/main.cpp index 7afaa9e7e2..c4d6194857 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -51,7 +51,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) */ +/** Fees smaller than this (in satoshi) are considered zero fee (for relaying and mining) */ int64_t CTransaction::nMinRelayTxFee = 1000; static CMedianFilter<int> cPeerBlockCounts(8, 0); // Amount of blocks that other nodes claim to have @@ -111,6 +111,16 @@ 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; + +// Blocks that are in flight, and that are in the queue to be downloaded. +// Protected by cs_main. +struct QueuedBlock { + uint256 hash; + int64_t nTime; // Time of "getdata" request in microseconds. + int nQueuedBefore; // Number of blocks in flight at the time of request. +}; +map<uint256, pair<NodeId, list<QueuedBlock>::iterator> > mapBlocksInFlight; +map<uint256, pair<NodeId, list<uint256>::iterator> > mapBlocksToDownload; } ////////////////////////////////////////////////////////////////////////////// @@ -194,10 +204,20 @@ struct CNodeState { std::string name; // List of asynchronously-determined block rejections to notify this peer about. std::vector<CBlockReject> rejects; + list<QueuedBlock> vBlocksInFlight; + int nBlocksInFlight; + list<uint256> vBlocksToDownload; + int nBlocksToDownload; + int64_t nLastBlockReceive; + int64_t nLastBlockProcess; CNodeState() { nMisbehavior = 0; fShouldBan = false; + nBlocksToDownload = 0; + nBlocksInFlight = 0; + nLastBlockReceive = 0; + nLastBlockProcess = 0; } }; @@ -226,8 +246,71 @@ void InitializeNode(NodeId nodeid, const CNode *pnode) { void FinalizeNode(NodeId nodeid) { LOCK(cs_main); + CNodeState *state = State(nodeid); + + BOOST_FOREACH(const QueuedBlock& entry, state->vBlocksInFlight) + mapBlocksInFlight.erase(entry.hash); + BOOST_FOREACH(const uint256& hash, state->vBlocksToDownload) + mapBlocksToDownload.erase(hash); + mapNodeState.erase(nodeid); } + +// Requires cs_main. +void MarkBlockAsReceived(const uint256 &hash, NodeId nodeFrom = -1) { + map<uint256, pair<NodeId, list<uint256>::iterator> >::iterator itToDownload = mapBlocksToDownload.find(hash); + if (itToDownload != mapBlocksToDownload.end()) { + CNodeState *state = State(itToDownload->second.first); + state->vBlocksToDownload.erase(itToDownload->second.second); + state->nBlocksToDownload--; + mapBlocksToDownload.erase(itToDownload); + } + + map<uint256, pair<NodeId, list<QueuedBlock>::iterator> >::iterator itInFlight = mapBlocksInFlight.find(hash); + if (itInFlight != mapBlocksInFlight.end()) { + CNodeState *state = State(itInFlight->second.first); + state->vBlocksInFlight.erase(itInFlight->second.second); + state->nBlocksInFlight--; + if (itInFlight->second.first == nodeFrom) + state->nLastBlockReceive = GetTimeMicros(); + mapBlocksInFlight.erase(itInFlight); + } + +} + +// Requires cs_main. +bool AddBlockToQueue(NodeId nodeid, const uint256 &hash) { + if (mapBlocksToDownload.count(hash) || mapBlocksInFlight.count(hash)) + return false; + + CNodeState *state = State(nodeid); + if (state == NULL) + return false; + + list<uint256>::iterator it = state->vBlocksToDownload.insert(state->vBlocksToDownload.end(), hash); + state->nBlocksToDownload++; + if (state->nBlocksToDownload > 5000) + Misbehaving(nodeid, 10); + mapBlocksToDownload[hash] = std::make_pair(nodeid, it); + return true; +} + +// Requires cs_main. +void MarkBlockAsInFlight(NodeId nodeid, const uint256 &hash) { + CNodeState *state = State(nodeid); + assert(state != NULL); + + // Make sure it's not listed somewhere already. + MarkBlockAsReceived(hash); + + QueuedBlock newentry = {hash, GetTimeMicros(), state->nBlocksInFlight}; + if (state->nBlocksInFlight == 0) + state->nLastBlockReceive = newentry.nTime; // Reset when a first request is sent. + list<QueuedBlock>::iterator it = state->vBlocksInFlight.insert(state->vBlocksInFlight.end(), newentry); + state->nBlocksInFlight++; + mapBlocksInFlight[hash] = std::make_pair(nodeid, it); +} + } bool GetNodeStateStats(NodeId nodeid, CNodeStateStats &stats) { @@ -1093,9 +1176,14 @@ void static PruneOrphanBlocks() int64_t GetBlockValue(int nHeight, int64_t nFees) { int64_t nSubsidy = 50 * COIN; + int halvings = nHeight / Params().SubsidyHalvingInterval(); + + // Force block reward to zero when right shift is undefined. + if (halvings >= 64) + return nFees; // Subsidy is cut in half every 210,000 blocks which will occur approximately every 4 years. - nSubsidy >>= (nHeight / Params().SubsidyHalvingInterval()); + nSubsidy >>= halvings; return nSubsidy + nFees; } @@ -1310,6 +1398,7 @@ void CheckForkWarningConditionsOnNewFork(CBlockIndex* pindexNewForkTip) CheckForkWarningConditions(); } +// Requires cs_main. void Misbehaving(NodeId pnode, int howmuch) { if (howmuch == 0) @@ -1739,7 +1828,7 @@ bool ConnectBlock(CBlock& block, CValidationState& state, CBlockIndex* pindex, C return state.DoS(100, error("ConnectBlock() : coinbase pays too much (actual=%d vs limit=%d)", block.vtx[0].GetValueOut(), GetBlockValue(pindex->nHeight, nFees)), - REJECT_INVALID, "bad-cb-amount"); + REJECT_INVALID, "bad-cb-amount"); if (!control.Wait()) return state.DoS(100, false); @@ -2044,12 +2133,11 @@ bool AddToBlockIndex(CBlock& block, CValidationState& state, const CDiskBlockPos // Construct new block index object CBlockIndex* pindexNew = new CBlockIndex(block); + assert(pindexNew); { 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); @@ -2400,11 +2488,8 @@ bool ProcessBlock(CValidationState &state, CNode* pfrom, CBlock* pblock, CDiskBl return state.Invalid(error("ProcessBlock() : already have block (orphan) %s", hash.ToString()), 0, "duplicate"); // Preliminary checks - if (!CheckBlock(*pblock, state)) { - if (state.CorruptionPossible()) - mapAlreadyAskedFor.erase(CInv(MSG_BLOCK, hash)); + if (!CheckBlock(*pblock, state)) return error("ProcessBlock() : CheckBlock FAILED"); - } CBlockIndex* pcheckpoint = Checkpoints::GetLastCheckpoint(mapBlockIndex); if (pcheckpoint && pblock->hashPrevBlock != (chainActive.Tip() ? chainActive.Tip()->GetBlockHash() : uint256(0))) @@ -2764,9 +2849,10 @@ bool static LoadBlockIndexDB() if (it == mapBlockIndex.end()) return true; chainActive.SetTip(it->second); - LogPrintf("LoadBlockIndexDB(): hashBestChain=%s height=%d date=%s\n", + LogPrintf("LoadBlockIndexDB(): hashBestChain=%s height=%d date=%s progress=%f\n", chainActive.Tip()->GetBlockHash().ToString(), chainActive.Height(), - DateTimeStrFormat("%Y-%m-%d %H:%M:%S", chainActive.Tip()->GetBlockTime())); + DateTimeStrFormat("%Y-%m-%d %H:%M:%S", chainActive.Tip()->GetBlockTime()), + Checkpoints::GuessVerificationProgress(chainActive.Tip())); return true; } @@ -2940,7 +3026,7 @@ void PrintBlockTree() // print item CBlock block; ReadBlockFromDisk(block, pindex); - LogPrintf("%d (blk%05u.dat:0x%x) %s tx %"PRIszu"", + LogPrintf("%d (blk%05u.dat:0x%x) %s tx %"PRIszu"\n", pindex->nHeight, pindex->GetBlockPos().nFile, pindex->GetBlockPos().nPos, DateTimeStrFormat("%Y-%m-%d %H:%M:%S", block.GetBlockTime()), @@ -3163,14 +3249,14 @@ void static ProcessGetData(CNode* pfrom) 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; - } + 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; + send = true; } } if (send) @@ -3274,7 +3360,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) return true; } - + State(pfrom->GetId())->nLastBlockProcess = GetTimeMicros(); @@ -3477,15 +3563,6 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) return error("message inv size() = %"PRIszu"", vInv.size()); } - // find last block in inv vector - unsigned int nLastBlock = (unsigned int)(-1); - for (unsigned int nInv = 0; nInv < vInv.size(); nInv++) { - if (vInv[vInv.size() - 1 - nInv].type == MSG_BLOCK) { - nLastBlock = vInv.size() - 1 - nInv; - break; - } - } - LOCK(cs_main); for (unsigned int nInv = 0; nInv < vInv.size(); nInv++) @@ -3499,17 +3576,14 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) LogPrint("net", " got inventory: %s %s\n", inv.ToString(), fAlreadyHave ? "have" : "new"); if (!fAlreadyHave) { - if (!fImporting && !fReindex) - pfrom->AskFor(inv); + if (!fImporting && !fReindex) { + if (inv.type == MSG_BLOCK) + AddBlockToQueue(pfrom->GetId(), inv.hash); + else + pfrom->AskFor(inv); + } } else if (inv.type == MSG_BLOCK && mapOrphanBlocks.count(inv.hash)) { PushGetBlocks(pfrom, chainActive.Tip(), GetOrphanRoot(inv.hash)); - } else if (nInv == nLastBlock) { - // In case we are on a very long side-chain, it is possible that we already have - // the last block in an inv bundle sent in response to getblocks. Try to detect - // this situation and push another getblocks to continue. - PushGetBlocks(pfrom, mapBlockIndex[inv.hash], uint256(0)); - if (fDebug) - LogPrintf("force request: %s\n", inv.ToString()); } // Track requests for our stuff @@ -3690,7 +3764,7 @@ 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(), pfrom->addr.ToString(), pfrom->cleanSubVer, state.GetRejectReason()); @@ -3716,6 +3790,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) LOCK(cs_main); // Remember who we got this block from. mapBlockSource[inv.hash] = pfrom->GetId(); + MarkBlockAsReceived(inv.hash, pfrom->GetId()); CValidationState state; ProcessBlock(state, pfrom, &block); @@ -4243,12 +4318,38 @@ bool SendMessages(CNode* pto, bool fSendTrickle) pto->PushMessage("inv", vInv); + // Detect stalled peers. Require that blocks are in flight, we haven't + // received a (requested) block in one minute, and that all blocks are + // in flight for over two minutes, since we first had a chance to + // process an incoming block. + int64_t nNow = GetTimeMicros(); + if (!pto->fDisconnect && state.nBlocksInFlight && + state.nLastBlockReceive < state.nLastBlockProcess - BLOCK_DOWNLOAD_TIMEOUT*1000000 && + state.vBlocksInFlight.front().nTime < state.nLastBlockProcess - 2*BLOCK_DOWNLOAD_TIMEOUT*1000000) { + LogPrintf("Peer %s is stalling block download, disconnecting\n", state.name.c_str()); + pto->fDisconnect = true; + } + // - // Message: getdata + // Message: getdata (blocks) // vector<CInv> vGetData; - int64_t nNow = GetTime() * 1000000; - while (!pto->mapAskFor.empty() && (*pto->mapAskFor.begin()).first <= nNow) + while (!pto->fDisconnect && state.nBlocksToDownload && state.nBlocksInFlight < MAX_BLOCKS_IN_TRANSIT_PER_PEER) { + uint256 hash = state.vBlocksToDownload.front(); + vGetData.push_back(CInv(MSG_BLOCK, hash)); + MarkBlockAsInFlight(pto->GetId(), hash); + LogPrint("net", "Requesting block %s from %s\n", hash.ToString().c_str(), state.name.c_str()); + if (vGetData.size() >= 1000) + { + pto->PushMessage("getdata", vGetData); + vGetData.clear(); + } + } + + // + // Message: getdata (non-blocks) + // + while (!pto->fDisconnect && !pto->mapAskFor.empty() && (*pto->mapAskFor.begin()).first <= nNow) { const CInv& inv = (*pto->mapAskFor.begin()).second; if (!AlreadyHave(inv)) diff --git a/src/main.h b/src/main.h index 781562854f..aff20d0379 100644 --- a/src/main.h +++ b/src/main.h @@ -35,8 +35,9 @@ class CInv; /** The maximum allowed size for a serialized block, in bytes (network rule) */ static const unsigned int MAX_BLOCK_SIZE = 1000000; -/** Default for -blockmaxsize, maximum size for mined blocks **/ +/** Default for -blockmaxsize and -blockminsize, which control the range of sizes the mining code will create **/ static const unsigned int DEFAULT_BLOCK_MAX_SIZE = 750000; +static const unsigned int DEFAULT_BLOCK_MIN_SIZE = 0; /** Default for -blockprioritysize, maximum space for zero/low-fee transactions **/ static const unsigned int DEFAULT_BLOCK_PRIORITY_SIZE = 50000; /** The maximum size for transactions we're willing to relay/mine */ @@ -59,6 +60,13 @@ static const int COINBASE_MATURITY = 100; static const unsigned int LOCKTIME_THRESHOLD = 500000000; // Tue Nov 5 00:53:20 1985 UTC /** Maximum number of script-checking threads allowed */ static const int MAX_SCRIPTCHECK_THREADS = 16; +/** -par default (number of script-checking threads, 0 = auto) */ +static const int DEFAULT_SCRIPTCHECK_THREADS = 0; +/** Number of blocks that can be requested at any given time from a single peer. */ +static const int MAX_BLOCKS_IN_TRANSIT_PER_PEER = 128; +/** Timeout in seconds before considering a block download peer unresponsive. */ +static const unsigned int BLOCK_DOWNLOAD_TIMEOUT = 60; + #ifdef USE_UPNP static const int fHaveUPnP = true; #else @@ -175,6 +183,9 @@ bool VerifySignature(const CCoins& txFrom, const CTransaction& txTo, unsigned in bool AbortNode(const std::string &msg); /** Get statistics from node state */ bool GetNodeStateStats(NodeId nodeid, CNodeStateStats &stats); +/** Increase a node's misbehavior score. */ +void Misbehaving(NodeId nodeid, int howmuch); + /** (try to) add transaction to memory pool **/ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransaction &tx, bool fLimitFree, @@ -266,10 +277,10 @@ int64_t GetMinFee(const CTransaction& tx, unsigned int nBytes, bool fAllowFree, // DUP CHECKSIG DROP ... repeated 100 times... OP_1 // - /** Check for standard transaction types - @param[in] mapInputs Map of previous transactions that have outputs we're spending - @return True if all inputs (scriptSigs) use only standard transaction forms - */ +/** Check for standard transaction types + @param[in] mapInputs Map of previous transactions that have outputs we're spending + @return True if all inputs (scriptSigs) use only standard transaction forms +*/ bool AreInputsStandard(const CTransaction& tx, CCoinsViewCache& mapInputs); /** Count ECDSA signature operations the old-fashioned (pre-0.6) way @@ -418,6 +429,7 @@ class CMerkleTx : public CTransaction { private: int GetDepthInMainChainINTERNAL(CBlockIndex* &pindexRet) const; + public: uint256 hashBlock; std::vector<uint256> vMerkleBranch; diff --git a/src/miner.cpp b/src/miner.cpp index e52f539085..3351908e65 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -136,7 +136,7 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn) // Minimum block size you want to create; block will be filled with free transactions // until there are no more or the block reaches this size: - unsigned int nBlockMinSize = GetArg("-blockminsize", 0); + unsigned int nBlockMinSize = GetArg("-blockminsize", DEFAULT_BLOCK_MIN_SIZE); nBlockMinSize = std::min(nBlockMaxSize, nBlockMinSize); // Collect memory pool transactions into the block @@ -254,7 +254,7 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn) continue; // Skip free transactions if we're past the minimum block size: - if (fSortedByFee && (dFeePerKb < CTransaction::nMinTxFee) && (nBlockSize + nTxSize >= nBlockMinSize)) + if (fSortedByFee && (dFeePerKb < CTransaction::nMinRelayTxFee) && (nBlockSize + nTxSize >= nBlockMinSize)) continue; // Prioritize by fee once past the priority size or we run out of high-priority diff --git a/src/net.cpp b/src/net.cpp index 19f4a73bc4..a0208c9605 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -27,6 +27,8 @@ #include <miniupnpc/upnperrors.h> #endif +#include <boost/filesystem.hpp> + // Dump addresses to peers.dat every 15 minutes (900s) #define DUMP_ADDRESSES_INTERVAL 900 @@ -944,11 +946,7 @@ void ThreadSocketHandler() } else if (nInbound >= nMaxConnections - MAX_OUTBOUND_CONNECTIONS) { - { - LOCK(cs_setservAddNodeAddresses); - if (!setservAddNodeAddresses.count(addr)) - closesocket(hSocket); - } + closesocket(hSocket); } else if (CNode::IsBanned(addr)) { @@ -1653,7 +1651,7 @@ bool BindListenPort(const CService &addrBind, string& strError) { int nErr = WSAGetLastError(); if (nErr == WSAEADDRINUSE) - strError = strprintf(_("Unable to bind to %s on this computer. Bitcoin Core Daemon is probably already running."), addrBind.ToString()); + strError = strprintf(_("Unable to bind to %s on this computer. Bitcoin Core is probably already running."), addrBind.ToString()); else strError = strprintf(_("Unable to bind to %s on this computer (bind returned error %d, %s)"), addrBind.ToString(), nErr, strerror(nErr)); LogPrintf("%s\n", strError); @@ -1986,9 +1984,9 @@ bool CAddrDB::Read(CAddrMan& addr) return error("CAddrman::Read() : open failed"); // use file size to size memory buffer - int fileSize = GetFilesize(filein); + int fileSize = boost::filesystem::file_size(pathAddr); int dataSize = fileSize - sizeof(uint256); - //Don't try to resize to a negative number if file is small + // Don't try to resize to a negative number if file is small if ( dataSize < 0 ) dataSize = 0; vector<unsigned char> vchData; vchData.resize(dataSize); @@ -426,7 +426,7 @@ public: LogPrint("net", "askfor %s %d (%s)\n", inv.ToString().c_str(), nRequestTime, DateTimeStrFormat("%H:%M:%S", nRequestTime/1000000).c_str()); // Make sure not to reuse time indexes to keep things in the same order - int64_t nNow = (GetTime() - 1) * 1000000; + int64_t nNow = GetTimeMicros() - 1000000; static int64_t nLastTime; ++nLastTime; nNow = std::max(nNow, nLastTime); diff --git a/src/netbase.cpp b/src/netbase.cpp index d5b75d6afd..2b300e5dd3 100644 --- a/src/netbase.cpp +++ b/src/netbase.cpp @@ -293,8 +293,10 @@ bool static Socks5(string strDest, int port, SOCKET& hSocket) case 0x03: { ret = recv(hSocket, pchRet3, 1, 0) != 1; - if (ret) + if (ret) { + closesocket(hSocket); return error("Error reading from proxy"); + } int nRecv = pchRet3[0]; ret = recv(hSocket, pchRet3, nRecv, 0) != nRecv; break; @@ -501,6 +503,7 @@ bool ConnectSocket(const CService &addrDest, SOCKET& hSocketRet, int nTimeout) return false; break; default: + closesocket(hSocket); return false; } @@ -532,7 +535,9 @@ bool ConnectSocketByName(CService &addr, SOCKET& hSocketRet, const char *pszDest switch(nameproxy.second) { default: - case 4: return false; + case 4: + closesocket(hSocket); + return false; case 5: if (!Socks5(strDest, port, hSocket)) return false; diff --git a/src/qt/Makefile.am b/src/qt/Makefile.am index c0ebfb61d2..f875ac283b 100644 --- a/src/qt/Makefile.am +++ b/src/qt/Makefile.am @@ -7,8 +7,8 @@ AM_CPPFLAGS += -I$(top_srcdir)/src \ $(QR_CFLAGS) bin_PROGRAMS = bitcoin-qt noinst_LIBRARIES = libbitcoinqt.a -SUBDIRS = $(BUILD_TEST_QT) -DIST_SUBDIRS = test +SUBDIRS = . $(BUILD_TEST_QT) +DIST_SUBDIRS = . test # bitcoin qt core # QT_TS = \ @@ -25,7 +25,6 @@ QT_TS = \ locale/bitcoin_cs.ts \ locale/bitcoin_cy.ts \ locale/bitcoin_da.ts \ - locale/bitcoin_de_AT.ts \ locale/bitcoin_de.ts \ locale/bitcoin_el_GR.ts \ locale/bitcoin_en.ts \ @@ -276,7 +275,6 @@ BITCOIN_QT_CPP = \ qvalidatedlineedit.cpp \ qvaluecombobox.cpp \ rpcconsole.cpp \ - signverifymessagedialog.cpp \ splashscreen.cpp \ trafficgraphwidget.cpp \ utilitydialog.cpp @@ -298,6 +296,7 @@ BITCOIN_QT_CPP += \ recentrequeststablemodel.cpp \ sendcoinsdialog.cpp \ sendcoinsentry.cpp \ + signverifymessagedialog.cpp \ transactiondesc.cpp \ transactiondescdialog.cpp \ transactionfilterproxy.cpp \ diff --git a/src/qt/addresstablemodel.cpp b/src/qt/addresstablemodel.cpp index 2987e5fdda..dfbd445ce3 100644 --- a/src/qt/addresstablemodel.cpp +++ b/src/qt/addresstablemodel.cpp @@ -114,7 +114,7 @@ public: case CT_NEW: if(inModel) { - qDebug() << "AddressTablePriv::updateEntry : Warning: Got CT_NOW, but entry is already in model"; + qDebug() << "AddressTablePriv::updateEntry : Warning: Got CT_NEW, but entry is already in model"; break; } parent->beginInsertRows(QModelIndex(), lowerIndex, lowerIndex); diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index 162009f5de..696e65ec19 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -25,7 +25,9 @@ #include "rpcserver.h" #include "ui_interface.h" #include "util.h" +#ifdef ENABLE_WALLET #include "wallet.h" +#endif #include <stdint.h> @@ -78,6 +80,12 @@ static void initTranslations(QTranslator &qtTranslatorBase, QTranslator &qtTrans { QSettings settings; + // Remove old translators + QApplication::removeTranslator(&qtTranslatorBase); + QApplication::removeTranslator(&qtTranslator); + QApplication::removeTranslator(&translatorBase); + QApplication::removeTranslator(&translator); + // Get desired locale (e.g. "de_DE") // 1) System default language QString lang_territory = QLocale::system().name(); @@ -439,21 +447,9 @@ void BitcoinApplication::handleRunawayException(const QString &message) #ifndef BITCOIN_QT_TEST int main(int argc, char *argv[]) { - bool fSelParFromCLFailed = false; /// 1. Parse command-line options. These take precedence over anything else. // Command-line options take precedence: ParseParameters(argc, argv); - // Check for -testnet or -regtest parameter (TestNet() calls are only valid after this clause) - if (!SelectParamsFromCommandLine()) { - fSelParFromCLFailed = true; - } -#ifdef ENABLE_WALLET - // Parse URIs on command line -- this can affect TestNet() / RegTest() mode - if (!PaymentServer::ipcParseCommandLine(argc, argv)) - exit(0); -#endif - - bool isaTestNet = TestNet() || RegTest(); // Do not refer to data directory yet, this can be overridden by Intro::pickDataDirectory @@ -480,12 +476,9 @@ int main(int argc, char *argv[]) /// 3. Application identification // must be set before OptionsModel is initialized or translations are loaded, // as it is used to locate QSettings - QApplication::setOrganizationName("Bitcoin"); - QApplication::setOrganizationDomain("bitcoin.org"); - if (isaTestNet) // Separate UI settings for testnets - QApplication::setApplicationName("Bitcoin-Qt-testnet"); - else - QApplication::setApplicationName("Bitcoin-Qt"); + QApplication::setOrganizationName(QAPP_ORG_NAME); + QApplication::setOrganizationDomain(QAPP_ORG_DOMAIN); + QApplication::setApplicationName(QAPP_APP_NAME_DEFAULT); /// 4. Initialization of translations, so that intro dialog is in user's language // Now that QSettings are accessible, initialize translations @@ -501,27 +494,54 @@ int main(int argc, char *argv[]) help.showOrPrint(); return 1; } - // Now that translations are initialized, check for earlier errors and show a translatable error message - if (fSelParFromCLFailed) { - QMessageBox::critical(0, QObject::tr("Bitcoin"), QObject::tr("Error: Invalid combination of -regtest and -testnet.")); - return 1; - } /// 5. Now that settings and translations are available, ask user for data directory // User language is set up: pick a data directory - Intro::pickDataDirectory(isaTestNet); + Intro::pickDataDirectory(); /// 6. Determine availability of data directory and parse bitcoin.conf + /// - Do not call GetDataDir(true) before this step finishes if (!boost::filesystem::is_directory(GetDataDir(false))) { QMessageBox::critical(0, QObject::tr("Bitcoin"), QObject::tr("Error: Specified data directory \"%1\" does not exist.").arg(QString::fromStdString(mapArgs["-datadir"]))); return 1; } - ReadConfigFile(mapArgs, mapMultiArgs); + try { + ReadConfigFile(mapArgs, mapMultiArgs); + } catch(std::exception &e) { + QMessageBox::critical(0, QObject::tr("Bitcoin"), + QObject::tr("Error: Cannot parse configuration file: %1. Only use key=value syntax.").arg(e.what())); + return false; + } + + /// 7. Determine network (and switch to network specific options) + // - Do not call Params() before this step + // - Do this after parsing the configuration file, as the network can be switched there + // - QSettings() will use the new application name after this, resulting in network-specific settings + // - Needs to be done before createOptionsModel + + // Check for -testnet or -regtest parameter (Params() calls are only valid after this clause) + if (!SelectParamsFromCommandLine()) { + QMessageBox::critical(0, QObject::tr("Bitcoin"), QObject::tr("Error: Invalid combination of -regtest and -testnet.")); + return 1; + } +#ifdef ENABLE_WALLET + // Parse URIs on command line -- this can affect Params() + if (!PaymentServer::ipcParseCommandLine(argc, argv)) + exit(0); +#endif + bool isaTestNet = Params().NetworkID() != CChainParams::MAIN; + // Allow for separate UI settings for testnets + if (isaTestNet) + QApplication::setApplicationName(QAPP_APP_NAME_TESTNET); + else + QApplication::setApplicationName(QAPP_APP_NAME_DEFAULT); + // Re-initialize translations after changing application name (language in network-specific settings can be different) + initTranslations(qtTranslatorBase, qtTranslator, translatorBase, translator); #ifdef ENABLE_WALLET - /// 7. URI IPC sending + /// 8. URI IPC sending // - Do this early as we don't want to bother initializing if we are just calling IPC // - Do this *after* setting up the data directory, as the data directory hash is used in the name // of the server. @@ -535,7 +555,7 @@ int main(int argc, char *argv[]) app.createPaymentServer(); #endif - /// 8. Main GUI initialization + /// 9. Main GUI initialization // Install global event filter that makes sure that long tooltips can be word-wrapped app.installEventFilter(new GUIUtil::ToolTipToRichTextFilter(TOOLTIP_WRAP_THRESHOLD, &app)); // Install qDebug() message handler to route to debug.log diff --git a/src/qt/bitcoin.qrc b/src/qt/bitcoin.qrc index 263ff5f7eb..75078581ce 100644 --- a/src/qt/bitcoin.qrc +++ b/src/qt/bitcoin.qrc @@ -98,7 +98,6 @@ <file alias="cs">locale/bitcoin_cs.qm</file> <file alias="cy">locale/bitcoin_cy.qm</file> <file alias="da">locale/bitcoin_da.qm</file> - <file alias="de_AT">locale/bitcoin_de_AT.qm</file> <file alias="de">locale/bitcoin_de.qm</file> <file alias="el_GR">locale/bitcoin_el_GR.qm</file> <file alias="en">locale/bitcoin_en.qm</file> diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 0ca16edb8c..da7762282a 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -673,17 +673,27 @@ void BitcoinGUI::setNumBlocks(int count, int nTotalBlocks) { // Represent time from last generated block in human readable text QString timeBehindText; - if(secs < 48*60*60) + const int HOUR_IN_SECONDS = 60*60; + const int DAY_IN_SECONDS = 24*60*60; + const int WEEK_IN_SECONDS = 7*24*60*60; + const int YEAR_IN_SECONDS = 31556952; // Average length of year in Gregorian calendar + if(secs < 2*DAY_IN_SECONDS) { - timeBehindText = tr("%n hour(s)","",secs/(60*60)); + timeBehindText = tr("%n hour(s)","",secs/HOUR_IN_SECONDS); } - else if(secs < 14*24*60*60) + else if(secs < 2*WEEK_IN_SECONDS) { - timeBehindText = tr("%n day(s)","",secs/(24*60*60)); + timeBehindText = tr("%n day(s)","",secs/DAY_IN_SECONDS); + } + else if(secs < YEAR_IN_SECONDS) + { + timeBehindText = tr("%n week(s)","",secs/WEEK_IN_SECONDS); } else { - timeBehindText = tr("%n week(s)","",secs/(7*24*60*60)); + int years = secs / YEAR_IN_SECONDS; + int remainder = secs % YEAR_IN_SECONDS; + timeBehindText = tr("%1 and %2").arg(tr("%n year(s)", "", years)).arg(tr("%n week(s)","", remainder/WEEK_IN_SECONDS)); } progressBarLabel->setVisible(true); diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp index c853fd10bc..f1d5301a11 100644 --- a/src/qt/bitcoinstrings.cpp +++ b/src/qt/bitcoinstrings.cpp @@ -33,9 +33,12 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" "Bind to given address and always listen on it. Use [host]:port notation for " "IPv6"), QT_TRANSLATE_NOOP("bitcoin-core", "" -"Cannot obtain a lock on data directory %s. Bitcoin is probably already " +"Cannot obtain a lock on data directory %s. Bitcoin Core is probably already " "running."), QT_TRANSLATE_NOOP("bitcoin-core", "" +"Continuously rate-limit free transactions to <n>*1000 bytes per minute " +"(default:15)"), +QT_TRANSLATE_NOOP("bitcoin-core", "" "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."), @@ -43,6 +46,8 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" "Enter regression test mode, which uses a special chain in which blocks can " "be solved instantly."), QT_TRANSLATE_NOOP("bitcoin-core", "" +"Error: Listening for incoming connections failed (listen returned error %d)"), +QT_TRANSLATE_NOOP("bitcoin-core", "" "Error: The transaction was rejected! This might happen if some of the coins " "in your wallet were already spent, such as if you used a copy of wallet.dat " "and coins were spent in the copy but not marked as spent here."), @@ -59,6 +64,17 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" "Execute command when the best block changes (%s in cmd is replaced by block " "hash)"), QT_TRANSLATE_NOOP("bitcoin-core", "" +"Fees smaller than this are considered zero fee (for transaction creation) " +"(default:"), +QT_TRANSLATE_NOOP("bitcoin-core", "" +"Flush database activity from memory pool to disk log every <n> megabytes " +"(default: 100)"), +QT_TRANSLATE_NOOP("bitcoin-core", "" +"How thorough the block verification of -checkblocks is (0-4, default: 3)"), +QT_TRANSLATE_NOOP("bitcoin-core", "" +"In this mode -genproclimit controls how many blocks are generated " +"immediately."), +QT_TRANSLATE_NOOP("bitcoin-core", "" "Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)"), QT_TRANSLATE_NOOP("bitcoin-core", "" "Number of seconds to keep misbehaving peers from reconnecting (default: " @@ -68,13 +84,17 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" QT_TRANSLATE_NOOP("bitcoin-core", "" "Set maximum size of high-priority/low-fee transactions in bytes (default: %d)"), QT_TRANSLATE_NOOP("bitcoin-core", "" -"Set the number of script verification threads (up to 16, 0 = auto, <0 = " -"leave that many cores free, default: 0)"), +"Set the number of script verification threads (%u to %d, 0 = auto, <0 = " +"leave that many cores free, default: %d)"), +QT_TRANSLATE_NOOP("bitcoin-core", "" +"Set the processor limit for when generation is on (-1 = unlimited, default: " +"-1)"), QT_TRANSLATE_NOOP("bitcoin-core", "" "This is a pre-release test build - use at your own risk - do not use for " "mining or merchant applications"), QT_TRANSLATE_NOOP("bitcoin-core", "" -"Unable to bind to %s on this computer. Bitcoin is probably already running."), +"Unable to bind to %s on this computer. Bitcoin Core is probably already " +"running."), QT_TRANSLATE_NOOP("bitcoin-core", "" "Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -" "proxy)"), @@ -102,6 +122,8 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" "%s\n" "If the file does not exist, create it with owner-readable-only file " "permissions."), +QT_TRANSLATE_NOOP("bitcoin-core", "(default: 1)"), +QT_TRANSLATE_NOOP("bitcoin-core", "(default: wallet.dat)"), QT_TRANSLATE_NOOP("bitcoin-core", "<category> can be:"), QT_TRANSLATE_NOOP("bitcoin-core", "Accept command line and JSON-RPC commands"), QT_TRANSLATE_NOOP("bitcoin-core", "Accept connections from outside (default: 1 if no -proxy or -connect)"), @@ -110,7 +132,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Allow DNS lookups for -addnode, -seednode and QT_TRANSLATE_NOOP("bitcoin-core", "Allow JSON-RPC connections from specified IP address"), QT_TRANSLATE_NOOP("bitcoin-core", "Attempt to recover private keys from a corrupt wallet.dat"), QT_TRANSLATE_NOOP("bitcoin-core", "Bitcoin Core Daemon"), -QT_TRANSLATE_NOOP("bitcoin-core", "Bitcoin RPC client version"), +QT_TRANSLATE_NOOP("bitcoin-core", "Bitcoin Core RPC client version"), QT_TRANSLATE_NOOP("bitcoin-core", "Block creation options:"), QT_TRANSLATE_NOOP("bitcoin-core", "Cannot downgrade wallet"), QT_TRANSLATE_NOOP("bitcoin-core", "Cannot resolve -bind address: '%s'"), @@ -121,7 +143,10 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Connect only to the specified node(s)"), QT_TRANSLATE_NOOP("bitcoin-core", "Connect through SOCKS proxy"), QT_TRANSLATE_NOOP("bitcoin-core", "Connect to JSON-RPC on <port> (default: 8332 or testnet: 18332)"), QT_TRANSLATE_NOOP("bitcoin-core", "Connect to a node to retrieve peer addresses, and disconnect"), +QT_TRANSLATE_NOOP("bitcoin-core", "Connection options:"), QT_TRANSLATE_NOOP("bitcoin-core", "Corrupted block database detected"), +QT_TRANSLATE_NOOP("bitcoin-core", "Debugging/Testing options:"), +QT_TRANSLATE_NOOP("bitcoin-core", "Disable safemode, override a real safe mode event (default: 0)"), QT_TRANSLATE_NOOP("bitcoin-core", "Discover own IP address (default: 1 when listening and no -externalip)"), QT_TRANSLATE_NOOP("bitcoin-core", "Do not load the wallet and disable wallet RPC calls"), QT_TRANSLATE_NOOP("bitcoin-core", "Do you want to rebuild the block database now?"), @@ -149,11 +174,12 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Failed to write to coin database"), QT_TRANSLATE_NOOP("bitcoin-core", "Failed to write transaction index"), QT_TRANSLATE_NOOP("bitcoin-core", "Failed to write undo data"), QT_TRANSLATE_NOOP("bitcoin-core", "Fee per kB to add to transactions you send"), +QT_TRANSLATE_NOOP("bitcoin-core", "Fees smaller than this are considered zero fee (for relaying) (default:"), QT_TRANSLATE_NOOP("bitcoin-core", "Find peers using DNS lookup (default: 1 unless -connect)"), +QT_TRANSLATE_NOOP("bitcoin-core", "Force safe mode (default: 0)"), QT_TRANSLATE_NOOP("bitcoin-core", "Generate coins (default: 0)"), QT_TRANSLATE_NOOP("bitcoin-core", "Get help for a command"), QT_TRANSLATE_NOOP("bitcoin-core", "How many blocks to check at startup (default: 288, 0 = all)"), -QT_TRANSLATE_NOOP("bitcoin-core", "How thorough the block verification is (0-4, default: 3)"), QT_TRANSLATE_NOOP("bitcoin-core", "If <category> is not supplied, output all debugging information."), QT_TRANSLATE_NOOP("bitcoin-core", "Imports blocks from external blk000??.dat file"), QT_TRANSLATE_NOOP("bitcoin-core", "Incorrect or no genesis block found. Wrong datadir for network?"), @@ -165,11 +191,13 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Invalid amount for -minrelaytxfee=<amount>: ' QT_TRANSLATE_NOOP("bitcoin-core", "Invalid amount for -mintxfee=<amount>: '%s'"), QT_TRANSLATE_NOOP("bitcoin-core", "Invalid amount for -paytxfee=<amount>: '%s'"), QT_TRANSLATE_NOOP("bitcoin-core", "Invalid amount"), +QT_TRANSLATE_NOOP("bitcoin-core", "Limit size of signature cache to <n> entries (default: 50000)"), QT_TRANSLATE_NOOP("bitcoin-core", "List commands"), QT_TRANSLATE_NOOP("bitcoin-core", "Listen for connections on <port> (default: 8333 or testnet: 18333)"), QT_TRANSLATE_NOOP("bitcoin-core", "Loading addresses..."), QT_TRANSLATE_NOOP("bitcoin-core", "Loading block index..."), QT_TRANSLATE_NOOP("bitcoin-core", "Loading wallet..."), +QT_TRANSLATE_NOOP("bitcoin-core", "Log transaction priority and fee per kB when mining blocks (default: 0)"), QT_TRANSLATE_NOOP("bitcoin-core", "Maintain a full transaction index (default: 0)"), QT_TRANSLATE_NOOP("bitcoin-core", "Maintain at most <n> connections to peers (default: 125)"), QT_TRANSLATE_NOOP("bitcoin-core", "Maximum per-connection receive buffer, <n>*1000 bytes (default: 5000)"), @@ -180,23 +208,33 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Only connect to nodes in network <net> (IPv4, QT_TRANSLATE_NOOP("bitcoin-core", "Options:"), QT_TRANSLATE_NOOP("bitcoin-core", "Password for JSON-RPC connections"), QT_TRANSLATE_NOOP("bitcoin-core", "Prepend debug output with timestamp (default: 1)"), +QT_TRANSLATE_NOOP("bitcoin-core", "Print block on startup, if found in block index"), +QT_TRANSLATE_NOOP("bitcoin-core", "Print block tree on startup (default: 0)"), +QT_TRANSLATE_NOOP("bitcoin-core", "RPC SSL options: (see the Bitcoin Wiki for SSL setup instructions)"), QT_TRANSLATE_NOOP("bitcoin-core", "RPC client options:"), +QT_TRANSLATE_NOOP("bitcoin-core", "RPC server options:"), +QT_TRANSLATE_NOOP("bitcoin-core", "Randomly drop 1 of every <n> network messages"), +QT_TRANSLATE_NOOP("bitcoin-core", "Randomly fuzz 1 of every <n> network messages"), QT_TRANSLATE_NOOP("bitcoin-core", "Rebuild block chain index from current blk000??.dat files"), QT_TRANSLATE_NOOP("bitcoin-core", "Rescan the block chain for missing wallet transactions"), QT_TRANSLATE_NOOP("bitcoin-core", "Rescanning..."), +QT_TRANSLATE_NOOP("bitcoin-core", "Run a thread to flush wallet periodically (default: 1)"), QT_TRANSLATE_NOOP("bitcoin-core", "Run in the background as a daemon and accept commands"), QT_TRANSLATE_NOOP("bitcoin-core", "SSL options: (see the Bitcoin Wiki for SSL setup instructions)"), QT_TRANSLATE_NOOP("bitcoin-core", "Select SOCKS version for -proxy (4 or 5, default: 5)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Send command to Bitcoin server"), +QT_TRANSLATE_NOOP("bitcoin-core", "Send command to Bitcoin Core"), QT_TRANSLATE_NOOP("bitcoin-core", "Send commands to node running on <ip> (default: 127.0.0.1)"), QT_TRANSLATE_NOOP("bitcoin-core", "Send trace/debug info to console instead of debug.log file"), QT_TRANSLATE_NOOP("bitcoin-core", "Server certificate file (default: server.cert)"), QT_TRANSLATE_NOOP("bitcoin-core", "Server private key (default: server.pem)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Set database cache size in megabytes (default: 25)"), +QT_TRANSLATE_NOOP("bitcoin-core", "Set database cache size in megabytes (%d to %d, default: %d)"), QT_TRANSLATE_NOOP("bitcoin-core", "Set key pool size to <n> (default: 100)"), QT_TRANSLATE_NOOP("bitcoin-core", "Set maximum block size in bytes (default: %d)"), QT_TRANSLATE_NOOP("bitcoin-core", "Set minimum block size in bytes (default: 0)"), QT_TRANSLATE_NOOP("bitcoin-core", "Set the number of threads to service RPC calls (default: 4)"), +QT_TRANSLATE_NOOP("bitcoin-core", "Sets the DB_PRIVATE flag in the wallet db environment (default: 1)"), +QT_TRANSLATE_NOOP("bitcoin-core", "Show all debugging options (usage: --help -help-debug)"), +QT_TRANSLATE_NOOP("bitcoin-core", "Show benchmark information (default: 0)"), QT_TRANSLATE_NOOP("bitcoin-core", "Shrink debug.log file on client startup (default: 1 when no -debug)"), QT_TRANSLATE_NOOP("bitcoin-core", "Signing transaction failed"), QT_TRANSLATE_NOOP("bitcoin-core", "Specify configuration file (default: bitcoin.conf)"), @@ -206,7 +244,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Specify pid file (default: bitcoind.pid)"), QT_TRANSLATE_NOOP("bitcoin-core", "Specify wallet file (within data directory)"), QT_TRANSLATE_NOOP("bitcoin-core", "Specify your own public address"), QT_TRANSLATE_NOOP("bitcoin-core", "Spend unconfirmed change when sending transactions (default: 1)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Start Bitcoin server"), +QT_TRANSLATE_NOOP("bitcoin-core", "Start Bitcoin Core Daemon"), QT_TRANSLATE_NOOP("bitcoin-core", "System error: "), QT_TRANSLATE_NOOP("bitcoin-core", "This help message"), QT_TRANSLATE_NOOP("bitcoin-core", "This is intended for regression testing tools and app development."), @@ -237,6 +275,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Warning: Deprecated argument -debugnet ignore QT_TRANSLATE_NOOP("bitcoin-core", "Warning: This version is obsolete, upgrade required!"), QT_TRANSLATE_NOOP("bitcoin-core", "You need to rebuild the database using -reindex to change -txindex"), QT_TRANSLATE_NOOP("bitcoin-core", "Zapping all transactions from wallet..."), +QT_TRANSLATE_NOOP("bitcoin-core", "on startup"), QT_TRANSLATE_NOOP("bitcoin-core", "version"), QT_TRANSLATE_NOOP("bitcoin-core", "wallet.dat corrupt, salvage failed"), }; diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp index f273b9ea46..cb832fdd42 100644 --- a/src/qt/clientmodel.cpp +++ b/src/qt/clientmodel.cpp @@ -39,9 +39,18 @@ ClientModel::~ClientModel() unsubscribeFromCoreSignals(); } -int ClientModel::getNumConnections() const +int ClientModel::getNumConnections(unsigned int flags) const { - return vNodes.size(); + LOCK(cs_vNodes); + if (flags == CONNECTIONS_ALL) // Shortcut if we want total + return vNodes.size(); + + int nNum = 0; + BOOST_FOREACH(CNode* pnode, vNodes) + if (flags & (pnode->fInbound ? CONNECTIONS_IN : CONNECTIONS_OUT)) + nNum++; + + return nNum; } int ClientModel::getNumBlocks() const diff --git a/src/qt/clientmodel.h b/src/qt/clientmodel.h index ca735f14ce..f29b695ea1 100644 --- a/src/qt/clientmodel.h +++ b/src/qt/clientmodel.h @@ -25,6 +25,13 @@ enum BlockSource { BLOCK_SOURCE_NETWORK }; +enum NumConnections { + CONNECTIONS_NONE = 0, + CONNECTIONS_IN = (1U << 0), + CONNECTIONS_OUT = (1U << 1), + CONNECTIONS_ALL = (CONNECTIONS_IN | CONNECTIONS_OUT), +}; + /** Model for Bitcoin network client. */ class ClientModel : public QObject { @@ -36,7 +43,8 @@ public: OptionsModel *getOptionsModel(); - int getNumConnections() const; + //! Return number of connections, default is in- and outbound (total) + int getNumConnections(unsigned int flags = CONNECTIONS_ALL) const; int getNumBlocks() const; int getNumBlocksAtStartup(); diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp index 1e5a2efc94..dc9d2afe27 100644 --- a/src/qt/coincontroldialog.cpp +++ b/src/qt/coincontroldialog.cpp @@ -18,7 +18,6 @@ #include <QApplication> #include <QCheckBox> -#include <QColor> #include <QCursor> #include <QDialogButtonBox> #include <QFlags> @@ -98,7 +97,7 @@ CoinControlDialog::CoinControlDialog(QWidget *parent) : connect(ui->radioListMode, SIGNAL(toggled(bool)), this, SLOT(radioListMode(bool))); // click on checkbox - connect(ui->treeWidget, SIGNAL(itemChanged( QTreeWidgetItem*, int)), this, SLOT(viewItemChanged( QTreeWidgetItem*, int))); + connect(ui->treeWidget, SIGNAL(itemChanged(QTreeWidgetItem*, int)), this, SLOT(viewItemChanged(QTreeWidgetItem*, int))); // click on header #if QT_VERSION < 0x050000 @@ -386,6 +385,18 @@ void CoinControlDialog::viewItemChanged(QTreeWidgetItem* item, int column) if (ui->treeWidget->isEnabled()) // do not update on every click for (un)select all CoinControlDialog::updateLabels(model, this); } + + // todo: this is a temporary qt5 fix: when clicking a parent node in tree mode, the parent node + // including all childs are partially selected. But the parent node should be fully selected + // as well as the childs. Childs should never be partially selected in the first place. + // Please remove this ugly fix, once the bug is solved upstream. +#if QT_VERSION >= 0x050000 + else if (column == COLUMN_CHECKBOX && item->childCount() > 0) + { + if (item->checkState(COLUMN_CHECKBOX) == Qt::PartiallyChecked && item->child(0)->checkState(COLUMN_CHECKBOX) == Qt::PartiallyChecked) + item->setCheckState(COLUMN_CHECKBOX, Qt::Checked); + } +#endif } // return human readable label for priority number @@ -423,7 +434,8 @@ void CoinControlDialog::updateLabelLocked() void CoinControlDialog::updateLabels(WalletModel *model, QDialog* dialog) { - if (!model) return; + if (!model) + return; // nPayAmount qint64 nPayAmount = 0; @@ -629,17 +641,18 @@ void CoinControlDialog::updateLabels(WalletModel *model, QDialog* dialog) void CoinControlDialog::updateView() { + if (!model || !model->getOptionsModel() || !model->getAddressTableModel()) + return; + bool treeMode = ui->radioTreeMode->isChecked(); ui->treeWidget->clear(); ui->treeWidget->setEnabled(false); // performance, otherwise updateLabels would be called for every checked checkbox ui->treeWidget->setAlternatingRowColors(!treeMode); - QFlags<Qt::ItemFlag> flgCheckbox=Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsUserCheckable; - QFlags<Qt::ItemFlag> flgTristate=Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsUserCheckable | Qt::ItemIsTristate; + QFlags<Qt::ItemFlag> flgCheckbox = Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsUserCheckable; + QFlags<Qt::ItemFlag> flgTristate = Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsUserCheckable | Qt::ItemIsTristate; - int nDisplayUnit = BitcoinUnits::BTC; - if (model && model->getOptionsModel()) - nDisplayUnit = model->getOptionsModel()->getDisplayUnit(); + int nDisplayUnit = model->getOptionsModel()->getDisplayUnit(); map<QString, vector<COutput> > mapCoins; model->listCoins(mapCoins); @@ -647,11 +660,10 @@ void CoinControlDialog::updateView() BOOST_FOREACH(PAIRTYPE(QString, vector<COutput>) coins, mapCoins) { QTreeWidgetItem *itemWalletAddress = new QTreeWidgetItem(); + itemWalletAddress->setCheckState(COLUMN_CHECKBOX, Qt::Unchecked); QString sWalletAddress = coins.first; - QString sWalletLabel = ""; - if (model->getAddressTableModel()) - sWalletLabel = model->getAddressTableModel()->labelForAddress(sWalletAddress); - if (sWalletLabel.length() == 0) + QString sWalletLabel = model->getAddressTableModel()->labelForAddress(sWalletAddress); + if (sWalletLabel.isEmpty()) sWalletLabel = tr("(no label)"); if (treeMode) @@ -660,10 +672,7 @@ void CoinControlDialog::updateView() ui->treeWidget->addTopLevelItem(itemWalletAddress); itemWalletAddress->setFlags(flgTristate); - itemWalletAddress->setCheckState(COLUMN_CHECKBOX,Qt::Unchecked); - - for (int i = 0; i < ui->treeWidget->columnCount(); i++) - itemWalletAddress->setBackground(i, QColor(248, 247, 246)); + itemWalletAddress->setCheckState(COLUMN_CHECKBOX, Qt::Unchecked); // label itemWalletAddress->setText(COLUMN_LABEL, sWalletLabel); @@ -714,10 +723,8 @@ void CoinControlDialog::updateView() } else if (!treeMode) { - QString sLabel = ""; - if (model->getAddressTableModel()) - sLabel = model->getAddressTableModel()->labelForAddress(sAddress); - if (sLabel.length() == 0) + QString sLabel = model->getAddressTableModel()->labelForAddress(sAddress); + if (sLabel.isEmpty()) sLabel = tr("(no label)"); itemOutput->setText(COLUMN_LABEL, sLabel); } @@ -758,7 +765,7 @@ void CoinControlDialog::updateView() // set checkbox if (coinControl->IsSelected(txhash, out.i)) - itemOutput->setCheckState(COLUMN_CHECKBOX,Qt::Checked); + itemOutput->setCheckState(COLUMN_CHECKBOX, Qt::Checked); } // amount diff --git a/src/qt/forms/optionsdialog.ui b/src/qt/forms/optionsdialog.ui index a555f13c2a..9fbc865185 100644 --- a/src/qt/forms/optionsdialog.ui +++ b/src/qt/forms/optionsdialog.ui @@ -98,13 +98,7 @@ <item> <widget class="QSpinBox" name="threadsScriptVerif"> <property name="toolTip"> - <string>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</string> - </property> - <property name="minimum"> - <number>-16</number> - </property> - <property name="maximum"> - <number>16</number> + <string>(0 = auto, <0 = leave that many cores free)</string> </property> </widget> </item> @@ -190,26 +184,6 @@ </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>&Spend unconfirmed change (experts only)</string> - </property> - </widget> - </item> - <item> <spacer name="verticalSpacer_Wallet"> <property name="orientation"> <enum>Qt::Vertical</enum> @@ -222,6 +196,35 @@ </property> </spacer> </item> + <item> + <widget class="QGroupBox" name="groupBox"> + <property name="title"> + <string>Expert</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <item> + <widget class="QCheckBox" name="coinControlFeatures"> + <property name="toolTip"> + <string>Whether to show coin control features or not.</string> + </property> + <property name="text"> + <string>Enable coin &control features</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="spendZeroConfChange"> + <property name="toolTip"> + <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="text"> + <string>&Spend unconfirmed change</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> </layout> </widget> <widget class="QWidget" name="tabNetwork"> @@ -469,16 +472,6 @@ </widget> </item> <item> - <widget class="QCheckBox" name="coinControlFeatures"> - <property name="toolTip"> - <string>Whether to show coin control features or not.</string> - </property> - <property name="text"> - <string>Display coin &control features (experts only)</string> - </property> - </widget> - </item> - <item> <spacer name="verticalSpacer_Display"> <property name="orientation"> <enum>Qt::Vertical</enum> diff --git a/src/qt/forms/receivecoinsdialog.ui b/src/qt/forms/receivecoinsdialog.ui index 3e1a8bccc7..e1a0a28f81 100644 --- a/src/qt/forms/receivecoinsdialog.ui +++ b/src/qt/forms/receivecoinsdialog.ui @@ -263,6 +263,9 @@ <property name="text"> <string>Show</string> </property> + <property name="enabled"> + <bool>false</bool> + </property> <property name="icon"> <iconset resource="../bitcoin.qrc"> <normaloff>:/icons/edit</normaloff>:/icons/edit</iconset> @@ -277,6 +280,9 @@ <property name="text"> <string>Remove</string> </property> + <property name="enabled"> + <bool>false</bool> + </property> <property name="icon"> <iconset resource="../bitcoin.qrc"> <normaloff>:/icons/remove</normaloff>:/icons/remove</iconset> diff --git a/src/qt/guiconstants.h b/src/qt/guiconstants.h index 9f6588bc9e..5ae4bc833d 100644 --- a/src/qt/guiconstants.h +++ b/src/qt/guiconstants.h @@ -41,4 +41,9 @@ static const int MAX_PAYMENT_REQUEST_SIZE = 50000; // bytes /* Number of frames in spinner animation */ #define SPINNER_FRAMES 35 +#define QAPP_ORG_NAME "Bitcoin" +#define QAPP_ORG_DOMAIN "bitcoin.org" +#define QAPP_APP_NAME_DEFAULT "Bitcoin-Qt" +#define QAPP_APP_NAME_TESTNET "Bitcoin-Qt-testnet" + #endif // GUICONSTANTS_H diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp index 7e1831f037..7b264d27c7 100644 --- a/src/qt/guiutil.cpp +++ b/src/qt/guiutil.cpp @@ -33,6 +33,9 @@ #include <boost/filesystem.hpp> #include <boost/filesystem/fstream.hpp> +#if BOOST_FILESYSTEM_VERSION >= 3 +#include <boost/filesystem/detail/utf8_codecvt_facet.hpp> +#endif #include <QAbstractItemView> #include <QApplication> @@ -54,6 +57,10 @@ #include <QUrlQuery> #endif +#if BOOST_FILESYSTEM_VERSION >= 3 +static boost::filesystem::detail::utf8_codecvt_facet utf8; +#endif + namespace GUIUtil { QString dateTimeStr(const QDateTime &date) @@ -352,7 +359,7 @@ void openDebugLogfile() /* Open debug.log with the associated application */ if (boost::filesystem::exists(pathDebug)) - QDesktopServices::openUrl(QUrl::fromLocalFile(QString::fromStdString(pathDebug.string()))); + QDesktopServices::openUrl(QUrl::fromLocalFile(boostPathToQString(pathDebug))); } ToolTipToRichTextFilter::ToolTipToRichTextFilter(int size_threshold, QObject *parent) : @@ -379,6 +386,123 @@ bool ToolTipToRichTextFilter::eventFilter(QObject *obj, QEvent *evt) return QObject::eventFilter(obj, evt); } +void TableViewLastColumnResizingFixer::connectViewHeadersSignals() +{ + connect(tableView->horizontalHeader(), SIGNAL(sectionResized(int,int,int)), this, SLOT(on_sectionResized(int,int,int))); + connect(tableView->horizontalHeader(), SIGNAL(geometriesChanged()), this, SLOT(on_geometriesChanged())); +} + +// We need to disconnect these while handling the resize events, otherwise we can enter infinite loops. +void TableViewLastColumnResizingFixer::disconnectViewHeadersSignals() +{ + disconnect(tableView->horizontalHeader(), SIGNAL(sectionResized(int,int,int)), this, SLOT(on_sectionResized(int,int,int))); + disconnect(tableView->horizontalHeader(), SIGNAL(geometriesChanged()), this, SLOT(on_geometriesChanged())); +} + +// Setup the resize mode, handles compatibility for Qt5 and below as the method signatures changed. +// Refactored here for readability. +void TableViewLastColumnResizingFixer::setViewHeaderResizeMode(int logicalIndex, QHeaderView::ResizeMode resizeMode) +{ +#if QT_VERSION < 0x050000 + tableView->horizontalHeader()->setResizeMode(logicalIndex, resizeMode); +#else + tableView->horizontalHeader()->setSectionResizeMode(logicalIndex, resizeMode); +#endif +} + +void TableViewLastColumnResizingFixer::resizeColumn(int nColumnIndex, int width) +{ + tableView->setColumnWidth(nColumnIndex, width); + tableView->horizontalHeader()->resizeSection(nColumnIndex, width); +} + +int TableViewLastColumnResizingFixer::getColumnsWidth() +{ + int nColumnsWidthSum = 0; + for (int i = 0; i < columnCount; i++) + { + nColumnsWidthSum += tableView->horizontalHeader()->sectionSize(i); + } + return nColumnsWidthSum; +} + +int TableViewLastColumnResizingFixer::getAvailableWidthForColumn(int column) +{ + int nResult = lastColumnMinimumWidth; + int nTableWidth = tableView->horizontalHeader()->width(); + + if (nTableWidth > 0) + { + int nOtherColsWidth = getColumnsWidth() - tableView->horizontalHeader()->sectionSize(column); + nResult = std::max(nResult, nTableWidth - nOtherColsWidth); + } + + return nResult; +} + +// Make sure we don't make the columns wider than the tables viewport width. +void TableViewLastColumnResizingFixer::adjustTableColumnsWidth() +{ + disconnectViewHeadersSignals(); + resizeColumn(lastColumnIndex, getAvailableWidthForColumn(lastColumnIndex)); + connectViewHeadersSignals(); + + int nTableWidth = tableView->horizontalHeader()->width(); + int nColsWidth = getColumnsWidth(); + if (nColsWidth > nTableWidth) + { + resizeColumn(secondToLastColumnIndex,getAvailableWidthForColumn(secondToLastColumnIndex)); + } +} + +// Make column use all the space available, useful during window resizing. +void TableViewLastColumnResizingFixer::stretchColumnWidth(int column) +{ + disconnectViewHeadersSignals(); + resizeColumn(column, getAvailableWidthForColumn(column)); + connectViewHeadersSignals(); +} + +// When a section is resized this is a slot-proxy for ajustAmountColumnWidth(). +void TableViewLastColumnResizingFixer::on_sectionResized(int logicalIndex, int oldSize, int newSize) +{ + adjustTableColumnsWidth(); + int remainingWidth = getAvailableWidthForColumn(logicalIndex); + if (newSize > remainingWidth) + { + resizeColumn(logicalIndex, remainingWidth); + } +} + +// When the tabless geometry is ready, we manually perform the stretch of the "Message" column, +// as the "Stretch" resize mode does not allow for interactive resizing. +void TableViewLastColumnResizingFixer::on_geometriesChanged() +{ + if ((getColumnsWidth() - this->tableView->horizontalHeader()->width()) != 0) + { + disconnectViewHeadersSignals(); + resizeColumn(secondToLastColumnIndex, getAvailableWidthForColumn(secondToLastColumnIndex)); + connectViewHeadersSignals(); + } +} + +/** + * Initializes all internal variables and prepares the + * the resize modes of the last 2 columns of the table and + */ +TableViewLastColumnResizingFixer::TableViewLastColumnResizingFixer(QTableView* table, int lastColMinimumWidth, int allColsMinimumWidth) : + tableView(table), + lastColumnMinimumWidth(lastColMinimumWidth), + allColumnsMinimumWidth(allColsMinimumWidth) +{ + columnCount = tableView->horizontalHeader()->count(); + lastColumnIndex = columnCount - 1; + secondToLastColumnIndex = columnCount - 2; + tableView->horizontalHeader()->setMinimumSectionSize(allColumnsMinimumWidth); + setViewHeaderResizeMode(secondToLastColumnIndex, QHeaderView::Interactive); + setViewHeaderResizeMode(lastColumnIndex, QHeaderView::Interactive); +} + #ifdef WIN32 boost::filesystem::path static StartupShortcutPath() { @@ -603,4 +727,27 @@ void setClipboard(const QString& str) QApplication::clipboard()->setText(str, QClipboard::Selection); } +#if BOOST_FILESYSTEM_VERSION >= 3 +boost::filesystem::path qstringToBoostPath(const QString &path) +{ + return boost::filesystem::path(path.toStdString(), utf8); +} + +QString boostPathToQString(const boost::filesystem::path &path) +{ + return QString::fromStdString(path.string(utf8)); +} +#else +#warning Conversion between boost path and QString can use invalid character encoding with boost_filesystem v2 and older +boost::filesystem::path qstringToBoostPath(const QString &path) +{ + return boost::filesystem::path(path.toStdString()); +} + +QString boostPathToQString(const boost::filesystem::path &path) +{ + return QString::fromStdString(path.string()); +} +#endif + } // namespace GUIUtil diff --git a/src/qt/guiutil.h b/src/qt/guiutil.h index 52124ff20a..4f9416d1af 100644 --- a/src/qt/guiutil.h +++ b/src/qt/guiutil.h @@ -5,9 +5,13 @@ #ifndef GUIUTIL_H #define GUIUTIL_H +#include <QHeaderView> #include <QMessageBox> #include <QObject> #include <QString> +#include <QTableView> + +#include <boost/filesystem.hpp> class QValidatedLineEdit; class SendCoinsRecipient; @@ -116,6 +120,45 @@ namespace GUIUtil int size_threshold; }; + /** + * Makes a QTableView last column feel as if it was being resized from its left border. + * Also makes sure the column widths are never larger than the table's viewport. + * In Qt, all columns are resizable from the right, but it's not intuitive resizing the last column from the right. + * Usually our second to last columns behave as if stretched, and when on strech mode, columns aren't resizable + * interactively or programatically. + * + * This helper object takes care of this issue. + * + */ + class TableViewLastColumnResizingFixer: public QObject + { + Q_OBJECT + + public: + TableViewLastColumnResizingFixer(QTableView* table, int lastColMinimumWidth, int allColsMinimumWidth); + void stretchColumnWidth(int column); + + private: + QTableView* tableView; + int lastColumnMinimumWidth; + int allColumnsMinimumWidth; + int lastColumnIndex; + int columnCount; + int secondToLastColumnIndex; + + void adjustTableColumnsWidth(); + int getAvailableWidthForColumn(int column); + int getColumnsWidth(); + void connectViewHeadersSignals(); + void disconnectViewHeadersSignals(); + void setViewHeaderResizeMode(int logicalIndex, QHeaderView::ResizeMode resizeMode); + void resizeColumn(int nColumnIndex, int width); + + private slots: + void on_sectionResized(int logicalIndex, int oldSize, int newSize); + void on_geometriesChanged(); + }; + bool GetStartOnSystemStartup(); bool SetStartOnSystemStartup(bool fAutoStart); @@ -124,6 +167,12 @@ namespace GUIUtil /** Restore window size and position */ void restoreWindowGeometry(const QString& strSetting, const QSize &defaultSizeIn, QWidget *parent); + /* Convert QString to OS specific boost path through UTF-8 */ + boost::filesystem::path qstringToBoostPath(const QString &path); + + /* Convert OS specific boost path to QString through UTF-8 */ + QString boostPathToQString(const boost::filesystem::path &path); + } // namespace GUIUtil #endif // GUIUTIL_H diff --git a/src/qt/intro.cpp b/src/qt/intro.cpp index fc1258827e..3e99e941a6 100644 --- a/src/qt/intro.cpp +++ b/src/qt/intro.cpp @@ -5,16 +5,19 @@ #include "intro.h" #include "ui_intro.h" +#include "guiutil.h" + #include "util.h" #include <boost/filesystem.hpp> + #include <QFileDialog> #include <QSettings> #include <QMessageBox> /* Minimum free space (in bytes) needed for data directory */ static const uint64_t GB_BYTES = 1000000000LL; -static const uint64_t BLOCK_CHAIN_SIZE = 10LL * GB_BYTES; +static const uint64_t BLOCK_CHAIN_SIZE = 20LL * GB_BYTES; /* Check free space asynchronously to prevent hanging the UI thread. @@ -59,7 +62,7 @@ void FreespaceChecker::check() { namespace fs = boost::filesystem; QString dataDirStr = intro->getPathToCheck(); - fs::path dataDir = fs::path(dataDirStr.toStdString()); + fs::path dataDir = GUIUtil::qstringToBoostPath(dataDirStr); uint64_t freeBytesAvailable = 0; int replyStatus = ST_OK; QString replyMessage = tr("A new data directory will be created."); @@ -143,10 +146,10 @@ void Intro::setDataDirectory(const QString &dataDir) QString Intro::getDefaultDataDirectory() { - return QString::fromStdString(GetDefaultDataDir().string()); + return GUIUtil::boostPathToQString(GetDefaultDataDir()); } -void Intro::pickDataDirectory(bool fIsTestnet) +void Intro::pickDataDirectory() { namespace fs = boost::filesystem; QSettings settings; @@ -159,15 +162,12 @@ void Intro::pickDataDirectory(bool fIsTestnet) /* 2) Allow QSettings to override default dir */ dataDir = settings.value("strDataDir", dataDir).toString(); - if(!fs::exists(dataDir.toStdString()) || GetBoolArg("-choosedatadir", false)) + if(!fs::exists(GUIUtil::qstringToBoostPath(dataDir)) || GetBoolArg("-choosedatadir", false)) { /* If current default data directory does not exist, let the user choose one */ Intro intro; intro.setDataDirectory(dataDir); - if (!fIsTestnet) - intro.setWindowIcon(QIcon(":icons/bitcoin")); - else - intro.setWindowIcon(QIcon(":icons/bitcoin_testnet")); + intro.setWindowIcon(QIcon(":icons/bitcoin")); while(true) { @@ -178,7 +178,7 @@ void Intro::pickDataDirectory(bool fIsTestnet) } dataDir = intro.getDataDirectory(); try { - fs::create_directory(dataDir.toStdString()); + TryCreateDirectory(GUIUtil::qstringToBoostPath(dataDir)); break; } catch(fs::filesystem_error &e) { QMessageBox::critical(0, tr("Bitcoin"), @@ -189,7 +189,12 @@ void Intro::pickDataDirectory(bool fIsTestnet) settings.setValue("strDataDir", dataDir); } - SoftSetArg("-datadir", dataDir.toStdString()); + /* Only override -datadir if different from the default, to make it possible to + * override -datadir in the bitcoin.conf file in the default data directory + * (to be consistent with bitcoind behavior) + */ + if(dataDir != getDefaultDataDirectory()) + SoftSetArg("-datadir", GUIUtil::qstringToBoostPath(dataDir).string()); // use OS locale for path setting } void Intro::setStatus(int status, const QString &message, quint64 bytesAvailable) diff --git a/src/qt/intro.h b/src/qt/intro.h index 72693d5544..295a75562f 100644 --- a/src/qt/intro.h +++ b/src/qt/intro.h @@ -36,7 +36,7 @@ public: * @note do NOT call global GetDataDir() before calling this function, this * will cause the wrong path to be cached. */ - static void pickDataDirectory(bool fIsTestnet); + static void pickDataDirectory(); /** * Determine default data directory for operating system. diff --git a/src/qt/locale/bitcoin_ach.ts b/src/qt/locale/bitcoin_ach.ts index 848ffc9d4c..195c41f37a 100644 --- a/src/qt/locale/bitcoin_ach.ts +++ b/src/qt/locale/bitcoin_ach.ts @@ -31,6 +31,12 @@ This product includes software developed by the OpenSSL Project for use in the O <source>The Bitcoin Core developers</source> <translation type="unfinished"/> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source> (%1-bit)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>AddressBookPage</name> @@ -612,6 +618,16 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation type="unfinished"/> @@ -681,7 +697,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+435"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -742,7 +758,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation type="unfinished"/> </message> @@ -757,7 +773,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation type="unfinished"/> </message> @@ -908,7 +924,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation type="unfinished"/> </message> @@ -1090,7 +1106,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation type="unfinished"/> </message> @@ -1234,7 +1250,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+122"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation type="unfinished"/> </message> @@ -1244,7 +1260,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="-131"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation type="unfinished"/> </message> @@ -1259,12 +1275,7 @@ Address: %4 <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"/> + <location line="+16"/> <source>MB</source> <translation type="unfinished"/> </message> @@ -1279,7 +1290,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+58"/> + <location line="+107"/> + <source>&Spend unconfirmed change (experts only)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+37"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation type="unfinished"/> </message> @@ -1314,7 +1330,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="-86"/> + <source>W&allet</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+52"/> + <source>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.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+40"/> <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> @@ -1429,17 +1455,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+70"/> <source>default</source> <translation type="unfinished"/> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation type="unfinished"/> </message> <message> - <location line="+75"/> + <location line="+78"/> <source>Confirm options reset</source> <translation type="unfinished"/> </message> @@ -1479,18 +1505,13 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-155"/> - <source>Unconfirmed:</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation type="unfinished"/> </message> <message> <location line="+51"/> - <source>Confirmed:</source> + <source>Available:</source> <translation type="unfinished"/> </message> <message> @@ -1499,7 +1520,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation type="unfinished"/> </message> @@ -1647,6 +1673,11 @@ Address: %4 <source>Error: Invalid combination of -regtest and -testnet.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../guiutil.cpp" line="+82"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>QRImageWidget</name> @@ -1867,22 +1898,22 @@ Address: %4 <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+83"/> + <location filename="../forms/receivecoinsdialog.ui" line="+107"/> <source>&Amount:</source> <translation type="unfinished"/> </message> <message> - <location line="-13"/> + <location line="-16"/> <source>&Label:</source> <translation type="unfinished"/> </message> <message> - <location line="-34"/> + <location line="-37"/> <source>&Message:</source> <translation type="unfinished"/> </message> <message> - <location line="-17"/> + <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"/> </message> @@ -1892,27 +1923,30 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+27"/> - <source>An optional 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"/> </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> + <location line="-7"/> + <location line="+21"/> + <source>An optional label to associate with the new receiving address.</source> <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="-7"/> <source>Use this form to request payments. All fields are <b>optional</b>.</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <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"/> </message> <message> - <location line="+17"/> + <location line="+32"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -1922,17 +1956,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+36"/> - <source>&Request payment</source> + <location line="+78"/> + <source>Requested payments history</source> <translation type="unfinished"/> </message> <message> - <location line="+47"/> - <source>Requested payments</source> + <location line="-98"/> + <source>&Request payment</source> <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+120"/> <source>Show the selected request (does the same as double clicking an entry)</source> <translation type="unfinished"/> </message> @@ -1951,6 +1985,21 @@ Address: %4 <source>Remove</source> <translation type="unfinished"/> </message> + <message> + <location filename="../receivecoinsdialog.cpp" line="+38"/> + <source>Copy label</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy message</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation type="unfinished"/> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -2052,12 +2101,17 @@ Address: %4 <source>(no message)</source> <translation type="unfinished"/> </message> + <message> + <location line="+8"/> + <source>(no amount)</source> + <translation type="unfinished"/> + </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 type="unfinished"/> @@ -2133,7 +2187,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+115"/> + <location line="+164"/> <source>Send to multiple recipients at once</source> <translation type="unfinished"/> </message> @@ -2143,7 +2197,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+20"/> + <location line="-23"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -2153,12 +2207,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+22"/> + <location line="+52"/> <source>Balance:</source> <translation type="unfinished"/> </message> <message> - <location line="+41"/> + <location line="-78"/> <source>Confirm the send action</source> <translation type="unfinished"/> </message> @@ -2168,7 +2222,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-228"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation type="unfinished"/> </message> @@ -2181,12 +2235,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-136"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+15"/> + <location line="-121"/> <source>Copy quantity</source> <translation type="unfinished"/> </message> @@ -2236,7 +2285,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+202"/> + <location line="+203"/> <source>The recipient address is not valid, please recheck.</source> <translation type="unfinished"/> </message> @@ -2271,12 +2320,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Warning: Invalid Bitcoin address</source> <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+20"/> <source>(no label)</source> <translation type="unfinished"/> </message> @@ -2286,7 +2335,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-366"/> + <location line="-367"/> <source>Are you sure you want to send?</source> <translation type="unfinished"/> </message> @@ -2296,7 +2345,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+170"/> + <location line="+171"/> <source>Payment request expired</source> <translation type="unfinished"/> </message> @@ -2373,12 +2422,7 @@ Address: %4 <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"/> + <location line="+968"/> <source>This is a verified payment request.</source> <translation type="unfinished"/> </message> @@ -2388,7 +2432,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+459"/> + <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"/> + </message> + <message> + <location line="+426"/> <source>This is an unverified payment request.</source> <translation type="unfinished"/> </message> @@ -2404,11 +2453,6 @@ Address: %4 <source>Memo:</source> <translation type="unfinished"/> </message> - <message> - <location filename="../sendcoinsentry.cpp" line="+1"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"/> - </message> </context> <context> <name>ShutdownWindow</name> @@ -2446,19 +2490,19 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+10"/> - <location line="+213"/> + <location line="+7"/> + <location line="+210"/> <source>Choose previously used address</source> <translation type="unfinished"/> </message> <message> - <location line="-203"/> - <location line="+213"/> + <location line="-200"/> + <location line="+210"/> <source>Alt+A</source> <translation type="unfinished"/> </message> <message> - <location line="-203"/> + <location line="-200"/> <source>Paste address from clipboard</source> <translation type="unfinished"/> </message> @@ -2499,12 +2543,12 @@ Address: %4 </message> <message> <location line="+3"/> - <location line="+146"/> + <location line="+143"/> <source>Clear &All</source> <translation type="unfinished"/> </message> <message> - <location line="-87"/> + <location line="-84"/> <source>&Verify Message</source> <translation type="unfinished"/> </message> @@ -2519,7 +2563,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+40"/> + <location line="+37"/> <source>Verify the message to ensure it was signed with the specified Bitcoin address</source> <translation type="unfinished"/> </message> @@ -2534,43 +2578,37 @@ Address: %4 <translation type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location line="-2"/> + <location line="-1"/> <source>Click "Sign Message" to generate signature</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Enter Bitcoin signature</source> - <translation type="unfinished"/> - </message> - <message> <location line="+84"/> - <location line="+81"/> + <location line="+80"/> <source>The entered address is invalid.</source> <translation type="unfinished"/> </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 type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location line="-73"/> + <location line="-72"/> <source>Wallet unlock was cancelled.</source> <translation type="unfinished"/> </message> @@ -2590,7 +2628,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+59"/> + <location line="+58"/> <source>The signature could not be decoded.</source> <translation type="unfinished"/> </message> @@ -2651,6 +2689,11 @@ Address: %4 </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation type="unfinished"/> </message> @@ -2812,12 +2855,12 @@ Address: %4 <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation type="unfinished"/> </message> @@ -2858,12 +2901,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> @@ -2873,33 +2916,42 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> + <location line="+12"/> + <source>Confirmed (%1 confirmations)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+9"/> + <source>This block was not received by any other nodes and will probably not be accepted!</source> <translation type="unfinished"/> </message> <message> <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> + <source>Generated but not accepted</source> <translation type="unfinished"/> </message> <message> - <location line="-22"/> - <location line="+25"/> - <source>Confirmed (%1 confirmations)</source> + <location line="-21"/> + <source>Offline</source> <translation type="unfinished"/> </message> <message> - <location line="-22"/> - <source>This block was not received by any other nodes and will probably not be accepted!</source> + <location line="+3"/> + <source>Unconfirmed</source> <translation type="unfinished"/> </message> <message> <location line="+3"/> - <source>Generated but not accepted</source> + <source>Confirming (%1 of %2 recommended confirmations)</source> <translation type="unfinished"/> </message> <message> - <location line="+62"/> + <location line="+6"/> + <source>Conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation type="unfinished"/> </message> @@ -2929,7 +2981,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation type="unfinished"/> </message> @@ -3195,12 +3247,12 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+223"/> <source>Usage:</source> <translation type="unfinished"/> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>List commands</source> <translation type="unfinished"/> </message> @@ -3255,12 +3307,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation type="unfinished"/> </message> <message> - <location line="-148"/> + <location line="-150"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"/> </message> @@ -3280,17 +3332,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Run in the background as a daemon and accept commands</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <location line="+40"/> <source>Use the test network</source> <translation type="unfinished"/> </message> <message> - <location line="-118"/> + <location line="-120"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> @@ -3421,6 +3473,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation type="unfinished"/> </message> @@ -3631,6 +3688,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Start Bitcoin server</source> <translation type="unfinished"/> </message> @@ -3680,12 +3742,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-79"/> + <location line="-80"/> <source>Imports blocks from external blk000??.dat file</source> <translation type="unfinished"/> </message> <message> - <location line="-105"/> + <location line="-106"/> <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> @@ -3705,7 +3767,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+89"/> + <location line="+90"/> <source>Information</source> <translation type="unfinished"/> </message> @@ -3775,7 +3837,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+7"/> <source>System error: </source> <translation type="unfinished"/> </message> @@ -3821,6 +3883,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>version</source> <translation type="unfinished"/> </message> @@ -3830,32 +3897,32 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-58"/> + <location line="-60"/> <source>Password for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-70"/> + <location line="-71"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation type="unfinished"/> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+161"/> + <location line="+163"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"/> </message> <message> - <location line="-24"/> + <location line="-25"/> <source>Set key pool size to <n> (default: 100)</source> <translation type="unfinished"/> </message> @@ -3865,12 +3932,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+38"/> + <location line="+39"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-30"/> + <location line="-31"/> <source>Server certificate file (default: server.cert)</source> <translation type="unfinished"/> </message> @@ -3880,7 +3947,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+17"/> <source>This help message</source> <translation type="unfinished"/> </message> @@ -3890,12 +3957,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-107"/> + <location line="-109"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation type="unfinished"/> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Loading addresses...</source> <translation type="unfinished"/> </message> @@ -3910,12 +3977,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+98"/> + <location line="+99"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation type="unfinished"/> </message> <message> - <location line="-100"/> + <location line="-101"/> <source>Error loading wallet.dat</source> <translation type="unfinished"/> </message> @@ -3925,7 +3992,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+56"/> + <location line="+57"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation type="unfinished"/> </message> @@ -3935,7 +4002,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-101"/> + <location line="-103"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -3945,7 +4012,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+48"/> + <location line="+49"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation type="unfinished"/> </message> @@ -3965,7 +4032,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-62"/> + <location line="-63"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"/> </message> @@ -3975,12 +4042,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+95"/> + <location line="+96"/> <source>Loading wallet...</source> <translation type="unfinished"/> </message> <message> - <location line="-56"/> + <location line="-57"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> @@ -3990,7 +4057,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+67"/> + <location line="+68"/> <source>Rescanning...</source> <translation type="unfinished"/> </message> @@ -4000,17 +4067,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+85"/> + <location line="+86"/> <source>To use the %s option</source> <translation type="unfinished"/> </message> <message> - <location line="-77"/> + <location line="-78"/> <source>Error</source> <translation type="unfinished"/> </message> <message> - <location line="-35"/> + <location line="-36"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_af_ZA.ts b/src/qt/locale/bitcoin_af_ZA.ts index ab6f88d377..e8e6464823 100644 --- a/src/qt/locale/bitcoin_af_ZA.ts +++ b/src/qt/locale/bitcoin_af_ZA.ts @@ -31,6 +31,12 @@ This product includes software developed by the OpenSSL Project for use in the O <source>The Bitcoin Core developers</source> <translation type="unfinished"/> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source> (%1-bit)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>AddressBookPage</name> @@ -612,6 +618,16 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation>%1 agter</translation> @@ -681,7 +697,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+435"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -742,7 +758,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation type="unfinished"/> </message> @@ -757,7 +773,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation>Bedrag</translation> </message> @@ -908,7 +924,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation type="unfinished"/> </message> @@ -1090,7 +1106,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation type="unfinished"/> </message> @@ -1234,7 +1250,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+122"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation type="unfinished"/> </message> @@ -1244,7 +1260,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="-131"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation type="unfinished"/> </message> @@ -1259,12 +1275,7 @@ Address: %4 <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"/> + <location line="+16"/> <source>MB</source> <translation type="unfinished"/> </message> @@ -1279,7 +1290,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+58"/> + <location line="+107"/> + <source>&Spend unconfirmed change (experts only)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+37"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation type="unfinished"/> </message> @@ -1314,7 +1330,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="-86"/> + <source>W&allet</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+52"/> + <source>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.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+40"/> <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> @@ -1429,17 +1455,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+70"/> <source>default</source> <translation type="unfinished"/> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation type="unfinished"/> </message> <message> - <location line="+75"/> + <location line="+78"/> <source>Confirm options reset</source> <translation type="unfinished"/> </message> @@ -1479,18 +1505,13 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-155"/> - <source>Unconfirmed:</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation>Beursie</translation> </message> <message> <location line="+51"/> - <source>Confirmed:</source> + <source>Available:</source> <translation type="unfinished"/> </message> <message> @@ -1499,7 +1520,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation type="unfinished"/> </message> @@ -1647,6 +1673,11 @@ Address: %4 <source>Error: Invalid combination of -regtest and -testnet.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../guiutil.cpp" line="+82"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>Die adres waarheen die betaling gestuur moet word (b.v. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> </context> <context> <name>QRImageWidget</name> @@ -1867,22 +1898,22 @@ Address: %4 <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+83"/> + <location filename="../forms/receivecoinsdialog.ui" line="+107"/> <source>&Amount:</source> <translation type="unfinished"/> </message> <message> - <location line="-13"/> + <location line="-16"/> <source>&Label:</source> <translation type="unfinished"/> </message> <message> - <location line="-34"/> + <location line="-37"/> <source>&Message:</source> <translation type="unfinished"/> </message> <message> - <location line="-17"/> + <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"/> </message> @@ -1892,27 +1923,30 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+27"/> - <source>An optional 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"/> </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> + <location line="-7"/> + <location line="+21"/> + <source>An optional label to associate with the new receiving address.</source> <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="-7"/> <source>Use this form to request payments. All fields are <b>optional</b>.</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <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"/> </message> <message> - <location line="+17"/> + <location line="+32"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -1922,17 +1956,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+36"/> - <source>&Request payment</source> + <location line="+78"/> + <source>Requested payments history</source> <translation type="unfinished"/> </message> <message> - <location line="+47"/> - <source>Requested payments</source> + <location line="-98"/> + <source>&Request payment</source> <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+120"/> <source>Show the selected request (does the same as double clicking an entry)</source> <translation type="unfinished"/> </message> @@ -1951,6 +1985,21 @@ Address: %4 <source>Remove</source> <translation type="unfinished"/> </message> + <message> + <location filename="../receivecoinsdialog.cpp" line="+38"/> + <source>Copy label</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy message</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation>Kopieer bedrag</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -2052,12 +2101,17 @@ Address: %4 <source>(no message)</source> <translation type="unfinished"/> </message> + <message> + <location line="+8"/> + <source>(no amount)</source> + <translation type="unfinished"/> + </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>Stuur Munstukke</translation> @@ -2133,7 +2187,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+115"/> + <location line="+164"/> <source>Send to multiple recipients at once</source> <translation>Stuur aan vele ontvangers op eens</translation> </message> @@ -2143,7 +2197,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+20"/> + <location line="-23"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -2153,12 +2207,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+22"/> + <location line="+52"/> <source>Balance:</source> <translation>Balans:</translation> </message> <message> - <location line="+41"/> + <location line="-78"/> <source>Confirm the send action</source> <translation type="unfinished"/> </message> @@ -2168,7 +2222,7 @@ Address: %4 <translation>S&tuur</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-228"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation type="unfinished"/> </message> @@ -2181,12 +2235,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-136"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Die adres waarheen die betaling gestuur moet word (b.v. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> - <message> - <location line="+15"/> + <location line="-121"/> <source>Copy quantity</source> <translation type="unfinished"/> </message> @@ -2236,7 +2285,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+202"/> + <location line="+203"/> <source>The recipient address is not valid, please recheck.</source> <translation type="unfinished"/> </message> @@ -2271,12 +2320,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Warning: Invalid Bitcoin address</source> <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+20"/> <source>(no label)</source> <translation>(geen etiket)</translation> </message> @@ -2286,7 +2335,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-366"/> + <location line="-367"/> <source>Are you sure you want to send?</source> <translation type="unfinished"/> </message> @@ -2296,7 +2345,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+170"/> + <location line="+171"/> <source>Payment request expired</source> <translation type="unfinished"/> </message> @@ -2373,12 +2422,7 @@ Address: %4 <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"/> + <location line="+968"/> <source>This is a verified payment request.</source> <translation type="unfinished"/> </message> @@ -2388,7 +2432,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+459"/> + <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"/> + </message> + <message> + <location line="+426"/> <source>This is an unverified payment request.</source> <translation type="unfinished"/> </message> @@ -2404,11 +2453,6 @@ Address: %4 <source>Memo:</source> <translation type="unfinished"/> </message> - <message> - <location filename="../sendcoinsentry.cpp" line="+1"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Die adres waarheen die betaling gestuur moet word (b.v. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> </context> <context> <name>ShutdownWindow</name> @@ -2446,19 +2490,19 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+10"/> - <location line="+213"/> + <location line="+7"/> + <location line="+210"/> <source>Choose previously used address</source> <translation type="unfinished"/> </message> <message> - <location line="-203"/> - <location line="+213"/> + <location line="-200"/> + <location line="+210"/> <source>Alt+A</source> <translation type="unfinished"/> </message> <message> - <location line="-203"/> + <location line="-200"/> <source>Paste address from clipboard</source> <translation type="unfinished"/> </message> @@ -2499,12 +2543,12 @@ Address: %4 </message> <message> <location line="+3"/> - <location line="+146"/> + <location line="+143"/> <source>Clear &All</source> <translation type="unfinished"/> </message> <message> - <location line="-87"/> + <location line="-84"/> <source>&Verify Message</source> <translation type="unfinished"/> </message> @@ -2519,7 +2563,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+40"/> + <location line="+37"/> <source>Verify the message to ensure it was signed with the specified Bitcoin address</source> <translation type="unfinished"/> </message> @@ -2534,43 +2578,37 @@ Address: %4 <translation type="unfinished"/> </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>Die adres waarheen die betaling gestuur moet word (b.v. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location line="-2"/> + <location line="-1"/> <source>Click "Sign Message" to generate signature</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Enter Bitcoin signature</source> - <translation type="unfinished"/> - </message> - <message> <location line="+84"/> - <location line="+81"/> + <location line="+80"/> <source>The entered address is invalid.</source> <translation type="unfinished"/> </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 type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location line="-73"/> + <location line="-72"/> <source>Wallet unlock was cancelled.</source> <translation type="unfinished"/> </message> @@ -2590,7 +2628,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+59"/> + <location line="+58"/> <source>The signature could not be decoded.</source> <translation type="unfinished"/> </message> @@ -2651,6 +2689,11 @@ Address: %4 </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation type="unfinished"/> </message> @@ -2812,12 +2855,12 @@ Address: %4 <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation>onbekend</translation> </message> @@ -2858,12 +2901,12 @@ Address: %4 <translation>Bedrag</translation> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> @@ -2873,33 +2916,42 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> + <location line="+12"/> + <source>Confirmed (%1 confirmations)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+9"/> + <source>This block was not received by any other nodes and will probably not be accepted!</source> <translation type="unfinished"/> </message> <message> <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> + <source>Generated but not accepted</source> <translation type="unfinished"/> </message> <message> - <location line="-22"/> - <location line="+25"/> - <source>Confirmed (%1 confirmations)</source> + <location line="-21"/> + <source>Offline</source> <translation type="unfinished"/> </message> <message> - <location line="-22"/> - <source>This block was not received by any other nodes and will probably not be accepted!</source> + <location line="+3"/> + <source>Unconfirmed</source> <translation type="unfinished"/> </message> <message> <location line="+3"/> - <source>Generated but not accepted</source> + <source>Confirming (%1 of %2 recommended confirmations)</source> <translation type="unfinished"/> </message> <message> - <location line="+62"/> + <location line="+6"/> + <source>Conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation>Ontvang met</translation> </message> @@ -2929,7 +2981,7 @@ Address: %4 <translation>(n.v.t)</translation> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation type="unfinished"/> </message> @@ -3195,12 +3247,12 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+223"/> <source>Usage:</source> <translation>Gebruik:</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>List commands</source> <translation type="unfinished"/> </message> @@ -3255,12 +3307,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation type="unfinished"/> </message> <message> - <location line="-148"/> + <location line="-150"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"/> </message> @@ -3280,17 +3332,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Run in the background as a daemon and accept commands</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <location line="+40"/> <source>Use the test network</source> <translation>Gebruik die toets netwerk</translation> </message> <message> - <location line="-118"/> + <location line="-120"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> @@ -3421,6 +3473,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation type="unfinished"/> </message> @@ -3631,6 +3688,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Start Bitcoin server</source> <translation type="unfinished"/> </message> @@ -3680,12 +3742,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-79"/> + <location line="-80"/> <source>Imports blocks from external blk000??.dat file</source> <translation type="unfinished"/> </message> <message> - <location line="-105"/> + <location line="-106"/> <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> @@ -3705,7 +3767,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+89"/> + <location line="+90"/> <source>Information</source> <translation>Informasie</translation> </message> @@ -3775,7 +3837,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+7"/> <source>System error: </source> <translation>Sisteem fout:</translation> </message> @@ -3821,6 +3883,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>version</source> <translation type="unfinished"/> </message> @@ -3830,32 +3897,32 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-58"/> + <location line="-60"/> <source>Password for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-70"/> + <location line="-71"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation type="unfinished"/> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+161"/> + <location line="+163"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"/> </message> <message> - <location line="-24"/> + <location line="-25"/> <source>Set key pool size to <n> (default: 100)</source> <translation type="unfinished"/> </message> @@ -3865,12 +3932,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+38"/> + <location line="+39"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-30"/> + <location line="-31"/> <source>Server certificate file (default: server.cert)</source> <translation type="unfinished"/> </message> @@ -3880,7 +3947,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+17"/> <source>This help message</source> <translation>Hierdie help boodskap</translation> </message> @@ -3890,12 +3957,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-107"/> + <location line="-109"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation type="unfinished"/> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Loading addresses...</source> <translation>Laai adresse...</translation> </message> @@ -3910,12 +3977,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+98"/> + <location line="+99"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation type="unfinished"/> </message> <message> - <location line="-100"/> + <location line="-101"/> <source>Error loading wallet.dat</source> <translation type="unfinished"/> </message> @@ -3925,7 +3992,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+56"/> + <location line="+57"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation type="unfinished"/> </message> @@ -3935,7 +4002,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-101"/> + <location line="-103"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -3945,7 +4012,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+48"/> + <location line="+49"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation type="unfinished"/> </message> @@ -3965,7 +4032,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Laai blok indeks...</translation> </message> <message> - <location line="-62"/> + <location line="-63"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"/> </message> @@ -3975,12 +4042,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+95"/> + <location line="+96"/> <source>Loading wallet...</source> <translation>Laai beursie...</translation> </message> <message> - <location line="-56"/> + <location line="-57"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> @@ -3990,7 +4057,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+67"/> + <location line="+68"/> <source>Rescanning...</source> <translation type="unfinished"/> </message> @@ -4000,17 +4067,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Klaar gelaai</translation> </message> <message> - <location line="+85"/> + <location line="+86"/> <source>To use the %s option</source> <translation type="unfinished"/> </message> <message> - <location line="-77"/> + <location line="-78"/> <source>Error</source> <translation>Fout</translation> </message> <message> - <location line="-35"/> + <location line="-36"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_ar.ts b/src/qt/locale/bitcoin_ar.ts index 2cd74d6604..1ab281b3f0 100644 --- a/src/qt/locale/bitcoin_ar.ts +++ b/src/qt/locale/bitcoin_ar.ts @@ -31,18 +31,24 @@ This product includes software developed by the OpenSSL Project for use in the O <source>The Bitcoin Core developers</source> <translation type="unfinished"/> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source> (%1-bit)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>AddressBookPage</name> <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"/> @@ -67,7 +73,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location filename="../addressbookpage.cpp" line="+74"/> <source>&Copy Address</source> - <translation type="unfinished"/> + <translation>انسخ العنوان</translation> </message> <message> <location filename="../forms/addressbookpage.ui" line="-41"/> @@ -132,7 +138,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+1"/> <source>&Edit</source> - <translation type="unfinished"/> + <translation>تعديل</translation> </message> <message> <location line="+194"/> @@ -188,7 +194,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+14"/> <source>New passphrase</source> - <translation>كلمة مرور جديدة</translation> + <translation>عبارة مرور جديدة</translation> </message> <message> <location line="+14"/> @@ -270,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 type="unfinished"/> + <translation>بتكوين سو٠يغلق الآن لإنهاء عملية التشÙير. تذكر أن التشÙير لا يستطيع Øماية Ù…ØÙظتك تمامًا من السرقة من خلال البرمجيات الخبيثة التي تصيب جهازك </translation> </message> <message> <location line="+13"/> @@ -321,7 +327,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location filename="../bitcoingui.cpp" line="+295"/> <source>Sign &message...</source> - <translation type="unfinished"/> + <translation>التوقيع Ùˆ الرسائل</translation> </message> <message> <location line="+335"/> @@ -356,7 +362,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+17"/> <source>E&xit</source> - <translation type="unfinished"/> + <translation>خروج</translation> </message> <message> <location line="+1"/> @@ -372,12 +378,12 @@ This product includes software developed by the OpenSSL Project for use in the O <location line="+3"/> <location line="+2"/> <source>About &Qt</source> - <translation type="unfinished"/> + <translation>عن</translation> </message> <message> <location line="+2"/> <source>Show information about Qt</source> - <translation type="unfinished"/> + <translation>اظهر المعلومات</translation> </message> <message> <location line="+2"/> @@ -427,7 +433,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="-405"/> <source>Send coins to a Bitcoin address</source> - <translation type="unfinished"/> + <translation>ارسل عملات الى عنوان بيتكوين</translation> </message> <message> <location line="+49"/> @@ -437,7 +443,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+12"/> <source>Backup wallet to another location</source> - <translation type="unfinished"/> + <translation>اØÙظ نسخة اØتياطية للمØÙظة ÙÙŠ مكان آخر</translation> </message> <message> <location line="+2"/> @@ -513,7 +519,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+14"/> <source>&Settings</source> - <translation>إعدادات</translation> + <translation>الاعدادات</translation> </message> <message> <location line="+9"/> @@ -576,7 +582,7 @@ This product includes software developed by the OpenSSL Project for use in the O <location line="+159"/> <location line="+5"/> <source>Bitcoin client</source> - <translation type="unfinished"/> + <translation>عميل بتكوين</translation> </message> <message numerus="yes"> <location line="+142"/> @@ -631,7 +637,7 @@ 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"/> @@ -683,7 +689,7 @@ Address: %4 <translation>المØÙظة مشÙرة Ùˆ مقÙلة Øاليا</translation> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+435"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -744,7 +750,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation type="unfinished"/> </message> @@ -759,7 +765,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation>المبلغ</translation> </message> @@ -781,7 +787,7 @@ Address: %4 <message> <location line="+3"/> <source>Confirmed</source> - <translation type="unfinished"/> + <translation>تأكيد</translation> </message> <message> <location line="+5"/> @@ -802,7 +808,7 @@ Address: %4 <location line="+1"/> <location line="+26"/> <source>Copy amount</source> - <translation type="unfinished"/> + <translation>نسخ الكمية</translation> </message> <message> <location line="-25"/> @@ -910,19 +916,19 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation type="unfinished"/> </message> <message> <location line="+0"/> <source>yes</source> - <translation type="unfinished"/> + <translation>نعم</translation> </message> <message> <location line="+0"/> <source>no</source> - <translation type="unfinished"/> + <translation>لا</translation> </message> <message> <location line="+10"/> @@ -1013,7 +1019,7 @@ Address: %4 <message> <location line="-10"/> <source>&Address</source> - <translation type="unfinished"/> + <translation>العنوان</translation> </message> <message> <location filename="../editaddressdialog.cpp" line="+28"/> @@ -1093,7 +1099,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation type="unfinished"/> </message> @@ -1105,7 +1111,7 @@ Address: %4 <message> <location line="+2"/> <source>Usage:</source> - <translation type="unfinished"/> + <translation>المستخدم</translation> </message> <message> <location line="+1"/> @@ -1115,7 +1121,7 @@ Address: %4 <message> <location line="+4"/> <source>UI options</source> - <translation type="unfinished"/> + <translation>خيارات UI</translation> </message> <message> <location line="+1"/> @@ -1183,7 +1189,7 @@ Address: %4 <message> <location line="+19"/> <source>Error</source> - <translation type="unfinished"/> + <translation>خطأ</translation> </message> <message> <location line="+9"/> @@ -1234,10 +1240,10 @@ Address: %4 <message> <location line="+13"/> <source>&Main</source> - <translation type="unfinished"/> + <translation>الرئيسي</translation> </message> <message> - <location line="+6"/> + <location line="+122"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation type="unfinished"/> </message> @@ -1247,7 +1253,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="-131"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation type="unfinished"/> </message> @@ -1262,12 +1268,7 @@ Address: %4 <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"/> + <location line="+16"/> <source>MB</source> <translation type="unfinished"/> </message> @@ -1282,7 +1283,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+58"/> + <location line="+107"/> + <source>&Spend unconfirmed change (experts only)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+37"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation type="unfinished"/> </message> @@ -1317,7 +1323,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="-86"/> + <source>W&allet</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+52"/> + <source>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.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+40"/> <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> @@ -1354,7 +1370,7 @@ Address: %4 <message> <location line="+36"/> <source>&Window</source> - <translation type="unfinished"/> + <translation>ناÙذه</translation> </message> <message> <location line="+6"/> @@ -1409,7 +1425,7 @@ Address: %4 <message> <location line="+3"/> <source>&Display addresses in transaction list</source> - <translation type="unfinished"/> + <translation>عرض العناوين ÙÙŠ قائمة الصÙقة</translation> </message> <message> <location line="+7"/> @@ -1424,25 +1440,25 @@ Address: %4 <message> <location line="+136"/> <source>&OK</source> - <translation type="unfinished"/> + <translation>تم</translation> </message> <message> <location line="+7"/> <source>&Cancel</source> - <translation type="unfinished"/> + <translation>الغاء</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+70"/> <source>default</source> - <translation type="unfinished"/> + <translation>الاÙتراضي</translation> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation type="unfinished"/> </message> <message> - <location line="+75"/> + <location line="+78"/> <source>Confirm options reset</source> <translation type="unfinished"/> </message> @@ -1465,7 +1481,7 @@ Address: %4 <message> <location line="+34"/> <source>The supplied proxy address is invalid.</source> - <translation type="unfinished"/> + <translation>عنوان الوكيل توÙيره غير صالØ.</translation> </message> </context> <context> @@ -1482,19 +1498,14 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-155"/> - <source>Unconfirmed:</source> - <translation>غير مؤكدة:</translation> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation>Ù…ØÙظة</translation> </message> <message> <location line="+51"/> - <source>Confirmed:</source> - <translation type="unfinished"/> + <source>Available:</source> + <translation>متوÙر</translation> </message> <message> <location line="+16"/> @@ -1502,14 +1513,19 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> <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="+16"/> <source>Immature:</source> - <translation type="unfinished"/> + <translation>غير ناضجة</translation> </message> <message> <location line="+13"/> @@ -1535,7 +1551,7 @@ Address: %4 <location filename="../overviewpage.cpp" line="+120"/> <location line="+1"/> <source>out of sync</source> - <translation type="unfinished"/> + <translation>خارج المزامنه</translation> </message> </context> <context> @@ -1650,6 +1666,11 @@ Address: %4 <source>Error: Invalid combination of -regtest and -testnet.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../guiutil.cpp" line="+82"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>إدخال عنوانBitcoin (مثال :1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> </context> <context> <name>QRImageWidget</name> @@ -1679,7 +1700,7 @@ Address: %4 <message> <location filename="../forms/rpcconsole.ui" line="+46"/> <source>Client name</source> - <translation type="unfinished"/> + <translation>اسم العميل</translation> </message> <message> <location line="+10"/> @@ -1694,17 +1715,17 @@ Address: %4 <location line="+23"/> <location filename="../rpcconsole.cpp" line="+359"/> <source>N/A</source> - <translation type="unfinished"/> + <translation>غير معروÙ</translation> </message> <message> <location line="-223"/> <source>Client version</source> - <translation type="unfinished"/> + <translation>نسخه العميل</translation> </message> <message> <location line="-45"/> <source>&Information</source> - <translation type="unfinished"/> + <translation>المعلومات</translation> </message> <message> <location line="-10"/> @@ -1729,17 +1750,17 @@ Address: %4 <message> <location line="+29"/> <source>Network</source> - <translation type="unfinished"/> + <translation>الشبكه</translation> </message> <message> <location line="+7"/> <source>Name</source> - <translation type="unfinished"/> + <translation>الاسم</translation> </message> <message> <location line="+23"/> <source>Number of connections</source> - <translation type="unfinished"/> + <translation>عدد الاتصالات</translation> </message> <message> <location line="+29"/> @@ -1764,7 +1785,7 @@ Address: %4 <message> <location line="+52"/> <source>&Open</source> - <translation type="unfinished"/> + <translation>الÙتØ</translation> </message> <message> <location line="+24"/> @@ -1799,7 +1820,7 @@ Address: %4 <message> <location line="-521"/> <source>Build date</source> - <translation type="unfinished"/> + <translation>وقت البناء</translation> </message> <message> <location line="+206"/> @@ -1870,22 +1891,22 @@ Address: %4 <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+83"/> + <location filename="../forms/receivecoinsdialog.ui" line="+107"/> <source>&Amount:</source> <translation type="unfinished"/> </message> <message> - <location line="-13"/> + <location line="-16"/> <source>&Label:</source> <translation type="unfinished"/> </message> <message> - <location line="-34"/> + <location line="-37"/> <source>&Message:</source> <translation type="unfinished"/> </message> <message> - <location line="-17"/> + <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"/> </message> @@ -1895,27 +1916,30 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+27"/> - <source>An optional 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"/> </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> + <location line="-7"/> + <location line="+21"/> + <source>An optional label to associate with the new receiving address.</source> <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="-7"/> <source>Use this form to request payments. All fields are <b>optional</b>.</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <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"/> </message> <message> - <location line="+17"/> + <location line="+32"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -1925,17 +1949,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+36"/> - <source>&Request payment</source> + <location line="+78"/> + <source>Requested payments history</source> <translation type="unfinished"/> </message> <message> - <location line="+47"/> - <source>Requested payments</source> + <location line="-98"/> + <source>&Request payment</source> <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+120"/> <source>Show the selected request (does the same as double clicking an entry)</source> <translation type="unfinished"/> </message> @@ -1954,6 +1978,21 @@ Address: %4 <source>Remove</source> <translation type="unfinished"/> </message> + <message> + <location filename="../receivecoinsdialog.cpp" line="+38"/> + <source>Copy label</source> + <translation> انسخ التسمية</translation> + </message> + <message> + <location line="+1"/> + <source>Copy message</source> + <translation>انسخ الرسالة</translation> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation>نسخ الكمية</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -2055,12 +2094,17 @@ Address: %4 <source>(no message)</source> <translation type="unfinished"/> </message> + <message> + <location line="+8"/> + <source>(no amount)</source> + <translation type="unfinished"/> + </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>إرسال Coins</translation> @@ -2136,7 +2180,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+115"/> + <location line="+164"/> <source>Send to multiple recipients at once</source> <translation>إرسال إلى عدة مستلمين ÙÙŠ وقت واØد</translation> </message> @@ -2146,22 +2190,22 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+20"/> + <location line="-23"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> <message> <location line="+3"/> <source>Clear &All</source> - <translation type="unfinished"/> + <translation>Ù…Ø³Ø Ø§Ù„ÙƒÙ„</translation> </message> <message> - <location line="+22"/> + <location line="+52"/> <source>Balance:</source> <translation>الرصيد:</translation> </message> <message> - <location line="+41"/> + <location line="-78"/> <source>Confirm the send action</source> <translation>تأكيد الإرسال</translation> </message> @@ -2171,7 +2215,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-228"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation>تأكيد الإرسال Coins</translation> </message> @@ -2184,19 +2228,14 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-136"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>إدخال عنوانBitcoin (مثال :1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> - <message> - <location line="+15"/> + <location line="-121"/> <source>Copy quantity</source> <translation type="unfinished"/> </message> <message> <location line="+1"/> <source>Copy amount</source> - <translation type="unfinished"/> + <translation>نسخ الكمية</translation> </message> <message> <location line="+1"/> @@ -2239,7 +2278,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+202"/> + <location line="+203"/> <source>The recipient address is not valid, please recheck.</source> <translation type="unfinished"/> </message> @@ -2274,12 +2313,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Warning: Invalid Bitcoin address</source> <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+20"/> <source>(no label)</source> <translation>(لا وصÙ)</translation> </message> @@ -2289,7 +2328,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-366"/> + <location line="-367"/> <source>Are you sure you want to send?</source> <translation type="unfinished"/> </message> @@ -2299,7 +2338,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+170"/> + <location line="+171"/> <source>Payment request expired</source> <translation type="unfinished"/> </message> @@ -2321,7 +2360,7 @@ Address: %4 <message> <location line="-1152"/> <source>Pay &To:</source> - <translation type="unfinished"/> + <translation>ادÙع الى </translation> </message> <message> <location line="+18"/> @@ -2373,15 +2412,10 @@ Address: %4 <message> <location line="-1008"/> <source>Message:</source> - <translation type="unfinished"/> + <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"/> + <location line="+968"/> <source>This is a verified payment request.</source> <translation type="unfinished"/> </message> @@ -2391,7 +2425,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+459"/> + <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"/> + </message> + <message> + <location line="+426"/> <source>This is an unverified payment request.</source> <translation type="unfinished"/> </message> @@ -2407,11 +2446,6 @@ Address: %4 <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> @@ -2449,19 +2483,19 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+10"/> - <location line="+213"/> + <location line="+7"/> + <location line="+210"/> <source>Choose previously used address</source> <translation type="unfinished"/> </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>انسخ العنوان من لوØØ© المÙاتيØ</translation> </message> @@ -2502,12 +2536,12 @@ Address: %4 </message> <message> <location line="+3"/> - <location line="+146"/> + <location line="+143"/> <source>Clear &All</source> - <translation type="unfinished"/> + <translation>Ù…Ø³Ø Ø§Ù„ÙƒÙ„</translation> </message> <message> - <location line="-87"/> + <location line="-84"/> <source>&Verify Message</source> <translation type="unfinished"/> </message> @@ -2522,7 +2556,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+40"/> + <location line="+37"/> <source>Verify the message to ensure it was signed with the specified Bitcoin address</source> <translation type="unfinished"/> </message> @@ -2537,43 +2571,37 @@ Address: %4 <translation type="unfinished"/> </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>إدخال عنوانBitcoin (مثال :1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location line="-2"/> + <location line="-1"/> <source>Click "Sign Message" to generate signature</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Enter Bitcoin signature</source> - <translation>ضع توقيع الخاص بالبت كوين</translation> - </message> - <message> <location line="+84"/> - <location line="+81"/> + <location line="+80"/> <source>The entered address is invalid.</source> <translation>العنوان المدخل غير صالØ</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>الرجاء التأكد من العنوان والمØاولة مرة اخرى</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>العنوان المدخل لا يشير الى Ù…ÙتاØ</translation> </message> <message> - <location line="-73"/> + <location line="-72"/> <source>Wallet unlock was cancelled.</source> <translation type="unfinished"/> </message> @@ -2593,7 +2621,7 @@ Address: %4 <translation>الرسالة موقعة.</translation> </message> <message> - <location line="+59"/> + <location line="+58"/> <source>The signature could not be decoded.</source> <translation type="unfinished"/> </message> @@ -2654,6 +2682,11 @@ Address: %4 </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation>1% غير متواجد</translation> </message> @@ -2815,12 +2848,12 @@ Address: %4 <translation>لم يتم Øتى الآن البث بنجاØ</translation> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <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="+70"/> + <location line="+72"/> <source>unknown</source> <translation>غير معروÙ</translation> </message> @@ -2861,12 +2894,12 @@ Address: %4 <translation>المبلغ</translation> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <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> @@ -2876,23 +2909,12 @@ Address: %4 <translation>Ù…ÙØªÙˆØ Øتى 1Ùª</translation> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> - <translation>غير متصل (1Ùª تأكيدات)</translation> - </message> - <message> - <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation>غير مؤكدة (Ùª 1 من٪ 2 تأكيدات)</translation> - </message> - <message> - <location line="-22"/> - <location line="+25"/> + <location line="+12"/> <source>Confirmed (%1 confirmations)</source> <translation>تأكيد الإرسال Coins</translation> </message> <message> - <location line="-22"/> + <location line="+9"/> <source>This block was not received by any other nodes and will probably not be accepted!</source> <translation>لم يتم تلقى هذه الكتلة (Block) من قبل أي العقد الأخرى وربما لن تكون مقبولة!</translation> </message> @@ -2902,14 +2924,34 @@ Address: %4 <translation>ولدت ولكن لم تقبل</translation> </message> <message> - <location line="+62"/> + <location line="-21"/> + <source>Offline</source> + <translation>غير متصل</translation> + </message> + <message> + <location line="+3"/> + <source>Unconfirmed</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+51"/> <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"/> @@ -2932,7 +2974,7 @@ Address: %4 <translation>غير متوÙر</translation> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation>Øالة المعاملة. تØوم Øول هذا الØقل لعرض عدد التأكيدات.</translation> </message> @@ -3043,7 +3085,7 @@ Address: %4 <message> <location line="+1"/> <source>Copy amount</source> - <translation type="unfinished"/> + <translation>نسخ الكمية</translation> </message> <message> <location line="+1"/> @@ -3093,7 +3135,7 @@ Address: %4 <message> <location line="+9"/> <source>Confirmed</source> - <translation type="unfinished"/> + <translation>تأكيد</translation> </message> <message> <location line="+1"/> @@ -3123,7 +3165,7 @@ Address: %4 <message> <location line="+1"/> <source>ID</source> - <translation type="unfinished"/> + <translation>العنوان</translation> </message> <message> <location line="+107"/> @@ -3133,7 +3175,7 @@ Address: %4 <message> <location line="+8"/> <source>to</source> - <translation type="unfinished"/> + <translation>الى</translation> </message> </context> <context> @@ -3198,12 +3240,12 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+223"/> <source>Usage:</source> - <translation type="unfinished"/> + <translation>المستخدم</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>List commands</source> <translation>اعرض الأوامر</translation> </message> @@ -3235,7 +3277,7 @@ Address: %4 <message> <location line="-9"/> <source>Set database cache size in megabytes (default: 25)</source> - <translation type="unfinished"/> + <translation>ضع Øجم كاش قاعدة البيانات بالميجابايت (الاÙتراضي: 25)</translation> </message> <message> <location line="-26"/> @@ -3258,12 +3300,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation type="unfinished"/> </message> <message> - <location line="-148"/> + <location line="-150"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"/> </message> @@ -3283,19 +3325,19 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Run in the background as a daemon and accept commands</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <location line="+40"/> <source>Use the test network</source> - <translation type="unfinished"/> + <translation>استخدم التØقق من الشبكه</translation> </message> <message> - <location line="-118"/> + <location line="-120"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation type="unfinished"/> + <translation>قبول الاتصالات من خارج</translation> </message> <message> <location line="-95"/> @@ -3424,6 +3466,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation type="unfinished"/> </message> @@ -3495,7 +3542,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+1"/> <source>Failed to listen on any port. Use -listen=0 if you want this.</source> - <translation type="unfinished"/> + <translation>Ùشل ÙÙŠ الاستماع على أي منÙØ°. استخدام الاستماع = 0 إذا كنت تريد هذا.</translation> </message> <message> <location line="+1"/> @@ -3634,6 +3681,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Start Bitcoin server</source> <translation type="unfinished"/> </message> @@ -3683,12 +3735,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-79"/> + <location line="-80"/> <source>Imports blocks from external blk000??.dat file</source> <translation type="unfinished"/> </message> <message> - <location line="-105"/> + <location line="-106"/> <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> @@ -3708,7 +3760,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+89"/> + <location line="+90"/> <source>Information</source> <translation type="unfinished"/> </message> @@ -3778,7 +3830,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+7"/> <source>System error: </source> <translation type="unfinished"/> </message> @@ -3824,6 +3876,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>version</source> <translation>النسخة</translation> </message> @@ -3833,32 +3890,32 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-58"/> + <location line="-60"/> <source>Password for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-70"/> + <location line="-71"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation type="unfinished"/> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+161"/> + <location line="+163"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"/> </message> <message> - <location line="-24"/> + <location line="-25"/> <source>Set key pool size to <n> (default: 100)</source> <translation type="unfinished"/> </message> @@ -3868,12 +3925,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+38"/> + <location line="+39"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-30"/> + <location line="-31"/> <source>Server certificate file (default: server.cert)</source> <translation type="unfinished"/> </message> @@ -3883,9 +3940,9 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+17"/> <source>This help message</source> - <translation type="unfinished"/> + <translation>رسالة المساعدة هذه</translation> </message> <message> <location line="+7"/> @@ -3893,34 +3950,34 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-107"/> + <location line="-109"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation type="unfinished"/> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Loading addresses...</source> - <translation type="unfinished"/> + <translation>تØميل العنوان</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: المØÙظة تتطلب نسخة Ø£Øدث من بتكوين</translation> </message> <message> - <location line="+98"/> + <location line="+99"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> - <translation type="unfinished"/> + <translation>المØÙظة تØتاج لإعادة إنشاء: أعد تشغيل بتكوين للإتمام</translation> </message> <message> - <location line="-100"/> + <location line="-101"/> <source>Error loading wallet.dat</source> - <translation type="unfinished"/> + <translation>خطأ عند تنزيل wallet.dat</translation> </message> <message> <location line="+31"/> @@ -3928,7 +3985,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+56"/> + <location line="+57"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation type="unfinished"/> </message> @@ -3938,7 +3995,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-101"/> + <location line="-103"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -3948,7 +4005,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+48"/> + <location line="+49"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation type="unfinished"/> </message> @@ -3968,7 +4025,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-62"/> + <location line="-63"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"/> </message> @@ -3978,12 +4035,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+95"/> + <location line="+96"/> <source>Loading wallet...</source> - <translation type="unfinished"/> + <translation>تØميل المØÙظه</translation> </message> <message> - <location line="-56"/> + <location line="-57"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> @@ -3993,27 +4050,27 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+67"/> + <location line="+68"/> <source>Rescanning...</source> - <translation type="unfinished"/> + <translation>إعادة مسØ</translation> </message> <message> <location line="-58"/> <source>Done loading</source> - <translation type="unfinished"/> + <translation>انتهاء التØميل</translation> </message> <message> - <location line="+85"/> + <location line="+86"/> <source>To use the %s option</source> <translation type="unfinished"/> </message> <message> - <location line="-77"/> + <location line="-78"/> <source>Error</source> - <translation type="unfinished"/> + <translation>خطأ</translation> </message> <message> - <location line="-35"/> + <location line="-36"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_be_BY.ts b/src/qt/locale/bitcoin_be_BY.ts index 5fbb794719..9c89795017 100644 --- a/src/qt/locale/bitcoin_be_BY.ts +++ b/src/qt/locale/bitcoin_be_BY.ts @@ -31,6 +31,12 @@ This product includes software developed by the OpenSSL Project for use in the O <source>The Bitcoin Core developers</source> <translation type="unfinished"/> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source> (%1-bit)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>AddressBookPage</name> @@ -612,6 +618,16 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation type="unfinished"/> @@ -685,7 +701,7 @@ Address: %4 <translation>Гаманец <b>зашыфраваны</b> Ñ– зараз <b>заблакаваны</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+435"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -746,7 +762,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation type="unfinished"/> </message> @@ -761,7 +777,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation>КолькаÑць</translation> </message> @@ -912,7 +928,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation type="unfinished"/> </message> @@ -1094,7 +1110,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation type="unfinished"/> </message> @@ -1238,7 +1254,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+122"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation type="unfinished"/> </message> @@ -1248,7 +1264,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="-131"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation type="unfinished"/> </message> @@ -1263,12 +1279,7 @@ Address: %4 <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"/> + <location line="+16"/> <source>MB</source> <translation type="unfinished"/> </message> @@ -1283,7 +1294,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+58"/> + <location line="+107"/> + <source>&Spend unconfirmed change (experts only)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+37"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation type="unfinished"/> </message> @@ -1318,7 +1334,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="-86"/> + <source>W&allet</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+52"/> + <source>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.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+40"/> <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> @@ -1433,17 +1459,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+70"/> <source>default</source> <translation type="unfinished"/> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation type="unfinished"/> </message> <message> - <location line="+75"/> + <location line="+78"/> <source>Confirm options reset</source> <translation type="unfinished"/> </message> @@ -1483,18 +1509,13 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-155"/> - <source>Unconfirmed:</source> - <translation>Ðепацверджана:</translation> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation type="unfinished"/> </message> <message> <location line="+51"/> - <source>Confirmed:</source> + <source>Available:</source> <translation type="unfinished"/> </message> <message> @@ -1503,7 +1524,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation type="unfinished"/> </message> @@ -1651,6 +1677,11 @@ Address: %4 <source>Error: Invalid combination of -regtest and -testnet.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../guiutil.cpp" line="+82"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>УвÑдзіце Біткойн-Ð°Ð´Ñ€Ð°Ñ (ўзор 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> </context> <context> <name>QRImageWidget</name> @@ -1871,22 +1902,22 @@ Address: %4 <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+83"/> + <location filename="../forms/receivecoinsdialog.ui" line="+107"/> <source>&Amount:</source> <translation type="unfinished"/> </message> <message> - <location line="-13"/> + <location line="-16"/> <source>&Label:</source> <translation>Пазнака:</translation> </message> <message> - <location line="-34"/> + <location line="-37"/> <source>&Message:</source> <translation type="unfinished"/> </message> <message> - <location line="-17"/> + <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"/> </message> @@ -1896,27 +1927,30 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+27"/> - <source>An optional 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"/> </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> + <location line="-7"/> + <location line="+21"/> + <source>An optional label to associate with the new receiving address.</source> <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="-7"/> <source>Use this form to request payments. All fields are <b>optional</b>.</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <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"/> </message> <message> - <location line="+17"/> + <location line="+32"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -1926,17 +1960,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+36"/> - <source>&Request payment</source> + <location line="+78"/> + <source>Requested payments history</source> <translation type="unfinished"/> </message> <message> - <location line="+47"/> - <source>Requested payments</source> + <location line="-98"/> + <source>&Request payment</source> <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+120"/> <source>Show the selected request (does the same as double clicking an entry)</source> <translation type="unfinished"/> </message> @@ -1955,6 +1989,21 @@ Address: %4 <source>Remove</source> <translation type="unfinished"/> </message> + <message> + <location filename="../receivecoinsdialog.cpp" line="+38"/> + <source>Copy label</source> + <translation>КапіÑваць пазнаку</translation> + </message> + <message> + <location line="+1"/> + <source>Copy message</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation>КапіÑваць колькаÑць</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -2056,12 +2105,17 @@ Address: %4 <source>(no message)</source> <translation type="unfinished"/> </message> + <message> + <location line="+8"/> + <source>(no amount)</source> + <translation type="unfinished"/> + </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>ДаÑлаць Манеты</translation> @@ -2137,7 +2191,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+115"/> + <location line="+164"/> <source>Send to multiple recipients at once</source> <translation>ДаÑлаць адразу некалькім атрымальнікам</translation> </message> @@ -2147,7 +2201,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+20"/> + <location line="-23"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -2157,12 +2211,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+22"/> + <location line="+52"/> <source>Balance:</source> <translation>БаланÑ:</translation> </message> <message> - <location line="+41"/> + <location line="-78"/> <source>Confirm the send action</source> <translation>Пацвердзіць даÑыланне</translation> </message> @@ -2172,7 +2226,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-228"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation>Пацвердзіць даÑыланне манет</translation> </message> @@ -2185,12 +2239,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-136"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>УвÑдзіце Біткойн-Ð°Ð´Ñ€Ð°Ñ (ўзор 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> - <message> - <location line="+15"/> + <location line="-121"/> <source>Copy quantity</source> <translation type="unfinished"/> </message> @@ -2240,7 +2289,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+202"/> + <location line="+203"/> <source>The recipient address is not valid, please recheck.</source> <translation type="unfinished"/> </message> @@ -2275,12 +2324,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Warning: Invalid Bitcoin address</source> <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+20"/> <source>(no label)</source> <translation>непазначаны</translation> </message> @@ -2290,7 +2339,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-366"/> + <location line="-367"/> <source>Are you sure you want to send?</source> <translation type="unfinished"/> </message> @@ -2300,7 +2349,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+170"/> + <location line="+171"/> <source>Payment request expired</source> <translation type="unfinished"/> </message> @@ -2377,12 +2426,7 @@ Address: %4 <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"/> + <location line="+968"/> <source>This is a verified payment request.</source> <translation type="unfinished"/> </message> @@ -2392,7 +2436,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+459"/> + <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"/> + </message> + <message> + <location line="+426"/> <source>This is an unverified payment request.</source> <translation type="unfinished"/> </message> @@ -2408,11 +2457,6 @@ Address: %4 <source>Memo:</source> <translation type="unfinished"/> </message> - <message> - <location filename="../sendcoinsentry.cpp" line="+1"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>УвÑдзіце Біткойн-Ð°Ð´Ñ€Ð°Ñ (ўзор 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> </context> <context> <name>ShutdownWindow</name> @@ -2450,19 +2494,19 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+10"/> - <location line="+213"/> + <location line="+7"/> + <location line="+210"/> <source>Choose previously used address</source> <translation type="unfinished"/> </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>УÑтавіць Ð°Ð´Ñ€Ð°Ñ Ð· буферу абмена</translation> </message> @@ -2503,12 +2547,12 @@ Address: %4 </message> <message> <location line="+3"/> - <location line="+146"/> + <location line="+143"/> <source>Clear &All</source> <translation type="unfinished"/> </message> <message> - <location line="-87"/> + <location line="-84"/> <source>&Verify Message</source> <translation type="unfinished"/> </message> @@ -2523,7 +2567,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+40"/> + <location line="+37"/> <source>Verify the message to ensure it was signed with the specified Bitcoin address</source> <translation type="unfinished"/> </message> @@ -2538,43 +2582,37 @@ Address: %4 <translation type="unfinished"/> </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>УвÑдзіце Біткойн-Ð°Ð´Ñ€Ð°Ñ (ўзор 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location line="-2"/> + <location line="-1"/> <source>Click "Sign Message" to generate signature</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Enter Bitcoin signature</source> - <translation type="unfinished"/> - </message> - <message> <location line="+84"/> - <location line="+81"/> + <location line="+80"/> <source>The entered address is invalid.</source> <translation type="unfinished"/> </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 type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location line="-73"/> + <location line="-72"/> <source>Wallet unlock was cancelled.</source> <translation type="unfinished"/> </message> @@ -2594,7 +2632,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+59"/> + <location line="+58"/> <source>The signature could not be decoded.</source> <translation type="unfinished"/> </message> @@ -2655,6 +2693,11 @@ Address: %4 </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation type="unfinished"/> </message> @@ -2816,12 +2859,12 @@ Address: %4 <translation>, пакуль не было паÑпÑхова транÑлÑвана</translation> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation>невÑдома</translation> </message> @@ -2862,12 +2905,12 @@ Address: %4 <translation>КолькаÑць</translation> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> @@ -2877,23 +2920,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> - <translation>Offline (%1 пацверджаннÑÑž)</translation> - </message> - <message> - <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation>Ðепацверджана (%1 з %2 пацверджаннÑÑž)</translation> - </message> - <message> - <location line="-22"/> - <location line="+25"/> + <location line="+12"/> <source>Confirmed (%1 confirmations)</source> <translation>Пацверджана (%1 пацверджаннÑÑž)</translation> </message> <message> - <location line="-22"/> + <location line="+9"/> <source>This block was not received by any other nodes and will probably not be accepted!</source> <translation>ГÑÑ‚Ñ‹ блок не быў прынÑÑ‚Ñ‹ іншымі вузламі Ñ– магчыма не будзе ўхвалены!</translation> </message> @@ -2903,7 +2935,27 @@ Address: %4 <translation>Згенеравана, але не прынÑта</translation> </message> <message> - <location line="+62"/> + <location line="-21"/> + <source>Offline</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Unconfirmed</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation>ПрынÑта з</translation> </message> @@ -2933,7 +2985,7 @@ Address: %4 <translation>(n/a)</translation> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation>Ð¡Ñ‚Ð°Ñ‚ÑƒÑ Ñ‚Ñ€Ð°Ð½Ð·Ð°ÐºÑ†Ñ‹Ñ–. ÐавÑдзіце курÑар на гÑтае поле, каб паказаць колькаÑць пацверджаннÑÑž.</translation> </message> @@ -3199,12 +3251,12 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+223"/> <source>Usage:</source> <translation>Ужыванне:</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>List commands</source> <translation>Ð¡Ð¿Ñ–Ñ ÐºÐ°Ð¼Ð°Ð½Ð´</translation> </message> @@ -3259,12 +3311,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation>Парог Ð´Ð»Ñ Ð°Ð´Ð»ÑƒÑ‡ÑÐ½Ð½Ñ Ð·Ð»Ð°ÑžÐ¼Ñ‹Ñных карыÑтальнікаў (тыпова: 100)</translation> </message> <message> - <location line="-148"/> + <location line="-150"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>КолькаÑць Ñекунд Ð´Ð»Ñ ÑžÑÑ‚Ñ€Ñ‹Ð¼Ð°Ð½Ð½Ñ Ð°Ñобаў да перадалучÑÐ½Ð½Ñ (заходна: 86400)</translation> </message> @@ -3284,17 +3336,17 @@ Address: %4 <translation>Прымаць камандны радок Ñ– JSON-RPC каманды</translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Run in the background as a daemon and accept commands</source> <translation>ЗапуÑціць у фоне Ñк дÑман Ñ– прымаць каманды</translation> </message> <message> - <location line="+39"/> + <location line="+40"/> <source>Use the test network</source> <translation>Ужываць Ñ‚ÑÑтавае Ñеціва</translation> </message> <message> - <location line="-118"/> + <location line="-120"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> @@ -3425,6 +3477,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation type="unfinished"/> </message> @@ -3635,6 +3692,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Start Bitcoin server</source> <translation type="unfinished"/> </message> @@ -3684,12 +3746,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-79"/> + <location line="-80"/> <source>Imports blocks from external blk000??.dat file</source> <translation type="unfinished"/> </message> <message> - <location line="-105"/> + <location line="-106"/> <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> @@ -3709,7 +3771,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+89"/> + <location line="+90"/> <source>Information</source> <translation type="unfinished"/> </message> @@ -3779,7 +3841,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+7"/> <source>System error: </source> <translation type="unfinished"/> </message> @@ -3825,6 +3887,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>version</source> <translation type="unfinished"/> </message> @@ -3834,32 +3901,32 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-58"/> + <location line="-60"/> <source>Password for JSON-RPC connections</source> <translation>Пароль Ð´Ð»Ñ JSON-RPC злучÑннÑÑž</translation> </message> <message> - <location line="-70"/> + <location line="-71"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Дазволіць JSON-RPC злучÑнні з пÑўнага IP адраÑу</translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>ÐдпраўлÑць каманды вузлу на <ip> (зыходна: 127.0.0.1)</translation> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>Выканаць каманду калі лепшы блок зменіцца (%s замÑнÑецца на Ñ…Ñш блока)</translation> </message> <message> - <location line="+161"/> + <location line="+163"/> <source>Upgrade wallet to latest format</source> <translation>Ðбнавіць гаманец на новы фармат</translation> </message> <message> - <location line="-24"/> + <location line="-25"/> <source>Set key pool size to <n> (default: 100)</source> <translation>УÑтанавіць памер фонда ключоў у <n> (тыпова: 100)</translation> </message> @@ -3869,12 +3936,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>ПераÑканаваць ланцуг блокаў Ð´Ð·ÐµÐ»Ñ Ð¿Ð¾ÑˆÑƒÐºÑƒ адÑутных транзакцый</translation> </message> <message> - <location line="+38"/> + <location line="+39"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Ужываць OpenSSL (https) Ð´Ð»Ñ JSON-RPC злучÑннÑÑž</translation> </message> <message> - <location line="-30"/> + <location line="-31"/> <source>Server certificate file (default: server.cert)</source> <translation>Файл-Ñертыфікат Ñервера (зыходна: server.cert)</translation> </message> @@ -3884,7 +3951,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Прыватны ключ Ñервера (зыходна: server.pem)</translation> </message> <message> - <location line="+16"/> + <location line="+17"/> <source>This help message</source> <translation type="unfinished"/> </message> @@ -3894,12 +3961,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-107"/> + <location line="-109"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation type="unfinished"/> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Loading addresses...</source> <translation>Загружаем адраÑÑ‹...</translation> </message> @@ -3914,12 +3981,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Памылка загрузкі wallet.dat: гаманец патрабуе новую верÑÑ–ÑŽ Bitcoin</translation> </message> <message> - <location line="+98"/> + <location line="+99"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>Гаманец мае быць перазапіÑаны: патрÑбны перазапуÑк Bitcoin Ð´Ð»Ñ Ð²Ñ‹ÐºÐ°Ð½Ð°Ð½Ð½Ñ</translation> </message> <message> - <location line="-100"/> + <location line="-101"/> <source>Error loading wallet.dat</source> <translation>Памылка загрузкі wallet.dat</translation> </message> @@ -3929,7 +3996,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+56"/> + <location line="+57"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation type="unfinished"/> </message> @@ -3939,7 +4006,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-101"/> + <location line="-103"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -3949,7 +4016,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+48"/> + <location line="+49"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation type="unfinished"/> </message> @@ -3969,7 +4036,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Загружаем індÑÐºÑ Ð±Ð»Ð¾ÐºÐ°Ñž...</translation> </message> <message> - <location line="-62"/> + <location line="-63"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"/> </message> @@ -3979,12 +4046,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+95"/> + <location line="+96"/> <source>Loading wallet...</source> <translation>Загружаем гаманец...</translation> </message> <message> - <location line="-56"/> + <location line="-57"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> @@ -3994,7 +4061,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+67"/> + <location line="+68"/> <source>Rescanning...</source> <translation>ПераÑканаванне...</translation> </message> @@ -4004,17 +4071,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Загрузка выканана</translation> </message> <message> - <location line="+85"/> + <location line="+86"/> <source>To use the %s option</source> <translation type="unfinished"/> </message> <message> - <location line="-77"/> + <location line="-78"/> <source>Error</source> <translation>Памылка</translation> </message> <message> - <location line="-35"/> + <location line="-36"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_bg.ts b/src/qt/locale/bitcoin_bg.ts index c8a403346d..eb0eb9ec07 100644 --- a/src/qt/locale/bitcoin_bg.ts +++ b/src/qt/locale/bitcoin_bg.ts @@ -36,6 +36,12 @@ This product includes software developed by the OpenSSL Project for use in the O <source>The Bitcoin Core developers</source> <translation type="unfinished"/> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source> (%1-bit)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>AddressBookPage</name> @@ -617,6 +623,16 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation type="unfinished"/> @@ -686,7 +702,7 @@ Address: %4 <translation>Портфейлът е <b>криптиран</b> и <b>заключен</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+435"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -747,7 +763,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation type="unfinished"/> </message> @@ -762,7 +778,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation>Сума</translation> </message> @@ -913,7 +929,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation type="unfinished"/> </message> @@ -1095,7 +1111,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation type="unfinished"/> </message> @@ -1239,7 +1255,7 @@ Address: %4 <translation>&ОÑновни</translation> </message> <message> - <location line="+6"/> + <location line="+122"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation type="unfinished"/> </message> @@ -1249,7 +1265,7 @@ Address: %4 <translation>&ТакÑа за изходÑща транзакциÑ</translation> </message> <message> - <location line="+31"/> + <location line="-131"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation type="unfinished"/> </message> @@ -1264,12 +1280,7 @@ Address: %4 <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"/> + <location line="+16"/> <source>MB</source> <translation type="unfinished"/> </message> @@ -1284,7 +1295,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+58"/> + <location line="+107"/> + <source>&Spend unconfirmed change (experts only)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+37"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation type="unfinished"/> </message> @@ -1319,7 +1335,17 @@ Address: %4 <translation>&Мрежа</translation> </message> <message> - <location line="+6"/> + <location line="-86"/> + <source>W&allet</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+52"/> + <source>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.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+40"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>Ðвтоматично отварÑне на входÑÑ‰Ð¸Ñ Bitcoin порт. Работи Ñамо Ñ Ñ€ÑƒÑ‚ÐµÑ€Ð¸ поддържащи UPnP.</translation> </message> @@ -1434,17 +1460,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+70"/> <source>default</source> <translation type="unfinished"/> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation type="unfinished"/> </message> <message> - <location line="+75"/> + <location line="+78"/> <source>Confirm options reset</source> <translation type="unfinished"/> </message> @@ -1484,18 +1510,13 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-155"/> - <source>Unconfirmed:</source> - <translation>Ðепотвърдени:</translation> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation>Портфейл</translation> </message> <message> <location line="+51"/> - <source>Confirmed:</source> + <source>Available:</source> <translation type="unfinished"/> </message> <message> @@ -1504,7 +1525,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation type="unfinished"/> </message> @@ -1652,6 +1678,11 @@ Address: %4 <source>Error: Invalid combination of -regtest and -testnet.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../guiutil.cpp" line="+82"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>Въведете Биткоин Ð°Ð´Ñ€ÐµÑ (например 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> </context> <context> <name>QRImageWidget</name> @@ -1872,22 +1903,22 @@ Address: %4 <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+83"/> + <location filename="../forms/receivecoinsdialog.ui" line="+107"/> <source>&Amount:</source> <translation type="unfinished"/> </message> <message> - <location line="-13"/> + <location line="-16"/> <source>&Label:</source> <translation>&Име:</translation> </message> <message> - <location line="-34"/> + <location line="-37"/> <source>&Message:</source> <translation type="unfinished"/> </message> <message> - <location line="-17"/> + <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"/> </message> @@ -1897,27 +1928,30 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+27"/> - <source>An optional 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"/> </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> + <location line="-7"/> + <location line="+21"/> + <source>An optional label to associate with the new receiving address.</source> <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="-7"/> <source>Use this form to request payments. All fields are <b>optional</b>.</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <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"/> </message> <message> - <location line="+17"/> + <location line="+32"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -1927,17 +1961,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+36"/> - <source>&Request payment</source> + <location line="+78"/> + <source>Requested payments history</source> <translation type="unfinished"/> </message> <message> - <location line="+47"/> - <source>Requested payments</source> + <location line="-98"/> + <source>&Request payment</source> <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+120"/> <source>Show the selected request (does the same as double clicking an entry)</source> <translation type="unfinished"/> </message> @@ -1956,6 +1990,21 @@ Address: %4 <source>Remove</source> <translation type="unfinished"/> </message> + <message> + <location filename="../receivecoinsdialog.cpp" line="+38"/> + <source>Copy label</source> + <translation>Копирай име</translation> + </message> + <message> + <location line="+1"/> + <source>Copy message</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation>Копирай Ñума</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -2057,12 +2106,17 @@ Address: %4 <source>(no message)</source> <translation type="unfinished"/> </message> + <message> + <location line="+8"/> + <source>(no amount)</source> + <translation type="unfinished"/> + </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>Изпращане</translation> @@ -2138,7 +2192,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+115"/> + <location line="+164"/> <source>Send to multiple recipients at once</source> <translation>Изпращане към повече от един получател</translation> </message> @@ -2148,7 +2202,7 @@ Address: %4 <translation>Добави &получател</translation> </message> <message> - <location line="+20"/> + <location line="-23"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -2158,12 +2212,12 @@ Address: %4 <translation>&ИзчиÑти</translation> </message> <message> - <location line="+22"/> + <location line="+52"/> <source>Balance:</source> <translation>БаланÑ:</translation> </message> <message> - <location line="+41"/> + <location line="-78"/> <source>Confirm the send action</source> <translation>Потвърдете изпращането</translation> </message> @@ -2173,7 +2227,7 @@ Address: %4 <translation>И&зпрати</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-228"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation>Потвърждаване</translation> </message> @@ -2186,12 +2240,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-136"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Въведете Биткоин Ð°Ð´Ñ€ÐµÑ (например 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> - <message> - <location line="+15"/> + <location line="-121"/> <source>Copy quantity</source> <translation type="unfinished"/> </message> @@ -2241,7 +2290,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+202"/> + <location line="+203"/> <source>The recipient address is not valid, please recheck.</source> <translation>Ðевалиден Ð°Ð´Ñ€ÐµÑ Ð½Ð° получателÑ.</translation> </message> @@ -2276,12 +2325,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Warning: Invalid Bitcoin address</source> <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+20"/> <source>(no label)</source> <translation>(без име)</translation> </message> @@ -2291,7 +2340,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-366"/> + <location line="-367"/> <source>Are you sure you want to send?</source> <translation type="unfinished"/> </message> @@ -2301,7 +2350,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+170"/> + <location line="+171"/> <source>Payment request expired</source> <translation type="unfinished"/> </message> @@ -2378,12 +2427,7 @@ Address: %4 <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"/> + <location line="+968"/> <source>This is a verified payment request.</source> <translation type="unfinished"/> </message> @@ -2393,7 +2437,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+459"/> + <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"/> + </message> + <message> + <location line="+426"/> <source>This is an unverified payment request.</source> <translation type="unfinished"/> </message> @@ -2409,11 +2458,6 @@ Address: %4 <source>Memo:</source> <translation type="unfinished"/> </message> - <message> - <location filename="../sendcoinsentry.cpp" line="+1"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Въведете Биткоин Ð°Ð´Ñ€ÐµÑ (например 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> </context> <context> <name>ShutdownWindow</name> @@ -2451,19 +2495,19 @@ Address: %4 <translation>ÐдреÑÑŠÑ‚, Ñ ÐºÐ¾Ð¹Ñ‚Ð¾ ще подпишете Ñъобщението (например 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"/> </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>Вмъкни от клипборда</translation> </message> @@ -2504,12 +2548,12 @@ Address: %4 </message> <message> <location line="+3"/> - <location line="+146"/> + <location line="+143"/> <source>Clear &All</source> <translation>&ИзчиÑти</translation> </message> <message> - <location line="-87"/> + <location line="-84"/> <source>&Verify Message</source> <translation>&Провери</translation> </message> @@ -2524,7 +2568,7 @@ Address: %4 <translation>ÐдреÑÑŠÑ‚, Ñ ÐºÐ¾Ð¹Ñ‚Ð¾ е подпиÑано Ñъобщението (например 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>Проверете Ñъобщение, за да Ñте Ñигурни че е подпиÑано Ñ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½ Биткоин адреÑ</translation> </message> @@ -2539,43 +2583,37 @@ Address: %4 <translation type="unfinished"/> </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>Въведете Биткоин Ð°Ð´Ñ€ÐµÑ (например 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location line="-2"/> + <location line="-1"/> <source>Click "Sign Message" to generate signature</source> <translation>ÐатиÑнете "ПодпиÑване на Ñъобщение" за да Ñъздадете подпиÑ</translation> </message> <message> - <location line="+3"/> - <source>Enter Bitcoin signature</source> - <translation>Биткоин подпиÑ</translation> - </message> - <message> <location line="+84"/> - <location line="+81"/> + <location line="+80"/> <source>The entered address is invalid.</source> <translation>ВъведениÑÑ‚ Ð°Ð´Ñ€ÐµÑ Ðµ невалиден.</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>ÐœÐ¾Ð»Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐµÑ‚Ðµ адреÑа и опитайте отново.</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 type="unfinished"/> </message> <message> - <location line="-73"/> + <location line="-72"/> <source>Wallet unlock was cancelled.</source> <translation type="unfinished"/> </message> @@ -2595,7 +2633,7 @@ Address: %4 <translation>Съобщението е подпиÑано.</translation> </message> <message> - <location line="+59"/> + <location line="+58"/> <source>The signature could not be decoded.</source> <translation>ПодпиÑÑŠÑ‚ не може да бъде декодиран.</translation> </message> @@ -2656,6 +2694,11 @@ Address: %4 </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation>%1/офлайн</translation> </message> @@ -2817,12 +2860,12 @@ Address: %4 <translation>, вÑе още не е изпратено</translation> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation>неизвеÑтен</translation> </message> @@ -2863,12 +2906,12 @@ Address: %4 <translation>Сума</translation> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> @@ -2878,23 +2921,12 @@ Address: %4 <translation>Подлежи на промÑна до %1</translation> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> - <translation>Офлайн (%1 потвърждениÑ)</translation> - </message> - <message> - <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation>Ðепотвърдени (%1 от %2 потвърждениÑ)</translation> - </message> - <message> - <location line="-22"/> - <location line="+25"/> + <location line="+12"/> <source>Confirmed (%1 confirmations)</source> <translation>Потвърдени (%1 потвърждениÑ)</translation> </message> <message> - <location line="-22"/> + <location line="+9"/> <source>This block was not received by any other nodes and will probably not be accepted!</source> <translation>Блокът не е получен от оÑтаналите учаÑтници и най-вероÑтно нÑма да бъде одобрен.</translation> </message> @@ -2904,7 +2936,27 @@ Address: %4 <translation>Генерирана, но отхвърлена от мрежата</translation> </message> <message> - <location line="+62"/> + <location line="-21"/> + <source>Offline</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Unconfirmed</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation>Получени Ñ</translation> </message> @@ -2934,7 +2986,7 @@ Address: %4 <translation>(n/a)</translation> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation>СъÑтоÑние на транзакциÑта. Задръжте върху това поле за брой потвърждениÑ.</translation> </message> @@ -3200,12 +3252,12 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+223"/> <source>Usage:</source> <translation>Използване:</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>List commands</source> <translation>ВпиÑване на команди</translation> </message> @@ -3260,12 +3312,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation>Праг на прекъÑване на връзката при непорÑдъчно държащи Ñе пиъри (по подразбиране:100)</translation> </message> <message> - <location line="-148"/> + <location line="-150"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>Брой Ñекунди до възтановÑване на връзката за зле държащите Ñе пиъри (по подразбиране:86400)</translation> </message> @@ -3285,17 +3337,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Run in the background as a daemon and accept commands</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <location line="+40"/> <source>Use the test network</source> <translation>Използвайте теÑтовата мрежа</translation> </message> <message> - <location line="-118"/> + <location line="-120"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> @@ -3426,6 +3478,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation type="unfinished"/> </message> @@ -3636,6 +3693,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Start Bitcoin server</source> <translation>Включи Биткойн Ñървър</translation> </message> @@ -3685,12 +3747,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-79"/> + <location line="-80"/> <source>Imports blocks from external blk000??.dat file</source> <translation type="unfinished"/> </message> <message> - <location line="-105"/> + <location line="-106"/> <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> @@ -3710,7 +3772,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+89"/> + <location line="+90"/> <source>Information</source> <translation type="unfinished"/> </message> @@ -3780,7 +3842,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+7"/> <source>System error: </source> <translation type="unfinished"/> </message> @@ -3826,6 +3888,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>version</source> <translation type="unfinished"/> </message> @@ -3835,32 +3902,32 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-58"/> + <location line="-60"/> <source>Password for JSON-RPC connections</source> <translation>Парола за JSON-RPC връзките</translation> </message> <message> - <location line="-70"/> + <location line="-71"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Разреши JSON-RPC връзките от отучнен IP адреÑ</translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>Изпрати команди до възел функциониращ на <ip> (По подразбиране: 127.0.0.1)</translation> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+161"/> + <location line="+163"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"/> </message> <message> - <location line="-24"/> + <location line="-25"/> <source>Set key pool size to <n> (default: 100)</source> <translation type="unfinished"/> </message> @@ -3870,12 +3937,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Повторно Ñканиране на блок-връзка за липÑващи портефейлни транзакции</translation> </message> <message> - <location line="+38"/> + <location line="+39"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Използвайте OpenSSL (https) за JSON-RPC връзките</translation> </message> <message> - <location line="-30"/> + <location line="-31"/> <source>Server certificate file (default: server.cert)</source> <translation>Сертификатен файл на Ñървъра (По подразбиране:server.cert)</translation> </message> @@ -3885,7 +3952,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Поверителен ключ за Ñървъра (default: server.pem)</translation> </message> <message> - <location line="+16"/> + <location line="+17"/> <source>This help message</source> <translation>Това помощно Ñъобщение</translation> </message> @@ -3895,12 +3962,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-107"/> + <location line="-109"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation type="unfinished"/> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Loading addresses...</source> <translation>Зареждане на адреÑите...</translation> </message> @@ -3915,12 +3982,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+98"/> + <location line="+99"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation type="unfinished"/> </message> <message> - <location line="-100"/> + <location line="-101"/> <source>Error loading wallet.dat</source> <translation type="unfinished"/> </message> @@ -3930,7 +3997,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Ðевалиден -proxy address: '%s'</translation> </message> <message> - <location line="+56"/> + <location line="+57"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation type="unfinished"/> </message> @@ -3940,7 +4007,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-101"/> + <location line="-103"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -3950,7 +4017,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+48"/> + <location line="+49"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation type="unfinished"/> </message> @@ -3970,7 +4037,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Зареждане на блок индекÑа...</translation> </message> <message> - <location line="-62"/> + <location line="-63"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"/> </message> @@ -3980,12 +4047,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+95"/> + <location line="+96"/> <source>Loading wallet...</source> <translation>Зареждане на портфейла...</translation> </message> <message> - <location line="-56"/> + <location line="-57"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> @@ -3995,7 +4062,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+67"/> + <location line="+68"/> <source>Rescanning...</source> <translation>Преразглеждане на поÑледовтелноÑтта от блокове...</translation> </message> @@ -4005,17 +4072,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Зареждането е завършено</translation> </message> <message> - <location line="+85"/> + <location line="+86"/> <source>To use the %s option</source> <translation type="unfinished"/> </message> <message> - <location line="-77"/> + <location line="-78"/> <source>Error</source> <translation>Грешка</translation> </message> <message> - <location line="-35"/> + <location line="-36"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_bs.ts b/src/qt/locale/bitcoin_bs.ts index 768d874fc5..be8575c4ca 100644 --- a/src/qt/locale/bitcoin_bs.ts +++ b/src/qt/locale/bitcoin_bs.ts @@ -31,6 +31,12 @@ This product includes software developed by the OpenSSL Project for use in the O <source>The Bitcoin Core developers</source> <translation type="unfinished"/> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source> (%1-bit)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>AddressBookPage</name> @@ -612,6 +618,16 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation type="unfinished"/> @@ -681,7 +697,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+435"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -742,7 +758,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation type="unfinished"/> </message> @@ -757,7 +773,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation type="unfinished"/> </message> @@ -908,7 +924,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation type="unfinished"/> </message> @@ -1090,7 +1106,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation>Bitcoin Jezrga</translation> </message> @@ -1234,7 +1250,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+122"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation type="unfinished"/> </message> @@ -1244,7 +1260,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="-131"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation type="unfinished"/> </message> @@ -1259,12 +1275,7 @@ Address: %4 <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"/> + <location line="+16"/> <source>MB</source> <translation type="unfinished"/> </message> @@ -1279,7 +1290,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+58"/> + <location line="+107"/> + <source>&Spend unconfirmed change (experts only)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+37"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation type="unfinished"/> </message> @@ -1314,7 +1330,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="-86"/> + <source>W&allet</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+52"/> + <source>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.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+40"/> <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> @@ -1429,17 +1455,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+70"/> <source>default</source> <translation type="unfinished"/> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation type="unfinished"/> </message> <message> - <location line="+75"/> + <location line="+78"/> <source>Confirm options reset</source> <translation type="unfinished"/> </message> @@ -1479,18 +1505,13 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-155"/> - <source>Unconfirmed:</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation type="unfinished"/> </message> <message> <location line="+51"/> - <source>Confirmed:</source> + <source>Available:</source> <translation type="unfinished"/> </message> <message> @@ -1499,7 +1520,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation type="unfinished"/> </message> @@ -1647,6 +1673,11 @@ Address: %4 <source>Error: Invalid combination of -regtest and -testnet.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../guiutil.cpp" line="+82"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>QRImageWidget</name> @@ -1867,22 +1898,22 @@ Address: %4 <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+83"/> + <location filename="../forms/receivecoinsdialog.ui" line="+107"/> <source>&Amount:</source> <translation type="unfinished"/> </message> <message> - <location line="-13"/> + <location line="-16"/> <source>&Label:</source> <translation type="unfinished"/> </message> <message> - <location line="-34"/> + <location line="-37"/> <source>&Message:</source> <translation type="unfinished"/> </message> <message> - <location line="-17"/> + <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"/> </message> @@ -1892,27 +1923,30 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+27"/> - <source>An optional 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"/> </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> + <location line="-7"/> + <location line="+21"/> + <source>An optional label to associate with the new receiving address.</source> <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="-7"/> <source>Use this form to request payments. All fields are <b>optional</b>.</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <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"/> </message> <message> - <location line="+17"/> + <location line="+32"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -1922,17 +1956,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+36"/> - <source>&Request payment</source> + <location line="+78"/> + <source>Requested payments history</source> <translation type="unfinished"/> </message> <message> - <location line="+47"/> - <source>Requested payments</source> + <location line="-98"/> + <source>&Request payment</source> <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+120"/> <source>Show the selected request (does the same as double clicking an entry)</source> <translation type="unfinished"/> </message> @@ -1951,6 +1985,21 @@ Address: %4 <source>Remove</source> <translation type="unfinished"/> </message> + <message> + <location filename="../receivecoinsdialog.cpp" line="+38"/> + <source>Copy label</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy message</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation type="unfinished"/> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -2052,12 +2101,17 @@ Address: %4 <source>(no message)</source> <translation type="unfinished"/> </message> + <message> + <location line="+8"/> + <source>(no amount)</source> + <translation type="unfinished"/> + </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 type="unfinished"/> @@ -2133,7 +2187,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+115"/> + <location line="+164"/> <source>Send to multiple recipients at once</source> <translation type="unfinished"/> </message> @@ -2143,7 +2197,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+20"/> + <location line="-23"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -2153,12 +2207,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+22"/> + <location line="+52"/> <source>Balance:</source> <translation type="unfinished"/> </message> <message> - <location line="+41"/> + <location line="-78"/> <source>Confirm the send action</source> <translation type="unfinished"/> </message> @@ -2168,7 +2222,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-228"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation type="unfinished"/> </message> @@ -2181,12 +2235,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-136"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+15"/> + <location line="-121"/> <source>Copy quantity</source> <translation type="unfinished"/> </message> @@ -2236,7 +2285,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+202"/> + <location line="+203"/> <source>The recipient address is not valid, please recheck.</source> <translation type="unfinished"/> </message> @@ -2271,12 +2320,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Warning: Invalid Bitcoin address</source> <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+20"/> <source>(no label)</source> <translation type="unfinished"/> </message> @@ -2286,7 +2335,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-366"/> + <location line="-367"/> <source>Are you sure you want to send?</source> <translation type="unfinished"/> </message> @@ -2296,7 +2345,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+170"/> + <location line="+171"/> <source>Payment request expired</source> <translation type="unfinished"/> </message> @@ -2373,12 +2422,7 @@ Address: %4 <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"/> + <location line="+968"/> <source>This is a verified payment request.</source> <translation type="unfinished"/> </message> @@ -2388,7 +2432,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+459"/> + <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"/> + </message> + <message> + <location line="+426"/> <source>This is an unverified payment request.</source> <translation type="unfinished"/> </message> @@ -2404,11 +2453,6 @@ Address: %4 <source>Memo:</source> <translation type="unfinished"/> </message> - <message> - <location filename="../sendcoinsentry.cpp" line="+1"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"/> - </message> </context> <context> <name>ShutdownWindow</name> @@ -2446,19 +2490,19 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+10"/> - <location line="+213"/> + <location line="+7"/> + <location line="+210"/> <source>Choose previously used address</source> <translation type="unfinished"/> </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 type="unfinished"/> </message> @@ -2499,12 +2543,12 @@ Address: %4 </message> <message> <location line="+3"/> - <location line="+146"/> + <location line="+143"/> <source>Clear &All</source> <translation type="unfinished"/> </message> <message> - <location line="-87"/> + <location line="-84"/> <source>&Verify Message</source> <translation type="unfinished"/> </message> @@ -2519,7 +2563,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+40"/> + <location line="+37"/> <source>Verify the message to ensure it was signed with the specified Bitcoin address</source> <translation type="unfinished"/> </message> @@ -2534,43 +2578,37 @@ Address: %4 <translation type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location line="-2"/> + <location line="-1"/> <source>Click "Sign Message" to generate signature</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Enter Bitcoin signature</source> - <translation type="unfinished"/> - </message> - <message> <location line="+84"/> - <location line="+81"/> + <location line="+80"/> <source>The entered address is invalid.</source> <translation type="unfinished"/> </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 type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location line="-73"/> + <location line="-72"/> <source>Wallet unlock was cancelled.</source> <translation type="unfinished"/> </message> @@ -2590,7 +2628,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+59"/> + <location line="+58"/> <source>The signature could not be decoded.</source> <translation type="unfinished"/> </message> @@ -2651,6 +2689,11 @@ Address: %4 </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation type="unfinished"/> </message> @@ -2812,12 +2855,12 @@ Address: %4 <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation type="unfinished"/> </message> @@ -2858,12 +2901,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> @@ -2873,33 +2916,42 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> + <location line="+12"/> + <source>Confirmed (%1 confirmations)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+9"/> + <source>This block was not received by any other nodes and will probably not be accepted!</source> <translation type="unfinished"/> </message> <message> <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> + <source>Generated but not accepted</source> <translation type="unfinished"/> </message> <message> - <location line="-22"/> - <location line="+25"/> - <source>Confirmed (%1 confirmations)</source> + <location line="-21"/> + <source>Offline</source> <translation type="unfinished"/> </message> <message> - <location line="-22"/> - <source>This block was not received by any other nodes and will probably not be accepted!</source> + <location line="+3"/> + <source>Unconfirmed</source> <translation type="unfinished"/> </message> <message> <location line="+3"/> - <source>Generated but not accepted</source> + <source>Confirming (%1 of %2 recommended confirmations)</source> <translation type="unfinished"/> </message> <message> - <location line="+62"/> + <location line="+6"/> + <source>Conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation type="unfinished"/> </message> @@ -2929,7 +2981,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation type="unfinished"/> </message> @@ -3195,12 +3247,12 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+223"/> <source>Usage:</source> <translation type="unfinished"/> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>List commands</source> <translation type="unfinished"/> </message> @@ -3255,12 +3307,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation type="unfinished"/> </message> <message> - <location line="-148"/> + <location line="-150"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"/> </message> @@ -3280,17 +3332,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Run in the background as a daemon and accept commands</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <location line="+40"/> <source>Use the test network</source> <translation type="unfinished"/> </message> <message> - <location line="-118"/> + <location line="-120"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> @@ -3421,6 +3473,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation type="unfinished"/> </message> @@ -3631,6 +3688,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Start Bitcoin server</source> <translation type="unfinished"/> </message> @@ -3680,12 +3742,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-79"/> + <location line="-80"/> <source>Imports blocks from external blk000??.dat file</source> <translation type="unfinished"/> </message> <message> - <location line="-105"/> + <location line="-106"/> <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> @@ -3705,7 +3767,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+89"/> + <location line="+90"/> <source>Information</source> <translation type="unfinished"/> </message> @@ -3775,7 +3837,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+7"/> <source>System error: </source> <translation type="unfinished"/> </message> @@ -3821,6 +3883,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>version</source> <translation type="unfinished"/> </message> @@ -3830,32 +3897,32 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-58"/> + <location line="-60"/> <source>Password for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-70"/> + <location line="-71"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation type="unfinished"/> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+161"/> + <location line="+163"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"/> </message> <message> - <location line="-24"/> + <location line="-25"/> <source>Set key pool size to <n> (default: 100)</source> <translation type="unfinished"/> </message> @@ -3865,12 +3932,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+38"/> + <location line="+39"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-30"/> + <location line="-31"/> <source>Server certificate file (default: server.cert)</source> <translation type="unfinished"/> </message> @@ -3880,7 +3947,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+17"/> <source>This help message</source> <translation type="unfinished"/> </message> @@ -3890,12 +3957,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-107"/> + <location line="-109"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation type="unfinished"/> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Loading addresses...</source> <translation type="unfinished"/> </message> @@ -3910,12 +3977,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+98"/> + <location line="+99"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation type="unfinished"/> </message> <message> - <location line="-100"/> + <location line="-101"/> <source>Error loading wallet.dat</source> <translation type="unfinished"/> </message> @@ -3925,7 +3992,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+56"/> + <location line="+57"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation type="unfinished"/> </message> @@ -3935,7 +4002,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-101"/> + <location line="-103"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -3945,7 +4012,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+48"/> + <location line="+49"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation type="unfinished"/> </message> @@ -3965,7 +4032,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-62"/> + <location line="-63"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"/> </message> @@ -3975,12 +4042,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+95"/> + <location line="+96"/> <source>Loading wallet...</source> <translation type="unfinished"/> </message> <message> - <location line="-56"/> + <location line="-57"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> @@ -3990,7 +4057,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+67"/> + <location line="+68"/> <source>Rescanning...</source> <translation type="unfinished"/> </message> @@ -4000,17 +4067,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+85"/> + <location line="+86"/> <source>To use the %s option</source> <translation type="unfinished"/> </message> <message> - <location line="-77"/> + <location line="-78"/> <source>Error</source> <translation type="unfinished"/> </message> <message> - <location line="-35"/> + <location line="-36"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_ca.ts b/src/qt/locale/bitcoin_ca.ts index 72a5339cc3..52595a9a15 100644 --- a/src/qt/locale/bitcoin_ca.ts +++ b/src/qt/locale/bitcoin_ca.ts @@ -31,6 +31,12 @@ This product includes software developed by the OpenSSL Project for use in the O <source>The Bitcoin Core developers</source> <translation type="unfinished"/> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source> (%1-bit)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>AddressBookPage</name> @@ -612,6 +618,16 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation type="unfinished"/> @@ -681,7 +697,7 @@ Address: %4 <translation>La cartera està <b>encriptada<b/> i <b>bloquejada<b/></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+435"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -742,7 +758,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation type="unfinished"/> </message> @@ -757,7 +773,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation type="unfinished"/> </message> @@ -908,7 +924,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation type="unfinished"/> </message> @@ -1090,7 +1106,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation type="unfinished"/> </message> @@ -1234,7 +1250,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+122"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation type="unfinished"/> </message> @@ -1244,7 +1260,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="-131"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation type="unfinished"/> </message> @@ -1259,12 +1275,7 @@ Address: %4 <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"/> + <location line="+16"/> <source>MB</source> <translation type="unfinished"/> </message> @@ -1279,7 +1290,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+58"/> + <location line="+107"/> + <source>&Spend unconfirmed change (experts only)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+37"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation type="unfinished"/> </message> @@ -1314,7 +1330,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="-86"/> + <source>W&allet</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+52"/> + <source>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.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+40"/> <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> @@ -1429,17 +1455,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+70"/> <source>default</source> <translation type="unfinished"/> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation type="unfinished"/> </message> <message> - <location line="+75"/> + <location line="+78"/> <source>Confirm options reset</source> <translation type="unfinished"/> </message> @@ -1479,18 +1505,13 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-155"/> - <source>Unconfirmed:</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation type="unfinished"/> </message> <message> <location line="+51"/> - <source>Confirmed:</source> + <source>Available:</source> <translation type="unfinished"/> </message> <message> @@ -1499,7 +1520,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation type="unfinished"/> </message> @@ -1647,6 +1673,11 @@ Address: %4 <source>Error: Invalid combination of -regtest and -testnet.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../guiutil.cpp" line="+82"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>QRImageWidget</name> @@ -1867,22 +1898,22 @@ Address: %4 <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+83"/> + <location filename="../forms/receivecoinsdialog.ui" line="+107"/> <source>&Amount:</source> <translation type="unfinished"/> </message> <message> - <location line="-13"/> + <location line="-16"/> <source>&Label:</source> <translation type="unfinished"/> </message> <message> - <location line="-34"/> + <location line="-37"/> <source>&Message:</source> <translation type="unfinished"/> </message> <message> - <location line="-17"/> + <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"/> </message> @@ -1892,27 +1923,30 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+27"/> - <source>An optional 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"/> </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> + <location line="-7"/> + <location line="+21"/> + <source>An optional label to associate with the new receiving address.</source> <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="-7"/> <source>Use this form to request payments. All fields are <b>optional</b>.</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <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"/> </message> <message> - <location line="+17"/> + <location line="+32"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -1922,17 +1956,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+36"/> - <source>&Request payment</source> + <location line="+78"/> + <source>Requested payments history</source> <translation type="unfinished"/> </message> <message> - <location line="+47"/> - <source>Requested payments</source> + <location line="-98"/> + <source>&Request payment</source> <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+120"/> <source>Show the selected request (does the same as double clicking an entry)</source> <translation type="unfinished"/> </message> @@ -1951,6 +1985,21 @@ Address: %4 <source>Remove</source> <translation type="unfinished"/> </message> + <message> + <location filename="../receivecoinsdialog.cpp" line="+38"/> + <source>Copy label</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy message</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation type="unfinished"/> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -2052,12 +2101,17 @@ Address: %4 <source>(no message)</source> <translation type="unfinished"/> </message> + <message> + <location line="+8"/> + <source>(no amount)</source> + <translation type="unfinished"/> + </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 type="unfinished"/> @@ -2133,7 +2187,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+115"/> + <location line="+164"/> <source>Send to multiple recipients at once</source> <translation type="unfinished"/> </message> @@ -2143,7 +2197,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+20"/> + <location line="-23"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -2153,12 +2207,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+22"/> + <location line="+52"/> <source>Balance:</source> <translation type="unfinished"/> </message> <message> - <location line="+41"/> + <location line="-78"/> <source>Confirm the send action</source> <translation type="unfinished"/> </message> @@ -2168,7 +2222,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-228"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation type="unfinished"/> </message> @@ -2181,12 +2235,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-136"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+15"/> + <location line="-121"/> <source>Copy quantity</source> <translation type="unfinished"/> </message> @@ -2236,7 +2285,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+202"/> + <location line="+203"/> <source>The recipient address is not valid, please recheck.</source> <translation type="unfinished"/> </message> @@ -2271,12 +2320,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Warning: Invalid Bitcoin address</source> <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+20"/> <source>(no label)</source> <translation>(sense etiqueta)</translation> </message> @@ -2286,7 +2335,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-366"/> + <location line="-367"/> <source>Are you sure you want to send?</source> <translation type="unfinished"/> </message> @@ -2296,7 +2345,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+170"/> + <location line="+171"/> <source>Payment request expired</source> <translation type="unfinished"/> </message> @@ -2373,12 +2422,7 @@ Address: %4 <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"/> + <location line="+968"/> <source>This is a verified payment request.</source> <translation type="unfinished"/> </message> @@ -2388,7 +2432,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+459"/> + <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"/> + </message> + <message> + <location line="+426"/> <source>This is an unverified payment request.</source> <translation type="unfinished"/> </message> @@ -2404,11 +2453,6 @@ Address: %4 <source>Memo:</source> <translation type="unfinished"/> </message> - <message> - <location filename="../sendcoinsentry.cpp" line="+1"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"/> - </message> </context> <context> <name>ShutdownWindow</name> @@ -2446,19 +2490,19 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+10"/> - <location line="+213"/> + <location line="+7"/> + <location line="+210"/> <source>Choose previously used address</source> <translation type="unfinished"/> </message> <message> - <location line="-203"/> - <location line="+213"/> + <location line="-200"/> + <location line="+210"/> <source>Alt+A</source> <translation type="unfinished"/> </message> <message> - <location line="-203"/> + <location line="-200"/> <source>Paste address from clipboard</source> <translation type="unfinished"/> </message> @@ -2499,12 +2543,12 @@ Address: %4 </message> <message> <location line="+3"/> - <location line="+146"/> + <location line="+143"/> <source>Clear &All</source> <translation type="unfinished"/> </message> <message> - <location line="-87"/> + <location line="-84"/> <source>&Verify Message</source> <translation type="unfinished"/> </message> @@ -2519,7 +2563,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+40"/> + <location line="+37"/> <source>Verify the message to ensure it was signed with the specified Bitcoin address</source> <translation type="unfinished"/> </message> @@ -2534,43 +2578,37 @@ Address: %4 <translation type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location line="-2"/> + <location line="-1"/> <source>Click "Sign Message" to generate signature</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Enter Bitcoin signature</source> - <translation type="unfinished"/> - </message> - <message> <location line="+84"/> - <location line="+81"/> + <location line="+80"/> <source>The entered address is invalid.</source> <translation type="unfinished"/> </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 type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location line="-73"/> + <location line="-72"/> <source>Wallet unlock was cancelled.</source> <translation type="unfinished"/> </message> @@ -2590,7 +2628,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+59"/> + <location line="+58"/> <source>The signature could not be decoded.</source> <translation type="unfinished"/> </message> @@ -2651,6 +2689,11 @@ Address: %4 </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation type="unfinished"/> </message> @@ -2812,12 +2855,12 @@ Address: %4 <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation type="unfinished"/> </message> @@ -2858,12 +2901,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> @@ -2873,33 +2916,42 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> + <location line="+12"/> + <source>Confirmed (%1 confirmations)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+9"/> + <source>This block was not received by any other nodes and will probably not be accepted!</source> <translation type="unfinished"/> </message> <message> <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> + <source>Generated but not accepted</source> <translation type="unfinished"/> </message> <message> - <location line="-22"/> - <location line="+25"/> - <source>Confirmed (%1 confirmations)</source> + <location line="-21"/> + <source>Offline</source> <translation type="unfinished"/> </message> <message> - <location line="-22"/> - <source>This block was not received by any other nodes and will probably not be accepted!</source> + <location line="+3"/> + <source>Unconfirmed</source> <translation type="unfinished"/> </message> <message> <location line="+3"/> - <source>Generated but not accepted</source> + <source>Confirming (%1 of %2 recommended confirmations)</source> <translation type="unfinished"/> </message> <message> - <location line="+62"/> + <location line="+6"/> + <source>Conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation type="unfinished"/> </message> @@ -2929,7 +2981,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation type="unfinished"/> </message> @@ -3195,12 +3247,12 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+223"/> <source>Usage:</source> <translation type="unfinished"/> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>List commands</source> <translation type="unfinished"/> </message> @@ -3255,12 +3307,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation type="unfinished"/> </message> <message> - <location line="-148"/> + <location line="-150"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"/> </message> @@ -3280,17 +3332,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Run in the background as a daemon and accept commands</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <location line="+40"/> <source>Use the test network</source> <translation type="unfinished"/> </message> <message> - <location line="-118"/> + <location line="-120"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> @@ -3421,6 +3473,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation type="unfinished"/> </message> @@ -3631,6 +3688,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Start Bitcoin server</source> <translation type="unfinished"/> </message> @@ -3680,12 +3742,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-79"/> + <location line="-80"/> <source>Imports blocks from external blk000??.dat file</source> <translation type="unfinished"/> </message> <message> - <location line="-105"/> + <location line="-106"/> <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> @@ -3705,7 +3767,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+89"/> + <location line="+90"/> <source>Information</source> <translation type="unfinished"/> </message> @@ -3775,7 +3837,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+7"/> <source>System error: </source> <translation type="unfinished"/> </message> @@ -3821,6 +3883,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>version</source> <translation type="unfinished"/> </message> @@ -3830,32 +3897,32 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-58"/> + <location line="-60"/> <source>Password for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-70"/> + <location line="-71"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation type="unfinished"/> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+161"/> + <location line="+163"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"/> </message> <message> - <location line="-24"/> + <location line="-25"/> <source>Set key pool size to <n> (default: 100)</source> <translation type="unfinished"/> </message> @@ -3865,12 +3932,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+38"/> + <location line="+39"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-30"/> + <location line="-31"/> <source>Server certificate file (default: server.cert)</source> <translation type="unfinished"/> </message> @@ -3880,7 +3947,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+17"/> <source>This help message</source> <translation type="unfinished"/> </message> @@ -3890,12 +3957,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-107"/> + <location line="-109"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation type="unfinished"/> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Loading addresses...</source> <translation type="unfinished"/> </message> @@ -3910,12 +3977,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+98"/> + <location line="+99"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation type="unfinished"/> </message> <message> - <location line="-100"/> + <location line="-101"/> <source>Error loading wallet.dat</source> <translation type="unfinished"/> </message> @@ -3925,7 +3992,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+56"/> + <location line="+57"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation type="unfinished"/> </message> @@ -3935,7 +4002,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-101"/> + <location line="-103"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -3945,7 +4012,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+48"/> + <location line="+49"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation type="unfinished"/> </message> @@ -3965,7 +4032,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-62"/> + <location line="-63"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"/> </message> @@ -3975,12 +4042,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+95"/> + <location line="+96"/> <source>Loading wallet...</source> <translation type="unfinished"/> </message> <message> - <location line="-56"/> + <location line="-57"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> @@ -3990,7 +4057,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+67"/> + <location line="+68"/> <source>Rescanning...</source> <translation type="unfinished"/> </message> @@ -4000,17 +4067,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+85"/> + <location line="+86"/> <source>To use the %s option</source> <translation type="unfinished"/> </message> <message> - <location line="-77"/> + <location line="-78"/> <source>Error</source> <translation type="unfinished"/> </message> <message> - <location line="-35"/> + <location line="-36"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_ca_ES.ts b/src/qt/locale/bitcoin_ca_ES.ts index 4c86a99a2c..ea4b8575a2 100644 --- a/src/qt/locale/bitcoin_ca_ES.ts +++ b/src/qt/locale/bitcoin_ca_ES.ts @@ -31,6 +31,12 @@ This product includes software developed by the OpenSSL Project for use in the O <source>The Bitcoin Core developers</source> <translation type="unfinished"/> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source> (%1-bit)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>AddressBookPage</name> @@ -612,6 +618,16 @@ This product includes software developed by the OpenSSL Project for use in the O <translation><numerusform>%n setmana</numerusform><numerusform>%n setmanes</numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation>%1 radera</translation> @@ -681,7 +697,7 @@ Address: %4 <translation>El moneder està <b>encriptat</b> i actualment <b>bloquejat</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+435"/> <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> @@ -742,7 +758,7 @@ Address: %4 <translation>Canvi:</translation> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation type="unfinished"/> </message> @@ -757,7 +773,7 @@ Address: %4 <translation>Mode llista</translation> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation>Quantitat</translation> </message> @@ -908,7 +924,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation>Pols</translation> </message> @@ -1090,7 +1106,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation>Nucli de Bitcoin</translation> </message> @@ -1234,7 +1250,7 @@ Address: %4 <translation>&Principal</translation> </message> <message> - <location line="+6"/> + <location line="+122"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation type="unfinished"/> </message> @@ -1244,7 +1260,7 @@ Address: %4 <translation>Pagar &comisió de transacció</translation> </message> <message> - <location line="+31"/> + <location line="-131"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation>Iniciar automà ticament Bitcoin després de l'inici de sessió del sistema.</translation> </message> @@ -1259,12 +1275,7 @@ Address: %4 <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"/> + <location line="+16"/> <source>MB</source> <translation>MB</translation> </message> @@ -1279,7 +1290,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+58"/> + <location line="+107"/> + <source>&Spend unconfirmed change (experts only)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+37"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation type="unfinished"/> </message> @@ -1314,7 +1330,17 @@ Address: %4 <translation>&Xarxa</translation> </message> <message> - <location line="+6"/> + <location line="-86"/> + <source>W&allet</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+52"/> + <source>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.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+40"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>Obrir el port del client de Bitcoin al router de forma automà tica. Això només funciona quan el teu router implementa UPnP i l'opció està activada.</translation> </message> @@ -1429,17 +1455,17 @@ Address: %4 <translation>&Cancel·la</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+70"/> <source>default</source> <translation>Per defecte</translation> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation type="unfinished"/> </message> <message> - <location line="+75"/> + <location line="+78"/> <source>Confirm options reset</source> <translation>Confirmi el reestabliment de les opcions</translation> </message> @@ -1479,18 +1505,13 @@ Address: %4 <translation>La informació mostrada pot no estar al dÃa. El teu moneder es sincronitza automà ticament amb la xarxa Bitcoin un cop s'ha establert connexió, però aquest proces no s'ha completat encara.</translation> </message> <message> - <location line="-155"/> - <source>Unconfirmed:</source> - <translation>Sense confirmar:</translation> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation>Moneder</translation> </message> <message> <location line="+51"/> - <source>Confirmed:</source> + <source>Available:</source> <translation type="unfinished"/> </message> <message> @@ -1499,7 +1520,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation type="unfinished"/> </message> @@ -1647,6 +1673,11 @@ Address: %4 <source>Error: Invalid combination of -regtest and -testnet.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../guiutil.cpp" line="+82"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>Introdueixi una adreça de Bitcoin (per exemple 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> </context> <context> <name>QRImageWidget</name> @@ -1867,22 +1898,22 @@ Address: %4 <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+83"/> + <location filename="../forms/receivecoinsdialog.ui" line="+107"/> <source>&Amount:</source> <translation>&Quantitat:</translation> </message> <message> - <location line="-13"/> + <location line="-16"/> <source>&Label:</source> <translation>&Etiqueta:</translation> </message> <message> - <location line="-34"/> + <location line="-37"/> <source>&Message:</source> <translation>&Missatge:</translation> </message> <message> - <location line="-17"/> + <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"/> </message> @@ -1892,27 +1923,30 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+27"/> - <source>An optional 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"/> </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> + <location line="-7"/> + <location line="+21"/> + <source>An optional label to associate with the new receiving address.</source> <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="-7"/> <source>Use this form to request payments. All fields are <b>optional</b>.</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <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"/> </message> <message> - <location line="+17"/> + <location line="+32"/> <source>Clear all fields of the form.</source> <translation>Esborra tots els camps del formuari.</translation> </message> @@ -1922,17 +1956,17 @@ Address: %4 <translation>Esborra</translation> </message> <message> - <location line="+36"/> - <source>&Request payment</source> - <translation>&Sol·licitud de pagament</translation> + <location line="+78"/> + <source>Requested payments history</source> + <translation type="unfinished"/> </message> <message> - <location line="+47"/> - <source>Requested payments</source> - <translation type="unfinished"/> + <location line="-98"/> + <source>&Request payment</source> + <translation>&Sol·licitud de pagament</translation> </message> <message> - <location line="+16"/> + <location line="+120"/> <source>Show the selected request (does the same as double clicking an entry)</source> <translation type="unfinished"/> </message> @@ -1951,6 +1985,21 @@ Address: %4 <source>Remove</source> <translation>Esborra</translation> </message> + <message> + <location filename="../receivecoinsdialog.cpp" line="+38"/> + <source>Copy label</source> + <translation>Copiar etiqueta</translation> + </message> + <message> + <location line="+1"/> + <source>Copy message</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation>Copiar quantitat</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -2052,12 +2101,17 @@ Address: %4 <source>(no message)</source> <translation>(sense missatge)</translation> </message> + <message> + <location line="+8"/> + <source>(no amount)</source> + <translation type="unfinished"/> + </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>Enviar monedes</translation> @@ -2133,7 +2187,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+115"/> + <location line="+164"/> <source>Send to multiple recipients at once</source> <translation>Enviar a multiples destinataris al mateix temps</translation> </message> @@ -2143,7 +2197,7 @@ Address: %4 <translation>Affegir &Destinatari</translation> </message> <message> - <location line="+20"/> + <location line="-23"/> <source>Clear all fields of the form.</source> <translation>Netejar tots els camps del formulari.</translation> </message> @@ -2153,12 +2207,12 @@ Address: %4 <translation>Esborrar &Tot</translation> </message> <message> - <location line="+22"/> + <location line="+52"/> <source>Balance:</source> <translation>Balanç:</translation> </message> <message> - <location line="+41"/> + <location line="-78"/> <source>Confirm the send action</source> <translation>Confirmi l'acció d'enviament</translation> </message> @@ -2168,7 +2222,7 @@ Address: %4 <translation>E&nviar</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-228"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation>Confirmar l'enviament de monedes</translation> </message> @@ -2181,12 +2235,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <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"/> + <location line="-121"/> <source>Copy quantity</source> <translation type="unfinished"/> </message> @@ -2236,7 +2285,7 @@ Address: %4 <translation>o</translation> </message> <message> - <location line="+202"/> + <location line="+203"/> <source>The recipient address is not valid, please recheck.</source> <translation>L'adreça remetent no és và lida, si us plau comprovi-la.</translation> </message> @@ -2271,12 +2320,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Warning: Invalid Bitcoin address</source> <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+20"/> <source>(no label)</source> <translation>(sense etiqueta)</translation> </message> @@ -2286,7 +2335,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-366"/> + <location line="-367"/> <source>Are you sure you want to send?</source> <translation>Està s segur que ho vols enviar?</translation> </message> @@ -2296,7 +2345,7 @@ Address: %4 <translation>S'ha afegit una taxa de transacció</translation> </message> <message> - <location line="+170"/> + <location line="+171"/> <source>Payment request expired</source> <translation>La sol·licitud de pagament ha caducat</translation> </message> @@ -2373,12 +2422,7 @@ Address: %4 <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"/> + <location line="+968"/> <source>This is a verified payment request.</source> <translation type="unfinished"/> </message> @@ -2388,7 +2432,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+459"/> + <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"/> + </message> + <message> + <location line="+426"/> <source>This is an unverified payment request.</source> <translation type="unfinished"/> </message> @@ -2404,11 +2453,6 @@ Address: %4 <source>Memo:</source> <translation type="unfinished"/> </message> - <message> - <location filename="../sendcoinsentry.cpp" line="+1"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Introdueixi una adreça de Bitcoin (per exemple 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> </context> <context> <name>ShutdownWindow</name> @@ -2446,19 +2490,19 @@ Address: %4 <translation>La adreça amb la que signat els missatges (per exemple 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location line="+10"/> - <location line="+213"/> + <location line="+7"/> + <location line="+210"/> <source>Choose previously used address</source> <translation>Escull adreces fetes servir amb anterioritat</translation> </message> <message> - <location line="-203"/> - <location line="+213"/> + <location line="-200"/> + <location line="+210"/> <source>Alt+A</source> <translation>Alta+A</translation> </message> <message> - <location line="-203"/> + <location line="-200"/> <source>Paste address from clipboard</source> <translation>Enganxar adreça del porta-retalls</translation> </message> @@ -2499,12 +2543,12 @@ Address: %4 </message> <message> <location line="+3"/> - <location line="+146"/> + <location line="+143"/> <source>Clear &All</source> <translation>Esborrar &Tot</translation> </message> <message> - <location line="-87"/> + <location line="-84"/> <source>&Verify Message</source> <translation>&Verificar el missatge</translation> </message> @@ -2519,7 +2563,7 @@ Address: %4 <translation>La adreça amb el que el missatge va ser signat (per exemple 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>Verificar el missatge per assegurar-se que ha estat signat amb una adreça Bitcoin especÃfica</translation> </message> @@ -2534,43 +2578,37 @@ Address: %4 <translation>Neteja tots els camps de verificació de missatge</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>Introdueixi una adreça de Bitcoin (per exemple 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location line="-2"/> + <location line="-1"/> <source>Click "Sign Message" to generate signature</source> <translation>Clica "Signar Missatge" per a generar una signatura</translation> </message> <message> - <location line="+3"/> - <source>Enter Bitcoin signature</source> - <translation>Introduïr una clau Bitcoin</translation> - </message> - <message> <location line="+84"/> - <location line="+81"/> + <location line="+80"/> <source>The entered address is invalid.</source> <translation>L'adreça intoduïda és invà lida.</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>Siu us plau, comprovi l'adreça i provi de nou.</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>L'adreça introduïda no referencia a cap clau.</translation> </message> <message> - <location line="-73"/> + <location line="-72"/> <source>Wallet unlock was cancelled.</source> <translation>El desbloqueig del moneder ha estat cancelat.</translation> </message> @@ -2590,7 +2628,7 @@ Address: %4 <translation>Missatge signat.</translation> </message> <message> - <location line="+59"/> + <location line="+58"/> <source>The signature could not be decoded.</source> <translation>La signatura no s'ha pogut decodificar .</translation> </message> @@ -2651,6 +2689,11 @@ Address: %4 </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation>%1/offline</translation> </message> @@ -2812,12 +2855,12 @@ Address: %4 <translation>, encara no ha estat emès correctement</translation> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <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> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation>desconegut</translation> </message> @@ -2858,12 +2901,12 @@ Address: %4 <translation>Quantitat</translation> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <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> @@ -2873,23 +2916,12 @@ Address: %4 <translation>Obert fins %1</translation> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> - <translation>Sense connexió (%1 confirmacions)</translation> - </message> - <message> - <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation>Sense confirmar (%1 de %2 confirmacions)</translation> - </message> - <message> - <location line="-22"/> - <location line="+25"/> + <location line="+12"/> <source>Confirmed (%1 confirmations)</source> <translation>Confirmat (%1 confirmacions)</translation> </message> <message> - <location line="-22"/> + <location line="+9"/> <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> @@ -2899,7 +2931,27 @@ Address: %4 <translation>Generat però no acceptat</translation> </message> <message> - <location line="+62"/> + <location line="-21"/> + <source>Offline</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Unconfirmed</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation>Rebut amb</translation> </message> @@ -2929,7 +2981,7 @@ Address: %4 <translation>(n/a)</translation> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation>Estat de la transacció. Desplaça't per aquà sobre per mostrar el nombre de confirmacions.</translation> </message> @@ -3195,12 +3247,12 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+223"/> <source>Usage:</source> <translation>Ús:</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>List commands</source> <translation>Llista d'ordres</translation> </message> @@ -3255,12 +3307,12 @@ Address: %4 <translation>Especificar la teva adreça pública</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <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="-148"/> + <location line="-150"/> <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> @@ -3280,17 +3332,17 @@ Address: %4 <translation>Acceptar lÃnia d'ordres i ordres JSON-RPC </translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <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="+39"/> + <location line="+40"/> <source>Use the test network</source> <translation>Usar la xarxa de prova</translation> </message> <message> - <location line="-118"/> + <location line="-120"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>Aceptar connexions d'afora (per defecte: 1 si no -proxy o -connect)</translation> </message> @@ -3421,6 +3473,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation>Connectar només al(s) node(s) especificats</translation> </message> @@ -3631,6 +3688,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Start Bitcoin server</source> <translation>Arranca el servidor de Bitcoin</translation> </message> @@ -3680,12 +3742,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-79"/> + <location line="-80"/> <source>Imports blocks from external blk000??.dat file</source> <translation>Importa blocs de un fitxer blk000??.dat extern</translation> </message> <message> - <location line="-105"/> + <location line="-106"/> <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> @@ -3705,7 +3767,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+89"/> + <location line="+90"/> <source>Information</source> <translation>&Informació</translation> </message> @@ -3775,7 +3837,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Especificar el temps limit per a un intent de connexió en milisegons (per defecte: 5000)</translation> </message> <message> - <location line="+6"/> + <location line="+7"/> <source>System error: </source> <translation>Error de sistema:</translation> </message> @@ -3821,6 +3883,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>version</source> <translation>versió</translation> </message> @@ -3830,32 +3897,32 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>L'arxiu wallet.data és corrupte, el rescat de les dades ha fallat</translation> </message> <message> - <location line="-58"/> + <location line="-60"/> <source>Password for JSON-RPC connections</source> <translation>Contrasenya per a connexions JSON-RPC</translation> </message> <message> - <location line="-70"/> + <location line="-71"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Permetre connexions JSON-RPC d'adreces IP especÃfiques</translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>Enviar ordre al node en execució a <ip> (per defecte: 127.0.0.1)</translation> </message> <message> - <location line="-132"/> + <location line="-133"/> <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="+161"/> + <location line="+163"/> <source>Upgrade wallet to latest format</source> <translation>Actualitzar moneder a l'últim format</translation> </message> <message> - <location line="-24"/> + <location line="-25"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Establir lÃmit de nombre de claus a <n> (per defecte: 100)</translation> </message> @@ -3865,12 +3932,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Re-escanejar cadena de blocs en cerca de transaccions de moneder perdudes</translation> </message> <message> - <location line="+38"/> + <location line="+39"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Utilitzar OpenSSL (https) per a connexions JSON-RPC</translation> </message> <message> - <location line="-30"/> + <location line="-31"/> <source>Server certificate file (default: server.cert)</source> <translation>Arxiu del certificat de servidor (per defecte: server.cert)</translation> </message> @@ -3880,7 +3947,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Clau privada del servidor (per defecte: server.pem)</translation> </message> <message> - <location line="+16"/> + <location line="+17"/> <source>This help message</source> <translation>Aquest misatge d'ajuda</translation> </message> @@ -3890,12 +3957,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Impossible d'unir %s a aquest ordinador (s'ha retornat l'error %d, %s)</translation> </message> <message> - <location line="-107"/> + <location line="-109"/> <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="+60"/> + <location line="+61"/> <source>Loading addresses...</source> <translation>Carregant adreces...</translation> </message> @@ -3910,12 +3977,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Error carregant wallet.dat: El moneder requereix una versió de Bitcoin més moderna</translation> </message> <message> - <location line="+98"/> + <location line="+99"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>El moneder necesita ser re-escrit: re-inicia Bitcoin per a completar la tasca</translation> </message> <message> - <location line="-100"/> + <location line="-101"/> <source>Error loading wallet.dat</source> <translation>Error carregant wallet.dat</translation> </message> @@ -3925,7 +3992,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Adreça -proxy invalida: '%s'</translation> </message> <message> - <location line="+56"/> + <location line="+57"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Xarxa desconeguda especificada a -onlynet: '%s'</translation> </message> @@ -3935,7 +4002,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>S'ha demanat una versió desconeguda de -socks proxy: %i</translation> </message> <message> - <location line="-101"/> + <location line="-103"/> <source>Cannot resolve -bind address: '%s'</source> <translation>No es pot resoldre l'adreça -bind: '%s'</translation> </message> @@ -3945,7 +4012,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>No es pot resoldre l'adreça -externalip: '%s'</translation> </message> <message> - <location line="+48"/> + <location line="+49"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>Quantitat invalida per a -paytxfee=<amount>: '%s'</translation> </message> @@ -3965,7 +4032,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Carregant Ãndex de blocs...</translation> </message> <message> - <location line="-62"/> + <location line="-63"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>Afegir un node per a connectar's-hi i intentar mantenir la connexió oberta</translation> </message> @@ -3975,12 +4042,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Impossible d'unir %s en aquest ordinador. Probablement Bitcoin ja estigui en execució.</translation> </message> <message> - <location line="+95"/> + <location line="+96"/> <source>Loading wallet...</source> <translation>Carregant moneder...</translation> </message> <message> - <location line="-56"/> + <location line="-57"/> <source>Cannot downgrade wallet</source> <translation>No es pot reduir la versió del moneder</translation> </message> @@ -3990,7 +4057,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>No es pot escriure l'adreça per defecte</translation> </message> <message> - <location line="+67"/> + <location line="+68"/> <source>Rescanning...</source> <translation>Re-escanejant...</translation> </message> @@ -4000,17 +4067,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Cà rrega acabada</translation> </message> <message> - <location line="+85"/> + <location line="+86"/> <source>To use the %s option</source> <translation>Utilitza la opció %s</translation> </message> <message> - <location line="-77"/> + <location line="-78"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location line="-35"/> + <location line="-36"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_cs.ts b/src/qt/locale/bitcoin_cs.ts index 668afd3acc..05ebe1741f 100644 --- a/src/qt/locale/bitcoin_cs.ts +++ b/src/qt/locale/bitcoin_cs.ts @@ -36,6 +36,12 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použità v Open <source>The Bitcoin Core developers</source> <translation type="unfinished"/> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source> (%1-bit)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>AddressBookPage</name> @@ -617,6 +623,16 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použità v Open <translation><numerusform>týden</numerusform><numerusform>%n týdny</numerusform><numerusform>%n týdnů</numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation>Stahuji jeÅ¡tÄ› bloky transakcà za poslednà %1</translation> @@ -690,7 +706,7 @@ Adresa: %4 <translation>Peněženka je <b>zaÅ¡ifrovaná</b> a momentálnÄ› <b>zamÄená</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+435"/> <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> @@ -751,7 +767,7 @@ Adresa: %4 <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation type="unfinished"/> </message> @@ -766,7 +782,7 @@ Adresa: %4 <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation>Částka</translation> </message> @@ -917,7 +933,7 @@ Adresa: %4 <translation type="unfinished"/> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation type="unfinished"/> </message> @@ -1099,7 +1115,7 @@ Adresa: %4 <translation type="unfinished"/> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation>Jádro Bitcoinu</translation> </message> @@ -1243,7 +1259,7 @@ Adresa: %4 <translation>&HlavnÃ</translation> </message> <message> - <location line="+6"/> + <location line="+122"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation>Dobrovolný transakÄnà poplatek za každý zapoÄatý kB dopomáhá k rychlému zpracovánà tvých transakcÃ. VÄ›tÅ¡ina transakcà má do 1 kB.</translation> </message> @@ -1253,7 +1269,7 @@ Adresa: %4 <translation>Platit &transakÄnà poplatek</translation> </message> <message> - <location line="+31"/> + <location line="-131"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation>Automaticky spustà Bitcoin po pÅ™ihlášenà do systému.</translation> </message> @@ -1268,12 +1284,7 @@ Adresa: %4 <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"/> + <location line="+16"/> <source>MB</source> <translation type="unfinished"/> </message> @@ -1288,7 +1299,12 @@ Adresa: %4 <translation>Nastavenà poÄtu vláken pro verifikaci skriptů (max. 16, 0 = automaticky, <0 = nechat daný poÄet jader volný, výchozÃ: 0)</translation> </message> <message> - <location line="+58"/> + <location line="+107"/> + <source>&Spend unconfirmed change (experts only)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+37"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation type="unfinished"/> </message> @@ -1323,7 +1339,17 @@ Adresa: %4 <translation>&SÃÅ¥</translation> </message> <message> - <location line="+6"/> + <location line="-86"/> + <source>W&allet</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+52"/> + <source>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.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+40"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>Automaticky otevÅ™e potÅ™ebný port na routeru. Tohle funguje jen za pÅ™edpokladu, že tvůj router podporuje UPnP a že je UPnP povolené.</translation> </message> @@ -1438,17 +1464,17 @@ Adresa: %4 <translation>&ZruÅ¡it</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+70"/> <source>default</source> <translation>výchozÃ</translation> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation type="unfinished"/> </message> <message> - <location line="+75"/> + <location line="+78"/> <source>Confirm options reset</source> <translation>Potvrzenà obnovenà nastavenÃ</translation> </message> @@ -1488,19 +1514,14 @@ Adresa: %4 <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="-155"/> - <source>Unconfirmed:</source> - <translation>Nepotvrzeno:</translation> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation>Peněženka</translation> </message> <message> <location line="+51"/> - <source>Confirmed:</source> - <translation>Potvrzeno:</translation> + <source>Available:</source> + <translation type="unfinished"/> </message> <message> <location line="+16"/> @@ -1508,7 +1529,12 @@ Adresa: %4 <translation>Aktuálnà disponibilnà stav tvého úÄtu</translation> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> <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> @@ -1656,6 +1682,11 @@ Adresa: %4 <source>Error: Invalid combination of -regtest and -testnet.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../guiutil.cpp" line="+82"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>Zadej Bitcoinovou adresu (napÅ™. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> </context> <context> <name>QRImageWidget</name> @@ -1876,22 +1907,22 @@ Adresa: %4 <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+83"/> + <location filename="../forms/receivecoinsdialog.ui" line="+107"/> <source>&Amount:</source> <translation type="unfinished"/> </message> <message> - <location line="-13"/> + <location line="-16"/> <source>&Label:</source> <translation>O&znaÄenÃ:</translation> </message> <message> - <location line="-34"/> + <location line="-37"/> <source>&Message:</source> <translation type="unfinished"/> </message> <message> - <location line="-17"/> + <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"/> </message> @@ -1901,27 +1932,30 @@ Adresa: %4 <translation type="unfinished"/> </message> <message> - <location line="+27"/> - <source>An optional 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"/> </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> + <location line="-7"/> + <location line="+21"/> + <source>An optional label to associate with the new receiving address.</source> <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="-7"/> <source>Use this form to request payments. All fields are <b>optional</b>.</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <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"/> </message> <message> - <location line="+17"/> + <location line="+32"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -1931,17 +1965,17 @@ Adresa: %4 <translation type="unfinished"/> </message> <message> - <location line="+36"/> - <source>&Request payment</source> + <location line="+78"/> + <source>Requested payments history</source> <translation type="unfinished"/> </message> <message> - <location line="+47"/> - <source>Requested payments</source> + <location line="-98"/> + <source>&Request payment</source> <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+120"/> <source>Show the selected request (does the same as double clicking an entry)</source> <translation type="unfinished"/> </message> @@ -1960,6 +1994,21 @@ Adresa: %4 <source>Remove</source> <translation type="unfinished"/> </message> + <message> + <location filename="../receivecoinsdialog.cpp" line="+38"/> + <source>Copy label</source> + <translation>KopÃrovat popis</translation> + </message> + <message> + <location line="+1"/> + <source>Copy message</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation>KopÃruj Äástku</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -2061,12 +2110,17 @@ Adresa: %4 <source>(no message)</source> <translation type="unfinished"/> </message> + <message> + <location line="+8"/> + <source>(no amount)</source> + <translation type="unfinished"/> + </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>PoÅ¡li mince</translation> @@ -2142,7 +2196,7 @@ Adresa: %4 <translation type="unfinished"/> </message> <message> - <location line="+115"/> + <location line="+164"/> <source>Send to multiple recipients at once</source> <translation>PoÅ¡li vÃce pÅ™Ãjemcům naráz</translation> </message> @@ -2152,7 +2206,7 @@ Adresa: %4 <translation>PÅ™i&dej pÅ™Ãjemce</translation> </message> <message> - <location line="+20"/> + <location line="-23"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -2162,12 +2216,12 @@ Adresa: %4 <translation>VÅ¡echno s&maž</translation> </message> <message> - <location line="+22"/> + <location line="+52"/> <source>Balance:</source> <translation>Stav úÄtu:</translation> </message> <message> - <location line="+41"/> + <location line="-78"/> <source>Confirm the send action</source> <translation>PotvrÄ odeslánÃ</translation> </message> @@ -2177,7 +2231,7 @@ Adresa: %4 <translation>P&oÅ¡li</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-228"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation>PotvrÄ odeslánà mincÃ</translation> </message> @@ -2190,12 +2244,7 @@ Adresa: %4 <translation type="unfinished"/> </message> <message> - <location line="-136"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Zadej Bitcoinovou adresu (napÅ™. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> - <message> - <location line="+15"/> + <location line="-121"/> <source>Copy quantity</source> <translation type="unfinished"/> </message> @@ -2245,7 +2294,7 @@ Adresa: %4 <translation type="unfinished"/> </message> <message> - <location line="+202"/> + <location line="+203"/> <source>The recipient address is not valid, please recheck.</source> <translation>Adresa pÅ™Ãjemce je neplatná, pÅ™ekontroluj ji prosÃm.</translation> </message> @@ -2280,12 +2329,12 @@ Adresa: %4 <translation type="unfinished"/> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Warning: Invalid Bitcoin address</source> <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+20"/> <source>(no label)</source> <translation>(bez popisu)</translation> </message> @@ -2295,7 +2344,7 @@ Adresa: %4 <translation type="unfinished"/> </message> <message> - <location line="-366"/> + <location line="-367"/> <source>Are you sure you want to send?</source> <translation type="unfinished"/> </message> @@ -2305,7 +2354,7 @@ Adresa: %4 <translation type="unfinished"/> </message> <message> - <location line="+170"/> + <location line="+171"/> <source>Payment request expired</source> <translation type="unfinished"/> </message> @@ -2382,12 +2431,7 @@ Adresa: %4 <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"/> + <location line="+968"/> <source>This is a verified payment request.</source> <translation type="unfinished"/> </message> @@ -2397,7 +2441,12 @@ Adresa: %4 <translation type="unfinished"/> </message> <message> - <location line="+459"/> + <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"/> + </message> + <message> + <location line="+426"/> <source>This is an unverified payment request.</source> <translation type="unfinished"/> </message> @@ -2413,11 +2462,6 @@ Adresa: %4 <source>Memo:</source> <translation type="unfinished"/> </message> - <message> - <location filename="../sendcoinsentry.cpp" line="+1"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Zadej Bitcoinovou adresu (napÅ™. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> </context> <context> <name>ShutdownWindow</name> @@ -2455,19 +2499,19 @@ Adresa: %4 <translation>Adresa, kterou se zpráva podepÃÅ¡e (napÅ™. 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"/> </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>Vlož adresu ze schránky</translation> </message> @@ -2508,12 +2552,12 @@ Adresa: %4 </message> <message> <location line="+3"/> - <location line="+146"/> + <location line="+143"/> <source>Clear &All</source> <translation>VÅ¡echno &smaž</translation> </message> <message> - <location line="-87"/> + <location line="-84"/> <source>&Verify Message</source> <translation>&Ověř zprávu</translation> </message> @@ -2528,7 +2572,7 @@ Adresa: %4 <translation>Adresa, kterou je zpráva podepsána (napÅ™. 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>Ověř zprávu, aby ses ujistil, že byla podepsána danou Bitcoinovou adresou</translation> </message> @@ -2543,43 +2587,37 @@ Adresa: %4 <translation>Vymaž vÅ¡echna pole formuláře pro ověřenà zrávy</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>Zadej Bitcoinovou adresu (napÅ™. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location line="-2"/> + <location line="-1"/> <source>Click "Sign Message" to generate signature</source> <translation>KliknutÃm na "PodepiÅ¡ zprávu" vygenerujeÅ¡ podpis</translation> </message> <message> - <location line="+3"/> - <source>Enter Bitcoin signature</source> - <translation>Vlož Bitcoinový podpis</translation> - </message> - <message> <location line="+84"/> - <location line="+81"/> + <location line="+80"/> <source>The entered address is invalid.</source> <translation>Zadaná adresa je neplatná.</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>Zkontroluj ji prosÃm a zkus to pak znovu.</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>Zadaná adresa nepasuje ke klÃÄi.</translation> </message> <message> - <location line="-73"/> + <location line="-72"/> <source>Wallet unlock was cancelled.</source> <translation>OdemÄenà peněženky bylo zruÅ¡eno.</translation> </message> @@ -2599,7 +2637,7 @@ Adresa: %4 <translation>Zpráv podepsána.</translation> </message> <message> - <location line="+59"/> + <location line="+58"/> <source>The signature could not be decoded.</source> <translation>Podpis nejde dekódovat.</translation> </message> @@ -2660,6 +2698,11 @@ Adresa: %4 </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation>%1/offline</translation> </message> @@ -2821,12 +2864,12 @@ Adresa: %4 <translation>, jeÅ¡tÄ› nebylo rozesláno</translation> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <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> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation>neznámo</translation> </message> @@ -2867,12 +2910,12 @@ Adresa: %4 <translation>Částka</translation> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <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> @@ -2882,23 +2925,12 @@ Adresa: %4 <translation>OtÅ™evÅ™eno dokud %1</translation> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> - <translation>Offline (%1 potvrzenÃ)</translation> - </message> - <message> - <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation>Nepotvrzeno (%1 z %2 potvrzenÃ)</translation> - </message> - <message> - <location line="-22"/> - <location line="+25"/> + <location line="+12"/> <source>Confirmed (%1 confirmations)</source> <translation>Potvrzeno (%1 potvrzenÃ)</translation> </message> <message> - <location line="-22"/> + <location line="+9"/> <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> @@ -2908,7 +2940,27 @@ Adresa: %4 <translation>Vygenerováno, ale neakceptováno</translation> </message> <message> - <location line="+62"/> + <location line="-21"/> + <source>Offline</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Unconfirmed</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation>PÅ™ijato do</translation> </message> @@ -2938,7 +2990,7 @@ Adresa: %4 <translation>(n/a)</translation> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation>Stav transakce. NajetÃm myÅ¡i na toto polÃÄko si zobrazÃÅ¡ poÄet potvrzenÃ.</translation> </message> @@ -3204,12 +3256,12 @@ Adresa: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+223"/> <source>Usage:</source> <translation>UžitÃ:</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>List commands</source> <translation>Výpis pÅ™Ãkazů</translation> </message> @@ -3264,12 +3316,12 @@ Adresa: %4 <translation>Specifikuj svou veÅ™ejnou adresu</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <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="-148"/> + <location line="-150"/> <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> @@ -3289,17 +3341,17 @@ Adresa: %4 <translation>Akceptovat pÅ™Ãkazy z pÅ™Ãkazové řádky a pÅ™es JSON-RPC</translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <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="+39"/> + <location line="+40"/> <source>Use the test network</source> <translation>PoužÃt testovacà sÃÅ¥ (testnet)</translation> </message> <message> - <location line="-118"/> + <location line="-120"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>PÅ™ijÃmat spojenà zvenÄà (výchozÃ: 1, pokud nenà zadáno -proxy nebo -connect)</translation> </message> @@ -3440,6 +3492,11 @@ napÅ™Ãklad: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation>PÅ™ipojit se pouze k zadanému uzlu (pÅ™Ãp. zadaným uzlům)</translation> </message> @@ -3650,6 +3707,11 @@ napÅ™Ãklad: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Start Bitcoin server</source> <translation type="unfinished"/> </message> @@ -3699,12 +3761,12 @@ napÅ™Ãklad: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <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="-79"/> + <location line="-80"/> <source>Imports blocks from external blk000??.dat file</source> <translation>Importovat bloky z externÃho souboru blk000??.dat</translation> </message> <message> - <location line="-105"/> + <location line="-106"/> <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> @@ -3724,7 +3786,7 @@ napÅ™Ãklad: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Nastavenà poÄtu vláken pro verifikaci skriptů (max. 16, 0 = automaticky, <0 = nechat daný poÄet jader volný, výchozÃ: 0)</translation> </message> <message> - <location line="+89"/> + <location line="+90"/> <source>Information</source> <translation>Informace</translation> </message> @@ -3794,7 +3856,7 @@ napÅ™Ãklad: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Zadej Äasový limit spojenà v milisekundách (výchozÃ: 5000)</translation> </message> <message> - <location line="+6"/> + <location line="+7"/> <source>System error: </source> <translation>Systémová chyba: </translation> </message> @@ -3840,6 +3902,11 @@ napÅ™Ãklad: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>version</source> <translation>verze</translation> </message> @@ -3849,32 +3916,32 @@ napÅ™Ãklad: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Soubor wallet.dat je poÅ¡kozen, jeho záchrana se nezdaÅ™ila</translation> </message> <message> - <location line="-58"/> + <location line="-60"/> <source>Password for JSON-RPC connections</source> <translation>Heslo pro JSON-RPC spojenÃ</translation> </message> <message> - <location line="-70"/> + <location line="-71"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Povolit JSON-RPC spojenà ze specifikované IP adresy</translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>PosÃlat pÅ™Ãkazy uzlu běžÃcÃm na <ip> (výchozÃ: 127.0.0.1)</translation> </message> <message> - <location line="-132"/> + <location line="-133"/> <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="+161"/> + <location line="+163"/> <source>Upgrade wallet to latest format</source> <translation>PÅ™evést peněženku na nejnovÄ›jÅ¡Ã formát</translation> </message> <message> - <location line="-24"/> + <location line="-25"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Nastavit zásobnÃk klÃÄů na velikost <n> (výchozÃ: 100)</translation> </message> @@ -3884,12 +3951,12 @@ napÅ™Ãklad: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>PÅ™eskenovat Å™etÄ›zec bloků na chybÄ›jÃcà transakce tvé pÄ›něženky</translation> </message> <message> - <location line="+38"/> + <location line="+39"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>PoužÃt OpenSSL (https) pro JSON-RPC spojenÃ</translation> </message> <message> - <location line="-30"/> + <location line="-31"/> <source>Server certificate file (default: server.cert)</source> <translation>Soubor se serverovým certifikátem (výchozÃ: server.cert)</translation> </message> @@ -3899,7 +3966,7 @@ napÅ™Ãklad: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Soubor se serverovým soukromým klÃÄem (výchozÃ: server.pem)</translation> </message> <message> - <location line="+16"/> + <location line="+17"/> <source>This help message</source> <translation>Tato nápovÄ›da</translation> </message> @@ -3909,12 +3976,12 @@ napÅ™Ãklad: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <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="-107"/> + <location line="-109"/> <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="+60"/> + <location line="+61"/> <source>Loading addresses...</source> <translation>NaÄÃtám adresy...</translation> </message> @@ -3929,12 +3996,12 @@ napÅ™Ãklad: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Chyba pÅ™i naÄÃtánà wallet.dat: peněženka vyžaduje novÄ›jÅ¡Ã verzi Bitcoinu</translation> </message> <message> - <location line="+98"/> + <location line="+99"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>Soubor s peněženkou potÅ™eboval pÅ™epsat: restartuj Bitcoin, aby se operace dokonÄila</translation> </message> <message> - <location line="-100"/> + <location line="-101"/> <source>Error loading wallet.dat</source> <translation>Chyba pÅ™i naÄÃtánà wallet.dat</translation> </message> @@ -3944,7 +4011,7 @@ napÅ™Ãklad: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Neplatná -proxy adresa: '%s'</translation> </message> <message> - <location line="+56"/> + <location line="+57"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>V -onlynet byla uvedena neznámá sÃÅ¥: '%s'</translation> </message> @@ -3954,7 +4021,7 @@ napÅ™Ãklad: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>V -socks byla požadována neznámá verze proxy: %i</translation> </message> <message> - <location line="-101"/> + <location line="-103"/> <source>Cannot resolve -bind address: '%s'</source> <translation>Nemohu pÅ™eložit -bind adresu: '%s'</translation> </message> @@ -3964,7 +4031,7 @@ napÅ™Ãklad: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Nemohu pÅ™eložit -externalip adresu: '%s'</translation> </message> <message> - <location line="+48"/> + <location line="+49"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>Neplatná Äástka pro -paytxfee=<Äástka>: '%s'</translation> </message> @@ -3984,7 +4051,7 @@ napÅ™Ãklad: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>NaÄÃtám index bloků...</translation> </message> <message> - <location line="-62"/> + <location line="-63"/> <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> @@ -3994,12 +4061,12 @@ napÅ™Ãklad: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Nedařà se mi pÅ™ipojit na %s na tomhle poÄÃtaÄi. Bitcoin už pravdÄ›podobnÄ› jednou běžÃ.</translation> </message> <message> - <location line="+95"/> + <location line="+96"/> <source>Loading wallet...</source> <translation>NaÄÃtám peněženku...</translation> </message> <message> - <location line="-56"/> + <location line="-57"/> <source>Cannot downgrade wallet</source> <translation>Nemohu pÅ™evést peněženku do starÅ¡Ãho formátu</translation> </message> @@ -4009,7 +4076,7 @@ napÅ™Ãklad: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Nemohu napsat výchozà adresu</translation> </message> <message> - <location line="+67"/> + <location line="+68"/> <source>Rescanning...</source> <translation>PÅ™eskenovávám...</translation> </message> @@ -4019,17 +4086,17 @@ napÅ™Ãklad: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>NaÄÃtánà dokonÄeno</translation> </message> <message> - <location line="+85"/> + <location line="+86"/> <source>To use the %s option</source> <translation>K použità volby %s</translation> </message> <message> - <location line="-77"/> + <location line="-78"/> <source>Error</source> <translation>Chyba</translation> </message> <message> - <location line="-35"/> + <location line="-36"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_cy.ts b/src/qt/locale/bitcoin_cy.ts index a28772d748..b49b68d21a 100644 --- a/src/qt/locale/bitcoin_cy.ts +++ b/src/qt/locale/bitcoin_cy.ts @@ -31,6 +31,12 @@ This product includes software developed by the OpenSSL Project for use in the O <source>The Bitcoin Core developers</source> <translation type="unfinished"/> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source> (%1-bit)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>AddressBookPage</name> @@ -612,6 +618,16 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation type="unfinished"/> @@ -681,7 +697,7 @@ Address: %4 <translation>Mae'r waled <b>wedi'i amgryptio</b> ac <b>ar glo</b> ar hyn o bryd</translation> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+435"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -742,7 +758,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation type="unfinished"/> </message> @@ -757,7 +773,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation type="unfinished"/> </message> @@ -908,7 +924,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation type="unfinished"/> </message> @@ -1090,7 +1106,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation type="unfinished"/> </message> @@ -1234,7 +1250,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+122"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation type="unfinished"/> </message> @@ -1244,7 +1260,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="-131"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation type="unfinished"/> </message> @@ -1259,12 +1275,7 @@ Address: %4 <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"/> + <location line="+16"/> <source>MB</source> <translation type="unfinished"/> </message> @@ -1279,7 +1290,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+58"/> + <location line="+107"/> + <source>&Spend unconfirmed change (experts only)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+37"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation type="unfinished"/> </message> @@ -1314,7 +1330,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="-86"/> + <source>W&allet</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+52"/> + <source>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.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+40"/> <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> @@ -1429,17 +1455,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+70"/> <source>default</source> <translation type="unfinished"/> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation type="unfinished"/> </message> <message> - <location line="+75"/> + <location line="+78"/> <source>Confirm options reset</source> <translation type="unfinished"/> </message> @@ -1479,18 +1505,13 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-155"/> - <source>Unconfirmed:</source> - <translation>Nas cadarnheir:</translation> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation type="unfinished"/> </message> <message> <location line="+51"/> - <source>Confirmed:</source> + <source>Available:</source> <translation type="unfinished"/> </message> <message> @@ -1499,7 +1520,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation type="unfinished"/> </message> @@ -1647,6 +1673,11 @@ Address: %4 <source>Error: Invalid combination of -regtest and -testnet.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../guiutil.cpp" line="+82"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>QRImageWidget</name> @@ -1867,22 +1898,22 @@ Address: %4 <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+83"/> + <location filename="../forms/receivecoinsdialog.ui" line="+107"/> <source>&Amount:</source> <translation type="unfinished"/> </message> <message> - <location line="-13"/> + <location line="-16"/> <source>&Label:</source> <translation>&Label:</translation> </message> <message> - <location line="-34"/> + <location line="-37"/> <source>&Message:</source> <translation type="unfinished"/> </message> <message> - <location line="-17"/> + <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"/> </message> @@ -1892,27 +1923,30 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+27"/> - <source>An optional 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"/> </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> + <location line="-7"/> + <location line="+21"/> + <source>An optional label to associate with the new receiving address.</source> <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="-7"/> <source>Use this form to request payments. All fields are <b>optional</b>.</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <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"/> </message> <message> - <location line="+17"/> + <location line="+32"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -1922,17 +1956,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+36"/> - <source>&Request payment</source> + <location line="+78"/> + <source>Requested payments history</source> <translation type="unfinished"/> </message> <message> - <location line="+47"/> - <source>Requested payments</source> + <location line="-98"/> + <source>&Request payment</source> <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+120"/> <source>Show the selected request (does the same as double clicking an entry)</source> <translation type="unfinished"/> </message> @@ -1951,6 +1985,21 @@ Address: %4 <source>Remove</source> <translation type="unfinished"/> </message> + <message> + <location filename="../receivecoinsdialog.cpp" line="+38"/> + <source>Copy label</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy message</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation type="unfinished"/> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -2052,12 +2101,17 @@ Address: %4 <source>(no message)</source> <translation type="unfinished"/> </message> + <message> + <location line="+8"/> + <source>(no amount)</source> + <translation type="unfinished"/> + </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>Anfon arian</translation> @@ -2133,7 +2187,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+115"/> + <location line="+164"/> <source>Send to multiple recipients at once</source> <translation>Anfon at pobl lluosog ar yr un pryd</translation> </message> @@ -2143,7 +2197,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+20"/> + <location line="-23"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -2153,12 +2207,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+22"/> + <location line="+52"/> <source>Balance:</source> <translation>Gweddill:</translation> </message> <message> - <location line="+41"/> + <location line="-78"/> <source>Confirm the send action</source> <translation>Cadarnhau'r gweithrediad anfon</translation> </message> @@ -2168,7 +2222,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-228"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation type="unfinished"/> </message> @@ -2181,12 +2235,7 @@ Address: %4 <translation>%1 i %2</translation> </message> <message> - <location line="-136"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+15"/> + <location line="-121"/> <source>Copy quantity</source> <translation type="unfinished"/> </message> @@ -2236,7 +2285,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+202"/> + <location line="+203"/> <source>The recipient address is not valid, please recheck.</source> <translation type="unfinished"/> </message> @@ -2271,12 +2320,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Warning: Invalid Bitcoin address</source> <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+20"/> <source>(no label)</source> <translation>(heb label)</translation> </message> @@ -2286,7 +2335,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-366"/> + <location line="-367"/> <source>Are you sure you want to send?</source> <translation type="unfinished"/> </message> @@ -2296,7 +2345,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+170"/> + <location line="+171"/> <source>Payment request expired</source> <translation type="unfinished"/> </message> @@ -2373,12 +2422,7 @@ Address: %4 <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"/> + <location line="+968"/> <source>This is a verified payment request.</source> <translation type="unfinished"/> </message> @@ -2388,7 +2432,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+459"/> + <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"/> + </message> + <message> + <location line="+426"/> <source>This is an unverified payment request.</source> <translation type="unfinished"/> </message> @@ -2404,11 +2453,6 @@ Address: %4 <source>Memo:</source> <translation type="unfinished"/> </message> - <message> - <location filename="../sendcoinsentry.cpp" line="+1"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"/> - </message> </context> <context> <name>ShutdownWindow</name> @@ -2446,19 +2490,19 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+10"/> - <location line="+213"/> + <location line="+7"/> + <location line="+210"/> <source>Choose previously used address</source> <translation type="unfinished"/> </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>Gludo cyfeiriad o'r glipfwrdd</translation> </message> @@ -2499,12 +2543,12 @@ Address: %4 </message> <message> <location line="+3"/> - <location line="+146"/> + <location line="+143"/> <source>Clear &All</source> <translation type="unfinished"/> </message> <message> - <location line="-87"/> + <location line="-84"/> <source>&Verify Message</source> <translation type="unfinished"/> </message> @@ -2519,7 +2563,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+40"/> + <location line="+37"/> <source>Verify the message to ensure it was signed with the specified Bitcoin address</source> <translation type="unfinished"/> </message> @@ -2534,43 +2578,37 @@ Address: %4 <translation type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location line="-2"/> + <location line="-1"/> <source>Click "Sign Message" to generate signature</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Enter Bitcoin signature</source> - <translation type="unfinished"/> - </message> - <message> <location line="+84"/> - <location line="+81"/> + <location line="+80"/> <source>The entered address is invalid.</source> <translation type="unfinished"/> </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 type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location line="-73"/> + <location line="-72"/> <source>Wallet unlock was cancelled.</source> <translation type="unfinished"/> </message> @@ -2590,7 +2628,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+59"/> + <location line="+58"/> <source>The signature could not be decoded.</source> <translation type="unfinished"/> </message> @@ -2651,6 +2689,11 @@ Address: %4 </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation type="unfinished"/> </message> @@ -2812,12 +2855,12 @@ Address: %4 <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation type="unfinished"/> </message> @@ -2858,12 +2901,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> @@ -2873,33 +2916,42 @@ Address: %4 <translation>Agor tan %1</translation> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> + <location line="+12"/> + <source>Confirmed (%1 confirmations)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+9"/> + <source>This block was not received by any other nodes and will probably not be accepted!</source> <translation type="unfinished"/> </message> <message> <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> + <source>Generated but not accepted</source> <translation type="unfinished"/> </message> <message> - <location line="-22"/> - <location line="+25"/> - <source>Confirmed (%1 confirmations)</source> + <location line="-21"/> + <source>Offline</source> <translation type="unfinished"/> </message> <message> - <location line="-22"/> - <source>This block was not received by any other nodes and will probably not be accepted!</source> + <location line="+3"/> + <source>Unconfirmed</source> <translation type="unfinished"/> </message> <message> <location line="+3"/> - <source>Generated but not accepted</source> + <source>Confirming (%1 of %2 recommended confirmations)</source> <translation type="unfinished"/> </message> <message> - <location line="+62"/> + <location line="+6"/> + <source>Conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation type="unfinished"/> </message> @@ -2929,7 +2981,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation type="unfinished"/> </message> @@ -3195,12 +3247,12 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+223"/> <source>Usage:</source> <translation type="unfinished"/> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>List commands</source> <translation type="unfinished"/> </message> @@ -3255,12 +3307,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation type="unfinished"/> </message> <message> - <location line="-148"/> + <location line="-150"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"/> </message> @@ -3280,17 +3332,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Run in the background as a daemon and accept commands</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <location line="+40"/> <source>Use the test network</source> <translation type="unfinished"/> </message> <message> - <location line="-118"/> + <location line="-120"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> @@ -3421,6 +3473,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation type="unfinished"/> </message> @@ -3631,6 +3688,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Start Bitcoin server</source> <translation type="unfinished"/> </message> @@ -3680,12 +3742,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-79"/> + <location line="-80"/> <source>Imports blocks from external blk000??.dat file</source> <translation type="unfinished"/> </message> <message> - <location line="-105"/> + <location line="-106"/> <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> @@ -3705,7 +3767,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+89"/> + <location line="+90"/> <source>Information</source> <translation>Gwybodaeth</translation> </message> @@ -3775,7 +3837,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+7"/> <source>System error: </source> <translation type="unfinished"/> </message> @@ -3821,6 +3883,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>version</source> <translation type="unfinished"/> </message> @@ -3830,32 +3897,32 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-58"/> + <location line="-60"/> <source>Password for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-70"/> + <location line="-71"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation type="unfinished"/> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+161"/> + <location line="+163"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"/> </message> <message> - <location line="-24"/> + <location line="-25"/> <source>Set key pool size to <n> (default: 100)</source> <translation type="unfinished"/> </message> @@ -3865,12 +3932,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+38"/> + <location line="+39"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-30"/> + <location line="-31"/> <source>Server certificate file (default: server.cert)</source> <translation type="unfinished"/> </message> @@ -3880,7 +3947,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+17"/> <source>This help message</source> <translation type="unfinished"/> </message> @@ -3890,12 +3957,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-107"/> + <location line="-109"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation type="unfinished"/> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Loading addresses...</source> <translation type="unfinished"/> </message> @@ -3910,12 +3977,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+98"/> + <location line="+99"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation type="unfinished"/> </message> <message> - <location line="-100"/> + <location line="-101"/> <source>Error loading wallet.dat</source> <translation type="unfinished"/> </message> @@ -3925,7 +3992,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+56"/> + <location line="+57"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation type="unfinished"/> </message> @@ -3935,7 +4002,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-101"/> + <location line="-103"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -3945,7 +4012,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+48"/> + <location line="+49"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation type="unfinished"/> </message> @@ -3965,7 +4032,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-62"/> + <location line="-63"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"/> </message> @@ -3975,12 +4042,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+95"/> + <location line="+96"/> <source>Loading wallet...</source> <translation type="unfinished"/> </message> <message> - <location line="-56"/> + <location line="-57"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> @@ -3990,7 +4057,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+67"/> + <location line="+68"/> <source>Rescanning...</source> <translation type="unfinished"/> </message> @@ -4000,17 +4067,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+85"/> + <location line="+86"/> <source>To use the %s option</source> <translation type="unfinished"/> </message> <message> - <location line="-77"/> + <location line="-78"/> <source>Error</source> <translation>Gwall</translation> </message> <message> - <location line="-35"/> + <location line="-36"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_da.ts b/src/qt/locale/bitcoin_da.ts index 56b4ebb3fe..ac295220c7 100644 --- a/src/qt/locale/bitcoin_da.ts +++ b/src/qt/locale/bitcoin_da.ts @@ -36,6 +36,12 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open <source>The Bitcoin Core developers</source> <translation type="unfinished"/> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source> (%1-bit)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>AddressBookPage</name> @@ -617,6 +623,16 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open <translation><numerusform>%n uge(r)</numerusform><numerusform>%n uge(r)</numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation>%1 bagud</translation> @@ -690,7 +706,7 @@ Adresse: %4 <translation>Tegnebog er <b>krypteret</b> og i øjeblikket <b>lÃ¥st</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+435"/> <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> @@ -751,7 +767,7 @@ Adresse: %4 <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation type="unfinished"/> </message> @@ -766,7 +782,7 @@ Adresse: %4 <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation>Beløb</translation> </message> @@ -917,7 +933,7 @@ Adresse: %4 <translation type="unfinished"/> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation type="unfinished"/> </message> @@ -1099,7 +1115,7 @@ Adresse: %4 <translation type="unfinished"/> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation>Bitcoin Core</translation> </message> @@ -1243,7 +1259,7 @@ Adresse: %4 <translation>Generelt</translation> </message> <message> - <location line="+6"/> + <location line="+122"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation>Valgfrit transaktionsgebyr pr. kB, der hjælper dine transaktioner med at blive behandlet hurtigt. De fleste transaktioner er pÃ¥ 1 kB.</translation> </message> @@ -1253,7 +1269,7 @@ Adresse: %4 <translation>Betal transaktionsgebyr</translation> </message> <message> - <location line="+31"/> + <location line="-131"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation>Start Bitcoin automatisk, nÃ¥r der logges ind pÃ¥ systemet</translation> </message> @@ -1268,12 +1284,7 @@ Adresse: %4 <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"/> + <location line="+16"/> <source>MB</source> <translation type="unfinished"/> </message> @@ -1288,7 +1299,12 @@ Adresse: %4 <translation>Angiv nummeret af trÃ¥de til verificering af script (op til 16, 0 = automatisk, <0 = efterlad det antal kerner tilgængelige, standard: 0)</translation> </message> <message> - <location line="+58"/> + <location line="+107"/> + <source>&Spend unconfirmed change (experts only)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+37"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation type="unfinished"/> </message> @@ -1323,7 +1339,17 @@ Adresse: %4 <translation>Netværk</translation> </message> <message> - <location line="+6"/> + <location line="-86"/> + <source>W&allet</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+52"/> + <source>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.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+40"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>Ã…bn Bitcoin-klientens port pÃ¥ routeren automatisk. Dette virker kun, nÃ¥r din router understøtter UPnP og UPnP er aktiveret.</translation> </message> @@ -1438,17 +1464,17 @@ Adresse: %4 <translation>Annuller</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+70"/> <source>default</source> <translation>standard</translation> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation type="unfinished"/> </message> <message> - <location line="+75"/> + <location line="+78"/> <source>Confirm options reset</source> <translation>Bekræft nulstilling af indstillinger</translation> </message> @@ -1488,19 +1514,14 @@ Adresse: %4 <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="-155"/> - <source>Unconfirmed:</source> - <translation>Ubekræftede:</translation> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation>Tegnebog</translation> </message> <message> <location line="+51"/> - <source>Confirmed:</source> - <translation>Bekræftede:</translation> + <source>Available:</source> + <translation type="unfinished"/> </message> <message> <location line="+16"/> @@ -1508,12 +1529,17 @@ Adresse: %4 <translation>Din nuværende tilgængelige saldo</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> + <location line="+16"/> + <source>Pending:</source> <translation type="unfinished"/> </message> <message> <location line="+16"/> + <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> + <translation>Total transaktioner, som ikke er blevet bekræftet endnu, og som ikke endnu er en del af den nuværende saldo</translation> + </message> + <message> + <location line="+16"/> <source>Immature:</source> <translation>Umodne:</translation> </message> @@ -1656,6 +1682,11 @@ Adresse: %4 <source>Error: Invalid combination of -regtest and -testnet.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../guiutil.cpp" line="+82"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>Indtast en Bitcoin-adresse (f.eks. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> </context> <context> <name>QRImageWidget</name> @@ -1876,22 +1907,22 @@ Adresse: %4 <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+83"/> + <location filename="../forms/receivecoinsdialog.ui" line="+107"/> <source>&Amount:</source> <translation>&Mængde:</translation> </message> <message> - <location line="-13"/> + <location line="-16"/> <source>&Label:</source> <translation>Mærkat:</translation> </message> <message> - <location line="-34"/> + <location line="-37"/> <source>&Message:</source> <translation>&Besked:</translation> </message> <message> - <location line="-17"/> + <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"/> </message> @@ -1901,27 +1932,30 @@ Adresse: %4 <translation type="unfinished"/> </message> <message> - <location line="+27"/> - <source>An optional 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"/> </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> + <location line="-7"/> + <location line="+21"/> + <source>An optional label to associate with the new receiving address.</source> <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="-7"/> <source>Use this form to request payments. All fields are <b>optional</b>.</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <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"/> </message> <message> - <location line="+17"/> + <location line="+32"/> <source>Clear all fields of the form.</source> <translation>Ryd alle fælter af formen.</translation> </message> @@ -1931,17 +1965,17 @@ Adresse: %4 <translation>Ryd</translation> </message> <message> - <location line="+36"/> - <source>&Request payment</source> - <translation>&Anmod betaling</translation> + <location line="+78"/> + <source>Requested payments history</source> + <translation type="unfinished"/> </message> <message> - <location line="+47"/> - <source>Requested payments</source> - <translation type="unfinished"/> + <location line="-98"/> + <source>&Request payment</source> + <translation>&Anmod betaling</translation> </message> <message> - <location line="+16"/> + <location line="+120"/> <source>Show the selected request (does the same as double clicking an entry)</source> <translation type="unfinished"/> </message> @@ -1960,6 +1994,21 @@ Adresse: %4 <source>Remove</source> <translation type="unfinished"/> </message> + <message> + <location filename="../receivecoinsdialog.cpp" line="+38"/> + <source>Copy label</source> + <translation>Kopier mærkat</translation> + </message> + <message> + <location line="+1"/> + <source>Copy message</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation>Kopier beløb</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -2061,12 +2110,17 @@ Adresse: %4 <source>(no message)</source> <translation type="unfinished"/> </message> + <message> + <location line="+8"/> + <source>(no amount)</source> + <translation type="unfinished"/> + </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 bitcoins</translation> @@ -2142,7 +2196,7 @@ Adresse: %4 <translation type="unfinished"/> </message> <message> - <location line="+115"/> + <location line="+164"/> <source>Send to multiple recipients at once</source> <translation>Send til flere modtagere pÃ¥ en gang</translation> </message> @@ -2152,7 +2206,7 @@ Adresse: %4 <translation>Tilføj modtager</translation> </message> <message> - <location line="+20"/> + <location line="-23"/> <source>Clear all fields of the form.</source> <translation>Ryd alle fælter af formen.</translation> </message> @@ -2162,12 +2216,12 @@ Adresse: %4 <translation>Ryd alle</translation> </message> <message> - <location line="+22"/> + <location line="+52"/> <source>Balance:</source> <translation>Saldo:</translation> </message> <message> - <location line="+41"/> + <location line="-78"/> <source>Confirm the send action</source> <translation>Bekræft afsendelsen</translation> </message> @@ -2177,7 +2231,7 @@ Adresse: %4 <translation>Afsend</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-228"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation>Bekræft afsendelse af bitcoins</translation> </message> @@ -2190,12 +2244,7 @@ Adresse: %4 <translation type="unfinished"/> </message> <message> - <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"/> + <location line="-121"/> <source>Copy quantity</source> <translation type="unfinished"/> </message> @@ -2245,7 +2294,7 @@ Adresse: %4 <translation type="unfinished"/> </message> <message> - <location line="+202"/> + <location line="+203"/> <source>The recipient address is not valid, please recheck.</source> <translation>Modtagerens adresse er ikke gyldig. Tjek venligst adressen igen.</translation> </message> @@ -2280,12 +2329,12 @@ Adresse: %4 <translation type="unfinished"/> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Warning: Invalid Bitcoin address</source> <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+20"/> <source>(no label)</source> <translation>(ingen mærkat)</translation> </message> @@ -2295,7 +2344,7 @@ Adresse: %4 <translation type="unfinished"/> </message> <message> - <location line="-366"/> + <location line="-367"/> <source>Are you sure you want to send?</source> <translation>Er du sikker pÃ¥ at du vil sende?</translation> </message> @@ -2305,7 +2354,7 @@ Adresse: %4 <translation>tilføjet som transaktionsgebyr</translation> </message> <message> - <location line="+170"/> + <location line="+171"/> <source>Payment request expired</source> <translation>Betalingsforespørgsel udløb</translation> </message> @@ -2382,12 +2431,7 @@ Adresse: %4 <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"/> + <location line="+968"/> <source>This is a verified payment request.</source> <translation type="unfinished"/> </message> @@ -2397,7 +2441,12 @@ Adresse: %4 <translation type="unfinished"/> </message> <message> - <location line="+459"/> + <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"/> + </message> + <message> + <location line="+426"/> <source>This is an unverified payment request.</source> <translation type="unfinished"/> </message> @@ -2413,11 +2462,6 @@ Adresse: %4 <source>Memo:</source> <translation type="unfinished"/> </message> - <message> - <location filename="../sendcoinsentry.cpp" line="+1"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Indtast en Bitcoin-adresse (f.eks. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> </context> <context> <name>ShutdownWindow</name> @@ -2455,19 +2499,19 @@ Adresse: %4 <translation>Bitcoin-adressen som beskeden skal underskrives med (f.eks. 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"/> </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>Indsæt adresse fra udklipsholderen</translation> </message> @@ -2508,12 +2552,12 @@ Adresse: %4 </message> <message> <location line="+3"/> - <location line="+146"/> + <location line="+143"/> <source>Clear &All</source> <translation>Ryd alle</translation> </message> <message> - <location line="-87"/> + <location line="-84"/> <source>&Verify Message</source> <translation>Verificér besked</translation> </message> @@ -2528,7 +2572,7 @@ Adresse: %4 <translation>Bitcoin-adressen som beskeden er underskrevet med (f.eks. 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>Verificér beskeden for at sikre, at den er underskrevet med den angivne Bitcoin-adresse</translation> </message> @@ -2543,43 +2587,37 @@ Adresse: %4 <translation>Nulstil alle "verificér besked"-felter</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>Indtast en Bitcoin-adresse (f.eks. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location line="-2"/> + <location line="-1"/> <source>Click "Sign Message" to generate signature</source> <translation>Klik "Underskriv besked" for at generere underskriften</translation> </message> <message> - <location line="+3"/> - <source>Enter Bitcoin signature</source> - <translation>Indtast Bitcoin-underskriften</translation> - </message> - <message> <location line="+84"/> - <location line="+81"/> + <location line="+80"/> <source>The entered address is invalid.</source> <translation>Den indtastede adresse er ugyldig.</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>Tjek venligst adressen, og forsøg igen.</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>Den indtastede adresse henviser ikke til en nøgle.</translation> </message> <message> - <location line="-73"/> + <location line="-72"/> <source>Wallet unlock was cancelled.</source> <translation>TegnebogsoplÃ¥sning annulleret.</translation> </message> @@ -2599,7 +2637,7 @@ Adresse: %4 <translation>Besked underskrevet.</translation> </message> <message> - <location line="+59"/> + <location line="+58"/> <source>The signature could not be decoded.</source> <translation>Underskriften kunne ikke afkodes.</translation> </message> @@ -2660,6 +2698,11 @@ Adresse: %4 </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation>%1/offline</translation> </message> @@ -2821,12 +2864,12 @@ Adresse: %4 <translation>, er ikke blevet transmitteret endnu</translation> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <source>Open for %n more block(s)</source> <translation><numerusform>Ã…ben %n blok yderligere</numerusform><numerusform>Ã…ben %n blokke yderligere</numerusform></translation> </message> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation>ukendt</translation> </message> @@ -2867,12 +2910,12 @@ Adresse: %4 <translation>Beløb</translation> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <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> @@ -2882,23 +2925,12 @@ Adresse: %4 <translation>Ã…ben indtil %1</translation> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> - <translation>Offline (%1 bekræftelser)</translation> - </message> - <message> - <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation>Ubekræftet (%1 af %2 bekræftelser)</translation> - </message> - <message> - <location line="-22"/> - <location line="+25"/> + <location line="+12"/> <source>Confirmed (%1 confirmations)</source> <translation>Bekræftet (%1 bekræftelser)</translation> </message> <message> - <location line="-22"/> + <location line="+9"/> <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> @@ -2908,7 +2940,27 @@ Adresse: %4 <translation>Genereret, men ikke accepteret</translation> </message> <message> - <location line="+62"/> + <location line="-21"/> + <source>Offline</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Unconfirmed</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation>Modtaget med</translation> </message> @@ -2938,7 +2990,7 @@ Adresse: %4 <translation>(n/a)</translation> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation>Transaktionsstatus. Hold musen over dette felt for at vise antallet af bekræftelser.</translation> </message> @@ -3204,12 +3256,12 @@ Adresse: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+223"/> <source>Usage:</source> <translation>Anvendelse:</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>List commands</source> <translation>Liste over kommandoer</translation> </message> @@ -3264,12 +3316,12 @@ Adresse: %4 <translation>Angiv din egen offentlige adresse</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <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="-148"/> + <location line="-150"/> <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> @@ -3289,17 +3341,17 @@ Adresse: %4 <translation>Accepter kommandolinje- og JSON-RPC-kommandoer</translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <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="+39"/> + <location line="+40"/> <source>Use the test network</source> <translation>Brug testnetværket</translation> </message> <message> - <location line="-118"/> + <location line="-120"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>Accepter forbindelser udefra (standard: 1 hvis hverken -proxy eller -connect)</translation> </message> @@ -3440,6 +3492,11 @@ f.eks.: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com </message> <message> <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation>Tilslut kun til de(n) angivne knude(r)</translation> </message> @@ -3650,6 +3707,11 @@ f.eks.: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com </message> <message> <location line="+2"/> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Start Bitcoin server</source> <translation>Start Bitcoin server</translation> </message> @@ -3699,12 +3761,12 @@ f.eks.: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation type="unfinished"/> </message> <message> - <location line="-79"/> + <location line="-80"/> <source>Imports blocks from external blk000??.dat file</source> <translation>Importerer blokke fra ekstern blk000??.dat fil</translation> </message> <message> - <location line="-105"/> + <location line="-106"/> <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> @@ -3724,7 +3786,7 @@ f.eks.: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Angiv nummeret af trÃ¥de til verificering af script (op til 16, 0 = automatisk, <0 = efterlad det antal kerner tilgængelige, standard: 0)</translation> </message> <message> - <location line="+89"/> + <location line="+90"/> <source>Information</source> <translation>Information</translation> </message> @@ -3794,7 +3856,7 @@ f.eks.: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Angiv tilslutningstimeout i millisekunder (standard: 5000)</translation> </message> <message> - <location line="+6"/> + <location line="+7"/> <source>System error: </source> <translation>Systemfejl: </translation> </message> @@ -3840,6 +3902,11 @@ f.eks.: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>version</source> <translation>version</translation> </message> @@ -3849,32 +3916,32 @@ f.eks.: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>wallet.dat ødelagt, redning af data mislykkedes</translation> </message> <message> - <location line="-58"/> + <location line="-60"/> <source>Password for JSON-RPC connections</source> <translation>Adgangskode til JSON-RPC-forbindelser</translation> </message> <message> - <location line="-70"/> + <location line="-71"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Tillad JSON-RPC-forbindelser fra bestemt IP-adresse</translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>Send kommandoer til knude, der kører pÃ¥ <ip> (standard: 127.0.0.1)</translation> </message> <message> - <location line="-132"/> + <location line="-133"/> <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="+161"/> + <location line="+163"/> <source>Upgrade wallet to latest format</source> <translation>Opgrader tegnebog til seneste format</translation> </message> <message> - <location line="-24"/> + <location line="-25"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Angiv nøglepoolstørrelse til <n> (standard: 100)</translation> </message> @@ -3884,12 +3951,12 @@ f.eks.: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Gennemsøg blokkæden for manglende tegnebogstransaktioner</translation> </message> <message> - <location line="+38"/> + <location line="+39"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Brug OpenSSL (https) for JSON-RPC-forbindelser</translation> </message> <message> - <location line="-30"/> + <location line="-31"/> <source>Server certificate file (default: server.cert)</source> <translation>Servercertifikat-fil (standard: server.cert)</translation> </message> @@ -3899,7 +3966,7 @@ f.eks.: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Serverens private nøgle (standard: server.pem)</translation> </message> <message> - <location line="+16"/> + <location line="+17"/> <source>This help message</source> <translation>Denne hjælpebesked</translation> </message> @@ -3909,12 +3976,12 @@ f.eks.: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Kunne ikke tildele %s pÃ¥ denne computer (bind returnerede fejl %d, %s)</translation> </message> <message> - <location line="-107"/> + <location line="-109"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>Tillad DNS-opslag for -addnode, -seednode og -connect</translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Loading addresses...</source> <translation>Indlæser adresser...</translation> </message> @@ -3929,12 +3996,12 @@ f.eks.: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Fejl ved indlæsning af wallet.dat: Tegnebog kræver en nyere version af Bitcoin</translation> </message> <message> - <location line="+98"/> + <location line="+99"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>Det var nødvendigt at genskrive tegnebogen: genstart Bitcoin for at gennemføre</translation> </message> <message> - <location line="-100"/> + <location line="-101"/> <source>Error loading wallet.dat</source> <translation>Fejl ved indlæsning af wallet.dat</translation> </message> @@ -3944,7 +4011,7 @@ f.eks.: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Ugyldig -proxy adresse: '%s'</translation> </message> <message> - <location line="+56"/> + <location line="+57"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Ukendt netværk anført i -onlynet: '%s'</translation> </message> @@ -3954,7 +4021,7 @@ f.eks.: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Ukendt -socks proxy-version: %i</translation> </message> <message> - <location line="-101"/> + <location line="-103"/> <source>Cannot resolve -bind address: '%s'</source> <translation>Kan ikke finde -bind adressen: '%s'</translation> </message> @@ -3964,7 +4031,7 @@ f.eks.: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Kan ikke finde -externalip adressen: '%s'</translation> </message> <message> - <location line="+48"/> + <location line="+49"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>Ugyldigt beløb for -paytxfee=<amount>: '%s'</translation> </message> @@ -3984,7 +4051,7 @@ f.eks.: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Indlæser blokindeks...</translation> </message> <message> - <location line="-62"/> + <location line="-63"/> <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> @@ -3994,12 +4061,12 @@ f.eks.: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Kunne ikke tildele %s pÃ¥ denne computer. Bitcoin kører sikkert allerede.</translation> </message> <message> - <location line="+95"/> + <location line="+96"/> <source>Loading wallet...</source> <translation>Indlæser tegnebog...</translation> </message> <message> - <location line="-56"/> + <location line="-57"/> <source>Cannot downgrade wallet</source> <translation>Kan ikke nedgradere tegnebog</translation> </message> @@ -4009,7 +4076,7 @@ f.eks.: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Kan ikke skrive standardadresse</translation> </message> <message> - <location line="+67"/> + <location line="+68"/> <source>Rescanning...</source> <translation>Genindlæser...</translation> </message> @@ -4019,17 +4086,17 @@ f.eks.: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Indlæsning gennemført</translation> </message> <message> - <location line="+85"/> + <location line="+86"/> <source>To use the %s option</source> <translation>For at bruge %s mulighed</translation> </message> <message> - <location line="-77"/> + <location line="-78"/> <source>Error</source> <translation>Fejl</translation> </message> <message> - <location line="-35"/> + <location line="-36"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_de.ts b/src/qt/locale/bitcoin_de.ts index 11bf37817a..e359b9fc09 100644 --- a/src/qt/locale/bitcoin_de.ts +++ b/src/qt/locale/bitcoin_de.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="de" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="de" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -36,6 +36,12 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open <source>The Bitcoin Core developers</source> <translation>Die "Bitcoin Core"-Entwickler</translation> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source> (%1-bit)</source> + <translation> (%1-Bit)</translation> + </message> </context> <context> <name>AddressBookPage</name> @@ -65,7 +71,7 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open <translation>&Kopieren</translation> </message> <message> - <location line="+52"/> + <location line="+58"/> <source>C&lose</source> <translation>&Schließen</translation> </message> @@ -75,7 +81,7 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open <translation>Adresse &kopieren</translation> </message> <message> - <location filename="../forms/addressbookpage.ui" line="-41"/> + <location filename="../forms/addressbookpage.ui" line="-47"/> <source>Delete the currently selected address from the list</source> <translation>Ausgewählte Adresse aus der Liste entfernen</translation> </message> @@ -322,7 +328,7 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+295"/> + <location filename="../bitcoingui.cpp" line="+294"/> <source>Sign &message...</source> <translation>Nachricht s&ignieren...</translation> </message> @@ -337,12 +343,12 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open <translation>&Ãœbersicht</translation> </message> <message> - <location line="-137"/> + <location line="-136"/> <source>Node</source> <translation>Knoten</translation> </message> <message> - <location line="+138"/> + <location line="+137"/> <source>Show general overview of wallet</source> <translation>Allgemeine Wallet-Ãœbersicht anzeigen</translation> </message> @@ -463,17 +469,17 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open <translation>Nachricht &verifizieren...</translation> </message> <message> - <location line="+430"/> + <location line="+440"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-643"/> + <location line="-652"/> <source>Wallet</source> <translation>Wallet</translation> </message> <message> - <location line="+146"/> + <location line="+145"/> <source>&Send</source> <translation>Ãœberweisen</translation> </message> @@ -529,18 +535,18 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open <translation>Registerkartenleiste</translation> </message> <message> - <location line="-284"/> - <location line="+376"/> + <location line="-283"/> + <location line="+375"/> <source>[testnet]</source> <translation>[Testnetz]</translation> </message> <message> - <location line="-401"/> + <location line="-400"/> <source>Bitcoin Core</source> - <translation>Bitcoin-Kern</translation> + <translation>Bitcoin Core</translation> </message> <message> - <location line="+163"/> + <location line="+162"/> <source>Request payments (generates QR codes and bitcoin: URIs)</source> <translation>Zahlungen anfordern (erzeugt QR-Codes und bitcoin: URIs)</translation> </message> @@ -602,7 +608,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="+23"/> + <location line="+27"/> <source>%n hour(s)</source> <translation><numerusform>%n Stunde</numerusform><numerusform>%n Stunden</numerusform></translation> </message> @@ -613,10 +619,21 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open </message> <message numerus="yes"> <location line="+4"/> + <location line="+6"/> <source>%n week(s)</source> <translation><numerusform>%n Woche</numerusform><numerusform>%n Wochen</numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation>%1 und %2</translation> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation><numerusform>%n Jahr</numerusform><numerusform>%n Jahre</numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation>%1 im Rückstand</translation> @@ -647,12 +664,12 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open <translation>Hinweis</translation> </message> <message> - <location line="-85"/> + <location line="-95"/> <source>Up to date</source> <translation>Auf aktuellem Stand</translation> </message> <message> - <location line="+34"/> + <location line="+44"/> <source>Catching up...</source> <translation>Hole auf...</translation> </message> @@ -689,7 +706,7 @@ Adresse: %4</translation> <translation>Wallet ist <b>verschlüsselt</b> und aktuell <b>gesperrt</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+441"/> <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> @@ -697,7 +714,7 @@ Adresse: %4</translation> <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+119"/> + <location filename="../clientmodel.cpp" line="+128"/> <source>Network Alert</source> <translation>Netzwerkalarm</translation> </message> @@ -750,7 +767,7 @@ Adresse: %4</translation> <translation>Wechselgeld:</translation> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation>Alles (de)selektieren</translation> </message> @@ -765,7 +782,7 @@ Adresse: %4</translation> <translation>Listenansicht</translation> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation>Betrag</translation> </message> @@ -795,7 +812,7 @@ Adresse: %4</translation> <translation>Priorität</translation> </message> <message> - <location filename="../coincontroldialog.cpp" line="+42"/> + <location filename="../coincontroldialog.cpp" line="+41"/> <source>Copy address</source> <translation>Adresse kopieren</translation> </message> @@ -861,7 +878,7 @@ Adresse: %4</translation> <translation>Wechselgeld kopieren</translation> </message> <message> - <location line="+323"/> + <location line="+332"/> <source>highest</source> <translation>am höchsten</translation> </message> @@ -916,7 +933,7 @@ Adresse: %4</translation> <translation>keine</translation> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation>Dust</translation> </message> @@ -979,7 +996,7 @@ Adresse: %4</translation> </message> <message> <location line="+43"/> - <location line="+66"/> + <location line="+63"/> <source>(no label)</source> <translation>(keine Bezeichnung)</translation> </message> @@ -1098,9 +1115,9 @@ Adresse: %4</translation> <translation>Bitcoin Core - Kommandozeilenoptionen</translation> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> - <translation>Bitcoin-Kern</translation> + <translation>Bitcoin Core</translation> </message> <message> <location line="+0"/> @@ -1176,7 +1193,7 @@ Adresse: %4</translation> <translation>Ein benutzerdefiniertes Datenverzeichnis verwenden:</translation> </message> <message> - <location filename="../intro.cpp" line="+85"/> + <location filename="../intro.cpp" line="+82"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> @@ -1242,7 +1259,7 @@ Adresse: %4</translation> <translation>&Allgemein</translation> </message> <message> - <location line="+6"/> + <location line="+122"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation>Optionale Transaktionsgebühr pro kB, die sicherstellt, dass ihre Transaktionen schnell bearbeitet werden. Die meisten Transaktionen sind 1 kB groß.</translation> </message> @@ -1252,7 +1269,7 @@ Adresse: %4</translation> <translation>Transaktions&gebühr bezahlen</translation> </message> <message> - <location line="+31"/> + <location line="-131"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation>Bitcoin nach der Anmeldung am System automatisch ausführen.</translation> </message> @@ -1267,12 +1284,7 @@ Adresse: %4</translation> <translation>Größe des &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"/> + <location line="+16"/> <source>MB</source> <translation>MB</translation> </message> @@ -1287,7 +1299,7 @@ Adresse: %4</translation> <translation>Maximale Anzahl an Skript-Verifizierungs-Threads festlegen (bis zu 16, 0 = automatisch, <0 = so viele Kerne frei lassen, Standard: 0)</translation> </message> <message> - <location line="+58"/> + <location line="+153"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation>Ãœber einen SOCKS-Proxy mit dem Bitcoin-Netzwerk verbinden.</translation> </message> @@ -1302,7 +1314,7 @@ Adresse: %4</translation> <translation>IP-Adresse des Proxies (z.B. IPv4: 127.0.0.1 / IPv6: ::1)</translation> </message> <message> - <location line="+224"/> + <location line="+214"/> <source>Active command-line options that override above options:</source> <translation>Aktive Kommandozeilenoptionen, die obige Konfiguration überschreiben:</translation> </message> @@ -1317,12 +1329,37 @@ Adresse: %4</translation> <translation>Konfiguration &zurücksetzen</translation> </message> <message> - <location line="-323"/> + <location line="-313"/> <source>&Network</source> <translation>&Netzwerk</translation> </message> <message> - <location line="+6"/> + <location line="-95"/> + <source>W&allet</source> + <translation>W&allet</translation> + </message> + <message> + <location line="+65"/> + <source>Expert</source> + <translation>Erweiterte Wallet-Optionen</translation> + </message> + <message> + <location line="+9"/> + <source>Enable coin &control features</source> + <translation>"&Coin Control"-Funktionen aktivieren</translation> + </message> + <message> + <location line="+7"/> + <source>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.</source> + <translation>Wenn Sie das Ausgeben von unbestätigtem Wechselgeld deaktivieren, kann das Wechselgeld einer Transaktion nicht verwendet werden, bis es mindestens eine Bestätigung erhalten hat. Dies wirkt sich auf die Berechnung des Kontostands aus.</translation> + </message> + <message> + <location line="+3"/> + <source>&Spend unconfirmed change</source> + <translation>&Unbestätigtes Wechselgeld darf ausgegeben werden</translation> + </message> + <message> + <location line="+17"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>Automatisch den Bitcoin-Clientport auf dem Router öffnen. Dies funktioniert nur, wenn ihr Router UPnP unterstützt und dies aktiviert ist.</translation> </message> @@ -1384,7 +1421,7 @@ Adresse: %4</translation> <message> <location line="+21"/> <source>&Display</source> - <translation>&Anzeige</translation> + <translation>Anzei&ge</translation> </message> <message> <location line="+8"/> @@ -1417,37 +1454,32 @@ Adresse: %4</translation> <translation>Adressen in der Transaktionsliste &anzeigen</translation> </message> <message> - <location line="+7"/> + <location line="-262"/> <source>Whether to show coin control features or not.</source> <translation>Legt fest, ob die "Coin Control"-Funktionen angezeigt werden.</translation> </message> <message> - <location line="+3"/> - <source>Display coin &control features (experts only)</source> - <translation>"&Coin Control"-Funktionen anzeigen (nur für Experten)</translation> - </message> - <message> - <location line="+136"/> + <location line="+398"/> <source>&OK</source> <translation>&OK</translation> </message> <message> <location line="+7"/> <source>&Cancel</source> - <translation>&Abbrechen</translation> + <translation>A&bbrechen</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+70"/> <source>default</source> <translation>Standard</translation> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation>keine</translation> </message> <message> - <location line="+75"/> + <location line="+78"/> <source>Confirm options reset</source> <translation>Zurücksetzen der Konfiguration bestätigen</translation> </message> @@ -1487,19 +1519,14 @@ Adresse: %4</translation> <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="-155"/> - <source>Unconfirmed:</source> - <translation>Unbestätigt:</translation> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation>Wallet</translation> </message> <message> <location line="+51"/> - <source>Confirmed:</source> - <translation>Bestätigt:</translation> + <source>Available:</source> + <translation>Verfügbar:</translation> </message> <message> <location line="+16"/> @@ -1507,7 +1534,12 @@ Adresse: %4</translation> <translation>Ihr aktuell verfügbarer Kontostand</translation> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation>Ausstehend:</translation> + </message> + <message> + <location line="+16"/> <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> @@ -1640,18 +1672,18 @@ Adresse: %4</translation> <context> <name>QObject</name> <message> - <location filename="../bitcoin.cpp" line="+71"/> - <location line="+11"/> + <location filename="../bitcoin.cpp" line="+63"/> + <location line="+14"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="+1"/> + <location line="-13"/> <source>Error: Specified data directory "%1" does not exist.</source> <translation>Fehler: Angegebenes Datenverzeichnis "%1" existiert nicht.</translation> </message> <message> - <location line="-12"/> + <location line="+13"/> <source>Error: Invalid combination of -regtest and -testnet.</source> <translation>Fehler: Ungültige Kombination von -regtest und -testnet.</translation> </message> @@ -1702,7 +1734,7 @@ Adresse: %4</translation> <location line="+36"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+359"/> + <location filename="../rpcconsole.cpp" line="+373"/> <source>N/A</source> <translation>k.A.</translation> </message> @@ -1798,11 +1830,13 @@ Adresse: %4</translation> </message> <message> <location line="+64"/> + <location filename="../rpcconsole.cpp" line="-10"/> <source>In:</source> <translation>eingehend:</translation> </message> <message> <location line="+80"/> + <location filename="../rpcconsole.cpp" line="+1"/> <source>Out:</source> <translation>ausgehend:</translation> </message> @@ -1827,7 +1861,7 @@ Adresse: %4</translation> <translation>Konsole zurücksetzen</translation> </message> <message> - <location filename="../rpcconsole.cpp" line="-30"/> + <location filename="../rpcconsole.cpp" line="-35"/> <source>Welcome to the Bitcoin RPC console.</source> <translation>Willkommen in der Bitcoin-RPC-Konsole.</translation> </message> @@ -1842,7 +1876,7 @@ Adresse: %4</translation> <translation>Bitte <b>help</b> eingeben, um eine Ãœbersicht verfügbarer Befehle zu erhalten.</translation> </message> <message> - <location line="+122"/> + <location line="+136"/> <source>%1 B</source> <translation>%1 B</translation> </message> @@ -1958,7 +1992,7 @@ Adresse: %4</translation> <translation>Anzeigen</translation> </message> <message> - <location line="+11"/> + <location line="+14"/> <source>Remove the selected entries from the list</source> <translation>Die ausgewählten Einträge aus der Liste entfernen</translation> </message> @@ -1968,7 +2002,7 @@ Adresse: %4</translation> <translation>Entfernen</translation> </message> <message> - <location filename="../receivecoinsdialog.cpp" line="+38"/> + <location filename="../receivecoinsdialog.cpp" line="+39"/> <source>Copy label</source> <translation>Bezeichnung kopieren</translation> </message> @@ -2038,7 +2072,7 @@ Adresse: %4</translation> <message> <location line="+2"/> <source>Message</source> - <translation>Nachricht signieren</translation> + <translation>Nachricht</translation> </message> <message> <location line="+10"/> @@ -2066,7 +2100,7 @@ Adresse: %4</translation> <message> <location line="+0"/> <source>Message</source> - <translation>Nachricht signieren</translation> + <translation>Nachricht</translation> </message> <message> <location line="+0"/> @@ -2189,12 +2223,12 @@ Adresse: %4</translation> <translation>&Zurücksetzen</translation> </message> <message> - <location line="+52"/> + <location line="+58"/> <source>Balance:</source> <translation>Kontostand:</translation> </message> <message> - <location line="-78"/> + <location line="-84"/> <source>Confirm the send action</source> <translation>Ãœberweisung bestätigen</translation> </message> @@ -2641,7 +2675,7 @@ Adresse: %4</translation> <message> <location filename="../splashscreen.cpp" line="+28"/> <source>Bitcoin Core</source> - <translation>Bitcoin-Kern</translation> + <translation>Bitcoin Core</translation> </message> <message> <location line="+2"/> @@ -2671,6 +2705,11 @@ Adresse: %4</translation> </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation>in Konflikt stehend</translation> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation>%1/offline</translation> </message> @@ -2774,7 +2813,7 @@ Adresse: %4</translation> <location line="+6"/> <location line="+9"/> <source>Message</source> - <translation>Nachricht signieren</translation> + <translation>Nachricht</translation> </message> <message> <location line="-7"/> @@ -2832,12 +2871,12 @@ Adresse: %4</translation> <translation>, wurde noch nicht erfolgreich übertragen</translation> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <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> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation>unbekannt</translation> </message> @@ -2878,12 +2917,12 @@ Adresse: %4</translation> <translation>Betrag</translation> </message> <message> - <location line="+59"/> + <location line="+78"/> <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="+16"/> + <location line="-21"/> <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> @@ -2893,23 +2932,12 @@ Adresse: %4</translation> <translation>Offen bis %1</translation> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> - <translation>Offline (%1 Bestätigungen)</translation> - </message> - <message> - <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation>Unbestätigt (%1 von %2 Bestätigungen)</translation> - </message> - <message> - <location line="-22"/> - <location line="+25"/> + <location line="+12"/> <source>Confirmed (%1 confirmations)</source> <translation>Bestätigt (%1 Bestätigungen)</translation> </message> <message> - <location line="-22"/> + <location line="+9"/> <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> @@ -2919,7 +2947,27 @@ Adresse: %4</translation> <translation>Generiert, jedoch nicht angenommen</translation> </message> <message> - <location line="+62"/> + <location line="-21"/> + <source>Offline</source> + <translation>Offline</translation> + </message> + <message> + <location line="+3"/> + <source>Unconfirmed</source> + <translation>Unbestätigt</translation> + </message> + <message> + <location line="+3"/> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation>Bestätige (%1 von %2 empfohlenen Bestätigungen)</translation> + </message> + <message> + <location line="+6"/> + <source>Conflicted</source> + <translation>in Konflikt stehend</translation> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation>Empfangen über</translation> </message> @@ -2949,7 +2997,7 @@ Adresse: %4</translation> <translation>(k.A.)</translation> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation>Transaktionsstatus. Fahren Sie mit der Maus über dieses Feld, um die Anzahl der Bestätigungen zu sehen.</translation> </message> @@ -3078,7 +3126,7 @@ Adresse: %4</translation> <translation>Transaktionsdetails anzeigen</translation> </message> <message> - <location line="+142"/> + <location line="+140"/> <source>Export Transaction History</source> <translation>Transaktionsverlauf exportieren</translation> </message> @@ -3215,12 +3263,12 @@ Adresse: %4</translation> <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+226"/> <source>Usage:</source> <translation>Benutzung:</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>List commands</source> <translation>Befehle auflisten</translation> </message> @@ -3250,12 +3298,7 @@ Adresse: %4</translation> <translation>Datenverzeichnis festlegen</translation> </message> <message> - <location line="-9"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation>Größe des Datenbankcaches in MB festlegen (Standard: 25)</translation> - </message> - <message> - <location line="-26"/> + <location line="-35"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation><port> nach Verbindungen abhören (Standard: 8333 oder Testnetz: 18333)</translation> </message> @@ -3275,47 +3318,47 @@ Adresse: %4</translation> <translation>Die eigene öffentliche Adresse angeben</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <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="-148"/> + <location line="-151"/> <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="-36"/> + <location line="-38"/> <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="+34"/> + <location line="+36"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation><port> nach JSON-RPC-Verbindungen abhören (Standard: 8332 oder Testnetz: 18332)</translation> </message> <message> - <location line="+45"/> + <location line="+46"/> <source>Accept command line and JSON-RPC commands</source> <translation>Kommandozeilenbefehle und JSON-RPC-Befehle annehmen</translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Run in the background as a daemon and accept commands</source> <translation>Als Hintergrunddienst starten und Befehle annehmen</translation> </message> <message> - <location line="+39"/> + <location line="+40"/> <source>Use the test network</source> <translation>Das Testnetz verwenden</translation> </message> <message> - <location line="-118"/> + <location line="-120"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>Eingehende Verbindungen annehmen (Standard: 1, wenn nicht -proxy oder -connect)</translation> </message> <message> - <location line="-95"/> + <location line="-98"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -3355,12 +3398,7 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f <translation>An die angegebene Adresse binden und immer abhören. Für IPv6 [Host]:Port-Schreibweise verwenden</translation> </message> <message> - <location line="+3"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> - <translation>Datenverzeichnis %s kann nicht gesperrt werden. Evtl. wurde Bitcoin bereits gestartet.</translation> - </message> - <message> - <location line="+3"/> + <location line="+6"/> <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>Regressionstest-Modus aktivieren, welcher eine spezielle Kette nutzt, in der Blöcke sofort gelöst werden. Dies ist für Regressionstest-Tools und Anwendungsentwicklung gedacht.</translation> </message> @@ -3371,6 +3409,11 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f </message> <message> <location line="+3"/> + <source>Error: Listening for incoming connections failed (listen returned error %d)</source> + <translation>Fehler: Abhören nach eingehenden Verbindungen fehlgeschlagen (Fehler %d)</translation> + </message> + <message> + <location line="+2"/> <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> @@ -3390,7 +3433,12 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f <translation>Dies ist eine Vorab-Testversion - Verwendung auf eigene Gefahr - nicht für Mining- oder Handelsanwendungen nutzen!</translation> </message> <message> - <location line="+5"/> + <location line="+3"/> + <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source> + <translation>Kann auf diesem Computer nicht an %s binden. Evtl. wurde Bitcoin Core bereits gestartet.</translation> + </message> + <message> + <location line="+3"/> <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> @@ -3437,7 +3485,7 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f <message> <location line="+1"/> <source>Bitcoin Core Daemon</source> - <translation>"Bitcoin Core"-Daemon</translation> + <translation>"Bitcoin Core"-Hintergrunddienst</translation> </message> <message> <location line="+1"/> @@ -3451,6 +3499,11 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f </message> <message> <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation>Liste der Wallet-Transaktionen zurücksetzen (Diagnosetool; beinhaltet -rescan)</translation> + </message> + <message> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation>Nur mit dem/den angegebenen Knoten verbinden</translation> </message> @@ -3645,7 +3698,12 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f <translation>Befehl an Bitcoin-Server senden</translation> </message> <message> - <location line="+7"/> + <location line="+5"/> + <source>Set database cache size in megabytes (%d to %d, default: %d)</source> + <translation>Größe des Datenbankcaches in MB festlegen (%d bis %d, Standard: %d)</translation> + </message> + <message> + <location line="+2"/> <source>Set maximum block size in bytes (default: %d)</source> <translation>Maximale Blockgröße in Byte festlegen (Standard: %d)</translation> </message> @@ -3661,6 +3719,11 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f </message> <message> <location line="+2"/> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation>Unbestätigtes Wechselgeld beim Senden von Transaktionen ausgeben (Standard: 1)</translation> + </message> + <message> + <location line="+1"/> <source>Start Bitcoin server</source> <translation>Bitcoin-Server starten</translation> </message> @@ -3710,12 +3773,17 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f <translation>Sie müssen die Datenbank mit Hilfe von -reindex neu aufbauen, um -txindex zu verändern</translation> </message> <message> - <location line="-79"/> + <location line="-80"/> <source>Imports blocks from external blk000??.dat file</source> <translation>Blöcke aus externer Datei blk000??.dat importieren</translation> </message> <message> - <location line="-105"/> + <location line="-126"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source> + <translation>Datenverzeichnis %s kann nicht gesperrt werden. Evtl. wurde Bitcoin Core bereits gestartet.</translation> + </message> + <message> + <location line="+19"/> <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> @@ -3735,7 +3803,7 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f <translation>Maximale Anzahl an Skript-Verifizierungs-Threads festlegen (bis zu 16, 0 = automatisch, <0 = so viele Kerne frei lassen, Standard: 0)</translation> </message> <message> - <location line="+89"/> + <location line="+91"/> <source>Information</source> <translation>Hinweis</translation> </message> @@ -3805,7 +3873,7 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f <translation>Verbindungstimeout in Millisekunden festlegen (Standard: 5000)</translation> </message> <message> - <location line="+6"/> + <location line="+7"/> <source>System error: </source> <translation>Systemfehler: </translation> </message> @@ -3851,6 +3919,11 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation>Lösche alle Transaktionen aus Wallet...</translation> + </message> + <message> + <location line="+1"/> <source>version</source> <translation>Version</translation> </message> @@ -3860,32 +3933,32 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f <translation>wallet.dat beschädigt, Rettung fehlgeschlagen</translation> </message> <message> - <location line="-58"/> + <location line="-60"/> <source>Password for JSON-RPC connections</source> <translation>Passwort für JSON-RPC-Verbindungen</translation> </message> <message> - <location line="-70"/> + <location line="-71"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>JSON-RPC-Verbindungen von der angegebenen IP-Adresse erlauben</translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>Sende Befehle an Knoten <ip> (Standard: 127.0.0.1)</translation> </message> <message> - <location line="-132"/> + <location line="-134"/> <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="+161"/> + <location line="+164"/> <source>Upgrade wallet to latest format</source> <translation>Wallet auf das neueste Format aktualisieren</translation> </message> <message> - <location line="-24"/> + <location line="-25"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Größe des Schlüsselpools festlegen auf <n> (Standard: 100)</translation> </message> @@ -3895,12 +3968,12 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f <translation>Blockkette erneut nach fehlenden Wallet-Transaktionen durchsuchen</translation> </message> <message> - <location line="+38"/> + <location line="+39"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>OpenSSL (https) für JSON-RPC-Verbindungen verwenden</translation> </message> <message> - <location line="-30"/> + <location line="-31"/> <source>Server certificate file (default: server.cert)</source> <translation>Serverzertifikat (Standard: server.cert)</translation> </message> @@ -3910,7 +3983,7 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f <translation>Privater Serverschlüssel (Standard: server.pem)</translation> </message> <message> - <location line="+16"/> + <location line="+17"/> <source>This help message</source> <translation>Dieser Hilfetext</translation> </message> @@ -3920,12 +3993,12 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f <translation>Kann auf diesem Computer nicht an %s binden (von bind zurückgegebener Fehler %d, %s)</translation> </message> <message> - <location line="-107"/> + <location line="-109"/> <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="+60"/> + <location line="+61"/> <source>Loading addresses...</source> <translation>Lade Adressen...</translation> </message> @@ -3940,12 +4013,12 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f <translation>Fehler beim Laden von wallet.dat: Wallet benötigt neuere Version von Bitcoin</translation> </message> <message> - <location line="+98"/> + <location line="+99"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>Wallet musste neu geschrieben werden: starten Sie Bitcoin zur Fertigstellung neu</translation> </message> <message> - <location line="-100"/> + <location line="-101"/> <source>Error loading wallet.dat</source> <translation>Fehler beim Laden von wallet.dat</translation> </message> @@ -3955,7 +4028,7 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f <translation>Ungültige Adresse in -proxy: '%s'</translation> </message> <message> - <location line="+56"/> + <location line="+57"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Unbekannter Netztyp in -onlynet angegeben: '%s'</translation> </message> @@ -3965,7 +4038,7 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f <translation>Unbekannte Proxyversion in -socks angefordert: %i</translation> </message> <message> - <location line="-101"/> + <location line="-103"/> <source>Cannot resolve -bind address: '%s'</source> <translation>Kann Adresse in -bind nicht auflösen: '%s'</translation> </message> @@ -3975,7 +4048,7 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f <translation>Kann Adresse in -externalip nicht auflösen: '%s'</translation> </message> <message> - <location line="+48"/> + <location line="+49"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>Ungültiger Betrag für -paytxfee=<amount>: '%s'</translation> </message> @@ -3995,22 +4068,17 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f <translation>Lade Blockindex...</translation> </message> <message> - <location line="-62"/> + <location line="-63"/> <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="-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="+95"/> + <location line="+64"/> <source>Loading wallet...</source> <translation>Lade Wallet...</translation> </message> <message> - <location line="-56"/> + <location line="-57"/> <source>Cannot downgrade wallet</source> <translation>Wallet kann nicht auf eine ältere Version herabgestuft werden</translation> </message> @@ -4020,7 +4088,7 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f <translation>Standardadresse kann nicht geschrieben werden</translation> </message> <message> - <location line="+67"/> + <location line="+68"/> <source>Rescanning...</source> <translation>Durchsuche erneut...</translation> </message> @@ -4030,17 +4098,17 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f <translation>Laden abgeschlossen</translation> </message> <message> - <location line="+85"/> + <location line="+86"/> <source>To use the %s option</source> <translation>Zur Nutzung der %s Option</translation> </message> <message> - <location line="-77"/> + <location line="-78"/> <source>Error</source> <translation>Fehler</translation> </message> <message> - <location line="-35"/> + <location line="-36"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_de_AT.ts b/src/qt/locale/bitcoin_de_AT.ts deleted file mode 100644 index 5dd65e0de4..0000000000 --- a/src/qt/locale/bitcoin_de_AT.ts +++ /dev/null @@ -1,4026 +0,0 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="de_AT" version="2.0"> -<context> - <name>AboutDialog</name> - <message> - <location filename="../forms/aboutdialog.ui" line="+14"/> - <source>About Bitcoin Core</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+39"/> - <source><b>Bitcoin Core</b> version</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+57"/> - <source> -This is experimental software. - -Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php. - -This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../utilitydialog.cpp" line="+29"/> - <source>Copyright</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+0"/> - <source>The Bitcoin Core developers</source> - <translation type="unfinished"/> - </message> -</context> -<context> - <name>AddressBookPage</name> - <message> - <location filename="../forms/addressbookpage.ui" line="+30"/> - <source>Double-click to edit address or label</source> - <translation>Doppelklickn zan Editian vo Adress und Titl</translation> - </message> - <message> - <location line="+27"/> - <source>Create a new address</source> - <translation>Eazeig a neiche Adress</translation> - </message> - <message> - <location line="+3"/> - <source>&New</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+11"/> - <source>Copy the currently selected address to the system clipboard</source> - <translation>Kopia di ausgwöhte Adress in' Puffa</translation> - </message> - <message> - <location line="+3"/> - <source>&Copy</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+52"/> - <source>C&lose</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../addressbookpage.cpp" line="+74"/> - <source>&Copy Address</source> - <translation>Adress &Kopian</translation> - </message> - <message> - <location filename="../forms/addressbookpage.ui" line="-41"/> - <source>Delete the currently selected address from the list</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+27"/> - <source>Export the data in the current tab to a file</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> - <source>&Export</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-27"/> - <source>&Delete</source> - <translation>&Leschn</translation> - </message> - <message> - <location filename="../addressbookpage.cpp" line="-30"/> - <source>Choose the address to send coins to</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Choose the address to receive coins with</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+5"/> - <source>C&hoose</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+6"/> - <source>Sending addresses</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Receiving addresses</source> - <translation type="unfinished"/> - </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"/> - </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"/> - </message> - <message> - <location line="+7"/> - <source>Copy &Label</source> - <translation>&Titl Kopian</translation> - </message> - <message> - <location line="+1"/> - <source>&Edit</source> - <translation>&Ändan</translation> - </message> - <message> - <location line="+194"/> - <source>Export Address List</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Comma separated file (*.csv)</source> - <translation>Beistrich 'trennte Weate (*.csv)</translation> - </message> - <message> - <location line="+13"/> - <source>Exporting Failed</source> - <translation type="unfinished"/> - </message> - <message> - <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="+168"/> - <source>Label</source> - <translation>Titl</translation> - </message> - <message> - <location line="+0"/> - <source>Address</source> - <translation>Adress</translation> - </message> - <message> - <location line="+36"/> - <source>(no label)</source> - <translation>nixda</translation> - </message> -</context> -<context> - <name>AskPassphraseDialog</name> - <message> - <location filename="../forms/askpassphrasedialog.ui" line="+26"/> - <source>Passphrase Dialog</source> - <translation>Geheimwort-Eingabedialog</translation> - </message> - <message> - <location line="+21"/> - <source>Enter passphrase</source> - <translation>Gib dei Geheimwuat ei</translation> - </message> - <message> - <location line="+14"/> - <source>New passphrase</source> - <translation>Gib a neix Geheimwuat ei</translation> - </message> - <message> - <location line="+14"/> - <source>Repeat new passphrase</source> - <translation>Und des gleiche noamoi</translation> - </message> - <message> - <location filename="../askpassphrasedialog.cpp" line="+40"/> - <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>10 or more random characters</b>, or <b>eight or more words</b>.</source> - <translation>A neix Geheimwuat fias Beasl vagebn.<br/>Vawend dabei entweda <b>10 (oda mea) zufölliche Zeichn</b> (oiso Buchstobn, Ziffan, Sondazeichn), oda <b>ocht (oda mea) gaunze Weata</b>.</translation> - </message> - <message> - <location line="+1"/> - <source>Encrypt wallet</source> - <translation>Vaschlissl 's Beasl</translation> - </message> - <message> - <location line="+3"/> - <source>This operation needs your wallet passphrase to unlock the wallet.</source> - <translation>Dafia muasst dei Beasl mitm Geheimwuat aufspean.</translation> - </message> - <message> - <location line="+5"/> - <source>Unlock wallet</source> - <translation>Beasl aufspean</translation> - </message> - <message> - <location line="+3"/> - <source>This operation needs your wallet passphrase to decrypt the wallet.</source> - <translation>Dafia musst des Beasl mitm Geheimwuat entschlissln.</translation> - </message> - <message> - <location line="+5"/> - <source>Decrypt wallet</source> - <translation>Beasl entschlissln</translation> - </message> - <message> - <location line="+3"/> - <source>Change passphrase</source> - <translation>Geheimwuat ändan</translation> - </message> - <message> - <location line="+1"/> - <source>Enter the old and new passphrase to the wallet.</source> - <translation>Gib des oite und des neiche Geheimwuat fias Beasl ei.</translation> - </message> - <message> - <location line="+46"/> - <source>Confirm wallet encryption</source> - <translation>Beasl-Vaschlisselung bschtätign</translation> - </message> - <message> - <location line="+1"/> - <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+0"/> - <source>Are you sure you wish to encrypt your wallet?</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+15"/> - <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+100"/> - <location line="+24"/> - <source>Warning: The Caps Lock key is on!</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-130"/> - <location line="+58"/> - <source>Wallet encrypted</source> - <translation>Beasl is vaschlisslt</translation> - </message> - <message> - <location line="-56"/> - <source>Bitcoin will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> - <translation>Bitcoin wiad si jetz vatschüssn um de Vaschlisselung obzschliaßn. Denk draun, doss di söbst de Vaschlisselung ned vua an Maleur schitzn kau, waunnst amoi a Ungeziefa (schadsoftware: viren, trojaner) auf dein Rechna host (oda losst).</translation> - </message> - <message> - <location line="+13"/> - <location line="+7"/> - <location line="+42"/> - <location line="+6"/> - <source>Wallet encryption failed</source> - <translation>Vaschlisselung vom Beasl is föhgschlogn</translation> - </message> - <message> - <location line="-54"/> - <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> - <translation>Vaschlisselung vom Beasl is wegn an inteanen Föhla föhgschlogn. Bleede Gschicht. Jetz is' immano unvaschlisslt.</translation> - </message> - <message> - <location line="+7"/> - <location line="+48"/> - <source>The supplied passphrases do not match.</source> - <translation>howined gsogd: <b>des gleiche<b/> noamoi?</translation> - </message> - <message> - <location line="-37"/> - <source>Wallet unlock failed</source> - <translation>Beasl aufspean is föhgschlogn</translation> - </message> - <message> - <location line="+1"/> - <location line="+11"/> - <location line="+19"/> - <source>The passphrase entered for the wallet decryption was incorrect.</source> - <translation>Des Geheimwuat fias Beasl-Entschlissln woa owa sowos vo foisch.</translation> - </message> - <message> - <location line="-20"/> - <source>Wallet decryption failed</source> - <translation>Beasl-Entschlisselung is föhgschlogn</translation> - </message> - <message> - <location line="+14"/> - <source>Wallet passphrase was successfully changed.</source> - <translation type="unfinished"/> - </message> -</context> -<context> - <name>BitcoinGUI</name> - <message> - <location filename="../bitcoingui.cpp" line="+295"/> - <source>Sign &message...</source> - <translation>A Mödung untaschreim...</translation> - </message> - <message> - <location line="+335"/> - <source>Synchronizing with network...</source> - <translation>Obgleichn midm Netz...</translation> - </message> - <message> - <location line="-407"/> - <source>&Overview</source> - <translation>&Iwasicht</translation> - </message> - <message> - <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's Beasl</translation> - </message> - <message> - <location line="+20"/> - <source>&Transactions</source> - <translation>&Iwaweisungen</translation> - </message> - <message> - <location line="+1"/> - <source>Browse transaction history</source> - <translation>Oite Iwaweisungen tscheckn</translation> - </message> - <message> - <location line="+17"/> - <source>E&xit</source> - <translation>&baba</translation> - </message> - <message> - <location line="+1"/> - <source>Quit application</source> - <translation>Baba und foi ned!</translation> - </message> - <message> - <location line="+7"/> - <source>Show information about Bitcoin</source> - <translation>Zeig Infoamationen iwa Bitcoin</translation> - </message> - <message> - <location line="+3"/> - <location line="+2"/> - <source>About &Qt</source> - <translation>Iwa &Qt</translation> - </message> - <message> - <location line="+2"/> - <source>Show information about Qt</source> - <translation>Zeig Infoamationen iwa Qt</translation> - </message> - <message> - <location line="+2"/> - <source>&Options...</source> - <translation>&Eistöllungen...</translation> - </message> - <message> - <location line="+9"/> - <source>&Encrypt Wallet...</source> - <translation>'s &Beasl vaschlissln...</translation> - </message> - <message> - <location line="+3"/> - <source>&Backup Wallet...</source> - <translation>&Sicharungskopie vom Beasl mochn...</translation> - </message> - <message> - <location line="+2"/> - <source>&Change Passphrase...</source> - <translation>&Geheimwuat ändan...</translation> - </message> - <message> - <location line="+10"/> - <source>&Sending addresses...</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> - <source>&Receiving addresses...</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> - <source>Open &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"/> - </message> - <message> - <location line="-405"/> - <source>Send coins to a Bitcoin address</source> - <translation>Schick Zasta aun a Bitcoin Adress</translation> - </message> - <message> - <location line="+49"/> - <source>Modify configuration options for Bitcoin</source> - <translation>Ända de Eistöllungen fia Bitcoin</translation> - </message> - <message> - <location line="+12"/> - <source>Backup wallet to another location</source> - <translation>Moch a Sichaheitskopie woaundas hin</translation> - </message> - <message> - <location line="+2"/> - <source>Change the passphrase used for wallet encryption</source> - <translation>Des Geheimwuat fia Beasl-Vaschlisselung ändan</translation> - </message> - <message> - <location line="+6"/> - <source>&Debug window</source> - <translation>&Debug Fensta</translation> - </message> - <message> - <location line="+1"/> - <source>Open debugging and diagnostic console</source> - <translation>Debug und Diagnose Konsole öffnen</translation> - </message> - <message> - <location line="-4"/> - <source>&Verify message...</source> - <translation>&Untaschrift tscheckn...</translation> - </message> - <message> - <location line="+430"/> - <source>Bitcoin</source> - <translation>Bitcoin</translation> - </message> - <message> - <location line="-643"/> - <source>Wallet</source> - <translation>Beasl</translation> - </message> - <message> - <location line="+146"/> - <source>&Send</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+7"/> - <source>&Receive</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+46"/> - <location line="+2"/> - <source>&Show / Hide</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Show or hide the main Window</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> - <source>Encrypt the private keys that belong to your wallet</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+7"/> - <source>Sign messages with your Bitcoin addresses to prove you own them</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> - <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+48"/> - <source>&File</source> - <translation>&Datei</translation> - </message> - <message> - <location line="+14"/> - <source>&Settings</source> - <translation>&Eistöllungen</translation> - </message> - <message> - <location line="+9"/> - <source>&Help</source> - <translation>&Hüfe</translation> - </message> - <message> - <location line="+15"/> - <source>Tabs toolbar</source> - <translation>Karteireita Werkzeigleistn</translation> - </message> - <message> - <location line="-284"/> - <location line="+376"/> - <source>[testnet]</source> - <translation>[testnetz]</translation> - </message> - <message> - <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="+29"/> - <location line="+2"/> - <source>&About Bitcoin Core</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+35"/> - <source>Show the list of used sending addresses and labels</source> - <translation type="unfinished"/> - </message> - <message> - <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>&Command-line options</source> - <translation type="unfinished"/> - </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"/> - </message> - <message> - <location line="+159"/> - <location line="+5"/> - <source>Bitcoin client</source> - <translation>Bitcoin Klient</translation> - </message> - <message numerus="yes"> - <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> - <message> - <location line="+22"/> - <source>No block source available...</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+12"/> - <source>Processed %1 of %2 (estimated) blocks of transaction history.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+4"/> - <source>Processed %1 blocks of transaction history.</source> - <translation type="unfinished"/> - </message> - <message numerus="yes"> - <location line="+23"/> - <source>%n hour(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> - </message> - <message numerus="yes"> - <location line="+4"/> - <source>%n day(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> - </message> - <message numerus="yes"> - <location line="+4"/> - <source>%n week(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> - </message> - <message> - <location line="+4"/> - <source>%1 behind</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+21"/> - <source>Last received block was generated %1 ago.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> - <source>Transactions after this will not yet be visible.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+27"/> - <source>Error</source> - <translation>Föhla</translation> - </message> - <message> - <location line="+3"/> - <source>Warning</source> - <translation>Pass auf</translation> - </message> - <message> - <location line="+3"/> - <source>Information</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-85"/> - <source>Up to date</source> - <translation>Aktuö</translation> - </message> - <message> - <location line="+34"/> - <source>Catching up...</source> - <translation>Aufhoin...</translation> - </message> - <message> - <location line="+130"/> - <source>Sent transaction</source> - <translation>Iwaweisung oogschickt</translation> - </message> - <message> - <location line="+0"/> - <source>Incoming transaction</source> - <translation>Iwaweisung aun dii</translation> - </message> - <message> - <location line="+1"/> - <source>Date: %1 -Amount: %2 -Type: %3 -Address: %4 -</source> - <translation>Waunn: %1 -Wiavü: %2 -Wos: %3 -Wohin: %4 -</translation> - </message> - <message> - <location line="+69"/> - <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> - <translation>'s Beasl is <b>vaschlisslt</b> und deazeit grod <b>aufgschpeat</b></translation> - </message> - <message> - <location line="+8"/> - <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> - <translation>'s Beasl is <b>vaschlisslt</b> und deazeit grod <b>zuagschpeat</b></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>Netz Alarm</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>Quantität:</translation> - </message> - <message> - <location line="+29"/> - <source>Bytes:</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+45"/> - <source>Amount:</source> - <translation>Betrog:</translation> - </message> - <message> - <location line="+29"/> - <source>Priority:</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+45"/> - <source>Fee:</source> - <translation>Gebühr:</translation> - </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>Betrog</translation> - </message> - <message> - <location line="+10"/> - <source>Address</source> - <translation>Adress</translation> - </message> - <message> - <location line="+5"/> - <source>Date</source> - <translation>Waunn</translation> - </message> - <message> - <location line="+5"/> - <source>Confirmations</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> - <source>Confirmed</source> - <translation>Bschtätigt</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>Adress in' Puffa kopian</translation> - </message> - <message> - <location line="+1"/> - <source>Copy label</source> - <translation>Titl in' Puffa kopian</translation> - </message> - <message> - <location line="+1"/> - <location line="+26"/> - <source>Copy amount</source> - <translation>Betrog in' Puffa kopian</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>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 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 "medium".</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>nixda</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"/> - <source>Edit Address</source> - <translation>Adress ändan</translation> - </message> - <message> - <location line="+11"/> - <source>&Label</source> - <translation>&Titl</translation> - </message> - <message> - <location line="+10"/> - <source>The label associated with this address list entry</source> - <translation type="unfinished"/> - </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"/> - </message> - <message> - <location line="-10"/> - <source>&Address</source> - <translation>&Adress</translation> - </message> - <message> - <location filename="../editaddressdialog.cpp" line="+28"/> - <source>New receiving address</source> - <translation>Neiche Empfaungsadress</translation> - </message> - <message> - <location line="+4"/> - <source>New sending address</source> - <translation>Neiche Züü-Adress</translation> - </message> - <message> - <location line="+3"/> - <source>Edit receiving address</source> - <translation>Empfaungs-Adress ändan</translation> - </message> - <message> - <location line="+4"/> - <source>Edit sending address</source> - <translation>Züü-Adress ändan</translation> - </message> - <message> - <location line="+76"/> - <source>The entered address "%1" is already in the address book.</source> - <translation>De eingebene Adress "%1" gibts eh scho im Adressbiachl.</translation> - </message> - <message> - <location line="-5"/> - <source>The entered address "%1" is not a valid Bitcoin address.</source> - <translation>De eingebane Adress "%1" is a Kas.</translation> - </message> - <message> - <location line="+10"/> - <source>Could not unlock wallet.</source> - <translation>'s Aufspean vom Beasl is föhgschlogn.</translation> - </message> - <message> - <location line="+5"/> - <source>New key generation failed.</source> - <translation>Neicha Schlissl hod ned eazeigt weadn kennan.</translation> - </message> -</context> -<context> - <name>FreespaceChecker</name> - <message> - <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"/> - </message> - <message> - <location line="+2"/> - <source>Directory already exists. Add %1 if you intend to create a new directory here.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> - <source>Path already exists, and is not a directory.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+7"/> - <source>Cannot create data directory here.</source> - <translation type="unfinished"/> - </message> -</context> -<context> - <name>HelpMessageDialog</name> - <message> - <location filename="../forms/helpmessagedialog.ui" line="+19"/> - <source>Bitcoin Core - Command-line options</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../utilitydialog.cpp" line="+38"/> - <source>Bitcoin Core</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+0"/> - <source>version</source> - <translation>veasion</translation> - </message> - <message> - <location line="+2"/> - <source>Usage:</source> - <translation>Vawendung:</translation> - </message> - <message> - <location line="+1"/> - <source>command-line options</source> - <translation>Kommandozeiln-Optionen</translation> - </message> - <message> - <location line="+4"/> - <source>UI options</source> - <translation>UI Optionen</translation> - </message> - <message> - <location line="+1"/> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>de Sproch, am Bestn "de_AT" (sunsta: de Standard-Sproch auf dera Maschin)</translation> - </message> - <message> - <location line="+1"/> - <source>Start minimized</source> - <translation>Mid minimiatn Fensta startn</translation> - </message> - <message> - <location line="+1"/> - <source>Show splash screen on startup (default: 1)</source> - <translation>Zeig a Willkommens-Fensterl beim Starten (waunn ned aundas aungebm: 1)</translation> - </message> - <message> - <location line="+1"/> - <source>Choose data directory on startup (default: 0)</source> - <translation type="unfinished"/> - </message> -</context> -<context> - <name>Intro</name> - <message> - <location filename="../forms/intro.ui" line="+14"/> - <source>Welcome</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+9"/> - <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 Core will store its data.</source> - <translation type="unfinished"/> - </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"/> - </message> - <message> - <location line="+10"/> - <source>Use the default data directory</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+7"/> - <source>Use a custom data directory:</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../intro.cpp" line="+85"/> - <source>Bitcoin</source> - <translation>Bitcoin</translation> - </message> - <message> - <location line="+1"/> - <source>Error: Specified data directory "%1" can not be created.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+19"/> - <source>Error</source> - <translation>Föhla</translation> - </message> - <message> - <location line="+9"/> - <source>GB of free space available</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> - <source>(of %1GB needed)</source> - <translation type="unfinished"/> - </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>Eistöllungen</translation> - </message> - <message> - <location line="+13"/> - <source>&Main</source> - <translation>&Masta</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"/> - </message> - <message> - <location line="+15"/> - <source>Pay transaction &fee</source> - <translation>Iwaweisungs-Gebührn zoin</translation> - </message> - <message> - <location line="+31"/> - <source>Automatically start Bitcoin after logging in to the system.</source> - <translation>Bitcoin automatisch nochm Einloggn starten.</translation> - </message> - <message> - <location line="+3"/> - <source>&Start Bitcoin on system login</source> - <translation>Bitcoin beim System-Einloggen starten</translation> - </message> - <message> - <location line="+9"/> - <source>Size of &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 &verification threads</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+13"/> - <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+58"/> - <source>Connect to the Bitcoin network through a SOCKS proxy.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> - <source>&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> - <message> - <location line="+3"/> - <source>&Reset Options</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-323"/> - <source>&Network</source> - <translation>&Netzwerk</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>Automatisch den Router fia 'n Bitcoin port eistölln. Des geht nur, waunn da Router UPnP kaunn und waunns des durtn aa eigschoitn is.</translation> - </message> - <message> - <location line="+3"/> - <source>Map port using &UPnP</source> - <translation>Port mit UPnP zuweisen</translation> - </message> - <message> - <location line="+19"/> - <source>Proxy &IP:</source> - <translation>Proxy &IP:</translation> - </message> - <message> - <location line="+32"/> - <source>&Port:</source> - <translation>&Port:</translation> - </message> - <message> - <location line="+25"/> - <source>Port of the proxy (e.g. 9050)</source> - <translation>Port vom Proxy (z.B. 9050)</translation> - </message> - <message> - <location line="+7"/> - <source>SOCKS &Version:</source> - <translation>SOCKS &Version:</translation> - </message> - <message> - <location line="+13"/> - <source>SOCKS version of the proxy (e.g. 5)</source> - <translation>SOCKS version vom Proxy (e.g. 5)</translation> - </message> - <message> - <location line="+36"/> - <source>&Window</source> - <translation>&Fensta</translation> - </message> - <message> - <location line="+6"/> - <source>Show only a tray icon after minimizing the window.</source> - <translation>Zeig nur 's Tray-Büderl, waunns Fensta minimiat wird.</translation> - </message> - <message> - <location line="+3"/> - <source>&Minimize to the tray instead of the taskbar</source> - <translation>Minimier in' Tray stott in' Taskbar</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>Waunns Fensta gschlossn wiad, moch kaan Exitus, sondan minimier di afoch nua. Zum wiaklichn Beendn muass ma daunn im Menü auf "baba und foi ned" klickn.</translation> - </message> - <message> - <location line="+3"/> - <source>M&inimize on close</source> - <translation>Minimian stott Schliaßn</translation> - </message> - <message> - <location line="+21"/> - <source>&Display</source> - <translation>&Anzeige</translation> - </message> - <message> - <location line="+8"/> - <source>User Interface &language:</source> - <translation>Sproch fias UI:</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>De UI Sproch kaunn do gsetzt weadn. Auswiakn tuat si des owa eascht beim nächsten Start.</translation> - </message> - <message> - <location line="+11"/> - <source>&Unit to show amounts in:</source> - <translation>&Weat-Einheit, in dea Beträge zeigt weadn:</translation> - </message> - <message> - <location line="+13"/> - <source>Choose the default subdivision unit to show in the interface and when sending coins.</source> - <translation>Wöh de standard Unta-Einheit aus, mit der Beträge im UI und beim Vaschickn zeigt weadn.</translation> - </message> - <message> - <location line="+9"/> - <source>Whether to show Bitcoin addresses in the transaction list or not.</source> - <translation>Ob Bitcoin Adressn in da Iwaweisungslistn zeigt weadn soin, oda ned.</translation> - </message> - <message> - <location line="+3"/> - <source>&Display addresses in transaction list</source> - <translation>Zeig Adressn in a Iwaweisungslistn</translation> - </message> - <message> - <location line="+7"/> - <source>Whether to show coin control features or not.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> - <source>Display coin &control features (experts only)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+136"/> - <source>&OK</source> - <translation>&Passt!</translation> - </message> - <message> - <location line="+7"/> - <source>&Cancel</source> - <translation>&Na Ned!</translation> - </message> - <message> - <location filename="../optionsdialog.cpp" line="+67"/> - <source>default</source> - <translation>sunsta</translation> - </message> - <message> - <location line="+57"/> - <source>none</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+75"/> - <source>Confirm options reset</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <location line="+29"/> - <source>Client restart required to activate changes.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-29"/> - <source>Client will be shutdown, do you want to proceed?</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+33"/> - <source>This change would require a client restart.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+34"/> - <source>The supplied proxy address is invalid.</source> - <translation>De aungebane Proxy-Adress is a Kas.</translation> - </message> -</context> -<context> - <name>OverviewPage</name> - <message> - <location filename="../forms/overviewpage.ui" line="+14"/> - <source>Form</source> - <translation>Foamulaa</translation> - </message> - <message> - <location line="+50"/> - <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="-155"/> - <source>Unconfirmed:</source> - <translation>Gerüchteweis:</translation> - </message> - <message> - <location line="-83"/> - <source>Wallet</source> - <translation>Beasl</translation> - </message> - <message> - <location line="+51"/> - <source>Confirmed:</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+16"/> - <source>Your current spendable balance</source> - <translation type="unfinished"/> - </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"/> - </message> - <message> - <location line="+16"/> - <source>Immature:</source> - <translation>Unreif:</translation> - </message> - <message> - <location line="+13"/> - <source>Mined balance that has not yet matured</source> - <translation>Gschiafta Betrog, dea no ned reif is</translation> - </message> - <message> - <location line="+16"/> - <source>Total:</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+16"/> - <source>Your current total balance</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+71"/> - <source><b>Recent transactions</b></source> - <translation><b>unlängste Iwaweisungen</b></translation> - </message> - <message> - <location filename="../overviewpage.cpp" line="+120"/> - <location line="+1"/> - <source>out of sync</source> - <translation>nimma atkuö</translation> - </message> -</context> -<context> - <name>PaymentServer</name> - <message> - <location filename="../paymentserver.cpp" line="+403"/> - <location line="+13"/> - <source>URI handling</source> - <translation>URI Behaundlung</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>De URI is a Kas! Meglichaweis is de Bitcoin Adress foisch, oda hoit sunst wos vamuakst.</translation> - </message> - <message> - <location line="+96"/> - <source>Requested payment amount of %1 is too small (considered dust).</source> - <translation type="unfinished"/> - </message> - <message> - <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>Your active proxy doesn'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"/> - </message> - <message> - <location line="+43"/> - <source>Error communicating with %1: %2</source> - <translation type="unfinished"/> - </message> - <message> - <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="+33"/> - <source>Payment acknowledged</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-11"/> - <source>Network request error</source> - <translation type="unfinished"/> - </message> -</context> -<context> - <name>QObject</name> - <message> - <location filename="../bitcoin.cpp" line="+71"/> - <location line="+11"/> - <source>Bitcoin</source> - <translation>Bitcoin</translation> - </message> - <message> - <location line="+1"/> - <source>Error: Specified data directory "%1" does not exist.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-12"/> - <source>Error: Invalid combination of -regtest and -testnet.</source> - <translation type="unfinished"/> - </message> -</context> -<context> - <name>QRImageWidget</name> - <message> - <location filename="../receiverequestdialog.cpp" line="+36"/> - <source>&Save Image...</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> - <source>&Copy Image</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+28"/> - <source>Save QR Code</source> - <translation>QR-Büderl speichan</translation> - </message> - <message> - <location line="+0"/> - <source>PNG Image (*.png)</source> - <translation type="unfinished"/> - </message> -</context> -<context> - <name>RPCConsole</name> - <message> - <location filename="../forms/rpcconsole.ui" line="+46"/> - <source>Client name</source> - <translation>Klient Namen</translation> - </message> - <message> - <location line="+10"/> - <location line="+23"/> - <location line="+26"/> - <location line="+23"/> - <location line="+23"/> - <location line="+36"/> - <location line="+23"/> - <location line="+36"/> - <location line="+23"/> - <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+359"/> - <source>N/A</source> - <translation>Nix</translation> - </message> - <message> - <location line="-223"/> - <source>Client version</source> - <translation>Klient Veasion</translation> - </message> - <message> - <location line="-45"/> - <source>&Information</source> - <translation>&Information</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="+53"/> - <source>Using OpenSSL version</source> - <translation>Vawend OpenSSL in a Version</translation> - </message> - <message> - <location line="+49"/> - <source>Startup time</source> - <translation>Startzeit</translation> - </message> - <message> - <location line="+29"/> - <source>Network</source> - <translation>Netz</translation> - </message> - <message> - <location line="+7"/> - <source>Name</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+23"/> - <source>Number of connections</source> - <translation>Aunzoi von Vabindungen</translation> - </message> - <message> - <location line="+29"/> - <source>Block chain</source> - <translation>Block-Kettn</translation> - </message> - <message> - <location line="+7"/> - <source>Current number of blocks</source> - <translation>Anzoi da Blöck</translation> - </message> - <message> - <location line="+23"/> - <source>Estimated total blocks</source> - <translation>Gschätzte Aunzoi da Blöck insgesaumt</translation> - </message> - <message> - <location line="+23"/> - <source>Last block time</source> - <translation>Zeit vom letztn Block</translation> - </message> - <message> - <location line="+52"/> - <source>&Open</source> - <translation>&Lodn</translation> - </message> - <message> - <location line="+24"/> - <source>&Console</source> - <translation>&Konsole</translation> - </message> - <message> - <location line="+72"/> - <source>&Network Traffic</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+52"/> - <source>&Clear</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+13"/> - <source>Totals</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+64"/> - <source>In:</source> - <translation>In:</translation> - </message> - <message> - <location line="+80"/> - <source>Out:</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-521"/> - <source>Build date</source> - <translation>Programm-Iwasetzunszeitpunkt</translation> - </message> - <message> - <location line="+206"/> - <source>Debug log file</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+7"/> - <source>Open the Bitcoin debug log file from the current data directory. This can take a few seconds for large log files.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+76"/> - <source>Clear console</source> - <translation>Konsole leermochn</translation> - </message> - <message> - <location filename="../rpcconsole.cpp" line="-30"/> - <source>Welcome to the Bitcoin RPC console.</source> - <translation>Heazlich willkomman zua Bitcoin RPC Konsole.</translation> - </message> - <message> - <location line="+1"/> - <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> - <translation>Vawend de Rauf- und Runta Tastn um bisherige Kommandos zruckzhoin, oder druck Strg-L zum Leschn.</translation> - </message> - <message> - <location line="+1"/> - <source>Type <b>help</b> for an overview of available commands.</source> - <translation>Gib <b>help</b> ein fiara Iwasicht iwa olle Kommandos.</translation> - </message> - <message> - <location line="+122"/> - <source>%1 B</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> - <source>%1 KB</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> - <source>%1 MB</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> - <source>%1 GB</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+7"/> - <source>%1 m</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+5"/> - <source>%1 h</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> - <source>%1 h %2 m</source> - <translation type="unfinished"/> - </message> -</context> -<context> - <name>ReceiveCoinsDialog</name> - <message> - <location filename="../forms/receivecoinsdialog.ui" line="+83"/> - <source>&Amount:</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-13"/> - <source>&Label:</source> - <translation>&Titl:</translation> - </message> - <message> - <location line="-34"/> - <source>&Message:</source> - <translation type="unfinished"/> - </message> - <message> - <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="+3"/> - <source>R&euse an existing receiving address (not recommended)</source> - <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 <b>optional</b>.</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> - <message> - <location line="+3"/> - <source>Clear</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+36"/> - <source>&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>Zeig</translation> - </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"/> - </message> - <message> - <location line="+46"/> - <source>Copy &URI</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+7"/> - <source>Copy &Address</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+7"/> - <source>&Save Image...</source> - <translation type="unfinished"/> - </message> - <message> - <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"/> - </message> - <message> - <location line="+1"/> - <source>URI</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> - <source>Address</source> - <translation>Adress</translation> - </message> - <message> - <location line="+2"/> - <source>Amount</source> - <translation>Betrog</translation> - </message> - <message> - <location line="+2"/> - <source>Label</source> - <translation>Titl</translation> - </message> - <message> - <location line="+2"/> - <source>Message</source> - <translation>Mödung</translation> - </message> - <message> - <location line="+10"/> - <source>Resulting URI too long, try to reduce the text for label / message.</source> - <translation>De URI is z'laung. Tua hoit ned goa sovü fasln. </translation> - </message> - <message> - <location line="+5"/> - <source>Error encoding URI into QR Code.</source> - <translation>Föhla beim Eazeign vo an QR-Büderl fia de URI.</translation> - </message> -</context> -<context> - <name>RecentRequestsTableModel</name> - <message> - <location filename="../recentrequeststablemodel.cpp" line="+24"/> - <source>Date</source> - <translation>Waunn</translation> - </message> - <message> - <location line="+0"/> - <source>Label</source> - <translation>Titl</translation> - </message> - <message> - <location line="+0"/> - <source>Message</source> - <translation>Mödung</translation> - </message> - <message> - <location line="+0"/> - <source>Amount</source> - <translation>Betrog</translation> - </message> - <message> - <location line="+38"/> - <source>(no label)</source> - <translation>nixda</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="+381"/> - <location line="+80"/> - <source>Send Coins</source> - <translation>Vaschick Zasta</translation> - </message> - <message> - <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>Quantität:</translation> - </message> - <message> - <location line="+35"/> - <source>Bytes:</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+48"/> - <source>Amount:</source> - <translation>Betrog:</translation> - </message> - <message> - <location line="+32"/> - <source>Priority:</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+48"/> - <source>Fee:</source> - <translation>Gebühr:</translation> - </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>Vaschick Zasta glei aun mehrare auf aamoi</translation> - </message> - <message> - <location line="+3"/> - <source>Add &Recipient</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+20"/> - <source>Clear all fields of the form.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> - <source>Clear &All</source> - <translation>&Ois Leschn</translation> - </message> - <message> - <location line="+22"/> - <source>Balance:</source> - <translation>Kontostaund:</translation> - </message> - <message> - <location line="+41"/> - <source>Confirm the send action</source> - <translation>Bschtätige de Iwaweisung</translation> - </message> - <message> - <location line="+3"/> - <source>S&end</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../sendcoinsdialog.cpp" line="-228"/> - <source>Confirm send coins</source> - <translation>Iwaweisung bschtätign</translation> - </message> - <message> - <location line="-74"/> - <location line="+5"/> - <location line="+5"/> - <location line="+4"/> - <source>%1 to %2</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-136"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Gib a Bitcoin-Adress ei (sowos wia: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> - <message> - <location line="+15"/> - <source>Copy quantity</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Copy amount</source> - <translation>Betrog in' Puffa kopian</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>oder</translation> - </message> - <message> - <location line="+202"/> - <source>The recipient address is not valid, please recheck.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> - <source>The amount to pay must be larger than 0.</source> - <translation>Waunnst nix vaschickn wüst, daunn loss' hoit bleibm.</translation> - </message> - <message> - <location line="+3"/> - <source>The amount exceeds your balance.</source> - <translation>Des is mea ois wost host.</translation> - </message> - <message> - <location line="+3"/> - <source>The total exceeds your balance when the %1 transaction fee is included.</source> - <translation>Ois zsamm und de Spesn vo %1 dazua is mea ois wost host.</translation> - </message> - <message> - <location line="+3"/> - <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation>A doppete Adress gfundn. (A jede Adress derfs immanua amoi in ana Iwaweisung gebm)</translation> - </message> - <message> - <location line="+3"/> - <source>Transaction creation failed!</source> - <translation type="unfinished"/> - </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 type="unfinished"/> - </message> - <message> - <location line="+112"/> - <source>Warning: Invalid Bitcoin address</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+21"/> - <source>(no label)</source> - <translation>nixda</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 type="unfinished"/> - </message> - <message> - <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> - <message> - <location line="+8"/> - <source>Invalid payment address %1</source> - <translation type="unfinished"/> - </message> -</context> -<context> - <name>SendCoinsEntry</name> - <message> - <location filename="../forms/sendcoinsentry.ui" line="+131"/> - <location line="+521"/> - <location line="+536"/> - <source>A&mount:</source> - <translation>&Betrog:</translation> - </message> - <message> - <location line="-1152"/> - <source>Pay &To:</source> - <translation>wo&hin:</translation> - </message> - <message> - <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="+30"/> - <source>Enter a label for this address to add it to your address book</source> - <translation>Gib an Titl fia de neiche Adress</translation> - </message> - <message> - <location filename="../forms/sendcoinsentry.ui" line="+57"/> - <source>&Label:</source> - <translation>&Titl:</translation> - </message> - <message> - <location line="-50"/> - <source>Choose previously used address</source> - <translation type="unfinished"/> - </message> - <message> - <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>Eifügn da Adress ausm Puffa</translation> - </message> - <message> - <location line="+10"/> - <source>Alt+P</source> - <translation>Alt+P</translation> - </message> - <message> - <location line="+7"/> - <location line="+524"/> - <location line="+536"/> - <source>Remove this entry</source> - <translation type="unfinished"/> - </message> - <message> - <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="-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="+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>Gib a Bitcoin-Adress ei (sowos wia: 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> -<context> - <name>SignVerifyMessageDialog</name> - <message> - <location filename="../forms/signverifymessagedialog.ui" line="+14"/> - <source>Signatures - Sign / Verify a Message</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+10"/> - <source>&Sign Message</source> - <translation>Mödung &untaschreim</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>Duachs Untaschreim vo ana Mödung mit deina Adress stöllst kloa, dass du den Schlissl dazua host. Pass owa auf, dassd ned glei ois untaschreibsd wos da iangdana hinhoit, weu sunst kennts leicht passian, dassd vasehentlich kwasi an Blanko-Scheck untaschreibst. Untaschreib nua konkrete Mödungen denenst aa wiakli zuastimmst.</translation> - </message> - <message> - <location line="+18"/> - <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>De Adress mit dera'st untaschreibst (z.B. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> - <message> - <location line="+10"/> - <location line="+213"/> - <source>Choose previously used address</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-203"/> - <location line="+213"/> - <source>Alt+A</source> - <translation>Alt+A</translation> - </message> - <message> - <location line="-203"/> - <source>Paste address from clipboard</source> - <translation>Eifügn da Adress ausm Puffa</translation> - </message> - <message> - <location line="+10"/> - <source>Alt+P</source> - <translation>Alt+P</translation> - </message> - <message> - <location line="+12"/> - <source>Enter the message you want to sign here</source> - <translation>Gib de Mödung ei, de'st untaschreibm wüst</translation> - </message> - <message> - <location line="+7"/> - <source>Signature</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+27"/> - <source>Copy the current signature to the system clipboard</source> - <translation>De Untaschrift in den Puffa kopian</translation> - </message> - <message> - <location line="+21"/> - <source>Sign the message to prove you own this Bitcoin address</source> - <translation>Untaschreib de Mödung, damid kloa is, dass de Adress dia gheat</translation> - </message> - <message> - <location line="+3"/> - <source>Sign &Message</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+14"/> - <source>Reset all sign message fields</source> - <translation>Olle Föda zrucksetzn</translation> - </message> - <message> - <location line="+3"/> - <location line="+146"/> - <source>Clear &All</source> - <translation>&Ois Leschn</translation> - </message> - <message> - <location line="-87"/> - <source>&Verify Message</source> - <translation>&Untaschrift tscheckn</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>Gib de Untaschrifts-Adress, de Mödung und de Untaschrift ei. De Mödung muass auf Punkt und Beistrich (und Leerzeichn, Tabulatorn, Zeulnumbrüch, usw) gaunz genau des gleiche sein, wos untaschriem wuan is. Pass auf, dassd ned mea in de Mödung eineliest, ois wos wiakli drinsteht, sunst kenntast leicht auf an Schmäh einefoin.</translation> - </message> - <message> - <location line="+21"/> - <source>The address the message was signed with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>De Adress, mit dera untaschriem wuan is (z.B. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> - <message> - <location line="+40"/> - <source>Verify the message to ensure it was signed with the specified Bitcoin address</source> - <translation>Tscheck, doss de Mödung a wiakli mit da aungebanan Adress untaschriem wuan is</translation> - </message> - <message> - <location line="+3"/> - <source>Verify &Message</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+14"/> - <source>Reset all verify message fields</source> - <translation>Olle Föda zrucksetzn</translation> - </message> - <message> - <location filename="../signverifymessagedialog.cpp" line="+29"/> - <location line="+3"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Gib a Bitcoin-Adress ei (sowos wia: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> - <message> - <location line="-2"/> - <source>Click "Sign Message" to generate signature</source> - <translation>Klick auf "Mödung untaschreim" zum Untaschreim</translation> - </message> - <message> - <location line="+3"/> - <source>Enter Bitcoin signature</source> - <translation>Gib de Untaschrift ei</translation> - </message> - <message> - <location line="+84"/> - <location line="+81"/> - <source>The entered address is invalid.</source> - <translation>De eingebane Adress is a Kas.</translation> - </message> - <message> - <location line="-81"/> - <location line="+8"/> - <location line="+73"/> - <location line="+8"/> - <source>Please check the address and try again.</source> - <translation>Tscheck dassd Adress richtig is, und prowias noamoi.</translation> - </message> - <message> - <location line="-81"/> - <location line="+81"/> - <source>The entered address does not refer to a key.</source> - <translation>De eingebene Adress gheat zu kaan Schlissl.</translation> - </message> - <message> - <location line="-73"/> - <source>Wallet unlock was cancelled.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+8"/> - <source>Private key for the entered address is not available.</source> - <translation>Zu dera Adress howi kaan Schlissl gspeichat.</translation> - </message> - <message> - <location line="+12"/> - <source>Message signing failed.</source> - <translation>'s Untaschreim is föhgschlogn.</translation> - </message> - <message> - <location line="+5"/> - <source>Message signed.</source> - <translation>Mödung is untaschriem.</translation> - </message> - <message> - <location line="+59"/> - <source>The signature could not be decoded.</source> - <translation>De Untaschrift woara Kas.</translation> - </message> - <message> - <location line="+0"/> - <location line="+13"/> - <source>Please check the signature and try again.</source> - <translation>Tscheck dassd Untaschrift richtig is, und prowias noamoi.</translation> - </message> - <message> - <location line="+0"/> - <source>The signature did not match the message digest.</source> - <translation>De Untaschrift passt ned zu dera Mödung.</translation> - </message> - <message> - <location line="+7"/> - <source>Message verification failed.</source> - <translation>Iwaprifung da Untaschrift is föhgschlogn.</translation> - </message> - <message> - <location line="+5"/> - <source>Message verified.</source> - <translation>De Untaschrift hod zua Mödung passt.</translation> - </message> -</context> -<context> - <name>SplashScreen</name> - <message> - <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>[testnet]</translation> - </message> -</context> -<context> - <name>TrafficGraphWidget</name> - <message> - <location filename="../trafficgraphwidget.cpp" line="+79"/> - <source>KB/s</source> - <translation type="unfinished"/> - </message> -</context> -<context> - <name>TransactionDesc</name> - <message> - <location filename="../transactiondesc.cpp" line="+28"/> - <source>Open until %1</source> - <translation>Offn bis %1</translation> - </message> - <message> - <location line="+6"/> - <source>%1/offline</source> - <translation>%1/koa netz</translation> - </message> - <message> - <location line="+2"/> - <source>%1/unconfirmed</source> - <translation>%1/unbschtätigt</translation> - </message> - <message> - <location line="+2"/> - <source>%1 confirmations</source> - <translation>%1 Bschtätigungan</translation> - </message> - <message> - <location line="+18"/> - <source>Status</source> - <translation>Zuastaund</translation> - </message> - <message numerus="yes"> - <location line="+7"/> - <source>, broadcast through %n node(s)</source> - <translation><numerusform>, iwa %n Knotn vateult</numerusform><numerusform>, iwa %n Knotn vateult</numerusform></translation> - </message> - <message> - <location line="+4"/> - <source>Date</source> - <translation>Waunn</translation> - </message> - <message> - <location line="+7"/> - <source>Source</source> - <translation>Kwöön</translation> - </message> - <message> - <location line="+0"/> - <source>Generated</source> - <translation>Gschiaft</translation> - </message> - <message> - <location line="+5"/> - <location line="+17"/> - <source>From</source> - <translation>Vo</translation> - </message> - <message> - <location line="+1"/> - <location line="+22"/> - <location line="+58"/> - <source>To</source> - <translation>Aun</translation> - </message> - <message> - <location line="-77"/> - <location line="+2"/> - <source>own address</source> - <translation>eigane Adress</translation> - </message> - <message> - <location line="-2"/> - <source>label</source> - <translation>Titl</translation> - </message> - <message> - <location line="+37"/> - <location line="+12"/> - <location line="+45"/> - <location line="+17"/> - <location line="+53"/> - <source>Credit</source> - <translation>eahoitena Betrog</translation> - </message> - <message numerus="yes"> - <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> - <message> - <location line="+2"/> - <source>not accepted</source> - <translation>ned aungnumman</translation> - </message> - <message> - <location line="+44"/> - <location line="+8"/> - <location line="+15"/> - <location line="+53"/> - <source>Debit</source> - <translation>ausgebana Betrog</translation> - </message> - <message> - <location line="-62"/> - <source>Transaction fee</source> - <translation>Iwaweisungsgebüa</translation> - </message> - <message> - <location line="+16"/> - <source>Net amount</source> - <translation>Untam Strich</translation> - </message> - <message> - <location line="+6"/> - <location line="+9"/> - <source>Message</source> - <translation>Mödung</translation> - </message> - <message> - <location line="-7"/> - <source>Comment</source> - <translation>Bemeakung</translation> - </message> - <message> - <location line="+2"/> - <source>Transaction ID</source> - <translation>Iwaweisungs Nr</translation> - </message> - <message> - <location line="+18"/> - <source>Merchant</source> - <translation type="unfinished"/> - </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 "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+8"/> - <source>Debug information</source> - <translation>Debug Infoamation</translation> - </message> - <message> - <location line="+8"/> - <source>Transaction</source> - <translation>Iwaweisung</translation> - </message> - <message> - <location line="+3"/> - <source>Inputs</source> - <translation>Eingobn</translation> - </message> - <message> - <location line="+23"/> - <source>Amount</source> - <translation>Betrog</translation> - </message> - <message> - <location line="+1"/> - <source>true</source> - <translation>woah</translation> - </message> - <message> - <location line="+0"/> - <source>false</source> - <translation>foisch</translation> - </message> - <message> - <location line="-232"/> - <source>, has not been successfully broadcast yet</source> - <translation>, is no ned eafoigreich oogschickt wuan.</translation> - </message> - <message numerus="yes"> - <location line="-35"/> - <source>Open for %n more block(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> - </message> - <message> - <location line="+70"/> - <source>unknown</source> - <translation>unbekaunnt</translation> - </message> -</context> -<context> - <name>TransactionDescDialog</name> - <message> - <location filename="../forms/transactiondescdialog.ui" line="+14"/> - <source>Transaction details</source> - <translation>Iwaweisungsdatn</translation> - </message> - <message> - <location line="+6"/> - <source>This pane shows a detailed description of the transaction</source> - <translation>Do sichst de Einzlheitn fo dera Iwaweisung</translation> - </message> -</context> -<context> - <name>TransactionTableModel</name> - <message> - <location filename="../transactiontablemodel.cpp" line="+234"/> - <source>Date</source> - <translation>Waunn</translation> - </message> - <message> - <location line="+0"/> - <source>Type</source> - <translation>Oat</translation> - </message> - <message> - <location line="+0"/> - <source>Address</source> - <translation>Adress</translation> - </message> - <message> - <location line="+0"/> - <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="+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>Offn bis %1</translation> - </message> - <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> - <translation>Koa Netz (%1 Bschtätigungen)</translation> - </message> - <message> - <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation>unbschtätigt (nua %1 vo %2 Bschtätigungen)</translation> - </message> - <message> - <location line="-22"/> - <location line="+25"/> - <source>Confirmed (%1 confirmations)</source> - <translation>bschtätigt (%1 Bschtätigungen)</translation> - </message> - <message> - <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' Hoa schmian!</translation> - </message> - <message> - <location line="+3"/> - <source>Generated but not accepted</source> - <translation>Eazeigt, owa ned aungnumman</translation> - </message> - <message> - <location line="+62"/> - <source>Received with</source> - <translation>Empfaungen mid</translation> - </message> - <message> - <location line="+2"/> - <source>Received from</source> - <translation>Empfaungen vo</translation> - </message> - <message> - <location line="+3"/> - <source>Sent to</source> - <translation>gschickt aun</translation> - </message> - <message> - <location line="+2"/> - <source>Payment to yourself</source> - <translation>Aun di söbst</translation> - </message> - <message> - <location line="+2"/> - <source>Mined</source> - <translation>gschiaft</translation> - </message> - <message> - <location line="+38"/> - <source>(n/a)</source> - <translation>(nix)</translation> - </message> - <message> - <location line="+199"/> - <source>Transaction status. Hover over this field to show number of confirmations.</source> - <translation>Zuastaund da Iwaweisung. Fia de Aunzoi da Bschtätigungan foah mid da Maus driwa.</translation> - </message> - <message> - <location line="+2"/> - <source>Date and time that the transaction was received.</source> - <translation>Waunn de Iwaweisung einakumman is.</translation> - </message> - <message> - <location line="+2"/> - <source>Type of transaction.</source> - <translation>Oat da Iwaweisung.</translation> - </message> - <message> - <location line="+2"/> - <source>Destination address of transaction.</source> - <translation>Züü-Adress da Iwaweisung.</translation> - </message> - <message> - <location line="+2"/> - <source>Amount removed from or added to balance.</source> - <translation>Da Betrog, den wos'd zoit oda kriagd host.</translation> - </message> -</context> -<context> - <name>TransactionView</name> - <message> - <location filename="../transactionview.cpp" line="+57"/> - <location line="+16"/> - <source>All</source> - <translation>Ois</translation> - </message> - <message> - <location line="-15"/> - <source>Today</source> - <translation>Heit</translation> - </message> - <message> - <location line="+1"/> - <source>This week</source> - <translation>de Wochn</translation> - </message> - <message> - <location line="+1"/> - <source>This month</source> - <translation>den Monat</translation> - </message> - <message> - <location line="+1"/> - <source>Last month</source> - <translation>letztn Monat</translation> - </message> - <message> - <location line="+1"/> - <source>This year</source> - <translation>des Joa</translation> - </message> - <message> - <location line="+1"/> - <source>Range...</source> - <translation>Bereich...</translation> - </message> - <message> - <location line="+11"/> - <source>Received with</source> - <translation>Empfaungen mid</translation> - </message> - <message> - <location line="+2"/> - <source>Sent to</source> - <translation>Gsendet aun</translation> - </message> - <message> - <location line="+2"/> - <source>To yourself</source> - <translation>Aun di söbst</translation> - </message> - <message> - <location line="+1"/> - <source>Mined</source> - <translation>Gschiaft</translation> - </message> - <message> - <location line="+1"/> - <source>Other</source> - <translation>Aundare</translation> - </message> - <message> - <location line="+6"/> - <source>Enter address or label to search</source> - <translation>Suach noch ana Adress oda an Titl</translation> - </message> - <message> - <location line="+6"/> - <source>Min amount</source> - <translation>klaaansta Betrog</translation> - </message> - <message> - <location line="+34"/> - <source>Copy address</source> - <translation>Adress in' Puffa kopian</translation> - </message> - <message> - <location line="+1"/> - <source>Copy label</source> - <translation>Titl in' Puffa kopian</translation> - </message> - <message> - <location line="+1"/> - <source>Copy amount</source> - <translation>Betrog in' Puffa kopian</translation> - </message> - <message> - <location line="+1"/> - <source>Copy transaction ID</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Edit label</source> - <translation>Titl ändan</translation> - </message> - <message> - <location line="+1"/> - <source>Show transaction details</source> - <translation>Zeig de Einzlheitn vo da Iwaweisung</translation> - </message> - <message> - <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="+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>Beistrich 'trennte Weate (*.csv)</translation> - </message> - <message> - <location line="+9"/> - <source>Confirmed</source> - <translation>Bschtätigt</translation> - </message> - <message> - <location line="+1"/> - <source>Date</source> - <translation>Waunn</translation> - </message> - <message> - <location line="+1"/> - <source>Type</source> - <translation>Oat</translation> - </message> - <message> - <location line="+1"/> - <source>Label</source> - <translation>Titl</translation> - </message> - <message> - <location line="+1"/> - <source>Address</source> - <translation>Adress</translation> - </message> - <message> - <location line="+1"/> - <source>Amount</source> - <translation>Betrog</translation> - </message> - <message> - <location line="+1"/> - <source>ID</source> - <translation>Nr</translation> - </message> - <message> - <location line="+107"/> - <source>Range:</source> - <translation>Bereich:</translation> - </message> - <message> - <location line="+8"/> - <source>to</source> - <translation>bis</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="+245"/> - <source>Send Coins</source> - <translation>Vaschick Zasta</translation> - </message> -</context> -<context> - <name>WalletView</name> - <message> - <location filename="../walletview.cpp" line="+43"/> - <source>&Export</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Export the data in the current tab to a file</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+181"/> - <source>Backup Wallet</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Wallet Data (*.dat)</source> - <translation type="unfinished"/> - </message> - <message> - <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 %1.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+4"/> - <source>The wallet data was successfully saved to %1.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+0"/> - <source>Backup Successful</source> - <translation type="unfinished"/> - </message> -</context> -<context> - <name>bitcoin-core</name> - <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> - <source>Usage:</source> - <translation>Vawendung:</translation> - </message> - <message> - <location line="-54"/> - <source>List commands</source> - <translation>Kommandos aunzeign</translation> - </message> - <message> - <location line="-14"/> - <source>Get help for a command</source> - <translation>Hüfe fiara Kommando</translation> - </message> - <message> - <location line="+26"/> - <source>Options:</source> - <translation>Eistöllungen:</translation> - </message> - <message> - <location line="+22"/> - <source>Specify configuration file (default: bitcoin.conf)</source> - <translation>Gib de Konfigurationsdatei aun (sunsta: bitcoin.conf)</translation> - </message> - <message> - <location line="+3"/> - <source>Specify pid file (default: bitcoind.pid)</source> - <translation>Datei, wo de Prozessnumma gspeichat wiad (sunsta: bitcoin.pid)</translation> - </message> - <message> - <location line="-1"/> - <source>Specify data directory</source> - <translation>Vazeichnis fia de Datein</translation> - </message> - <message> - <location line="-9"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation>Zwischnspeichagreß fia de Datenbank in megabeits (sunsta: 25)</translation> - </message> - <message> - <location line="-26"/> - <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> - <translation>Auf Vabindungen am <port> lauschn (sunsta: 8333 bzw. testnet: 18333)</translation> - </message> - <message> - <location line="+5"/> - <source>Maintain at most <n> connections to peers (default: 125)</source> - <translation>Hechstns <n> Vabindungen zu aundare Netz-Knotn aufrecht eahoitn (sunsta: 125)</translation> - </message> - <message> - <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> - <message> - <location line="+84"/> - <source>Specify your own public address</source> - <translation>Gib dei eigene öffentliche Adress aun</translation> - </message> - <message> - <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="-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="-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="+34"/> - <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+45"/> - <source>Accept command line and JSON-RPC commands</source> - <translation>Hob a Uawaschl offn fia de Kommandozeuln und JSON-RPC Beföhle</translation> - </message> - <message> - <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> - <message> - <location line="+39"/> - <source>Use the test network</source> - <translation>Des Test-Netz vawenden</translation> - </message> - <message> - <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="-95"/> - <source>%s, you must set a rpcpassword in the configuration file: -%s -It is recommended you use the following random password: -rpcuser=bitcoinrpc -rpcpassword=%s -(you do not need to remember this password) -The username and password MUST NOT be the same. -If the file does not exist, create it with owner-readable-only file permissions. -It is also recommended to set alertnotify so you are notified of problems; -for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com -</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+12"/> - <source>Acceptable ciphers (default: TLSv1.2+HIGH:TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!3DES:@STRENGTH)</source> - <translation type="unfinished"/> - </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"/> - </message> - <message> - <location line="+3"/> - <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> - <source>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"/> - </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> - <message> - <location line="+4"/> - <source>Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds!</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+6"/> - <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> - <translation>A programmal startn, waunn si a unbstätigte Iwaweisung ändat. (a %s wiad dabei duachn Iwaweisungs-Hash easetzt)</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 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 type="unfinished"/> - </message> - <message> - <location line="+3"/> - <source>Warning: Please check that your computer's date and time are correct! If your clock is wrong Bitcoin will not work properly.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> - <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> - <translation type="unfinished"/> - </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"/> - </message> - <message> - <location line="+3"/> - <source>Warning: error reading wallet.dat! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> - <source>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+9"/> - <source><category> 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="+1"/> - <source>Block creation options:</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+5"/> - <source>Connect only to the specified node(s)</source> - <translation>Nur mit de aungebanen Netz-Knotn vabindn.</translation> - </message> - <message> - <location line="+1"/> - <source>Connect through SOCKS proxy</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Connect to JSON-RPC on <port> (default: 8332 or testnet: 18332)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> - <source>Corrupted block database detected</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Discover own IP address (default: 1 when listening and no -externalip)</source> - <translation>Find söbst de eigane IP-Adress (waunn nix aungebn is: 1, aussa mit -externalip oda waunns Lauschn oisagaunza oodraht is)</translation> - </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"/> - </message> - <message> - <location line="+1"/> - <source>Error initializing wallet database environment %s!</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Error loading block database</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+4"/> - <source>Error opening block database</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> - <source>Error: Disk space is low!</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Error: Wallet locked, unable to create transaction!</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Error: system error: </source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Failed to listen on any port. Use -listen=0 if you want this.</source> - <translation>Föhla beim Lauschn aufn port. Waunn des so gwoit is, dann gib de Option -listen=0 aun.</translation> - </message> - <message> - <location line="+1"/> - <source>Failed to read block info</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Failed to read block</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Failed to sync block index</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Failed to write block index</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Failed to write block info</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Failed to write block</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Failed to write file info</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Failed to write to coin database</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Failed to write transaction index</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Failed to write undo data</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+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> - <message> - <location line="+1"/> - <source>Generate coins (default: 0)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> - <source>How many blocks to check at startup (default: 288, 0 = all)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>How thorough the block verification is (0-4, default: 3)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>If <category> 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"/> - </message> - <message> - <location line="+3"/> - <source>Invalid -onion address: '%s'</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+15"/> - <source>Not enough file descriptors available.</source> - <translation type="unfinished"/> - </message> - <message> - <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="+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="+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> - <message> - <location line="+7"/> - <source>Specify wallet file (within data directory)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> - <source>Start Bitcoin server</source> - <translation type="unfinished"/> - </message> - <message> - <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="+7"/> - <source>Verifying blocks...</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Verifying wallet...</source> - <translation type="unfinished"/> - </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="+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="-79"/> - <source>Imports blocks from external blk000??.dat file</source> - <translation type="unfinished"/> - </message> - <message> - <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> - <message> - <location line="+14"/> - <source>Output debugging information (default: 0, supplying <category> 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, <0 = leave that many cores free, default: 0)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+89"/> - <source>Information</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+4"/> - <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Invalid amount for -mintxfee=<amount>: '%s'</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+8"/> - <source>Maintain a full transaction index (default: 0)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> - <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 5000)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Maximum per-connection send buffer, <n>*1000 bytes (default: 1000)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> - <source>Only accept block chain matching built-in checkpoints (default: 1)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Only connect to nodes in network <net> (IPv4, IPv6 or Tor)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+9"/> - <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+4"/> - <source>Send trace/debug info to console instead of debug.log file</source> - <translation>Protokoi anstott in de Datei debug.log liawa direkt aussaschreibn</translation> - </message> - <message> - <location line="+6"/> - <source>Set minimum block size in bytes (default: 0)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> - <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Signing transaction failed</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> - <source>Specify connection timeout in milliseconds (default: 5000)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+6"/> - <source>System error: </source> - <translation type="unfinished"/> - </message> - <message> - <location line="+5"/> - <source>Transaction amount too small</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Transaction amounts must be positive</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Transaction too large</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+8"/> - <source>Use UPnP to map the listening port (default: 0)</source> - <translation>Vawend UPnP um den Lausch-Port zuzuweisn (sunsta: 0)</translation> - </message> - <message> - <location line="+1"/> - <source>Use UPnP to map the listening port (default: 1 when listening)</source> - <translation>Vawend UPnP um den Lausch-Port zuzuweisn (wenn nix aungebm is: 1, wenns Lauschn eigschoitn is)</translation> - </message> - <message> - <location line="+2"/> - <source>Username for JSON-RPC connections</source> - <translation>Benutza fia JSON-RPC Vabindungen</translation> - </message> - <message> - <location line="+7"/> - <source>Warning</source> - <translation>Pass auf</translation> - </message> - <message> - <location line="+2"/> - <source>Warning: This version is obsolete, upgrade required!</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> - <source>version</source> - <translation>veasion</translation> - </message> - <message> - <location line="+1"/> - <source>wallet.dat corrupt, salvage failed</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-58"/> - <source>Password for JSON-RPC connections</source> - <translation>Geheimwuat fia JSON-RPC Vabindungen</translation> - </message> - <message> - <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="+80"/> - <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> - <translation>Beföhle zum Netz-Knotn mit da <ip>-Adress schickn (sunsta: 127.0.0.1)</translation> - </message> - <message> - <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="+161"/> - <source>Upgrade wallet to latest format</source> - <translation>'s Beasl ins neichaste Foamat bringan</translation> - </message> - <message> - <location line="-24"/> - <source>Set key pool size to <n> (default: 100)</source> - <translation>Schlisslvorratsgreß auf <n> setzn (sunsta: 100)</translation> - </message> - <message> - <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> - <message> - <location line="+38"/> - <source>Use OpenSSL (https) for JSON-RPC connections</source> - <translation>Vawend OpenSSL (https) fia JSON-RPC Vabindungan</translation> - </message> - <message> - <location line="-30"/> - <source>Server certificate file (default: server.cert)</source> - <translation>Söawa Zeatifikatsdatei (sunsta: server.cert)</translation> - </message> - <message> - <location line="+1"/> - <source>Server private key (default: server.pem)</source> - <translation>Söawa Privatschlissl (sunsta: server.pem)</translation> - </message> - <message> - <location line="+16"/> - <source>This help message</source> - <translation>Dea Hüfe-Text</translation> - </message> - <message> - <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="-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="+60"/> - <source>Loading addresses...</source> - <translation>Adressbiachl lodn...</translation> - </message> - <message> - <location line="-37"/> - <source>Error loading wallet.dat: Wallet corrupted</source> - <translation>Föhla beim Lodn vom Beasl: 's Beasl is leida hinnich</translation> - </message> - <message> - <location line="+1"/> - <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source> - <translation>Föhla beim Lodn vom Beasl: fia des Beasl brauchst a neichare Bitcoin veasion</translation> - </message> - <message> - <location line="+98"/> - <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> - <translation>'s Beasl hod neich gschriem weadn miassn: beend des Programmal und starts noamoi zum Featigmochn</translation> - </message> - <message> - <location line="-100"/> - <source>Error loading wallet.dat</source> - <translation>Föhla beim Lodn vom Beasl (wallet.dat)</translation> - </message> - <message> - <location line="+31"/> - <source>Invalid -proxy address: '%s'</source> - <translation>Ungültige "-proxy" Adress: '%s'</translation> - </message> - <message> - <location line="+56"/> - <source>Unknown network specified in -onlynet: '%s'</source> - <translation>Des Netzwerk in -onlynet is a Kas: '%s'</translation> - </message> - <message> - <location line="-1"/> - <source>Unknown -socks proxy version requested: %i</source> - <translation>De valongte -socks proxy version is ned bekaunnt: %i</translation> - </message> - <message> - <location line="-101"/> - <source>Cannot resolve -bind address: '%s'</source> - <translation>Kaunn de -bind Adressn ned auflösn: '%s'</translation> - </message> - <message> - <location line="+1"/> - <source>Cannot resolve -externalip address: '%s'</source> - <translation>Kaunn de -externalip Adressn ned auflösn: '%s'</translation> - </message> - <message> - <location line="+48"/> - <source>Invalid amount for -paytxfee=<amount>: '%s'</source> - <translation>Da Betrog fia -paytxfee=<amount> is a Kas: '%s'</translation> - </message> - <message> - <location line="+1"/> - <source>Invalid amount</source> - <translation>Ungültiga Betrog</translation> - </message> - <message> - <location line="-6"/> - <source>Insufficient funds</source> - <translation>Sovü host goaned</translation> - </message> - <message> - <location line="+10"/> - <source>Loading block index...</source> - <translation>Block index lodn...</translation> - </message> - <message> - <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> - <message> - <location line="-32"/> - <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source> - <translation>Konnt mi ned aun %s auf dera Maschin aunhängan. Meglichaweis rennt des Programmal scho.</translation> - </message> - <message> - <location line="+95"/> - <source>Loading wallet...</source> - <translation>Beasl lodn...</translation> - </message> - <message> - <location line="-56"/> - <source>Cannot downgrade wallet</source> - <translation>Zrucksteign geht nimma beim Beasl</translation> - </message> - <message> - <location line="+3"/> - <source>Cannot write default address</source> - <translation>De Easotz Adress kaunn ned gschriem weadn</translation> - </message> - <message> - <location line="+67"/> - <source>Rescanning...</source> - <translation>Noch-tscheckn...</translation> - </message> - <message> - <location line="-58"/> - <source>Done loading</source> - <translation>Featig midm Lodn</translation> - </message> - <message> - <location line="+85"/> - <source>To use the %s option</source> - <translation>Um de Option %s z'vawendn</translation> - </message> - <message> - <location line="-77"/> - <source>Error</source> - <translation>Föhla</translation> - </message> - <message> - <location line="-35"/> - <source>You must set rpcpassword=<password> in the configuration file: -%s -If the file does not exist, create it with owner-readable-only file permissions.</source> - <translation>Du muasst rpcpassword=<password> in da Konfigurationsdatei: -%s -setzn. Waunns de Datei no ned gibt, daunn eazeigs so, dass' ka aundara lesn kau.</translation> - </message> -</context> -</TS>
\ No newline at end of file diff --git a/src/qt/locale/bitcoin_el_GR.ts b/src/qt/locale/bitcoin_el_GR.ts index da09f39f4f..bffec0002d 100644 --- a/src/qt/locale/bitcoin_el_GR.ts +++ b/src/qt/locale/bitcoin_el_GR.ts @@ -36,6 +36,12 @@ This product includes software developed by the OpenSSL Project for use in the O <source>The Bitcoin Core developers</source> <translation type="unfinished"/> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source> (%1-bit)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>AddressBookPage</name> @@ -618,6 +624,16 @@ This product includes software developed by the OpenSSL Project for use in the O <translation><numerusform>%n εβδομαδες</numerusform><numerusform>%n εβδομαδες</numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation>%1 πίσω</translation> @@ -691,7 +707,7 @@ Address: %4 <translation>Το ποÏτοφόλι είναι <b>κÏυπτογÏαφημÎνο</b> και <b>κλειδωμÎνο</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+435"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>ΠαÏουσιάστηκε ανεπανόÏθωτο σφάλμα. Το Bitcoin δεν μποÏεί πλÎον να συνεχίσει με ασφάλεια και θα τεÏματισθει.</translation> </message> @@ -752,7 +768,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation type="unfinished"/> </message> @@ -767,7 +783,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation>Ποσό</translation> </message> @@ -918,7 +934,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation type="unfinished"/> </message> @@ -1100,7 +1116,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation>Bitcoin Core</translation> </message> @@ -1244,7 +1260,7 @@ Address: %4 <translation>&ΚÏÏιο</translation> </message> <message> - <location line="+6"/> + <location line="+122"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation>Η Ï€ÏοαιÏετική αμοιβή για κάθε kB επισπεÏδει την επεξεÏγασία των συναλλαγών σας. Οι πεÏισσότεÏες συναλλαγÎÏ‚ είναι 1 kB. </translation> </message> @@ -1254,7 +1270,7 @@ Address: %4 <translation>Αμοιβή &συναλλαγής</translation> </message> <message> - <location line="+31"/> + <location line="-131"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation>Αυτόματη εκκίνηση του Bitcoin μετά την εισαγωγή στο σÏστημα</translation> </message> @@ -1269,12 +1285,7 @@ Address: %4 <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"/> + <location line="+16"/> <source>MB</source> <translation type="unfinished"/> </message> @@ -1289,7 +1300,12 @@ Address: %4 <translation>ΟÏίσμος του αÏιθμό των νημάτων ελÎγχου σεναÏίου (μÎχÏι 16, 0 = auto, <0 = αφήνουν τους πολλους πυÏήνες δωÏεάν, default: 0)</translation> </message> <message> - <location line="+58"/> + <location line="+107"/> + <source>&Spend unconfirmed change (experts only)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+37"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation type="unfinished"/> </message> @@ -1324,7 +1340,17 @@ Address: %4 <translation>&Δίκτυο</translation> </message> <message> - <location line="+6"/> + <location line="-86"/> + <source>W&allet</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+52"/> + <source>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.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+40"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>Αυτόματο άνοιγμα των θυÏών Bitcoin στον δÏομολογητή. ΛειτουÏγεί μόνο αν ο δÏομολογητής σας υποστηÏίζει τη λειτουÏγία UPnP.</translation> </message> @@ -1439,17 +1465,17 @@ Address: %4 <translation>&ΑκÏÏωση</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+70"/> <source>default</source> <translation>Ï€Ïοεπιλογή</translation> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation type="unfinished"/> </message> <message> - <location line="+75"/> + <location line="+78"/> <source>Confirm options reset</source> <translation>Επιβεβαιώση των επιλογων επαναφοÏάς </translation> </message> @@ -1489,19 +1515,14 @@ Address: %4 <translation>Οι πληÏοφοÏίες που εμφανίζονται μποÏεί να είναι ξεπεÏασμÎνες. Το ποÏτοφόλι σας συγχÏονίζεται αυτόματα με το δίκτυο Bitcoin μετά από μια σÏνδεση, αλλά αυτή η διαδικασία δεν Îχει ακόμη ολοκληÏωθεί. </translation> </message> <message> - <location line="-155"/> - <source>Unconfirmed:</source> - <translation>Ανεπιβεβαίωτες</translation> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation>ΠοÏτοφόλι</translation> </message> <message> <location line="+51"/> - <source>Confirmed:</source> - <translation>ΕπικυÏωμÎνες:</translation> + <source>Available:</source> + <translation type="unfinished"/> </message> <message> <location line="+16"/> @@ -1509,7 +1530,12 @@ Address: %4 <translation>Το Ï„ÏÎχον διαθÎσιμο υπόλοιπο</translation> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation>Το άθÏοισμα των συναλλαγών που δεν Îχουν ακόμα επιβεβαιωθεί και δεν Ï€ÏοσμετÏώνται στο Ï„ÏÎχον διαθÎσιμο υπόλοιπό σας</translation> </message> @@ -1657,6 +1683,11 @@ Address: %4 <source>Error: Invalid combination of -regtest and -testnet.</source> <translation>Σφάλμα: ΆκυÏος συνδυασμός των -regtest και -testnet</translation> </message> + <message> + <location filename="../guiutil.cpp" line="+82"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>Εισάγετε μια διεÏθυνση Bitcoin (Ï€.χ. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> </context> <context> <name>QRImageWidget</name> @@ -1877,22 +1908,22 @@ Address: %4 <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+83"/> + <location filename="../forms/receivecoinsdialog.ui" line="+107"/> <source>&Amount:</source> <translation type="unfinished"/> </message> <message> - <location line="-13"/> + <location line="-16"/> <source>&Label:</source> <translation>&ΕπιγÏαφή</translation> </message> <message> - <location line="-34"/> + <location line="-37"/> <source>&Message:</source> <translation type="unfinished"/> </message> <message> - <location line="-17"/> + <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"/> </message> @@ -1902,27 +1933,30 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+27"/> - <source>An optional 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"/> </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> + <location line="-7"/> + <location line="+21"/> + <source>An optional label to associate with the new receiving address.</source> <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="-7"/> <source>Use this form to request payments. All fields are <b>optional</b>.</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <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"/> </message> <message> - <location line="+17"/> + <location line="+32"/> <source>Clear all fields of the form.</source> <translation>ΚαθαÏισμός όλων των πεδίων της φόÏμας.</translation> </message> @@ -1932,17 +1966,17 @@ Address: %4 <translation>ΚαθαÏισμός</translation> </message> <message> - <location line="+36"/> - <source>&Request payment</source> + <location line="+78"/> + <source>Requested payments history</source> <translation type="unfinished"/> </message> <message> - <location line="+47"/> - <source>Requested payments</source> + <location line="-98"/> + <source>&Request payment</source> <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+120"/> <source>Show the selected request (does the same as double clicking an entry)</source> <translation type="unfinished"/> </message> @@ -1961,6 +1995,21 @@ Address: %4 <source>Remove</source> <translation type="unfinished"/> </message> + <message> + <location filename="../receivecoinsdialog.cpp" line="+38"/> + <source>Copy label</source> + <translation>ΑντιγÏαφή επιγÏαφής</translation> + </message> + <message> + <location line="+1"/> + <source>Copy message</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation>ΑντιγÏαφή ποσοÏ</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -2062,12 +2111,17 @@ Address: %4 <source>(no message)</source> <translation type="unfinished"/> </message> + <message> + <location line="+8"/> + <source>(no amount)</source> + <translation type="unfinished"/> + </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>Αποστολή νομισμάτων</translation> @@ -2143,7 +2197,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+115"/> + <location line="+164"/> <source>Send to multiple recipients at once</source> <translation>Αποστολή σε πολλοÏÏ‚ αποδÎκτες ταυτόχÏονα</translation> </message> @@ -2153,7 +2207,7 @@ Address: %4 <translation>&Î Ïοσθήκη αποδÎκτη</translation> </message> <message> - <location line="+20"/> + <location line="-23"/> <source>Clear all fields of the form.</source> <translation>ΚαθαÏισμός όλων των πεδίων της φόÏμας.</translation> </message> @@ -2163,12 +2217,12 @@ Address: %4 <translation>ΚαθαÏισμός &Όλων</translation> </message> <message> - <location line="+22"/> + <location line="+52"/> <source>Balance:</source> <translation>Υπόλοιπο:</translation> </message> <message> - <location line="+41"/> + <location line="-78"/> <source>Confirm the send action</source> <translation>Επιβεβαίωση αποστολής</translation> </message> @@ -2178,7 +2232,7 @@ Address: %4 <translation>Αποστολη</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-228"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation>Επιβεβαίωση αποστολής νομισμάτων</translation> </message> @@ -2191,12 +2245,7 @@ Address: %4 <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"/> + <location line="-121"/> <source>Copy quantity</source> <translation type="unfinished"/> </message> @@ -2246,7 +2295,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+202"/> + <location line="+203"/> <source>The recipient address is not valid, please recheck.</source> <translation>Η διεÏθυνση του αποδÎκτη δεν είναι σωστή. ΠαÏακαλώ ελÎγξτε ξανά.</translation> </message> @@ -2281,12 +2330,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Warning: Invalid Bitcoin address</source> <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+20"/> <source>(no label)</source> <translation>(χωÏίς ετικÎτα)</translation> </message> @@ -2296,7 +2345,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-366"/> + <location line="-367"/> <source>Are you sure you want to send?</source> <translation>Είστε βÎβαιοι για την αποστολή;</translation> </message> @@ -2306,7 +2355,7 @@ Address: %4 <translation>Ï€ÏοστÎθηκαν ως αμοιβή συναλλαγής</translation> </message> <message> - <location line="+170"/> + <location line="+171"/> <source>Payment request expired</source> <translation>Έληξε η αίτηση πληÏωμής</translation> </message> @@ -2383,12 +2432,7 @@ Address: %4 <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"/> + <location line="+968"/> <source>This is a verified payment request.</source> <translation type="unfinished"/> </message> @@ -2398,7 +2442,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+459"/> + <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"/> + </message> + <message> + <location line="+426"/> <source>This is an unverified payment request.</source> <translation type="unfinished"/> </message> @@ -2414,11 +2463,6 @@ Address: %4 <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> @@ -2456,19 +2500,19 @@ Address: %4 <translation>Εισάγετε μια διεÏθυνση Bitcoin (Ï€.χ. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location line="+10"/> - <location line="+213"/> + <location line="+7"/> + <location line="+210"/> <source>Choose previously used address</source> <translation>Επιλογή διεÏθυνσης που Îχει ήδη χÏησιμοποιηθεί</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>Επικόλληση διεÏθυνσης από το βιβλίο διευθÏνσεων</translation> </message> @@ -2509,12 +2553,12 @@ Address: %4 </message> <message> <location line="+3"/> - <location line="+146"/> + <location line="+143"/> <source>Clear &All</source> <translation>ΚαθαÏισμός &Όλων</translation> </message> <message> - <location line="-87"/> + <location line="-84"/> <source>&Verify Message</source> <translation>&Επιβεβαίωση μηνÏματος</translation> </message> @@ -2529,7 +2573,7 @@ Address: %4 <translation>Εισάγετε μια διεÏθυνση Bitcoin (Ï€.χ. 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>ΥπογÏάψτε Îνα μήνυμα για ν' αποδείξετε πως υπογÏαφθηκε απο μια συγκεκÏιμÎνη διεÏθυνση Bitcoin</translation> </message> @@ -2544,43 +2588,37 @@ Address: %4 <translation>ΕπαναφοÏά όλων επαλήθευμενων πεδίων μήνυματος </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>Εισάγετε μια διεÏθυνση Bitcoin (Ï€.χ. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location line="-2"/> + <location line="-1"/> <source>Click "Sign Message" to generate signature</source> <translation>Κάντε κλικ στο "ΥπογÏαφή ΜηνÏματος" για να λάβετε την υπογÏαφή</translation> </message> <message> - <location line="+3"/> - <source>Enter Bitcoin signature</source> - <translation>Εισαγωγή υπογÏαφής Bitcoin</translation> - </message> - <message> <location line="+84"/> - <location line="+81"/> + <location line="+80"/> <source>The entered address is invalid.</source> <translation>Η διεÏθυνση που εισήχθη είναι λάθος.</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>ΠαÏακαλοÏμε ελÎγξτε την διεÏθυνση και δοκιμάστε ξανά.</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>Η διεÏθυνση που Îχει εισαχθεί δεν αναφÎÏεται σε Îνα πλήκτÏο.</translation> </message> <message> - <location line="-73"/> + <location line="-72"/> <source>Wallet unlock was cancelled.</source> <translation>το ξεκλείδωμα του ποÏÏ„Î¿Ï†Î¿Î»Î¹Î¿Ï Î±Ï€Îτυχε</translation> </message> @@ -2600,7 +2638,7 @@ Address: %4 <translation>Μήνυμα υπεγÏάφη.</translation> </message> <message> - <location line="+59"/> + <location line="+58"/> <source>The signature could not be decoded.</source> <translation>Η υπογÏαφή δεν μπόÏεσε να αποκÏυπτογÏαφηθεί.</translation> </message> @@ -2661,6 +2699,11 @@ Address: %4 </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation>%1/χωÏίς σÏνδεση;</translation> </message> @@ -2822,12 +2865,12 @@ Address: %4 <translation>, δεν Îχει ακόμα μεταδοθεί μ' επιτυχία</translation> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <source>Open for %n more block(s)</source> <translation><numerusform>Ανοιχτό για %n μπλοκ</numerusform><numerusform>Ανοιχτό για %n μπλοκ</numerusform></translation> </message> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation>άγνωστο</translation> </message> @@ -2868,12 +2911,12 @@ Address: %4 <translation>Ποσό</translation> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <source>Open for %n more block(s)</source> <translation><numerusform>Ανοιχτό για %n μπλοκ</numerusform><numerusform>Ανοιχτό για %n μπλοκ</numerusform></translation> </message> @@ -2883,23 +2926,12 @@ Address: %4 <translation>Ανοιχτό μÎχÏι %1</translation> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> - <translation>ΧωÏίς σÏνδεση (%1 επικυÏώσεις)</translation> - </message> - <message> - <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation>ΧωÏίς επιβεβαίωση (%1 από %2 επικυÏώσεις)</translation> - </message> - <message> - <location line="-22"/> - <location line="+25"/> + <location line="+12"/> <source>Confirmed (%1 confirmations)</source> <translation>ΕπικυÏωμÎνη (%1 επικυÏώσεις)</translation> </message> <message> - <location line="-22"/> + <location line="+9"/> <source>This block was not received by any other nodes and will probably not be accepted!</source> <translation>Αυτό το μπλοκ δεν Îχει παÏαληφθεί από κανÎναν άλλο κόμβο και κατά πάσα πιθανότητα θα αποÏÏιφθεί!</translation> </message> @@ -2909,7 +2941,27 @@ Address: %4 <translation>ΔημιουÏγήθηκε αλλά αποÏÏίφθηκε</translation> </message> <message> - <location line="+62"/> + <location line="-21"/> + <source>Offline</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Unconfirmed</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation>ΠαÏαλαβή με</translation> </message> @@ -2939,7 +2991,7 @@ Address: %4 <translation>(δ/α)</translation> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation>Κατάσταση συναλλαγής. Πηγαίνετε το ποντίκι πάνω από αυτό το πεδίο για να δείτε τον αÏιθμό των επικυÏώσεων</translation> </message> @@ -3205,12 +3257,12 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+223"/> <source>Usage:</source> <translation>ΧÏήση:</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>List commands</source> <translation>Λίστα εντολών</translation> </message> @@ -3265,12 +3317,12 @@ Address: %4 <translation>ΔιευκÏινίστε τη δικιά σας δημόσια διεÏθυνση.</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation>ÎŒÏιο αποσÏνδεσης Ï€Ïοβληματικών peers (Ï€Ïοεπιλογή: 100)</translation> </message> <message> - <location line="-148"/> + <location line="-150"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>ΔευτεÏόλεπτα Ï€Ïιν επιτÏαπεί ξανά η σÏνδεση των Ï€Ïοβληματικών peers (Ï€Ïοεπιλογή: 86400)</translation> </message> @@ -3290,17 +3342,17 @@ Address: %4 <translation>Αποδοχή εντολών κονσόλας και JSON-RPC</translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Run in the background as a daemon and accept commands</source> <translation>ΕκτÎλεση στο παÏασκήνιο κι αποδοχή εντολών</translation> </message> <message> - <location line="+39"/> + <location line="+40"/> <source>Use the test network</source> <translation>ΧÏήση του Î´Î¿ÎºÎ¹Î¼Î±ÏƒÏ„Î¹ÎºÎ¿Ï Î´Î¹ÎºÏ„Ïου</translation> </message> <message> - <location line="-118"/> + <location line="-120"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>Îα δÎχεσαι συνδÎσεις από Îξω(Ï€Ïοεπιλογή:1)</translation> </message> @@ -3442,6 +3494,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation>ΣÏνδεση μόνο με οÏισμÎνους κόμβους</translation> </message> @@ -3652,6 +3709,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Start Bitcoin server</source> <translation type="unfinished"/> </message> @@ -3701,12 +3763,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-79"/> + <location line="-80"/> <source>Imports blocks from external blk000??.dat file</source> <translation>Εισαγωγή μπλοκ από εξωτεÏικό αÏχείο blk000?.dat</translation> </message> <message> - <location line="-105"/> + <location line="-106"/> <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> @@ -3726,7 +3788,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>ΟÏίσμος του αÏιθμό των νημάτων ελÎγχου σεναÏίου (μÎχÏι 16, 0 = auto, <0 = αφήνουν τους πολλους πυÏήνες δωÏεάν, default: 0)</translation> </message> <message> - <location line="+89"/> + <location line="+90"/> <source>Information</source> <translation>ΠληÏοφοÏία</translation> </message> @@ -3796,7 +3858,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>ΟÏισμός λήξης χÏÎ¿Î½Î¹ÎºÎ¿Ï Î¿Ïίου σε χιλιοστά του δευτεÏολÎπτου(Ï€Ïοεπιλογή:5000)</translation> </message> <message> - <location line="+6"/> + <location line="+7"/> <source>System error: </source> <translation>Λάθος Συστήματος:</translation> </message> @@ -3842,6 +3904,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>version</source> <translation>Îκδοση</translation> </message> @@ -3851,32 +3918,32 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Το αÏχειο wallet.dat ειναι διεφθαÏμÎνο, η διάσωση απÎτυχε</translation> </message> <message> - <location line="-58"/> + <location line="-60"/> <source>Password for JSON-RPC connections</source> <translation>Κωδικός για τις συνδÎσεις JSON-RPC</translation> </message> <message> - <location line="-70"/> + <location line="-71"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Αποδοχή συνδÎσεων JSON-RPC από συγκεκÏιμÎνη διεÏθυνση IP</translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>Αποστολή εντολών στον κόμβο <ip> (Ï€Ïοεπιλογή: 127.0.0.1)</translation> </message> <message> - <location line="-132"/> + <location line="-133"/> <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="+161"/> + <location line="+163"/> <source>Upgrade wallet to latest format</source> <translation>Αναβάθμισε το ποÏτοφόλι στην τελευταία Îκδοση</translation> </message> <message> - <location line="-24"/> + <location line="-25"/> <source>Set key pool size to <n> (default: 100)</source> <translation>ÎŒÏιο πλήθους κλειδιών pool <n> (Ï€Ïοεπιλογή: 100)</translation> </message> @@ -3886,12 +3953,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>ΕπανÎλεγχος της αλυσίδας μπλοκ για αποÏσες συναλλαγÎÏ‚</translation> </message> <message> - <location line="+38"/> + <location line="+39"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>ΧÏήση του OpenSSL (https) για συνδÎσεις JSON-RPC</translation> </message> <message> - <location line="-30"/> + <location line="-31"/> <source>Server certificate file (default: server.cert)</source> <translation>ΑÏχείο Ï€Î¹ÏƒÏ„Î¿Ï€Î¿Î¹Î·Ï„Î¹ÎºÎ¿Ï Ï„Î¿Ï… διακομιστή (Ï€Ïοεπιλογή: server.cert)</translation> </message> @@ -3901,7 +3968,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Î Ïοσωπικό κλειδί του διακομιστή (Ï€Ïοεπιλογή: server.pem)</translation> </message> <message> - <location line="+16"/> + <location line="+17"/> <source>This help message</source> <translation>Αυτό το κείμενο βοήθειας</translation> </message> @@ -3911,12 +3978,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>ΑδÏνατη η σÏνδεση με τη θÏÏα %s Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… υπολογιστή (bind returned error %d, %s) </translation> </message> <message> - <location line="-107"/> + <location line="-109"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>Îα επιτÏÎπονται οι Îλεγχοι DNS για Ï€Ïοσθήκη και σÏνδεση κόμβων</translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Loading addresses...</source> <translation>ΦόÏτωση διευθÏνσεων...</translation> </message> @@ -3931,12 +3998,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Σφάλμα φόÏτωσης wallet.dat: Το ΠοÏτοφόλι απαιτεί μια νεότεÏη Îκδοση του Bitcoin</translation> </message> <message> - <location line="+98"/> + <location line="+99"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>Απαιτείται η επανεγγÏαφή του ΠοÏτοφολιοÏ, η οποία θα ολοκληÏωθεί στην επανεκκίνηση του Bitcoin</translation> </message> <message> - <location line="-100"/> + <location line="-101"/> <source>Error loading wallet.dat</source> <translation>Σφάλμα φόÏτωσης αÏχείου wallet.dat</translation> </message> @@ -3946,7 +4013,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Δεν είναι ÎγκυÏη η διεÏθυνση διαμεσολαβητή: '%s'</translation> </message> <message> - <location line="+56"/> + <location line="+57"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Άγνωστo δίκτυο οÏίζεται σε onlynet: '%s'</translation> </message> @@ -3956,7 +4023,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Άγνωστo δίκτυο οÏίζεται: %i</translation> </message> <message> - <location line="-101"/> + <location line="-103"/> <source>Cannot resolve -bind address: '%s'</source> <translation>Δεν μποÏÏŽ να γÏάψω την Ï€ÏοεπιλεγμÎνη διεÏθυνση: '%s'</translation> </message> @@ -3966,7 +4033,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Δεν μποÏÏŽ να γÏάψω την Ï€ÏοεπιλεγμÎνη διεÏθυνση: '%s'</translation> </message> <message> - <location line="+48"/> + <location line="+49"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>Μη ÎγκυÏο ποσό για την παÏάμετÏο -paytxfee=<amount>: '%s'</translation> </message> @@ -3986,7 +4053,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>ΦόÏτωση ευÏετηÏίου μπλοκ...</translation> </message> <message> - <location line="-62"/> + <location line="-63"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>Î ÏοσÎθεσε Îνα κόμβο για σÏνδεση και Ï€Ïοσπάθησε να κÏατήσεις την σÏνδεση ανοιχτή</translation> </message> @@ -3996,12 +4063,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>ΑδÏνατη η σÏνδεση με τη θÏÏα %s Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… υπολογιστή. Το Bitcoin είναι πιθανώς ήδη ενεÏγό.</translation> </message> <message> - <location line="+95"/> + <location line="+96"/> <source>Loading wallet...</source> <translation>ΦόÏτωση ποÏτοφολιοÏ...</translation> </message> <message> - <location line="-56"/> + <location line="-57"/> <source>Cannot downgrade wallet</source> <translation>Δεν μποÏÏŽ να υποβαθμίσω το ποÏτοφόλι</translation> </message> @@ -4011,7 +4078,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Δεν μποÏÏŽ να γÏάψω την Ï€ÏοεπιλεγμÎνη διεÏθυνση</translation> </message> <message> - <location line="+67"/> + <location line="+68"/> <source>Rescanning...</source> <translation>Ανίχνευση...</translation> </message> @@ -4021,17 +4088,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Η φόÏτωση ολοκληÏώθηκε</translation> </message> <message> - <location line="+85"/> + <location line="+86"/> <source>To use the %s option</source> <translation>ΧÏήση της %s επιλογής</translation> </message> <message> - <location line="-77"/> + <location line="-78"/> <source>Error</source> <translation>Σφάλμα</translation> </message> <message> - <location line="-35"/> + <location line="-36"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts index 628847e030..cbe59c553d 100644 --- a/src/qt/locale/bitcoin_en.ts +++ b/src/qt/locale/bitcoin_en.ts @@ -41,7 +41,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+12"/> <location line="+2"/> - <source> (%1-bit)</source> + <source>(%1-bit)</source> <translation type="unfinished"></translation> </message> </context> @@ -73,7 +73,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"></translation> </message> <message> - <location line="+52"/> + <location line="+58"/> <source>C&lose</source> <translation type="unfinished"></translation> </message> @@ -83,7 +83,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Copy Address</translation> </message> <message> - <location filename="../forms/addressbookpage.ui" line="-41"/> + <location filename="../forms/addressbookpage.ui" line="-47"/> <source>Delete the currently selected address from the list</source> <translation>Delete the currently selected address from the list</translation> </message> @@ -330,7 +330,7 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+295"/> + <location filename="../bitcoingui.cpp" line="+294"/> <source>Sign &message...</source> <translation>Sign &message...</translation> </message> @@ -345,12 +345,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Overview</translation> </message> <message> - <location line="-137"/> + <location line="-136"/> <source>Node</source> <translation type="unfinished"></translation> </message> <message> - <location line="+138"/> + <location line="+137"/> <source>Show general overview of wallet</source> <translation>Show general overview of wallet</translation> </message> @@ -471,17 +471,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Verify message...</translation> </message> <message> - <location line="+430"/> + <location line="+440"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-643"/> + <location line="-652"/> <source>Wallet</source> <translation>Wallet</translation> </message> <message> - <location line="+146"/> + <location line="+145"/> <source>&Send</source> <translation>&Send</translation> </message> @@ -537,18 +537,18 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Tabs toolbar</translation> </message> <message> - <location line="-284"/> - <location line="+376"/> + <location line="-283"/> + <location line="+375"/> <source>[testnet]</source> <translation>[testnet]</translation> </message> <message> - <location line="-401"/> + <location line="-400"/> <source>Bitcoin Core</source> <translation type="unfinished">Bitcoin Core</translation> </message> <message> - <location line="+163"/> + <location line="+162"/> <source>Request payments (generates QR codes and bitcoin: URIs)</source> <translation type="unfinished"></translation> </message> @@ -613,7 +613,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Processed %1 blocks of transaction history.</translation> </message> <message numerus="yes"> - <location line="+23"/> + <location line="+27"/> <source>%n hour(s)</source> <translation> <numerusform>%n hour</numerusform> @@ -630,6 +630,7 @@ This product includes software developed by the OpenSSL Project for use in the O </message> <message numerus="yes"> <location line="+4"/> + <location line="+6"/> <source>%n week(s)</source> <translation> <numerusform>%n week</numerusform> @@ -637,6 +638,19 @@ This product includes software developed by the OpenSSL Project for use in the O </translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation type="unfinished"></translation> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation type="unfinished"> + <numerusform>%n year</numerusform> + <numerusform>%n years</numerusform> + </translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation>%1 behind</translation> @@ -667,12 +681,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Information</translation> </message> <message> - <location line="-85"/> + <location line="-95"/> <source>Up to date</source> <translation>Up to date</translation> </message> <message> - <location line="+34"/> + <location line="+44"/> <source>Catching up...</source> <translation>Catching up...</translation> </message> @@ -710,7 +724,7 @@ Address: %4 <translation>Wallet is <b>encrypted</b> and currently <b>locked</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+435"/> + <location filename="../bitcoin.cpp" line="+443"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</translation> </message> @@ -718,7 +732,7 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+119"/> + <location filename="../clientmodel.cpp" line="+128"/> <source>Network Alert</source> <translation>Network Alert</translation> </message> @@ -816,7 +830,7 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location filename="../coincontroldialog.cpp" line="+42"/> + <location filename="../coincontroldialog.cpp" line="+41"/> <source>Copy address</source> <translation type="unfinished">Copy address</translation> </message> @@ -882,7 +896,7 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="+323"/> + <location line="+332"/> <source>highest</source> <translation type="unfinished"></translation> </message> @@ -932,7 +946,7 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="+31"/> + <location line="+32"/> <source>none</source> <translation type="unfinished"></translation> </message> @@ -1000,12 +1014,12 @@ Address: %4 </message> <message> <location line="+43"/> - <location line="+66"/> + <location line="+61"/> <source>(no label)</source> <translation type="unfinished">(no label)</translation> </message> <message> - <location line="-9"/> + <location line="-7"/> <source>change from %1 (%2)</source> <translation type="unfinished"></translation> </message> @@ -1086,7 +1100,7 @@ Address: %4 <context> <name>FreespaceChecker</name> <message> - <location filename="../intro.cpp" line="+65"/> + <location filename="../intro.cpp" line="+68"/> <source>A new data directory will be created.</source> <translation>A new data directory will be created.</translation> </message> @@ -1144,7 +1158,7 @@ Address: %4 <translation type="unfinished">UI options</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Set language, for example "de_DE" (default: system locale)</source> <translation type="unfinished">Set language, for example "de_DE" (default: system locale)</translation> </message> @@ -1155,11 +1169,16 @@ Address: %4 </message> <message> <location line="+1"/> + <source>Set SSL root certificates for payment request (default: -system-)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> <source>Show splash screen on startup (default: 1)</source> <translation type="unfinished">Show splash screen on startup (default: 1)</translation> </message> <message> - <location line="+1"/> + <location line="-4"/> <source>Choose data directory on startup (default: 0)</source> <translation type="unfinished">Choose data directory on startup (default: 0)</translation> </message> @@ -1197,7 +1216,7 @@ Address: %4 <translation>Use a custom data directory:</translation> </message> <message> - <location filename="../intro.cpp" line="+85"/> + <location filename="../intro.cpp" line="+82"/> <source>Bitcoin</source> <translation type="unfinished">Bitcoin</translation> </message> @@ -1207,7 +1226,7 @@ Address: %4 <translation type="unfinished">Error: Specified data directory "%1" can not be created.</translation> </message> <message> - <location line="+19"/> + <location line="+24"/> <source>Error</source> <translation>Error</translation> </message> @@ -1263,7 +1282,7 @@ Address: %4 <translation>&Main</translation> </message> <message> - <location line="+122"/> + <location line="+116"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</translation> </message> @@ -1273,7 +1292,7 @@ Address: %4 <translation>Pay transaction &fee</translation> </message> <message> - <location line="-131"/> + <location line="-125"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation>Automatically start Bitcoin after logging in to the system.</translation> </message> @@ -1298,17 +1317,7 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="+13"/> - <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> - <translation type="unfinished">Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</translation> - </message> - <message> - <location line="+107"/> - <source>&Spend unconfirmed change (experts only)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+37"/> + <location line="+160"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation type="unfinished"></translation> </message> @@ -1323,7 +1332,7 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="+224"/> + <location line="+214"/> <source>Active command-line options that override above options:</source> <translation type="unfinished"></translation> </message> @@ -1338,22 +1347,42 @@ Address: %4 <translation>&Reset Options</translation> </message> <message> - <location line="-323"/> + <location line="-313"/> <source>&Network</source> <translation>&Network</translation> </message> <message> - <location line="-86"/> + <location line="-131"/> + <source>(0 = auto, <0 = leave that many cores free)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+36"/> <source>W&allet</source> <translation type="unfinished"></translation> </message> <message> - <location line="+52"/> + <location line="+65"/> + <source>Expert</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> + <source>Enable coin &control features</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> <source>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.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+40"/> + <location line="+3"/> + <source>&Spend unconfirmed change</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+17"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</translation> </message> @@ -1448,17 +1477,12 @@ Address: %4 <translation>&Display addresses in transaction list</translation> </message> <message> - <location line="+7"/> + <location line="-262"/> <source>Whether to show coin control features or not.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Display coin &control features (experts only)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+136"/> + <location line="+398"/> <source>&OK</source> <translation>&OK</translation> </message> @@ -1468,7 +1492,7 @@ Address: %4 <translation>&Cancel</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+70"/> + <location filename="../optionsdialog.cpp" line="+72"/> <source>default</source> <translation>default</translation> </message> @@ -1478,7 +1502,7 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="+78"/> + <location line="+80"/> <source>Confirm options reset</source> <translation>Confirm options reset</translation> </message> @@ -1671,23 +1695,29 @@ Address: %4 <context> <name>QObject</name> <message> - <location filename="../bitcoin.cpp" line="+71"/> - <location line="+11"/> + <location filename="../bitcoin.cpp" line="+63"/> + <location line="+7"/> + <location line="+13"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="+1"/> + <location line="-19"/> <source>Error: Specified data directory "%1" does not exist.</source> <translation>Error: Specified data directory "%1" does not exist.</translation> </message> <message> - <location line="-12"/> + <location line="+7"/> + <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+12"/> <source>Error: Invalid combination of -regtest and -testnet.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../guiutil.cpp" line="+82"/> + <location filename="../guiutil.cpp" line="+89"/> <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation type="unfinished">Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> @@ -1733,7 +1763,7 @@ Address: %4 <location line="+36"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+359"/> + <location filename="../rpcconsole.cpp" line="+373"/> <source>N/A</source> <translation>N/A</translation> </message> @@ -1829,11 +1859,13 @@ Address: %4 </message> <message> <location line="+64"/> + <location filename="../rpcconsole.cpp" line="-10"/> <source>In:</source> <translation type="unfinished"></translation> </message> <message> <location line="+80"/> + <location filename="../rpcconsole.cpp" line="+1"/> <source>Out:</source> <translation type="unfinished"></translation> </message> @@ -1858,7 +1890,7 @@ Address: %4 <translation>Clear console</translation> </message> <message> - <location filename="../rpcconsole.cpp" line="-30"/> + <location filename="../rpcconsole.cpp" line="-35"/> <source>Welcome to the Bitcoin RPC console.</source> <translation>Welcome to the Bitcoin RPC console.</translation> </message> @@ -1873,7 +1905,7 @@ Address: %4 <translation>Type <b>help</b> for an overview of available commands.</translation> </message> <message> - <location line="+122"/> + <location line="+136"/> <source>%1 B</source> <translation type="unfinished"></translation> </message> @@ -1989,7 +2021,7 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="+11"/> + <location line="+14"/> <source>Remove the selected entries from the list</source> <translation type="unfinished"></translation> </message> @@ -1999,7 +2031,7 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location filename="../receivecoinsdialog.cpp" line="+38"/> + <location filename="../receivecoinsdialog.cpp" line="+39"/> <source>Copy label</source> <translation type="unfinished">Copy label</translation> </message> @@ -2220,12 +2252,12 @@ Address: %4 <translation>Clear &All</translation> </message> <message> - <location line="+52"/> + <location line="+58"/> <source>Balance:</source> <translation>Balance:</translation> </message> <message> - <location line="-78"/> + <location line="-84"/> <source>Confirm the send action</source> <translation>Confirm the send action</translation> </message> @@ -2470,7 +2502,7 @@ Address: %4 <context> <name>ShutdownWindow</name> <message> - <location filename="../utilitydialog.cpp" line="+48"/> + <location filename="../utilitydialog.cpp" line="+52"/> <source>Bitcoin Core is shutting down...</source> <translation type="unfinished"></translation> </message> @@ -2670,7 +2702,7 @@ Address: %4 <context> <name>SplashScreen</name> <message> - <location filename="../splashscreen.cpp" line="+28"/> + <location filename="../splashscreen.cpp" line="+32"/> <source>Bitcoin Core</source> <translation type="unfinished">Bitcoin Core</translation> </message> @@ -3135,7 +3167,7 @@ Address: %4 <translation>Show transaction details</translation> </message> <message> - <location line="+142"/> + <location line="+140"/> <source>Export Transaction History</source> <translation type="unfinished"></translation> </message> @@ -3229,7 +3261,7 @@ Address: %4 <context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+43"/> + <location filename="../walletview.cpp" line="+44"/> <source>&Export</source> <translation>&Export</translation> </message> @@ -3239,7 +3271,7 @@ Address: %4 <translation>Export the data in the current tab to a file</translation> </message> <message> - <location line="+181"/> + <location line="+184"/> <source>Backup Wallet</source> <translation>Backup Wallet</translation> </message> @@ -3272,12 +3304,12 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+223"/> + <location filename="../bitcoinstrings.cpp" line="+261"/> <source>Usage:</source> <translation>Usage:</translation> </message> <message> - <location line="-55"/> + <location line="-66"/> <source>List commands</source> <translation>List commands</translation> </message> @@ -3287,12 +3319,12 @@ Address: %4 <translation>Get help for a command</translation> </message> <message> - <location line="+26"/> + <location line="+27"/> <source>Options:</source> <translation>Options:</translation> </message> <message> - <location line="+22"/> + <location line="+32"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Specify configuration file (default: bitcoin.conf)</translation> </message> @@ -3307,27 +3339,22 @@ Address: %4 <translation>Specify data directory</translation> </message> <message> - <location line="-9"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation>Set database cache size in megabytes (default: 25)</translation> - </message> - <message> - <location line="-26"/> + <location line="-46"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>Listen for connections on <port> (default: 8333 or testnet: 18333)</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Maintain at most <n> connections to peers (default: 125)</source> <translation>Maintain at most <n> connections to peers (default: 125)</translation> </message> <message> - <location line="-51"/> + <location line="-57"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation>Connect to a node to retrieve peer addresses, and disconnect</translation> </message> <message> - <location line="+84"/> + <location line="+100"/> <source>Specify your own public address</source> <translation>Specify your own public address</translation> </message> @@ -3337,42 +3364,47 @@ Address: %4 <translation>Threshold for disconnecting misbehaving peers (default: 100)</translation> </message> <message> - <location line="-150"/> + <location line="-172"/> <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="-36"/> + <location line="-52"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation>An error occurred while setting up the RPC port %u for listening on IPv4: %s</translation> </message> <message> - <location line="+34"/> + <location line="+50"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</translation> </message> <message> - <location line="+45"/> + <location line="+51"/> <source>Accept command line and JSON-RPC commands</source> <translation>Accept command line and JSON-RPC commands</translation> </message> <message> - <location line="+81"/> + <location line="+7"/> + <source>Bitcoin Core RPC client version</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+87"/> <source>Run in the background as a daemon and accept commands</source> <translation>Run in the background as a daemon and accept commands</translation> </message> <message> - <location line="+40"/> + <location line="+43"/> <source>Use the test network</source> <translation>Use the test network</translation> </message> <message> - <location line="-120"/> + <location line="-136"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>Accept connections from outside (default: 1 if no -proxy or -connect)</translation> </message> <message> - <location line="-95"/> + <location line="-117"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -3412,9 +3444,9 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Bind to given address and always listen on it. Use [host]:port notation for IPv6</translation> </message> <message> - <location line="+3"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> - <translation>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</translation> + <location line="+6"/> + <source>Continuously rate-limit free transactions to <n>*1000 bytes per minute (default:15)</source> + <translation type="unfinished"></translation> </message> <message> <location line="+3"/> @@ -3428,6 +3460,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+3"/> + <source>Error: Listening for incoming connections failed (listen returned error %d)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</translation> </message> @@ -3442,12 +3479,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</translation> </message> <message> - <location line="+18"/> + <location line="+6"/> + <source>Fees smaller than this are considered zero fee (for transaction creation) (default:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Flush database activity from memory pool to disk log every <n> megabytes (default: 100)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>How thorough the block verification of -checkblocks is (0-4, default: 3)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>In this mode -genproclimit controls how many blocks are generated immediately.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+12"/> + <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Set the processor limit for when generation is on (-1 = unlimited, default: -1)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</translation> </message> <message> - <location line="+5"/> + <location line="+3"/> + <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source> <translation type="unfinished"></translation> </message> @@ -3483,6 +3555,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+9"/> + <source>(default: 1)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>(default: wallet.dat)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> <source><category> can be:</source> <translation type="unfinished"></translation> </message> @@ -3497,12 +3579,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"></translation> </message> <message> - <location line="+1"/> - <source>Bitcoin RPC client version</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> + <location line="+2"/> <source>Block creation options:</source> <translation>Block creation options:</translation> </message> @@ -3528,11 +3605,26 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Connection options:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> <source>Corrupted block database detected</source> <translation>Corrupted block database detected</translation> </message> <message> <location line="+1"/> + <source>Debugging/Testing options:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Disable safemode, override a real safe mode event (default: 0)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> <source>Discover own IP address (default: 1 when listening and no -externalip)</source> <translation>Discover own IP address (default: 1 when listening and no -externalip)</translation> </message> @@ -3643,11 +3735,21 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> + <source>Fees smaller than this are considered zero fee (for relaying) (default:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> <source>Find peers using DNS lookup (default: 1 unless -connect)</source> <translation>Find peers using DNS lookup (default: 1 unless -connect)</translation> </message> <message> <location line="+1"/> + <source>Force safe mode (default: 0)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> <source>Generate coins (default: 0)</source> <translation>Generate coins (default: 0)</translation> </message> @@ -3658,11 +3760,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> - <source>How thorough the block verification is (0-4, default: 3)</source> - <translation>How thorough the block verification is (0-4, default: 3)</translation> - </message> - <message> - <location line="+1"/> <source>If <category> is not supplied, output all debugging information.</source> <translation type="unfinished"></translation> </message> @@ -3677,7 +3774,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"></translation> </message> <message> - <location line="+15"/> + <location line="+17"/> <source>Not enough file descriptors available.</source> <translation>Not enough file descriptors available.</translation> </message> @@ -3687,27 +3784,27 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"></translation> </message> <message> - <location line="+1"/> + <location line="+4"/> <source>RPC client options:</source> <translation type="unfinished"></translation> </message> <message> - <location line="+1"/> + <location line="+4"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation>Rebuild block chain index from current blk000??.dat files</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+1"/> - <source>Send command to Bitcoin server</source> + <location line="+6"/> + <source>Set database cache size in megabytes (%d to %d, default: %d)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> + <location line="+2"/> <source>Set maximum block size in bytes (default: %d)</source> <translation type="unfinished"></translation> </message> @@ -3717,7 +3814,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Set the number of threads to service RPC calls (default: 4)</translation> </message> <message> - <location line="+7"/> + <location line="+10"/> <source>Specify wallet file (within data directory)</source> <translation>Specify wallet file (within data directory)</translation> </message> @@ -3727,12 +3824,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"></translation> </message> <message> - <location line="+1"/> - <source>Start Bitcoin server</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+3"/> + <location line="+4"/> <source>This is intended for regression testing tools and app development.</source> <translation type="unfinished"></translation> </message> @@ -3777,17 +3869,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>You need to rebuild the database using -reindex to change -txindex</translation> </message> <message> - <location line="-80"/> + <location line="-92"/> <source>Imports blocks from external blk000??.dat file</source> <translation>Imports blocks from external blk000??.dat file</translation> </message> <message> - <location line="-106"/> + <location line="-149"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+22"/> <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>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</translation> </message> <message> - <location line="+14"/> + <location line="+25"/> <source>Output debugging information (default: 0, supplying <category> is optional)</source> <translation type="unfinished"></translation> </message> @@ -3797,12 +3894,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> - <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> - <translation>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</translation> - </message> - <message> - <location line="+90"/> + <location line="+102"/> <source>Information</source> <translation>Information</translation> </message> @@ -3817,7 +3909,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Invalid amount for -mintxfee=<amount>: '%s'</translation> </message> <message> - <location line="+8"/> + <location line="+3"/> + <source>Limit size of signature cache to <n> entries (default: 50000)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>Log transaction priority and fee per kB when mining blocks (default: 0)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> <source>Maintain a full transaction index (default: 0)</source> <translation>Maintain a full transaction index (default: 0)</translation> </message> @@ -3842,12 +3944,52 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Only connect to nodes in network <net> (IPv4, IPv6 or Tor)</translation> </message> <message> - <location line="+9"/> + <location line="+4"/> + <source>Print block on startup, if found in block index</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Print block tree on startup (default: 0)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>RPC SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>RPC server options:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Randomly drop 1 of every <n> network messages</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Randomly fuzz 1 of every <n> network messages</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>Run a thread to flush wallet periodically (default: 1)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</translation> </message> <message> - <location line="+4"/> + <location line="+2"/> + <source>Send command to Bitcoin Core</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> <source>Send trace/debug info to console instead of debug.log file</source> <translation>Send trace/debug info to console instead of debug.log file</translation> </message> @@ -3858,6 +4000,21 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Sets the DB_PRIVATE flag in the wallet db environment (default: 1)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Show all debugging options (usage: --help -help-debug)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Show benchmark information (default: 0)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> <translation>Shrink debug.log file on client startup (default: 1 when no -debug)</translation> </message> @@ -3872,7 +4029,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Specify connection timeout in milliseconds (default: 5000)</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> + <source>Start Bitcoin Core Daemon</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> <source>System error: </source> <translation>System error: </translation> </message> @@ -3923,6 +4085,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> + <source>on startup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> <source>version</source> <translation type="unfinished">version</translation> </message> @@ -3932,47 +4099,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>wallet.dat corrupt, salvage failed</translation> </message> <message> - <location line="-60"/> + <location line="-71"/> <source>Password for JSON-RPC connections</source> <translation>Password for JSON-RPC connections</translation> </message> <message> - <location line="-71"/> + <location line="-77"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Allow JSON-RPC connections from specified IP address</translation> </message> <message> - <location line="+81"/> + <location line="+94"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>Send commands to node running on <ip> (default: 127.0.0.1)</translation> </message> <message> - <location line="-133"/> + <location line="-163"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>Execute command when the best block changes (%s in cmd is replaced by block hash)</translation> </message> <message> - <location line="+163"/> + <location line="+196"/> <source>Upgrade wallet to latest format</source> <translation>Upgrade wallet to latest format</translation> </message> <message> - <location line="-25"/> + <location line="-28"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Set key pool size to <n> (default: 100)</translation> </message> <message> - <location line="-11"/> + <location line="-12"/> <source>Rescan the block chain for missing wallet transactions</source> <translation>Rescan the block chain for missing wallet transactions</translation> </message> <message> - <location line="+39"/> + <location line="+43"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Use OpenSSL (https) for JSON-RPC connections</translation> </message> <message> - <location line="-31"/> + <location line="-34"/> <source>Server certificate file (default: server.cert)</source> <translation>Server certificate file (default: server.cert)</translation> </message> @@ -3982,7 +4149,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Server private key (default: server.pem)</translation> </message> <message> - <location line="+17"/> + <location line="+20"/> <source>This help message</source> <translation>This help message</translation> </message> @@ -3992,17 +4159,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Unable to bind to %s on this computer (bind returned error %d, %s)</translation> </message> <message> - <location line="-109"/> + <location line="-125"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>Allow DNS lookups for -addnode, -seednode and -connect</translation> </message> <message> - <location line="+61"/> + <location line="+66"/> <source>Loading addresses...</source> <translation>Loading addresses...</translation> </message> <message> - <location line="-37"/> + <location line="-39"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>Error loading wallet.dat: Wallet corrupted</translation> </message> @@ -4012,22 +4179,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Error loading wallet.dat: Wallet requires newer version of Bitcoin</translation> </message> <message> - <location line="+99"/> + <location line="+112"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>Wallet needed to be rewritten: restart Bitcoin to complete</translation> </message> <message> - <location line="-101"/> + <location line="-114"/> <source>Error loading wallet.dat</source> <translation>Error loading wallet.dat</translation> </message> <message> - <location line="+31"/> + <location line="+32"/> <source>Invalid -proxy address: '%s'</source> <translation>Invalid -proxy address: '%s'</translation> </message> <message> - <location line="+57"/> + <location line="+69"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Unknown network specified in -onlynet: '%s'</translation> </message> @@ -4037,7 +4204,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Unknown -socks proxy version requested: %i</translation> </message> <message> - <location line="-103"/> + <location line="-119"/> <source>Cannot resolve -bind address: '%s'</source> <translation>Cannot resolve -bind address: '%s'</translation> </message> @@ -4047,7 +4214,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Cannot resolve -externalip address: '%s'</translation> </message> <message> - <location line="+49"/> + <location line="+53"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>Invalid amount for -paytxfee=<amount>: '%s'</translation> </message> @@ -4062,27 +4229,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Insufficient funds</translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>Loading block index...</source> <translation>Loading block index...</translation> </message> <message> - <location line="-63"/> + <location line="-68"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>Add a node to connect to and attempt to keep the connection open</translation> </message> <message> - <location line="-32"/> - <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source> - <translation>Unable to bind to %s on this computer. Bitcoin is probably already running.</translation> - </message> - <message> - <location line="+96"/> + <location line="+69"/> <source>Loading wallet...</source> <translation>Loading wallet...</translation> </message> <message> - <location line="-57"/> + <location line="-62"/> <source>Cannot downgrade wallet</source> <translation>Cannot downgrade wallet</translation> </message> @@ -4092,27 +4254,27 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Cannot write default address</translation> </message> <message> - <location line="+68"/> + <location line="+80"/> <source>Rescanning...</source> <translation>Rescanning...</translation> </message> <message> - <location line="-58"/> + <location line="-67"/> <source>Done loading</source> <translation>Done loading</translation> </message> <message> - <location line="+86"/> + <location line="+99"/> <source>To use the %s option</source> <translation>To use the %s option</translation> </message> <message> - <location line="-78"/> + <location line="-91"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location line="-36"/> + <location line="-41"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_eo.ts b/src/qt/locale/bitcoin_eo.ts index 329ff7a57f..62a4220e00 100644 --- a/src/qt/locale/bitcoin_eo.ts +++ b/src/qt/locale/bitcoin_eo.ts @@ -36,6 +36,12 @@ Tiu ĉi produkto enhavas erojn kreitajn de la "OpenSSL Project" por uz <source>The Bitcoin Core developers</source> <translation>La programistoj de Bitmona Kerno</translation> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source> (%1-bit)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>AddressBookPage</name> @@ -188,12 +194,12 @@ Tiu ĉi produkto enhavas erojn kreitajn de la "OpenSSL Project" por uz <message> <location line="+21"/> <source>Enter passphrase</source> - <translation>Tajpu vian pasfrazon</translation> + <translation>Enigu pasfrazon</translation> </message> <message> <location line="+14"/> <source>New passphrase</source> - <translation>Tajpu novan pasfrazon</translation> + <translation>Nova pasfrazo</translation> </message> <message> <location line="+14"/> @@ -617,6 +623,16 @@ Tiu ĉi produkto enhavas erojn kreitajn de la "OpenSSL Project" por uz <translation><numerusform>%n semajno</numerusform><numerusform>%n semajnoj</numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation>%1 kaj %2</translation> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation>mankas %1</translation> @@ -690,7 +706,7 @@ Adreso: %4 <translation>Monujo estas <b>ĉifrita</b> kaj aktuale <b>Ålosita</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+435"/> <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 gÌ‚i sekure ĉesos.</translation> </message> @@ -751,7 +767,7 @@ Adreso: %4 <translation>Restmono:</translation> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation>(mal)elekti ĉion</translation> </message> @@ -766,7 +782,7 @@ Adreso: %4 <translation>ListreÄimo</translation> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation>Sumo</translation> </message> @@ -917,7 +933,7 @@ Adreso: %4 <translation>neniu</translation> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation>Polvo</translation> </message> @@ -1099,7 +1115,7 @@ Adreso: %4 <translation>Bitmona Kerno - Komandliniaj agordajÌ‚oj</translation> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation>Kerno de Bitmono</translation> </message> @@ -1243,7 +1259,7 @@ Adreso: %4 <translation>CÌ‚&efa</translation> </message> <message> - <location line="+6"/> + <location line="+122"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation>Nedeviga krompago por cÌ‚iu kB, kiu helpas plirapidigi la traktadon de via transakcio. Plej multaj transakcioj grandas je 1kB.</translation> </message> @@ -1253,7 +1269,7 @@ Adreso: %4 <translation>Krompago</translation> </message> <message> - <location line="+31"/> + <location line="-131"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation>Aŭtomate lancÌ‚i Bitmonon post ensaluto al la sistemo.</translation> </message> @@ -1268,12 +1284,7 @@ Adreso: %4 <translation>Dosiergrando de &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"/> + <location line="+16"/> <source>MB</source> <translation>MB</translation> </message> @@ -1288,7 +1299,12 @@ Adreso: %4 <translation>Agordi la nombron de fadenoj por skriptkontrolado (gÌ‚is 16, 0 = aŭtomate, <0 = lasi tiom da kernoj liberaj, defaŭlte: 0)</translation> </message> <message> - <location line="+58"/> + <location line="+107"/> + <source>&Spend unconfirmed change (experts only)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+37"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation type="unfinished"/> </message> @@ -1323,7 +1339,17 @@ Adreso: %4 <translation>&Reto</translation> </message> <message> - <location line="+6"/> + <location line="-86"/> + <source>W&allet</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+52"/> + <source>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.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+40"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>Aŭtomate malfermi la kursilan pordon por Bitmono. Tio funkcias nur se via kursilo havas la UPnP-funkcion, kaj se tiu cÌ‚i estas sÌ‚altita.</translation> </message> @@ -1438,17 +1464,17 @@ Adreso: %4 <translation>&Nuligi</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+70"/> <source>default</source> <translation>defaŭlta</translation> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation>neniu</translation> </message> <message> - <location line="+75"/> + <location line="+78"/> <source>Confirm options reset</source> <translation>Konfirmi resÌ‚argo de agordoj</translation> </message> @@ -1488,19 +1514,14 @@ Adreso: %4 <translation>Eblas, ke la informoj videblaj cÌ‚i tie estas eksdataj. Via monujo aŭtomate sinkonigÌ‚as kun la bitmona reto kiam ili konektigÌ‚as, sed tiu procezo ankoraŭ ne finfarigÌ‚is.</translation> </message> <message> - <location line="-155"/> - <source>Unconfirmed:</source> - <translation>Nekonfirmita:</translation> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation>Monujo</translation> </message> <message> <location line="+51"/> - <source>Confirmed:</source> - <translation>Konfirmita:</translation> + <source>Available:</source> + <translation type="unfinished"/> </message> <message> <location line="+16"/> @@ -1508,7 +1529,12 @@ Adreso: %4 <translation>via aktuala elspezebla saldo</translation> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> <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> @@ -1656,6 +1682,11 @@ Adreso: %4 <source>Error: Invalid combination of -regtest and -testnet.</source> <translation>Eraro: nevalida kunigo de -regtest kaj -testnet</translation> </message> + <message> + <location filename="../guiutil.cpp" line="+82"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>Enigi Bitmon-adreson (ekz. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> </context> <context> <name>QRImageWidget</name> @@ -1677,7 +1708,7 @@ Adreso: %4 <message> <location line="+0"/> <source>PNG Image (*.png)</source> - <translation type="unfinished"/> + <translation>PNG-bildo (*.png)</translation> </message> </context> <context> @@ -1715,7 +1746,7 @@ Adreso: %4 <message> <location line="-10"/> <source>Debug window</source> - <translation type="unfinished"/> + <translation>Sencimiga fenestro</translation> </message> <message> <location line="+25"/> @@ -1876,22 +1907,22 @@ Adreso: %4 <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+83"/> + <location filename="../forms/receivecoinsdialog.ui" line="+107"/> <source>&Amount:</source> <translation>&Kvanto:</translation> </message> <message> - <location line="-13"/> + <location line="-16"/> <source>&Label:</source> <translation>&Etikedo:</translation> </message> <message> - <location line="-34"/> + <location line="-37"/> <source>&Message:</source> <translation>&MesaÄo:</translation> </message> <message> - <location line="-17"/> + <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>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> @@ -1901,27 +1932,30 @@ Adreso: %4 <translation>R&euzi ekzistantan ricevan adreson (malrekomendinda)</translation> </message> <message> - <location line="+27"/> - <source>An optional 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"/> </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> + <location line="-7"/> + <location line="+21"/> + <source>An optional label to associate with the new receiving address.</source> <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="-7"/> <source>Use this form to request payments. All fields are <b>optional</b>.</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <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"/> </message> <message> - <location line="+17"/> + <location line="+32"/> <source>Clear all fields of the form.</source> <translation>Malplenigi ĉiujn kampojn de la formularo.</translation> </message> @@ -1931,24 +1965,24 @@ Adreso: %4 <translation>Forigi</translation> </message> <message> - <location line="+36"/> - <source>&Request payment</source> - <translation>&Peti pagon</translation> + <location line="+78"/> + <source>Requested payments history</source> + <translation type="unfinished"/> </message> <message> - <location line="+47"/> - <source>Requested payments</source> - <translation type="unfinished"/> + <location line="-98"/> + <source>&Request payment</source> + <translation>&Peti pagon</translation> </message> <message> - <location line="+16"/> + <location line="+120"/> <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"/> + <translation>Vidigi</translation> </message> <message> <location line="+11"/> @@ -1960,6 +1994,21 @@ Adreso: %4 <source>Remove</source> <translation>Forigi</translation> </message> + <message> + <location filename="../receivecoinsdialog.cpp" line="+38"/> + <source>Copy label</source> + <translation>Kopii etikedon</translation> + </message> + <message> + <location line="+1"/> + <source>Copy message</source> + <translation>Kopiu mesaÄon</translation> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation>Kopii sumon</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -2061,12 +2110,17 @@ Adreso: %4 <source>(no message)</source> <translation>(neniu mesaÄo)</translation> </message> + <message> + <location line="+8"/> + <source>(no amount)</source> + <translation type="unfinished"/> + </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>Sendi Monon</translation> @@ -2074,7 +2128,7 @@ Adreso: %4 <message> <location line="+76"/> <source>Coin Control Features</source> - <translation type="unfinished"/> + <translation>Monregaj Opcioj</translation> </message> <message> <location line="+20"/> @@ -2089,7 +2143,7 @@ Adreso: %4 <message> <location line="+19"/> <source>Insufficient funds!</source> - <translation type="unfinished"/> + <translation>Nesufiĉa mono!</translation> </message> <message> <location line="+89"/> @@ -2142,7 +2196,7 @@ Adreso: %4 <translation type="unfinished"/> </message> <message> - <location line="+115"/> + <location line="+164"/> <source>Send to multiple recipients at once</source> <translation>Sendi samtempe al pluraj ricevantoj</translation> </message> @@ -2152,7 +2206,7 @@ Adreso: %4 <translation>Aldoni &Ricevonton</translation> </message> <message> - <location line="+20"/> + <location line="-23"/> <source>Clear all fields of the form.</source> <translation>Malplenigi ĉiujn kampojn de la formularo.</translation> </message> @@ -2162,12 +2216,12 @@ Adreso: %4 <translation>&Forigi ĉion</translation> </message> <message> - <location line="+22"/> + <location line="+52"/> <source>Balance:</source> <translation>Saldo:</translation> </message> <message> - <location line="+41"/> + <location line="-78"/> <source>Confirm the send action</source> <translation>Konfirmi la sendon</translation> </message> @@ -2177,7 +2231,7 @@ Adreso: %4 <translation>Åœendi</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-228"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation>Konfirmi sendon de bitmono</translation> </message> @@ -2190,12 +2244,7 @@ Adreso: %4 <translation>%1 al %2</translation> </message> <message> - <location line="-136"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Enigi Bitmon-adreson (ekz. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> - <message> - <location line="+15"/> + <location line="-121"/> <source>Copy quantity</source> <translation>Kopii kvanton</translation> </message> @@ -2245,7 +2294,7 @@ Adreso: %4 <translation>aÅ</translation> </message> <message> - <location line="+202"/> + <location line="+203"/> <source>The recipient address is not valid, please recheck.</source> <translation>La adreso de la ricevonto ne validas. Bonvolu kontroli.</translation> </message> @@ -2280,12 +2329,12 @@ Adreso: %4 <translation type="unfinished"/> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Warning: Invalid Bitcoin address</source> <translation>Averto: Nevalida Bitmon-adreso</translation> </message> <message> - <location line="+21"/> + <location line="+20"/> <source>(no label)</source> <translation>(neniu etikedo)</translation> </message> @@ -2295,7 +2344,7 @@ Adreso: %4 <translation type="unfinished"/> </message> <message> - <location line="-366"/> + <location line="-367"/> <source>Are you sure you want to send?</source> <translation>Ĉu vi certas, ke vi volas sendi?</translation> </message> @@ -2305,7 +2354,7 @@ Adreso: %4 <translation>aldonita kiel krompago</translation> </message> <message> - <location line="+170"/> + <location line="+171"/> <source>Payment request expired</source> <translation>Pagopeto nun estas eksdata</translation> </message> @@ -2382,12 +2431,7 @@ Adreso: %4 <translation>MesagÌ‚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"/> + <location line="+968"/> <source>This is a verified payment request.</source> <translation type="unfinished"/> </message> @@ -2397,7 +2441,12 @@ Adreso: %4 <translation>Tajpu etikedon por tiu ĉi adreso por aldoni Äin al la listo de uzitaj adresoj</translation> </message> <message> - <location line="+459"/> + <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"/> + </message> + <message> + <location line="+426"/> <source>This is an unverified payment request.</source> <translation type="unfinished"/> </message> @@ -2413,11 +2462,6 @@ Adreso: %4 <source>Memo:</source> <translation>Memorando:</translation> </message> - <message> - <location filename="../sendcoinsentry.cpp" line="+1"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Enigi Bitmon-adreson (ekz. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> </context> <context> <name>ShutdownWindow</name> @@ -2455,19 +2499,19 @@ Adreso: %4 <translation>La adreso por subskribi la mesagÌ‚on (ekz. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location line="+10"/> - <location line="+213"/> + <location line="+7"/> + <location line="+210"/> <source>Choose previously used address</source> <translation>Elektu la jam uzitan adreson</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>Alglui adreson de tondejo</translation> </message> @@ -2508,12 +2552,12 @@ Adreso: %4 </message> <message> <location line="+3"/> - <location line="+146"/> + <location line="+143"/> <source>Clear &All</source> <translation>&Forigi CÌ‚ion</translation> </message> <message> - <location line="-87"/> + <location line="-84"/> <source>&Verify Message</source> <translation>&Kontroli MesagÌ‚on</translation> </message> @@ -2528,7 +2572,7 @@ Adreso: %4 <translation>La adreso per kio oni subskribis la mesagÌ‚on (ekz. 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>Kontroli la mesagÌ‚on por pravigi, ke gÌ‚i ja estas subskribita per la specifa Bitmon-adreso</translation> </message> @@ -2543,43 +2587,37 @@ Adreso: %4 <translation>Reagordigi cÌ‚iujn prikontrolajn kampojn</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>Enigi Bitmon-adreson (ekz. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location line="-2"/> + <location line="-1"/> <source>Click "Sign Message" to generate signature</source> <translation>Klaku "Subskribi MesagÌ‚on" por krei subskribon</translation> </message> <message> - <location line="+3"/> - <source>Enter Bitcoin signature</source> - <translation>Enigi Bitmon-subskribon</translation> - </message> - <message> <location line="+84"/> - <location line="+81"/> + <location line="+80"/> <source>The entered address is invalid.</source> <translation>La adreso, kiun vi enmetis, estas nevalida.</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>Bonvolu kontroli la adreson kaj reprovi.</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>La adreso, kiun vi enmetis, referencas neniun sÌ‚losilon.</translation> </message> <message> - <location line="-73"/> + <location line="-72"/> <source>Wallet unlock was cancelled.</source> <translation>MalÅloso de monujo estas nuligita.</translation> </message> @@ -2599,7 +2637,7 @@ Adreso: %4 <translation>MesagÌ‚o estas subskribita.</translation> </message> <message> - <location line="+59"/> + <location line="+58"/> <source>The signature could not be decoded.</source> <translation>Ne eblis malcÌ‚ifri la subskribon.</translation> </message> @@ -2660,6 +2698,11 @@ Adreso: %4 </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation>%1/senkonekte</translation> </message> @@ -2821,12 +2864,12 @@ Adreso: %4 <translation>, ankoraÅ ne elsendita sukcese</translation> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <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> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation>nekonata</translation> </message> @@ -2867,12 +2910,12 @@ Adreso: %4 <translation>Sumo</translation> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <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> @@ -2882,23 +2925,12 @@ Adreso: %4 <translation>Malferma gÌ‚is %1</translation> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> - <translation>Senkonekta (%1 konfirmoj)</translation> - </message> - <message> - <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation>Nekonfirmita (%1 el %2 konfirmoj)</translation> - </message> - <message> - <location line="-22"/> - <location line="+25"/> + <location line="+12"/> <source>Confirmed (%1 confirmations)</source> <translation>Konfirmita (%1 konfirmoj)</translation> </message> <message> - <location line="-22"/> + <location line="+9"/> <source>This block was not received by any other nodes and will probably not be accepted!</source> <translation>Tiun cÌ‚i blokon ne ricevis ajna alia nodo, kaj gÌ‚i versÌ‚ajne ne akceptigÌ‚os!</translation> </message> @@ -2908,7 +2940,27 @@ Adreso: %4 <translation>Kreita sed ne akceptita</translation> </message> <message> - <location line="+62"/> + <location line="-21"/> + <source>Offline</source> + <translation>Senkonekte</translation> + </message> + <message> + <location line="+3"/> + <source>Unconfirmed</source> + <translation>Nekonfirmita</translation> + </message> + <message> + <location line="+3"/> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation>Ricevita kun</translation> </message> @@ -2938,7 +2990,7 @@ Adreso: %4 <translation>neaplikebla</translation> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation>Transakcia stato. SÌ‚vebi super tiu cÌ‚i kampo por montri la nombron de konfirmoj.</translation> </message> @@ -3204,12 +3256,12 @@ Adreso: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+223"/> <source>Usage:</source> <translation>Uzado:</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>List commands</source> <translation>Listigi komandojn</translation> </message> @@ -3264,12 +3316,12 @@ Adreso: %4 <translation>Specifi vian propran publikan adreson</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation>Sojlo por malkonekti misagantajn samtavolanojn (defaŭlte: 100)</translation> </message> <message> - <location line="-148"/> + <location line="-150"/> <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> @@ -3289,17 +3341,17 @@ Adreso: %4 <translation>Akcepti komandojn JSON-RPC kaj el komandlinio</translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <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="+39"/> + <location line="+40"/> <source>Use the test network</source> <translation>Uzi la test-reton</translation> </message> <message> - <location line="-118"/> + <location line="-120"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>Akcepti konektojn el ekstere (defaŭlte: 1 se ne estas -proxy nek -connect)</translation> </message> @@ -3440,6 +3492,11 @@ ekzemple: alertnotify=echo %%s | mail -s "Averto de Bitmono" admin@foo </message> <message> <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation>Konekti nur al specifita(j) nodo(j)</translation> </message> @@ -3650,6 +3707,11 @@ ekzemple: alertnotify=echo %%s | mail -s "Averto de Bitmono" admin@foo </message> <message> <location line="+2"/> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Start Bitcoin server</source> <translation>Starti bitmonan servilon</translation> </message> @@ -3699,12 +3761,12 @@ ekzemple: alertnotify=echo %%s | mail -s "Averto de Bitmono" admin@foo <translation>Vi devas rekontrui la datumbazon kun -reindex por sÌ‚angÌ‚i -txindex</translation> </message> <message> - <location line="-79"/> + <location line="-80"/> <source>Imports blocks from external blk000??.dat file</source> <translation>Importas blokojn el ekstera dosiero blk000??.dat</translation> </message> <message> - <location line="-105"/> + <location line="-106"/> <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> @@ -3724,7 +3786,7 @@ ekzemple: alertnotify=echo %%s | mail -s "Averto de Bitmono" admin@foo <translation>Agordi la nombron de fadenoj por skriptkontrolado (gÌ‚is 16, 0 = aŭtomate, <0 = lasi tiom da kernoj liberaj, defaŭlte: 0)</translation> </message> <message> - <location line="+89"/> + <location line="+90"/> <source>Information</source> <translation>Informoj</translation> </message> @@ -3794,7 +3856,7 @@ ekzemple: alertnotify=echo %%s | mail -s "Averto de Bitmono" admin@foo <translation>Specifi konektan tempolimon je milisekundoj (defaŭlte: 5000)</translation> </message> <message> - <location line="+6"/> + <location line="+7"/> <source>System error: </source> <translation>Sistema eraro: </translation> </message> @@ -3840,6 +3902,11 @@ ekzemple: alertnotify=echo %%s | mail -s "Averto de Bitmono" admin@foo </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>version</source> <translation>versio</translation> </message> @@ -3849,32 +3916,32 @@ ekzemple: alertnotify=echo %%s | mail -s "Averto de Bitmono" admin@foo <translation>wallet.dat estas difektita, riparo malsukcesis</translation> </message> <message> - <location line="-58"/> + <location line="-60"/> <source>Password for JSON-RPC connections</source> <translation>Pasvorto por konektoj JSON-RPC</translation> </message> <message> - <location line="-70"/> + <location line="-71"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Permesi konektojn JSON-RPC de specifa IP-adreso</translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>Sendi komandon al nodo cÌ‚e <ip> (defaŭlte: 127.0.0.1)</translation> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>Plenumi komandon kiam plej bona bloko sÌ‚angÌ‚igÌ‚as (%s en cmd anstataŭigÌ‚as per bloka haketajÌ‚o)</translation> </message> <message> - <location line="+161"/> + <location line="+163"/> <source>Upgrade wallet to latest format</source> <translation>GÌ‚isdatigi monujon al plej lasta formato</translation> </message> <message> - <location line="-24"/> + <location line="-25"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Agordi la grandon de la sÌ‚losilo-vico al <n> (defaŭlte: 100)</translation> </message> @@ -3884,12 +3951,12 @@ ekzemple: alertnotify=echo %%s | mail -s "Averto de Bitmono" admin@foo <translation>Reskani la blokcÌ‚enon por mankantaj monujaj transakcioj</translation> </message> <message> - <location line="+38"/> + <location line="+39"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Uzi OpenSSL (https) por konektoj JSON-RPC</translation> </message> <message> - <location line="-30"/> + <location line="-31"/> <source>Server certificate file (default: server.cert)</source> <translation>Dosiero de servila atestilo (defaŭlte: server.cert)</translation> </message> @@ -3899,7 +3966,7 @@ ekzemple: alertnotify=echo %%s | mail -s "Averto de Bitmono" admin@foo <translation>Dosiero de servila privata sÌ‚losilo (defaŭlte: server.pem)</translation> </message> <message> - <location line="+16"/> + <location line="+17"/> <source>This help message</source> <translation>Tiu cÌ‚i helpmesagÌ‚o</translation> </message> @@ -3909,12 +3976,12 @@ ekzemple: alertnotify=echo %%s | mail -s "Averto de Bitmono" admin@foo <translation>Ne eblis bindi al %s en tiu cÌ‚i komputilo (bind resendis eraron %d, %s)</translation> </message> <message> - <location line="-107"/> + <location line="-109"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>Permesi DNS-elsercÌ‚ojn por -addnote, -seednote kaj -connect</translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Loading addresses...</source> <translation>ÅœarÄante adresojn...</translation> </message> @@ -3929,12 +3996,12 @@ ekzemple: alertnotify=echo %%s | mail -s "Averto de Bitmono" admin@foo <translation>Eraro dum Åargo de wallet.dat: monujo bezonas pli novan version de Bitmono</translation> </message> <message> - <location line="+98"/> + <location line="+99"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>Monujo bezonas esti reskribita: relancÌ‚u Bitmonon por finfari tion</translation> </message> <message> - <location line="-100"/> + <location line="-101"/> <source>Error loading wallet.dat</source> <translation>Eraro dum sÌ‚argado de wallet.dat</translation> </message> @@ -3944,7 +4011,7 @@ ekzemple: alertnotify=echo %%s | mail -s "Averto de Bitmono" admin@foo <translation>Nevalid adreso -proxy: '%s'</translation> </message> <message> - <location line="+56"/> + <location line="+57"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Nekonata reto specifita en -onlynet: '%s'</translation> </message> @@ -3954,7 +4021,7 @@ ekzemple: alertnotify=echo %%s | mail -s "Averto de Bitmono" admin@foo <translation>Nekonata versio de -socks petita: %i</translation> </message> <message> - <location line="-101"/> + <location line="-103"/> <source>Cannot resolve -bind address: '%s'</source> <translation>Ne eblas trovi la adreson -bind: '%s'</translation> </message> @@ -3964,7 +4031,7 @@ ekzemple: alertnotify=echo %%s | mail -s "Averto de Bitmono" admin@foo <translation>Ne eblas trovi la adreson -externalip: '%s'</translation> </message> <message> - <location line="+48"/> + <location line="+49"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>Nevalida sumo por -paytxfee=<amount>: '%s'</translation> </message> @@ -3984,7 +4051,7 @@ ekzemple: alertnotify=echo %%s | mail -s "Averto de Bitmono" admin@foo <translation>ÅœarÄante blok-indekson...</translation> </message> <message> - <location line="-62"/> + <location line="-63"/> <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> @@ -3994,12 +4061,12 @@ ekzemple: alertnotify=echo %%s | mail -s "Averto de Bitmono" admin@foo <translation>Ne eblas bindi al %s cÌ‚e tiu cÌ‚i komputilo. Bitmono versÌ‚ajne jam rulas.</translation> </message> <message> - <location line="+95"/> + <location line="+96"/> <source>Loading wallet...</source> <translation>Åœargado de monujo...</translation> </message> <message> - <location line="-56"/> + <location line="-57"/> <source>Cannot downgrade wallet</source> <translation>Ne eblas malpromocii monujon</translation> </message> @@ -4009,7 +4076,7 @@ ekzemple: alertnotify=echo %%s | mail -s "Averto de Bitmono" admin@foo <translation>Ne eblas skribi defaŭltan adreson</translation> </message> <message> - <location line="+67"/> + <location line="+68"/> <source>Rescanning...</source> <translation>Reskanado...</translation> </message> @@ -4019,17 +4086,17 @@ ekzemple: alertnotify=echo %%s | mail -s "Averto de Bitmono" admin@foo <translation>Åœargado finigÌ‚is</translation> </message> <message> - <location line="+85"/> + <location line="+86"/> <source>To use the %s option</source> <translation>Por uzi la agordon %s</translation> </message> <message> - <location line="-77"/> + <location line="-78"/> <source>Error</source> <translation>Eraro</translation> </message> <message> - <location line="-35"/> + <location line="-36"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_es.ts b/src/qt/locale/bitcoin_es.ts index f190b33e02..df88d59f90 100644 --- a/src/qt/locale/bitcoin_es.ts +++ b/src/qt/locale/bitcoin_es.ts @@ -4,12 +4,12 @@ <message> <location filename="../forms/aboutdialog.ui" line="+14"/> <source>About Bitcoin Core</source> - <translation>Acerca del Núcleo de Bitcoin</translation> + <translation>Acerca de Bitcoin Core</translation> </message> <message> <location line="+39"/> <source><b>Bitcoin Core</b> version</source> - <translation>Versión del <b>Núcleo de Bitcoin<b></translation> + <translation>Versión de <b>Bitcoin Core<b></translation> </message> <message> <location line="+57"/> @@ -37,7 +37,13 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <message> <location line="+0"/> <source>The Bitcoin Core developers</source> - <translation>Los desarrolladores del Núcleo de Bitcoin</translation> + <translation>Los desarrolladores de Bitcoin Core</translation> + </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source> (%1-bit)</source> + <translation> (%1-bit)</translation> </message> </context> <context> @@ -100,12 +106,12 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <message> <location filename="../addressbookpage.cpp" line="-30"/> <source>Choose the address to send coins to</source> - <translation>Escoja la dirección para enviar monedas</translation> + <translation>Escoja la dirección a la que enviar bitcoins</translation> </message> <message> <location line="+1"/> <source>Choose the address to receive coins with</source> - <translation>Escoja la dirección para recibir monedas</translation> + <translation>Escoja la dirección de la que recibir bitcoins</translation> </message> <message> <location line="+5"/> @@ -115,17 +121,17 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <message> <location line="+6"/> <source>Sending addresses</source> - <translation>Enviando dirección</translation> + <translation>Direcciones de envÃo</translation> </message> <message> <location line="+1"/> <source>Receiving addresses</source> - <translation>Recibiendo dirección</translation> + <translation>Direcciones de recepción</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>Estas son sus direcciones Bitcoin para enviar pagos. Compruebe siempre la cantidad y la dirección receptora antes de transferir monedas.</translation> + <translation>Estas son sus direcciones Bitcoin para enviar pagos. Compruebe siempre la cantidad y la dirección receptora antes de enviar bitcoins.</translation> </message> <message> <location line="+4"/> @@ -398,7 +404,7 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <message> <location line="+3"/> <source>&Backup Wallet...</source> - <translation>Copia de &respaldo del monedero...</translation> + <translation>%Guardar copia del monedero...</translation> </message> <message> <location line="+2"/> @@ -408,12 +414,12 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <message> <location line="+10"/> <source>&Sending addresses...</source> - <translation>&Enviando direcciones...</translation> + <translation>Direcciones de &envÃo...</translation> </message> <message> <location line="+2"/> <source>&Receiving addresses...</source> - <translation>&Recibiendo direcciones...</translation> + <translation>Direcciones de &recepción...</translation> </message> <message> <location line="+3"/> @@ -433,7 +439,7 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <message> <location line="-405"/> <source>Send coins to a Bitcoin address</source> - <translation>Enviar monedas a una dirección Bitcoin</translation> + <translation>Enviar bitcoins a una dirección Bitcoin</translation> </message> <message> <location line="+49"/> @@ -540,7 +546,7 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <message> <location line="-401"/> <source>Bitcoin Core</source> - <translation>Núcleo de Bitcoin</translation> + <translation>Bitcoin Core</translation> </message> <message> <location line="+163"/> @@ -551,7 +557,7 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <location line="+29"/> <location line="+2"/> <source>&About Bitcoin Core</source> - <translation>&Acerca del Núcleo de Bitcoin</translation> + <translation>&Acerca de Bitcoin Core</translation> </message> <message> <location line="+35"/> @@ -571,12 +577,12 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <message> <location line="+2"/> <source>&Command-line options</source> - <translation>&Opciones de lÃnea de comandos</translation> + <translation>&Opciones de consola de comandos</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>Muestra el mensaje de ayuda Bitcoin Core para obtener una lista con las posibles opciones de lÃnea de comandos Bitcoin</translation> + <translation>Muestra el mensaje de ayuda Bitcoin Core para obtener una lista con las posibles opciones de la consola de comandos de Bitcoin</translation> </message> <message> <location line="+159"/> @@ -620,9 +626,19 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <translation><numerusform>%n semana</numerusform><numerusform>%n semanas</numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation>%1 y %2</translation> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation><numerusform>%n año</numerusform><numerusform>%n años</numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> - <translation>%1 atrás</translation> + <translation>%1 por detrás</translation> </message> <message> <location line="+21"/> @@ -693,7 +709,7 @@ Dirección: %4 <translation>El monedero está <b>cifrado</b> y actualmente <b>bloqueado</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+435"/> <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> @@ -711,7 +727,7 @@ Dirección: %4 <message> <location filename="../forms/coincontroldialog.ui" line="+14"/> <source>Coin Control Address Selection</source> - <translation>Selección de la dirección de control de la moneda</translation> + <translation>Selección de direcciones bajo Coin Control</translation> </message> <message> <location line="+34"/> @@ -754,14 +770,14 @@ Dirección: %4 <translation>Cambio:</translation> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> - <translation>(des)selecciona todos</translation> + <translation>(des)marcar todos</translation> </message> <message> <location line="+13"/> <source>Tree mode</source> - <translation>Modo arbol</translation> + <translation>Modo árbol</translation> </message> <message> <location line="+16"/> @@ -769,7 +785,7 @@ Dirección: %4 <translation>Modo lista</translation> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation>Cantidad</translation> </message> @@ -917,10 +933,10 @@ Dirección: %4 <message> <location line="+31"/> <source>none</source> - <translation>nada</translation> + <translation>ninguna</translation> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation>Basura</translation> </message> @@ -979,7 +995,7 @@ Dirección: %4 <message> <location line="+2"/> <source>This label turns red, if the change is smaller than %1.</source> - <translation>Esta etiqueta se vuelve roja si la cantidad de monedas es menor a %1</translation> + <translation>Esta etiqueta se vuelve roja si el cambio es menor que %1</translation> </message> <message> <location line="+43"/> @@ -1099,12 +1115,12 @@ Dirección: %4 <message> <location filename="../forms/helpmessagedialog.ui" line="+19"/> <source>Bitcoin Core - Command-line options</source> - <translation>Bitcoin Core - opciones de lÃnea de comandos</translation> + <translation>Bitcoin Core - Opciones de consola de comandos</translation> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> - <translation>Núcleo de Bitcoin</translation> + <translation>Bitcoin Core</translation> </message> <message> <location line="+0"/> @@ -1119,7 +1135,7 @@ Dirección: %4 <message> <location line="+1"/> <source>command-line options</source> - <translation>opciones de la lÃnea de órdenes</translation> + <translation>opciones de la consola de comandos</translation> </message> <message> <location line="+4"/> @@ -1157,7 +1173,7 @@ Dirección: %4 <message> <location line="+9"/> <source>Welcome to Bitcoin Core.</source> - <translation>Bienvenido al Núcleo de Bitcoin</translation> + <translation>Bienvenido a Bitcoin Core</translation> </message> <message> <location line="+26"/> @@ -1246,7 +1262,7 @@ Dirección: %4 <translation>&Principal</translation> </message> <message> - <location line="+6"/> + <location line="+122"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation>Tarifa de transacción opcional por kB que ayuda a asegurar que sus transacciones sean procesadas rápidamente. La mayorÃa de transacciones son de 1kB.</translation> </message> @@ -1256,7 +1272,7 @@ Dirección: %4 <translation>Comisión de &transacciones</translation> </message> <message> - <location line="+31"/> + <location line="-131"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation>Iniciar Bitcoin automáticamente al encender el sistema.</translation> </message> @@ -1271,19 +1287,14 @@ Dirección: %4 <translation>Tamaño de cache de la &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"/> + <location line="+16"/> <source>MB</source> <translation>MB</translation> </message> <message> <location line="+27"/> <source>Number of script &verification threads</source> - <translation>Número de hilos de &verificación de scripts</translation> + <translation>Número de procesos de &verificación de scripts</translation> </message> <message> <location line="+13"/> @@ -1291,7 +1302,12 @@ Dirección: %4 <translation>Configura el número de hilos para el script de verificación (hasta 16, 0 = auto, <0 = leave that many cores free, por fecto: 0)</translation> </message> <message> - <location line="+58"/> + <location line="+107"/> + <source>&Spend unconfirmed change (experts only)</source> + <translation>&Gastar cambio no confirmado (solo expertos)</translation> + </message> + <message> + <location line="+37"/> <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> @@ -1308,7 +1324,7 @@ Dirección: %4 <message> <location line="+224"/> <source>Active command-line options that override above options:</source> - <translation>Opciones activas de lÃnea de comandos que tienen preferencia sobre las opciones antes mencionadas:</translation> + <translation>Opciones activas de consola de comandos que tienen preferencia sobre las opciones antes mencionadas:</translation> </message> <message> <location line="+43"/> @@ -1326,7 +1342,17 @@ Dirección: %4 <translation>&Red</translation> </message> <message> - <location line="+6"/> + <location line="-86"/> + <source>W&allet</source> + <translation>&Monedero</translation> + </message> + <message> + <location line="+52"/> + <source>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.</source> + <translation>Si desactiva el gasto del cambio no confirmado, no se podrá usar el cambio de una transacción hasta que se alcance al menos una confirmación. Esto afecta también a cómo se calcula su saldo.</translation> + </message> + <message> + <location line="+40"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>Abrir automáticamente el puerto del cliente Bitcoin en el router. Esta opción solo funciona si el router admite UPnP y está activado.</translation> </message> @@ -1358,7 +1384,7 @@ Dirección: %4 <message> <location line="+13"/> <source>SOCKS version of the proxy (e.g. 5)</source> - <translation>Versión del proxy SOCKS (ej. 5)</translation> + <translation>Versión SOCKS del proxy (ej. 5)</translation> </message> <message> <location line="+36"/> @@ -1408,7 +1434,7 @@ Dirección: %4 <message> <location line="+13"/> <source>Choose the default subdivision unit to show in the interface and when sending coins.</source> - <translation>Elegir la subdivisión predeterminada para mostrar cantidades en la interfaz y cuando se envÃan monedas.</translation> + <translation>Elegir la subdivisión predeterminada para mostrar cantidades en la interfaz y cuando se envÃan bitcoins.</translation> </message> <message> <location line="+9"/> @@ -1423,12 +1449,12 @@ Dirección: %4 <message> <location line="+7"/> <source>Whether to show coin control features or not.</source> - <translation>Mostrar o no caracterÃsticas de control de moneda</translation> + <translation>Mostrar o no funcionalidad de Coin Control</translation> </message> <message> <location line="+3"/> <source>Display coin &control features (experts only)</source> - <translation>Mostrar moneda y caracterÃsticas de control (Avanzado)</translation> + <translation>Mostrar funcionalidad de Coin Control (solo expertos)</translation> </message> <message> <location line="+136"/> @@ -1441,17 +1467,17 @@ Dirección: %4 <translation>&Cancelar</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+70"/> <source>default</source> <translation>predeterminado</translation> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> - <translation>nada</translation> + <translation>ninguna</translation> </message> <message> - <location line="+75"/> + <location line="+78"/> <source>Confirm options reset</source> <translation>Confirme el restablecimiento de las opciones</translation> </message> @@ -1491,19 +1517,14 @@ Dirección: %4 <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="-155"/> - <source>Unconfirmed:</source> - <translation>No confirmado(s):</translation> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation>Monedero</translation> </message> <message> <location line="+51"/> - <source>Confirmed:</source> - <translation>Confirmado:</translation> + <source>Available:</source> + <translation>Disponible:</translation> </message> <message> <location line="+16"/> @@ -1511,7 +1532,12 @@ Dirección: %4 <translation>Su balance actual gastable</translation> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation>Pendiente:</translation> + </message> + <message> + <location line="+16"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation>Total de transacciones que deben ser confirmadas, y que no cuentan con el balance gastable necesario</translation> </message> @@ -1793,7 +1819,7 @@ Dirección: %4 <message> <location line="+52"/> <source>&Clear</source> - <translation>&Limpiar</translation> + <translation>&Vaciar</translation> </message> <message> <location line="+13"/> @@ -1803,12 +1829,12 @@ Dirección: %4 <message> <location line="+64"/> <source>In:</source> - <translation>Dentro:</translation> + <translation>Entrante:</translation> </message> <message> <location line="+80"/> <source>Out:</source> - <translation>Fuera:</translation> + <translation>Saliente:</translation> </message> <message> <location line="-521"/> @@ -1838,7 +1864,7 @@ Dirección: %4 <message> <location line="+1"/> <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> - <translation>Use las flechas arriba y abajo para navegar por el historial y <b>Control+L</b> para limpiar la pantalla.</translation> + <translation>Use las flechas arriba y abajo para navegar por el historial y <b>Control+L</b> para vaciar la pantalla.</translation> </message> <message> <location line="+1"/> @@ -1923,7 +1949,7 @@ Dirección: %4 <message> <location line="-7"/> <source>Use this form to request payments. All fields are <b>optional</b>.</source> - <translation>Utiliza este formulario para solicitar pagos. Todos los campos son <b>opcionales</b>.</translation> + <translation>Utilice este formulario para solicitar pagos. Todos los campos son <b>opcionales</b>.</translation> </message> <message> <location line="+23"/> @@ -1934,17 +1960,17 @@ Dirección: %4 <message> <location line="+32"/> <source>Clear all fields of the form.</source> - <translation>Limpiar todos los campos del formulario.</translation> + <translation>Vaciar todos los campos del formulario.</translation> </message> <message> <location line="+3"/> <source>Clear</source> - <translation>Limpiar</translation> + <translation>Vaciar</translation> </message> <message> <location line="+78"/> <source>Requested payments history</source> - <translation>Se solicita historial de pagos</translation> + <translation>Historial de pagos solicitados</translation> </message> <message> <location line="-98"/> @@ -2090,7 +2116,7 @@ Dirección: %4 <message> <location line="+8"/> <source>(no amount)</source> - <translation>(sin monto)</translation> + <translation>(sin cantidad)</translation> </message> </context> <context> @@ -2100,12 +2126,12 @@ Dirección: %4 <location filename="../sendcoinsdialog.cpp" line="+380"/> <location line="+80"/> <source>Send Coins</source> - <translation>Enviar monedas</translation> + <translation>Enviar bitcoins</translation> </message> <message> <location line="+76"/> <source>Coin Control Features</source> - <translation>CaracterÃsticas de control de la moneda</translation> + <translation>CaracterÃsticas de Coin Control</translation> </message> <message> <location line="+20"/> @@ -2115,7 +2141,7 @@ Dirección: %4 <message> <location line="+7"/> <source>automatically selected</source> - <translation>Seleccionado automaticamente</translation> + <translation>Seleccionado automáticamente</translation> </message> <message> <location line="+19"/> @@ -2165,7 +2191,7 @@ Dirección: %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>Al activarse, si la dirección esta vacÃa o es inválida, las monedas serán enviadas a una nueva dirección generada.</translation> + <translation>Si se marca esta opción pero la dirección de cambio está vacÃa o es inválida, el cambio se enviará a una nueva dirección recién generada.</translation> </message> <message> <location line="+3"/> @@ -2185,12 +2211,12 @@ Dirección: %4 <message> <location line="-23"/> <source>Clear all fields of the form.</source> - <translation>Limpiar todos los campos del formulario</translation> + <translation>Vaciar todos los campos del formulario</translation> </message> <message> <location line="+3"/> <source>Clear &All</source> - <translation>Limpiar &todo</translation> + <translation>Vaciar &todo</translation> </message> <message> <location line="+52"/> @@ -2210,7 +2236,7 @@ Dirección: %4 <message> <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> - <translation>Confirmar el envÃo de monedas</translation> + <translation>Confirmar el envÃo de bitcoins</translation> </message> <message> <location line="-74"/> @@ -2303,7 +2329,7 @@ Dirección: %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>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> + <translation>¡La transacción fue rechazada! Esto puede haber ocurrido si alguno de los bitcoins de su monedero ya estaba gastado o si ha usado una copia de wallet.dat y los bitcoins estaban gastados en la copia pero no se habÃan marcado como gastados aqui.</translation> </message> <message> <location line="+113"/> @@ -2445,13 +2471,13 @@ Dirección: %4 <message> <location filename="../utilitydialog.cpp" line="+48"/> <source>Bitcoin Core is shutting down...</source> - <translation>El núcleo de Bitcoin se está cerrando... + <translation>Bitcoin Core se está cerrando... </translation> </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> + <translation>No apague el equipo hasta que desaparezca esta ventana.</translation> </message> </context> <context> @@ -2526,13 +2552,13 @@ Dirección: %4 <message> <location line="+14"/> <source>Reset all sign message fields</source> - <translation>Limpiar todos los campos de la firma de mensaje</translation> + <translation>Vaciar todos los campos de la firma de mensaje</translation> </message> <message> <location line="+3"/> <location line="+143"/> <source>Clear &All</source> - <translation>Limpiar &todo</translation> + <translation>Vaciar &todo</translation> </message> <message> <location line="-84"/> @@ -2562,7 +2588,7 @@ Dirección: %4 <message> <location line="+14"/> <source>Reset all verify message fields</source> - <translation>Limpiar todos los campos de la verificación de mensaje</translation> + <translation>Vaciar todos los campos de la verificación de mensaje</translation> </message> <message> <location filename="../signverifymessagedialog.cpp" line="+30"/> @@ -2646,12 +2672,12 @@ Dirección: %4 <message> <location filename="../splashscreen.cpp" line="+28"/> <source>Bitcoin Core</source> - <translation>Núcleo de Bitcoin</translation> + <translation>Bitcoin Core</translation> </message> <message> <location line="+2"/> <source>The Bitcoin Core developers</source> - <translation>Los desarrolladores del Núcleo de Bitcoin</translation> + <translation>Los desarrolladores de Bitcoin Core</translation> </message> <message> <location line="+1"/> @@ -2676,6 +2702,11 @@ Dirección: %4 </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation>en conflicto</translation> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation>%1/fuera de lÃnea</translation> </message> @@ -2799,7 +2830,7 @@ Dirección: %4 <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 "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source> - <translation>Las monedas generadas deben madurar %1 bloques antes de que puedan ser gastadas. Una vez que generas este bloque, es propagado por la red para ser añadido a la cadena de bloques. Si falla el intento de meterse en la cadena, su estado cambiará a "no aceptado" y ya no se puede gastar. Esto puede ocurrir ocasionalmente si otro nodo genera un bloque a pocos segundos del tuyo.</translation> + <translation>Los bitcoins generados deben madurar %1 bloques antes de que puedan gastarse. Cuando generó este bloque, se transmitió a la red para que se añadiera a la cadena de bloques. Si no consigue entrar en la cadena, su estado cambiará a "no aceptado" y ya no se podrá gastar. Esto puede ocurrir ocasionalmente si otro nodo genera un bloque a pocos segundos del suyo.</translation> </message> <message> <location line="+8"/> @@ -2837,12 +2868,12 @@ Dirección: %4 <translation>, todavÃa no se ha sido difundido satisfactoriamente</translation> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <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> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation>desconocido</translation> </message> @@ -2883,12 +2914,12 @@ Dirección: %4 <translation>Cantidad</translation> </message> <message> - <location line="+59"/> + <location line="+78"/> <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="+16"/> + <location line="-21"/> <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> @@ -2898,23 +2929,12 @@ Dirección: %4 <translation>Abierto hasta %1</translation> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> - <translation>Fuera de lÃnea (%1 confirmaciones)</translation> - </message> - <message> - <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation>No confirmado (%1 de %2 confirmaciones)</translation> - </message> - <message> - <location line="-22"/> - <location line="+25"/> + <location line="+12"/> <source>Confirmed (%1 confirmations)</source> <translation>Confirmado (%1 confirmaciones)</translation> </message> <message> - <location line="-22"/> + <location line="+9"/> <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> @@ -2924,7 +2944,27 @@ Dirección: %4 <translation>Generado pero no aceptado</translation> </message> <message> - <location line="+62"/> + <location line="-21"/> + <source>Offline</source> + <translation>Sin conexión</translation> + </message> + <message> + <location line="+3"/> + <source>Unconfirmed</source> + <translation>Sin confirmar</translation> + </message> + <message> + <location line="+3"/> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation>Confirmando (%1 de %2 confirmaciones recomendadas)</translation> + </message> + <message> + <location line="+6"/> + <source>Conflicted</source> + <translation>En conflicto</translation> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation>Recibido con</translation> </message> @@ -2954,7 +2994,7 @@ Dirección: %4 <translation>(nd)</translation> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation>Estado de transacción. Pasa el ratón sobre este campo para ver el número de confirmaciones.</translation> </message> @@ -3171,7 +3211,7 @@ Dirección: %4 <message> <location filename="../walletmodel.cpp" line="+245"/> <source>Send Coins</source> - <translation>Enviar monedas</translation> + <translation>Enviar bitcoins</translation> </message> </context> <context> @@ -3189,7 +3229,7 @@ Dirección: %4 <message> <location line="+181"/> <source>Backup Wallet</source> - <translation>Respaldo de monedero</translation> + <translation>Copia de seguridad del monedero</translation> </message> <message> <location line="+1"/> @@ -3214,18 +3254,18 @@ Dirección: %4 <message> <location line="+0"/> <source>Backup Successful</source> - <translation>Se ha completado con éxito la copia de respaldo</translation> + <translation>Se ha completado la copia de seguridad del monedero</translation> </message> </context> <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+223"/> <source>Usage:</source> <translation>Uso:</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>List commands</source> <translation>Muestra comandos </translation> @@ -3285,12 +3325,12 @@ Dirección: %4 <translation>Especifique su propia dirección pública</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <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="-148"/> + <location line="-150"/> <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> @@ -3311,19 +3351,19 @@ Dirección: %4 </translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Run in the background as a daemon and accept commands</source> <translation>Ejecutar en segundo plano como daemon y aceptar comandos </translation> </message> <message> - <location line="+39"/> + <location line="+40"/> <source>Use the test network</source> <translation>Usar la red de pruebas </translation> </message> <message> - <location line="-118"/> + <location line="-120"/> <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> @@ -3355,7 +3395,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+12"/> <source>Acceptable ciphers (default: TLSv1.2+HIGH:TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!3DES:@STRENGTH)</source> - <translation>Cifradores aceptables (por defecto: TLSv1.2+HIGH:TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!3DES:@STRENGTH)</translation> + <translation>Cifrados aceptables (predeterminados: TLSv1.2+HIGH:TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!3DES:@STRENGTH)</translation> </message> <message> <location line="+5"/> @@ -3385,12 +3425,12 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <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> + <translation>¡Error: se ha rechazado la transacción! Esto puede ocurrir si ya se han gastado algunos de los bitcoins del monedero, como ocurrirÃa si hubiera hecho una copia de wallet.dat y se hubieran gastado bitcoins a partir de la copia, con lo que no se habrÃan marcado aquà como gastados.</translation> </message> <message> <location line="+4"/> <source>Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds!</source> - <translation>¡Error: Esta transacción requiere una comisión de al menos %s debido a su monto, complejidad, o al uso de fondos recién recibidos!</translation> + <translation>¡Error: Esta transacción requiere una comisión de al menos %s debido a su cantidad, complejidad, o al uso de fondos recién recibidos!</translation> </message> <message> <location line="+6"/> @@ -3405,7 +3445,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+5"/> <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source> - <translation>Usar distintos proxys SOCKS5 para comunicarse vÃa Tor de forma anónima (Por defecto: -proxy)</translation> + <translation>Usar proxy SOCKS5 distinto para comunicarse vÃa Tor de forma anónima (Predeterminado: -proxy)</translation> </message> <message> <location line="+3"/> @@ -3450,7 +3490,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+1"/> <source>Bitcoin Core Daemon</source> - <translation>Proceso Bitcoin-QT</translation> + <translation>Proceso Bitcoin Core</translation> </message> <message> <location line="+1"/> @@ -3464,6 +3504,11 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation>Vaciar lista de transacciones del monedero (herramienta de diagnóstico; implica -rescan)</translation> + </message> + <message> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation>Conectar sólo a los nodos (o nodo) especificados</translation> </message> @@ -3575,7 +3620,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+1"/> <source>Failed to write to coin database</source> - <translation>No se ha podido escribir en la base de datos de monedas</translation> + <translation>No se ha podido escribir en la base de datos de bitcoins</translation> </message> <message> <location line="+1"/> @@ -3600,7 +3645,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+1"/> <source>Generate coins (default: 0)</source> - <translation>Generar monedas (por defecto: 0)</translation> + <translation>Generar bitcoins (predeterminado: 0)</translation> </message> <message> <location line="+2"/> @@ -3610,7 +3655,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+1"/> <source>How thorough the block verification is (0-4, default: 3)</source> - <translation>Como es de exhaustiva la verificación de bloques (0-4, por defecto 3)</translation> + <translation>Cómo es de exhaustiva la verificación de bloques (0-4, predeterminado 3)</translation> </message> <message> <location line="+1"/> @@ -3635,7 +3680,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+5"/> <source>Prepend debug output with timestamp (default: 1)</source> - <translation>Anteponer marca temporal a la información de depuración (por defecto: 1)</translation> + <translation>Anteponer marca temporal a la información de depuración (predeterminado: 1)</translation> </message> <message> <location line="+1"/> @@ -3650,7 +3695,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+5"/> <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source> - <translation>Seleccionar version de SOCKS para -proxy (4 o 5, por defecto: 5)</translation> + <translation>Seleccionar versión de SOCKS para -proxy (4 o 5, predeterminado: 5)</translation> </message> <message> <location line="+1"/> @@ -3660,12 +3705,12 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <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> + <translation>Establecer tamaño máximo de bloque en bytes (predeterminado: %d)</translation> </message> <message> <location line="+2"/> <source>Set the number of threads to service RPC calls (default: 4)</source> - <translation>Establecer el número de hilos para atender las llamadas RPC (predeterminado: 4)</translation> + <translation>Establecer el número de procesos para atender las llamadas RPC (predeterminado: 4)</translation> </message> <message> <location line="+7"/> @@ -3674,6 +3719,11 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation>Gastar cambio no confirmado al enviar transacciones (predeterminado: 1)</translation> + </message> + <message> + <location line="+1"/> <source>Start Bitcoin server</source> <translation>Iniciar servidor Bitcoin</translation> </message> @@ -3723,24 +3773,24 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Usted necesita reconstruir la base de datos utilizando -reindex para cambiar -txindex</translation> </message> <message> - <location line="-79"/> + <location line="-80"/> <source>Imports blocks from external blk000??.dat file</source> <translation>Importa los bloques desde un archivo blk000??.dat externo</translation> </message> <message> - <location line="-105"/> + <location line="-106"/> <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> <message> <location line="+14"/> <source>Output debugging information (default: 0, supplying <category> is optional)</source> - <translation>Mostrar depuración (por defecto: 0, proporcionar <category> es opcional)</translation> + <translation>Mostrar información de depuración (predeterminado: 0, proporcionar <category> es opcional)</translation> </message> <message> <location line="+2"/> <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source> - <translation>Establecer tamaño máximo de las transacciones de alta prioridad/comisión baja en bytes (por defecto: %d)</translation> + <translation>Establecer tamaño máximo de las transacciones de alta prioridad/baja comisión en bytes (predeterminado: %d)</translation> </message> <message> <location line="+2"/> @@ -3748,19 +3798,19 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Configura el número de hilos para el script de verificación (hasta 16, 0 = auto, <0 = leave that many cores free, por fecto: 0)</translation> </message> <message> - <location line="+89"/> + <location line="+90"/> <source>Information</source> <translation>Información</translation> </message> <message> <location line="+4"/> <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> - <translation>Inválido por el monto -minrelaytxfee=<amount>: '%s'</translation> + <translation>Cantidad inválida para -minrelaytxfee=<amount>: '%s'</translation> </message> <message> <location line="+1"/> <source>Invalid amount for -mintxfee=<amount>: '%s'</source> - <translation>Inválido por el monto -mintxfee=<amount>: '%s'</translation> + <translation>Cantidad inválida para -mintxfee=<amount>: '%s'</translation> </message> <message> <location line="+8"/> @@ -3818,19 +3868,19 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Especificar el tiempo máximo de conexión en milisegundos (predeterminado: 5000)</translation> </message> <message> - <location line="+6"/> + <location line="+7"/> <source>System error: </source> <translation>Error de sistema: </translation> </message> <message> <location line="+5"/> <source>Transaction amount too small</source> - <translation>Monto de la transacción muy pequeño</translation> + <translation>Cantidad de la transacción demasiado pequeña</translation> </message> <message> <location line="+1"/> <source>Transaction amounts must be positive</source> - <translation>Montos de transacciones deben ser positivos</translation> + <translation>Las cantidades en las transacciones deben ser positivas</translation> </message> <message> <location line="+1"/> @@ -3865,6 +3915,11 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation>Eliminando todas las transacciones del monedero...</translation> + </message> + <message> + <location line="+1"/> <source>version</source> <translation>versión</translation> </message> @@ -3874,35 +3929,35 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>wallet.dat corrupto. Ha fallado la recuperación.</translation> </message> <message> - <location line="-58"/> + <location line="-60"/> <source>Password for JSON-RPC connections</source> <translation>Contraseña para las conexiones JSON-RPC </translation> </message> <message> - <location line="-70"/> + <location line="-71"/> <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="+80"/> + <location line="+81"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>Enviar comando al nodo situado en <ip> (predeterminado: 127.0.0.1) </translation> </message> <message> - <location line="-132"/> + <location line="-133"/> <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="+161"/> + <location line="+163"/> <source>Upgrade wallet to latest format</source> <translation>Actualizar el monedero al último formato</translation> </message> <message> - <location line="-24"/> + <location line="-25"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Ajustar el número de claves en reserva <n> (predeterminado: 100) </translation> @@ -3913,13 +3968,13 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Volver a examinar la cadena de bloques en busca de transacciones del monedero perdidas</translation> </message> <message> - <location line="+38"/> + <location line="+39"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Usar OpenSSL (https) para las conexiones JSON-RPC </translation> </message> <message> - <location line="-30"/> + <location line="-31"/> <source>Server certificate file (default: server.cert)</source> <translation>Certificado del servidor (predeterminado: server.cert) </translation> @@ -3931,7 +3986,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </translation> </message> <message> - <location line="+16"/> + <location line="+17"/> <source>This help message</source> <translation>Este mensaje de ayuda </translation> @@ -3942,12 +3997,12 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>No es posible conectar con %s en este sistema (bind ha dado el error %d, %s)</translation> </message> <message> - <location line="-107"/> + <location line="-109"/> <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="+60"/> + <location line="+61"/> <source>Loading addresses...</source> <translation>Cargando direcciones...</translation> </message> @@ -3962,12 +4017,12 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Error al cargar wallet.dat: El monedero requiere una versión más reciente de Bitcoin</translation> </message> <message> - <location line="+98"/> + <location line="+99"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>El monedero ha necesitado ser reescrito. Reinicie Bitcoin para completar el proceso</translation> </message> <message> - <location line="-100"/> + <location line="-101"/> <source>Error loading wallet.dat</source> <translation>Error al cargar wallet.dat</translation> </message> @@ -3977,7 +4032,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Dirección -proxy inválida: '%s'</translation> </message> <message> - <location line="+56"/> + <location line="+57"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>La red especificada en -onlynet '%s' es desconocida</translation> </message> @@ -3987,7 +4042,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Solicitada versión de proxy -socks desconocida: %i</translation> </message> <message> - <location line="-101"/> + <location line="-103"/> <source>Cannot resolve -bind address: '%s'</source> <translation>No se puede resolver la dirección de -bind: '%s'</translation> </message> @@ -3997,7 +4052,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>No se puede resolver la dirección de -externalip: '%s'</translation> </message> <message> - <location line="+48"/> + <location line="+49"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>Cantidad inválida para -paytxfee=<amount>: '%s'</translation> </message> @@ -4017,7 +4072,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Cargando el Ãndice de bloques...</translation> </message> <message> - <location line="-62"/> + <location line="-63"/> <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> @@ -4027,12 +4082,12 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>No es posible conectar con %s en este sistema. Probablemente Bitcoin ya está ejecutándose.</translation> </message> <message> - <location line="+95"/> + <location line="+96"/> <source>Loading wallet...</source> <translation>Cargando monedero...</translation> </message> <message> - <location line="-56"/> + <location line="-57"/> <source>Cannot downgrade wallet</source> <translation>No se puede rebajar el monedero</translation> </message> @@ -4042,7 +4097,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>No se puede escribir la dirección predeterminada</translation> </message> <message> - <location line="+67"/> + <location line="+68"/> <source>Rescanning...</source> <translation>Reexplorando...</translation> </message> @@ -4052,17 +4107,17 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Generado pero no aceptado</translation> </message> <message> - <location line="+85"/> + <location line="+86"/> <source>To use the %s option</source> <translation>Para utilizar la opción %s</translation> </message> <message> - <location line="-77"/> + <location line="-78"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location line="-35"/> + <location line="-36"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_es_DO.ts b/src/qt/locale/bitcoin_es_DO.ts index 2126ff2230..c78a043113 100644 --- a/src/qt/locale/bitcoin_es_DO.ts +++ b/src/qt/locale/bitcoin_es_DO.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="es_DO" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="es_DO" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -39,6 +39,12 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <source>The Bitcoin Core developers</source> <translation>Los desarrolladores del Núcleo de Bitcoin</translation> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source> (%1-bit)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>AddressBookPage</name> @@ -68,7 +74,7 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <translation>&Copiar</translation> </message> <message> - <location line="+52"/> + <location line="+58"/> <source>C&lose</source> <translation>&Cerrar</translation> </message> @@ -78,7 +84,7 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <translation>&Copiar dirección</translation> </message> <message> - <location filename="../forms/addressbookpage.ui" line="-41"/> + <location filename="../forms/addressbookpage.ui" line="-47"/> <source>Delete the currently selected address from the list</source> <translation>Borrar de la lista la dirección seleccionada</translation> </message> @@ -325,7 +331,7 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+295"/> + <location filename="../bitcoingui.cpp" line="+294"/> <source>Sign &message...</source> <translation>Firmar &mensaje...</translation> </message> @@ -340,12 +346,12 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <translation>&Vista general</translation> </message> <message> - <location line="-137"/> + <location line="-136"/> <source>Node</source> <translation>Nodo</translation> </message> <message> - <location line="+138"/> + <location line="+137"/> <source>Show general overview of wallet</source> <translation>Mostrar vista general del monedero</translation> </message> @@ -466,17 +472,17 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <translation>&Verificar mensaje...</translation> </message> <message> - <location line="+430"/> + <location line="+440"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-643"/> + <location line="-652"/> <source>Wallet</source> <translation>Monedero</translation> </message> <message> - <location line="+146"/> + <location line="+145"/> <source>&Send</source> <translation>&Enviar</translation> </message> @@ -532,18 +538,18 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <translation>Barra de pestañas</translation> </message> <message> - <location line="-284"/> - <location line="+376"/> + <location line="-283"/> + <location line="+375"/> <source>[testnet]</source> <translation>[testnet]</translation> </message> <message> - <location line="-401"/> + <location line="-400"/> <source>Bitcoin Core</source> <translation>Núcleo de Bitcoin</translation> </message> <message> - <location line="+163"/> + <location line="+162"/> <source>Request payments (generates QR codes and bitcoin: URIs)</source> <translation>Solicitar pagos (genera codigo QR y URL's de Bitcoin)</translation> </message> @@ -571,7 +577,7 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <message> <location line="+2"/> <source>&Command-line options</source> - <translation type="unfinished"/> + <translation>&Opciones de linea de comando</translation> </message> <message> <location line="+1"/> @@ -605,7 +611,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="+23"/> + <location line="+27"/> <source>%n hour(s)</source> <translation><numerusform>%n hora</numerusform><numerusform>%n horas</numerusform></translation> </message> @@ -616,10 +622,21 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t </message> <message numerus="yes"> <location line="+4"/> + <location line="+6"/> <source>%n week(s)</source> <translation><numerusform>%n semana</numerusform><numerusform>%n semanas</numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation>%1 atrás</translation> @@ -650,12 +667,12 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <translation>Información</translation> </message> <message> - <location line="-85"/> + <location line="-95"/> <source>Up to date</source> <translation>Actualizado</translation> </message> <message> - <location line="+34"/> + <location line="+44"/> <source>Catching up...</source> <translation>Actualizando...</translation> </message> @@ -693,7 +710,7 @@ Dirección: %4 <translation>El monedero está <b>cifrado</b> y actualmente <b>bloqueado</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+441"/> <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> @@ -701,7 +718,7 @@ Dirección: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+119"/> + <location filename="../clientmodel.cpp" line="+128"/> <source>Network Alert</source> <translation>Alerta de red</translation> </message> @@ -754,7 +771,7 @@ Dirección: %4 <translation>Cambio:</translation> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation>(des)selecciona todos</translation> </message> @@ -769,7 +786,7 @@ Dirección: %4 <translation>Modo lista</translation> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation>Cantidad</translation> </message> @@ -799,7 +816,7 @@ Dirección: %4 <translation>Prioridad</translation> </message> <message> - <location filename="../coincontroldialog.cpp" line="+42"/> + <location filename="../coincontroldialog.cpp" line="+41"/> <source>Copy address</source> <translation>Copiar dirección</translation> </message> @@ -865,7 +882,7 @@ Dirección: %4 <translation>Copiar cambio</translation> </message> <message> - <location line="+323"/> + <location line="+332"/> <source>highest</source> <translation>lo más alto</translation> </message> @@ -917,10 +934,10 @@ Dirección: %4 <message> <location line="+31"/> <source>none</source> - <translation type="unfinished"/> + <translation>ninguno</translation> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation>Basura</translation> </message> @@ -958,7 +975,7 @@ Dirección: %4 <message> <location line="+1"/> <source>This label turns red, if the priority is smaller than "medium".</source> - <translation type="unfinished"/> + <translation>Esta etiqueta se convierte en rojo, si la prioridad es menor que "medio".</translation> </message> <message> <location line="+3"/> @@ -983,7 +1000,7 @@ Dirección: %4 </message> <message> <location line="+43"/> - <location line="+66"/> + <location line="+63"/> <source>(no label)</source> <translation>(sin etiqueta)</translation> </message> @@ -1102,7 +1119,7 @@ Dirección: %4 <translation type="unfinished"/> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation>Núcleo de Bitcoin</translation> </message> @@ -1180,7 +1197,7 @@ Dirección: %4 <translation>Utilice un directorio de datos personalizado:</translation> </message> <message> - <location filename="../intro.cpp" line="+85"/> + <location filename="../intro.cpp" line="+82"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> @@ -1246,7 +1263,7 @@ Dirección: %4 <translation>&Principal</translation> </message> <message> - <location line="+6"/> + <location line="+122"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation>Tarifa de transacción opcional por kB que ayuda a asegurar que sus transacciones sean procesadas rápidamente. La mayorÃa de transacciones son de 1kB.</translation> </message> @@ -1256,7 +1273,7 @@ Dirección: %4 <translation>Comisión de &transacciones</translation> </message> <message> - <location line="+31"/> + <location line="-131"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation>Iniciar Bitcoin automáticamente al encender el sistema.</translation> </message> @@ -1271,14 +1288,9 @@ Dirección: %4 <translation type="unfinished"/> </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"/> + <location line="+16"/> <source>MB</source> - <translation type="unfinished"/> + <translation>MB</translation> </message> <message> <location line="+27"/> @@ -1291,9 +1303,9 @@ Dirección: %4 <translation>Configura el número de hilos para el script de verificación (hasta 16, 0 = auto, <0 = leave that many cores free, por fecto: 0)</translation> </message> <message> - <location line="+58"/> + <location line="+153"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> - <translation type="unfinished"/> + <translation>Conéctese a la red Bitcoin través de un proxy SOCKS.</translation> </message> <message> <location line="+3"/> @@ -1303,10 +1315,10 @@ Dirección: %4 <message> <location line="+34"/> <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source> - <translation type="unfinished"/> + <translation>Dirección IP del proxy (ej. IPv4: 127.0.0.1 / IPv6: ::1)</translation> </message> <message> - <location line="+224"/> + <location line="+214"/> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1321,12 +1333,37 @@ Dirección: %4 <translation>&Restablecer opciones</translation> </message> <message> - <location line="-323"/> + <location line="-313"/> <source>&Network</source> <translation>&Red</translation> </message> <message> - <location line="+6"/> + <location line="-95"/> + <source>W&allet</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+65"/> + <source>Expert</source> + <translation>Experto</translation> + </message> + <message> + <location line="+9"/> + <source>Enable coin &control features</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> + <source>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.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>&Spend unconfirmed change</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+17"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>Abrir automáticamente el puerto del cliente Bitcoin en el router. Esta opción solo funciona si el router admite UPnP y está activado.</translation> </message> @@ -1421,17 +1458,12 @@ Dirección: %4 <translation>&Mostrar las direcciones en la lista de transacciones</translation> </message> <message> - <location line="+7"/> + <location line="-262"/> <source>Whether to show coin control features or not.</source> <translation>Mostrar o no caracterÃsticas de control de moneda</translation> </message> <message> - <location line="+3"/> - <source>Display coin &control features (experts only)</source> - <translation>Mostrar moneda y caracterÃsticas de control (Avanzado)</translation> - </message> - <message> - <location line="+136"/> + <location line="+398"/> <source>&OK</source> <translation>&Aceptar</translation> </message> @@ -1441,17 +1473,17 @@ Dirección: %4 <translation>&Cancelar</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+70"/> <source>default</source> <translation>predeterminado</translation> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> - <translation type="unfinished"/> + <translation>Ninguna</translation> </message> <message> - <location line="+75"/> + <location line="+78"/> <source>Confirm options reset</source> <translation>Confirme el restablecimiento de las opciones</translation> </message> @@ -1459,7 +1491,7 @@ Dirección: %4 <location line="+1"/> <location line="+29"/> <source>Client restart required to activate changes.</source> - <translation type="unfinished"/> + <translation>Reinicio del cliente para activar cambios.</translation> </message> <message> <location line="-29"/> @@ -1469,7 +1501,7 @@ Dirección: %4 <message> <location line="+33"/> <source>This change would require a client restart.</source> - <translation type="unfinished"/> + <translation>Este cambio requiere reinicio por parte del cliente.</translation> </message> <message> <location line="+34"/> @@ -1491,19 +1523,14 @@ Dirección: %4 <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="-155"/> - <source>Unconfirmed:</source> - <translation>No confirmado(s):</translation> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation>Monedero</translation> </message> <message> <location line="+51"/> - <source>Confirmed:</source> - <translation>Confirmado:</translation> + <source>Available:</source> + <translation type="unfinished"/> </message> <message> <location line="+16"/> @@ -1511,7 +1538,12 @@ Dirección: %4 <translation>Su balance actual gastable</translation> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation>Total de transacciones que deben ser confirmadas, y que no cuentan con el balance gastable necesario</translation> </message> @@ -1644,18 +1676,18 @@ Dirección: %4 <context> <name>QObject</name> <message> - <location filename="../bitcoin.cpp" line="+71"/> - <location line="+11"/> + <location filename="../bitcoin.cpp" line="+63"/> + <location line="+14"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="+1"/> + <location line="-13"/> <source>Error: Specified data directory "%1" does not exist.</source> <translation>Error: El directorio de datos especificado "%1" no existe.</translation> </message> <message> - <location line="-12"/> + <location line="+13"/> <source>Error: Invalid combination of -regtest and -testnet.</source> <translation>Error: Combinación no válida de -regtest y -testnet.</translation> </message> @@ -1706,7 +1738,7 @@ Dirección: %4 <location line="+36"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+359"/> + <location filename="../rpcconsole.cpp" line="+373"/> <source>N/A</source> <translation>N/D</translation> </message> @@ -1728,7 +1760,7 @@ Dirección: %4 <message> <location line="+25"/> <source>General</source> - <translation type="unfinished"/> + <translation>General</translation> </message> <message> <location line="+53"/> @@ -1748,7 +1780,7 @@ Dirección: %4 <message> <location line="+7"/> <source>Name</source> - <translation type="unfinished"/> + <translation>Nombre</translation> </message> <message> <location line="+23"/> @@ -1802,11 +1834,13 @@ Dirección: %4 </message> <message> <location line="+64"/> + <location filename="../rpcconsole.cpp" line="-10"/> <source>In:</source> <translation>Dentro:</translation> </message> <message> <location line="+80"/> + <location filename="../rpcconsole.cpp" line="+1"/> <source>Out:</source> <translation>Fuera:</translation> </message> @@ -1831,7 +1865,7 @@ Dirección: %4 <translation>Borrar consola</translation> </message> <message> - <location filename="../rpcconsole.cpp" line="-30"/> + <location filename="../rpcconsole.cpp" line="-35"/> <source>Welcome to the Bitcoin RPC console.</source> <translation>Bienvenido a la consola RPC de Bitcoin</translation> </message> @@ -1846,7 +1880,7 @@ Dirección: %4 <translation>Escriba <b>help</b> para ver un resumen de los comandos disponibles.</translation> </message> <message> - <location line="+122"/> + <location line="+136"/> <source>%1 B</source> <translation>%1 B</translation> </message> @@ -1962,7 +1996,7 @@ Dirección: %4 <translation>Mostrar</translation> </message> <message> - <location line="+11"/> + <location line="+14"/> <source>Remove the selected entries from the list</source> <translation>Borrar de la lista las direcciónes actualmente seleccionadas</translation> </message> @@ -1972,7 +2006,7 @@ Dirección: %4 <translation>Eliminar</translation> </message> <message> - <location filename="../receivecoinsdialog.cpp" line="+38"/> + <location filename="../receivecoinsdialog.cpp" line="+39"/> <source>Copy label</source> <translation>Copiar etiqueta</translation> </message> @@ -2193,12 +2227,12 @@ Dirección: %4 <translation>Limpiar &todo</translation> </message> <message> - <location line="+52"/> + <location line="+58"/> <source>Balance:</source> <translation>Saldo:</translation> </message> <message> - <location line="-78"/> + <location line="-84"/> <source>Confirm the send action</source> <translation>Confirmar el envÃo</translation> </message> @@ -2675,6 +2709,11 @@ Dirección: %4 </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation>%1/fuera de lÃnea</translation> </message> @@ -2836,12 +2875,12 @@ Dirección: %4 <translation>, todavÃa no se ha sido difundido satisfactoriamente</translation> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <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> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation>desconocido</translation> </message> @@ -2882,12 +2921,12 @@ Dirección: %4 <translation>Cantidad</translation> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <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> @@ -2897,23 +2936,12 @@ Dirección: %4 <translation>Abierto hasta %1</translation> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> - <translation>Fuera de lÃnea (%1 confirmaciones)</translation> - </message> - <message> - <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation>No confirmado (%1 de %2 confirmaciones)</translation> - </message> - <message> - <location line="-22"/> - <location line="+25"/> + <location line="+12"/> <source>Confirmed (%1 confirmations)</source> <translation>Confirmado (%1 confirmaciones)</translation> </message> <message> - <location line="-22"/> + <location line="+9"/> <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> @@ -2923,7 +2951,27 @@ Dirección: %4 <translation>Generado pero no aceptado</translation> </message> <message> - <location line="+62"/> + <location line="-21"/> + <source>Offline</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Unconfirmed</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation>Recibido con</translation> </message> @@ -2953,7 +3001,7 @@ Dirección: %4 <translation>(nd)</translation> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation>Estado de transacción. Pasa el ratón sobre este campo para ver el número de confirmaciones.</translation> </message> @@ -3082,7 +3130,7 @@ Dirección: %4 <translation>Mostrar detalles de la transacción</translation> </message> <message> - <location line="+142"/> + <location line="+140"/> <source>Export Transaction History</source> <translation>Exportar historial de transacciones</translation> </message> @@ -3219,12 +3267,12 @@ Dirección: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+226"/> <source>Usage:</source> <translation>Uso:</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>List commands</source> <translation>Muestra comandos </translation> @@ -3259,12 +3307,7 @@ Dirección: %4 <translation>Especificar directorio para los datos</translation> </message> <message> - <location line="-9"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation>Establecer el tamaño de caché de la base de datos en megabytes (predeterminado: 25)</translation> - </message> - <message> - <location line="-26"/> + <location line="-35"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>Escuchar conexiones en <puerto> (predeterminado: 8333 o testnet: 18333)</translation> </message> @@ -3284,50 +3327,50 @@ Dirección: %4 <translation>Especifique su propia dirección pública</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <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="-148"/> + <location line="-151"/> <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="-36"/> + <location line="-38"/> <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="+34"/> + <location line="+36"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation>Escuchar conexiones JSON-RPC en <puerto> (predeterminado: 8332 o testnet:18332)</translation> </message> <message> - <location line="+45"/> + <location line="+46"/> <source>Accept command line and JSON-RPC commands</source> <translation>Aceptar comandos consola y JSON-RPC </translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Run in the background as a daemon and accept commands</source> <translation>Ejecutar en segundo plano como daemon y aceptar comandos </translation> </message> <message> - <location line="+39"/> + <location line="+40"/> <source>Use the test network</source> <translation>Usar la red de pruebas </translation> </message> <message> - <location line="-118"/> + <location line="-120"/> <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="-95"/> + <location line="-98"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -3367,12 +3410,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Vincular a la dirección dada y escuchar siempre en ella. Utilice la notación [host]:port para IPv6</translation> </message> <message> - <location line="+3"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> - <translation>No se puede bloquear el directorio de datos %s. Probablemente Bitcoin ya se está ejecutando.</translation> - </message> - <message> - <location line="+3"/> + <location line="+6"/> <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>Iniciar modo de prueba de regresión, el cuál utiliza una cadena especial en la cual los bloques pueden ser resueltos instantáneamente. Se utiliza para herramientas de prueba de regresión y desarrollo de aplicaciones.</translation> </message> @@ -3383,6 +3421,11 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+3"/> + <source>Error: Listening for incoming connections failed (listen returned error %d)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <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> @@ -3402,7 +3445,12 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Esta es una versión de pre-prueba - utilÃcela bajo su propio riesgo. No la utilice para usos comerciales o de minerÃa.</translation> </message> <message> - <location line="+5"/> + <location line="+3"/> + <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source> <translation>Usar distintos proxys SOCKS5 para comunicarse vÃa Tor de forma anónima (Por defecto: -proxy)</translation> </message> @@ -3463,6 +3511,11 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation>Conectar sólo a los nodos (o nodo) especificados</translation> </message> @@ -3657,7 +3710,12 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Enviar comando a servidor Bitcoin</translation> </message> <message> - <location line="+7"/> + <location line="+5"/> + <source>Set database cache size in megabytes (%d to %d, default: %d)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <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> @@ -3673,6 +3731,11 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Start Bitcoin server</source> <translation>Iniciar servidor Bitcoin</translation> </message> @@ -3722,12 +3785,17 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Usted necesita reconstruir la base de datos utilizando -reindex para cambiar -txindex</translation> </message> <message> - <location line="-79"/> + <location line="-80"/> <source>Imports blocks from external blk000??.dat file</source> <translation>Importa los bloques desde un archivo blk000??.dat externo</translation> </message> <message> - <location line="-105"/> + <location line="-126"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+19"/> <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> @@ -3747,7 +3815,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Configura el número de hilos para el script de verificación (hasta 16, 0 = auto, <0 = leave that many cores free, por fecto: 0)</translation> </message> <message> - <location line="+89"/> + <location line="+91"/> <source>Information</source> <translation>Información</translation> </message> @@ -3817,7 +3885,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Especificar el tiempo máximo de conexión en milisegundos (predeterminado: 5000)</translation> </message> <message> - <location line="+6"/> + <location line="+7"/> <source>System error: </source> <translation>Error de sistema: </translation> </message> @@ -3864,6 +3932,11 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>version</source> <translation>versión</translation> </message> @@ -3873,35 +3946,35 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>wallet.dat corrupto. Ha fallado la recuperación.</translation> </message> <message> - <location line="-58"/> + <location line="-60"/> <source>Password for JSON-RPC connections</source> <translation>Contraseña para las conexiones JSON-RPC </translation> </message> <message> - <location line="-70"/> + <location line="-71"/> <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="+80"/> + <location line="+81"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>Enviar comando al nodo situado en <ip> (predeterminado: 127.0.0.1) </translation> </message> <message> - <location line="-132"/> + <location line="-134"/> <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="+161"/> + <location line="+164"/> <source>Upgrade wallet to latest format</source> <translation>Actualizar el monedero al último formato</translation> </message> <message> - <location line="-24"/> + <location line="-25"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Ajustar el número de claves en reserva <n> (predeterminado: 100) </translation> @@ -3912,13 +3985,13 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Volver a examinar la cadena de bloques en busca de transacciones del monedero perdidas</translation> </message> <message> - <location line="+38"/> + <location line="+39"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Usar OpenSSL (https) para las conexiones JSON-RPC </translation> </message> <message> - <location line="-30"/> + <location line="-31"/> <source>Server certificate file (default: server.cert)</source> <translation>Certificado del servidor (predeterminado: server.cert) </translation> @@ -3930,7 +4003,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </translation> </message> <message> - <location line="+16"/> + <location line="+17"/> <source>This help message</source> <translation>Este mensaje de ayuda </translation> @@ -3941,12 +4014,12 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>No es posible conectar con %s en este sistema (bind ha dado el error %d, %s)</translation> </message> <message> - <location line="-107"/> + <location line="-109"/> <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="+60"/> + <location line="+61"/> <source>Loading addresses...</source> <translation>Cargando direcciones...</translation> </message> @@ -3961,12 +4034,12 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Error al cargar wallet.dat: El monedero requiere una versión más reciente de Bitcoin</translation> </message> <message> - <location line="+98"/> + <location line="+99"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>El monedero ha necesitado ser reescrito. Reinicie Bitcoin para completar el proceso</translation> </message> <message> - <location line="-100"/> + <location line="-101"/> <source>Error loading wallet.dat</source> <translation>Error al cargar wallet.dat</translation> </message> @@ -3976,7 +4049,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Dirección -proxy inválida: '%s'</translation> </message> <message> - <location line="+56"/> + <location line="+57"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>La red especificada en -onlynet '%s' es desconocida</translation> </message> @@ -3986,7 +4059,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Solicitada versión de proxy -socks desconocida: %i</translation> </message> <message> - <location line="-101"/> + <location line="-103"/> <source>Cannot resolve -bind address: '%s'</source> <translation>No se puede resolver la dirección de -bind: '%s'</translation> </message> @@ -3996,7 +4069,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>No se puede resolver la dirección de -externalip: '%s'</translation> </message> <message> - <location line="+48"/> + <location line="+49"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>Cantidad inválida para -paytxfee=<amount>: '%s'</translation> </message> @@ -4016,22 +4089,17 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Cargando el Ãndice de bloques...</translation> </message> <message> - <location line="-62"/> + <location line="-63"/> <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> <message> - <location line="-32"/> - <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source> - <translation>No es posible conectar con %s en este sistema. Probablemente Bitcoin ya está ejecutándose.</translation> - </message> - <message> - <location line="+95"/> + <location line="+64"/> <source>Loading wallet...</source> <translation>Cargando monedero...</translation> </message> <message> - <location line="-56"/> + <location line="-57"/> <source>Cannot downgrade wallet</source> <translation>No se puede rebajar el monedero</translation> </message> @@ -4041,7 +4109,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>No se puede escribir la dirección predeterminada</translation> </message> <message> - <location line="+67"/> + <location line="+68"/> <source>Rescanning...</source> <translation>Reexplorando...</translation> </message> @@ -4051,17 +4119,17 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Generado pero no aceptado</translation> </message> <message> - <location line="+85"/> + <location line="+86"/> <source>To use the %s option</source> <translation>Para utilizar la opción %s</translation> </message> <message> - <location line="-77"/> + <location line="-78"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location line="-35"/> + <location line="-36"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_es_MX.ts b/src/qt/locale/bitcoin_es_MX.ts index cb0a3bc5cf..a933051f2c 100644 --- a/src/qt/locale/bitcoin_es_MX.ts +++ b/src/qt/locale/bitcoin_es_MX.ts @@ -29,6 +29,12 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+0"/> <source>The Bitcoin Core developers</source> + <translation>El nucleo de Bitcoin de desarrolladores</translation> + </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source> (%1-bit)</source> <translation type="unfinished"/> </message> </context> @@ -147,12 +153,12 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+13"/> <source>Exporting Failed</source> - <translation type="unfinished"/> + <translation>Fallo en la exportación</translation> </message> <message> <location line="+1"/> <source>There was an error trying to save the address list to %1.</source> - <translation type="unfinished"/> + <translation>Ocurrio un error al intentar guardar la lista de direccione en %1</translation> </message> </context> <context> @@ -563,12 +569,12 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+2"/> <source>&Command-line options</source> - <translation type="unfinished"/> + <translation>opciones de la &Linea de comandos</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>Mostrar mensaje de ayuda del nucleo de Bitcoin para optener una lista con los posibles comandos de Bitcoin</translation> </message> <message> <location line="+159"/> @@ -612,6 +618,16 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation type="unfinished"/> @@ -681,7 +697,7 @@ Address: %4 <translation>La cartera esta <b>encriptada</b> y <b>bloqueada</b> actualmente </translation> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+435"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -742,7 +758,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation type="unfinished"/> </message> @@ -757,7 +773,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation>Monto</translation> </message> @@ -800,7 +816,7 @@ Address: %4 <location line="+1"/> <location line="+26"/> <source>Copy amount</source> - <translation type="unfinished"/> + <translation>copiar monto</translation> </message> <message> <location line="-25"/> @@ -820,27 +836,27 @@ Address: %4 <message> <location line="+22"/> <source>Copy quantity</source> - <translation type="unfinished"/> + <translation>copiar cantidad</translation> </message> <message> <location line="+2"/> <source>Copy fee</source> - <translation type="unfinished"/> + <translation>copiar cuota</translation> </message> <message> <location line="+1"/> <source>Copy after fee</source> - <translation type="unfinished"/> + <translation>copiar despues de cuota</translation> </message> <message> <location line="+1"/> <source>Copy bytes</source> - <translation type="unfinished"/> + <translation>copiar bytes</translation> </message> <message> <location line="+1"/> <source>Copy priority</source> - <translation type="unfinished"/> + <translation>copiar prioridad</translation> </message> <message> <location line="+1"/> @@ -850,7 +866,7 @@ Address: %4 <message> <location line="+1"/> <source>Copy change</source> - <translation type="unfinished"/> + <translation>copiar cambio</translation> </message> <message> <location line="+323"/> @@ -908,7 +924,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation type="unfinished"/> </message> @@ -1087,10 +1103,10 @@ Address: %4 <message> <location filename="../forms/helpmessagedialog.ui" line="+19"/> <source>Bitcoin Core - Command-line options</source> - <translation type="unfinished"/> + <translation>Opciones de lineas de comando del nucleo de Bitcoin</translation> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation>nucleo Bitcoin</translation> </message> @@ -1234,7 +1250,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+122"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation type="unfinished"/> </message> @@ -1244,7 +1260,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="-131"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation type="unfinished"/> </message> @@ -1259,12 +1275,7 @@ Address: %4 <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"/> + <location line="+16"/> <source>MB</source> <translation type="unfinished"/> </message> @@ -1279,7 +1290,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+58"/> + <location line="+107"/> + <source>&Spend unconfirmed change (experts only)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+37"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation type="unfinished"/> </message> @@ -1314,7 +1330,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="-86"/> + <source>W&allet</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+52"/> + <source>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.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+40"/> <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> @@ -1429,17 +1455,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+70"/> <source>default</source> <translation type="unfinished"/> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation type="unfinished"/> </message> <message> - <location line="+75"/> + <location line="+78"/> <source>Confirm options reset</source> <translation type="unfinished"/> </message> @@ -1479,18 +1505,13 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-155"/> - <source>Unconfirmed:</source> - <translation>Inconformidad :</translation> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation type="unfinished"/> </message> <message> <location line="+51"/> - <source>Confirmed:</source> + <source>Available:</source> <translation type="unfinished"/> </message> <message> @@ -1499,7 +1520,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation type="unfinished"/> </message> @@ -1647,6 +1673,11 @@ Address: %4 <source>Error: Invalid combination of -regtest and -testnet.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../guiutil.cpp" line="+82"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>Ingrese una direccion Bitcoin (ejem. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> </context> <context> <name>QRImageWidget</name> @@ -1867,22 +1898,22 @@ Address: %4 <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+83"/> + <location filename="../forms/receivecoinsdialog.ui" line="+107"/> <source>&Amount:</source> <translation type="unfinished"/> </message> <message> - <location line="-13"/> + <location line="-16"/> <source>&Label:</source> <translation>&Etiqueta</translation> </message> <message> - <location line="-34"/> + <location line="-37"/> <source>&Message:</source> <translation type="unfinished"/> </message> <message> - <location line="-17"/> + <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"/> </message> @@ -1892,27 +1923,30 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+27"/> - <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="+7"/> + <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>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="+7"/> + <location line="-7"/> + <location line="+21"/> + <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 <b>optional</b>.</source> <translation>Use este formulario para la solicitud de pagos. Todos los campos son <b>opcionales</b></translation> </message> <message> - <location line="+39"/> + <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>Monto opcional a solicitar. Dejarlo vacion o en cero no solicita un monto especifico.</translation> </message> <message> - <location line="+17"/> + <location line="+32"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -1922,17 +1956,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+36"/> - <source>&Request payment</source> + <location line="+78"/> + <source>Requested payments history</source> <translation type="unfinished"/> </message> <message> - <location line="+47"/> - <source>Requested payments</source> + <location line="-98"/> + <source>&Request payment</source> <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+120"/> <source>Show the selected request (does the same as double clicking an entry)</source> <translation type="unfinished"/> </message> @@ -1951,6 +1985,21 @@ Address: %4 <source>Remove</source> <translation type="unfinished"/> </message> + <message> + <location filename="../receivecoinsdialog.cpp" line="+38"/> + <source>Copy label</source> + <translation>Copiar capa </translation> + </message> + <message> + <location line="+1"/> + <source>Copy message</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation>copiar monto</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -2052,12 +2101,17 @@ Address: %4 <source>(no message)</source> <translation type="unfinished"/> </message> + <message> + <location line="+8"/> + <source>(no amount)</source> + <translation type="unfinished"/> + </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>Mandar monedas</translation> @@ -2133,7 +2187,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+115"/> + <location line="+164"/> <source>Send to multiple recipients at once</source> <translation>Enviar a múltiples receptores a la vez</translation> </message> @@ -2143,7 +2197,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+20"/> + <location line="-23"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -2153,12 +2207,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+22"/> + <location line="+52"/> <source>Balance:</source> <translation>Saldo:</translation> </message> <message> - <location line="+41"/> + <location line="-78"/> <source>Confirm the send action</source> <translation>Confirme la acción de enviar</translation> </message> @@ -2168,7 +2222,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-228"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation>Confirme para mandar monedas</translation> </message> @@ -2181,39 +2235,34 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-136"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Ingrese una direccion Bitcoin (ejem. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> - <message> - <location line="+15"/> + <location line="-121"/> <source>Copy quantity</source> - <translation type="unfinished"/> + <translation>copiar cantidad</translation> </message> <message> <location line="+1"/> <source>Copy amount</source> - <translation type="unfinished"/> + <translation>copiar monto</translation> </message> <message> <location line="+1"/> <source>Copy fee</source> - <translation type="unfinished"/> + <translation>copiar cuota</translation> </message> <message> <location line="+1"/> <source>Copy after fee</source> - <translation type="unfinished"/> + <translation>copiar despues de cuota</translation> </message> <message> <location line="+1"/> <source>Copy bytes</source> - <translation type="unfinished"/> + <translation>copiar bytes</translation> </message> <message> <location line="+1"/> <source>Copy priority</source> - <translation type="unfinished"/> + <translation>copiar prioridad</translation> </message> <message> <location line="+1"/> @@ -2223,20 +2272,20 @@ Address: %4 <message> <location line="+1"/> <source>Copy change</source> - <translation type="unfinished"/> + <translation>copiar cambio</translation> </message> <message> <location line="+170"/> <source>Total Amount %1 (= %2)</source> - <translation type="unfinished"/> + <translation>Monto total %1(=%2)</translation> </message> <message> <location line="+2"/> <source>or</source> - <translation type="unfinished"/> + <translation>o</translation> </message> <message> - <location line="+202"/> + <location line="+203"/> <source>The recipient address is not valid, please recheck.</source> <translation type="unfinished"/> </message> @@ -2263,30 +2312,30 @@ Address: %4 <message> <location line="+3"/> <source>Transaction creation failed!</source> - <translation type="unfinished"/> + <translation>¡La creación de transacion falló!</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 type="unfinished"/> + <translation>¡La transación fue rechazada! Esto puede ocurrir si algunas de tus monedas en tu cartera han sido gastadas, al igual que si usas una cartera copiada y la monedas fueron gastadas en la copia pero no se marcaron como gastadas.</translation> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Warning: Invalid Bitcoin address</source> - <translation type="unfinished"/> + <translation>Advertencia: Dirección de Bitcoin invalida</translation> </message> <message> - <location line="+21"/> + <location line="+20"/> <source>(no label)</source> <translation>(sin etiqueta)</translation> </message> <message> <location line="-11"/> <source>Warning: Unknown change address</source> - <translation type="unfinished"/> + <translation>Advertencia: Cambio de dirección desconocido</translation> </message> <message> - <location line="-366"/> + <location line="-367"/> <source>Are you sure you want to send?</source> <translation type="unfinished"/> </message> @@ -2296,7 +2345,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+170"/> + <location line="+171"/> <source>Payment request expired</source> <translation type="unfinished"/> </message> @@ -2343,7 +2392,7 @@ Address: %4 <message> <location line="-40"/> <source>This is a normal payment.</source> - <translation type="unfinished"/> + <translation>Este es un pago normal</translation> </message> <message> <location line="+50"/> @@ -2365,7 +2414,7 @@ Address: %4 <location line="+524"/> <location line="+536"/> <source>Remove this entry</source> - <translation type="unfinished"/> + <translation>Quitar esta entrada</translation> </message> <message> <location line="-1008"/> @@ -2373,14 +2422,9 @@ Address: %4 <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"/> + <location line="+968"/> <source>This is a verified payment request.</source> - <translation type="unfinished"/> + <translation>Esta es una verificación de solicituda de pago.</translation> </message> <message> <location line="-991"/> @@ -2388,15 +2432,20 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+459"/> - <source>This is an unverified payment request.</source> + <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"/> </message> <message> + <location line="+426"/> + <source>This is an unverified payment request.</source> + <translation>Esta es una solicitud de pago no verificada.</translation> + </message> + <message> <location line="+18"/> <location line="+532"/> <source>Pay To:</source> - <translation type="unfinished"/> + <translation>Pago para:</translation> </message> <message> <location line="-498"/> @@ -2404,11 +2453,6 @@ Address: %4 <source>Memo:</source> <translation type="unfinished"/> </message> - <message> - <location filename="../sendcoinsentry.cpp" line="+1"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Ingrese una direccion Bitcoin (ejem. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> </context> <context> <name>ShutdownWindow</name> @@ -2446,19 +2490,19 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+10"/> - <location line="+213"/> + <location line="+7"/> + <location line="+210"/> <source>Choose previously used address</source> <translation type="unfinished"/> </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>Pegar dirección del portapapeles</translation> </message> @@ -2499,12 +2543,12 @@ Address: %4 </message> <message> <location line="+3"/> - <location line="+146"/> + <location line="+143"/> <source>Clear &All</source> <translation type="unfinished"/> </message> <message> - <location line="-87"/> + <location line="-84"/> <source>&Verify Message</source> <translation type="unfinished"/> </message> @@ -2519,7 +2563,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+40"/> + <location line="+37"/> <source>Verify the message to ensure it was signed with the specified Bitcoin address</source> <translation type="unfinished"/> </message> @@ -2534,43 +2578,37 @@ Address: %4 <translation type="unfinished"/> </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>Ingrese una direccion Bitcoin (ejem. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location line="-2"/> + <location line="-1"/> <source>Click "Sign Message" to generate signature</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Enter Bitcoin signature</source> - <translation type="unfinished"/> - </message> - <message> <location line="+84"/> - <location line="+81"/> + <location line="+80"/> <source>The entered address is invalid.</source> <translation type="unfinished"/> </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 type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location line="-73"/> + <location line="-72"/> <source>Wallet unlock was cancelled.</source> <translation type="unfinished"/> </message> @@ -2590,7 +2628,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+59"/> + <location line="+58"/> <source>The signature could not be decoded.</source> <translation type="unfinished"/> </message> @@ -2626,7 +2664,7 @@ Address: %4 <message> <location line="+2"/> <source>The Bitcoin Core developers</source> - <translation type="unfinished"/> + <translation>El nucleo de Bitcoin de desarrolladores</translation> </message> <message> <location line="+1"/> @@ -2651,6 +2689,11 @@ Address: %4 </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation type="unfinished"/> </message> @@ -2812,12 +2855,12 @@ Address: %4 <translation>, no ha sido transmitido aun</translation> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation>desconocido</translation> </message> @@ -2858,12 +2901,12 @@ Address: %4 <translation>Monto</translation> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> @@ -2873,23 +2916,12 @@ Address: %4 <translation>Abrir hasta %1</translation> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> - <translation>Sin conexion (%1 confirmaciones)</translation> - </message> - <message> - <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation>sin confirmar (%1 de %2 confirmaciones)</translation> - </message> - <message> - <location line="-22"/> - <location line="+25"/> + <location line="+12"/> <source>Confirmed (%1 confirmations)</source> <translation>Confimado (%1 confirmaciones)</translation> </message> <message> - <location line="-22"/> + <location line="+9"/> <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> @@ -2899,7 +2931,27 @@ Address: %4 <translation>Generado pero no aprovado</translation> </message> <message> - <location line="+62"/> + <location line="-21"/> + <source>Offline</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Unconfirmed</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation>Recivido con</translation> </message> @@ -2929,7 +2981,7 @@ Address: %4 <translation>(n/a)</translation> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation type="unfinished"/> </message> @@ -3040,7 +3092,7 @@ Address: %4 <message> <location line="+1"/> <source>Copy amount</source> - <translation type="unfinished"/> + <translation>copiar monto</translation> </message> <message> <location line="+1"/> @@ -3060,27 +3112,27 @@ Address: %4 <message> <location line="+142"/> <source>Export Transaction History</source> - <translation type="unfinished"/> + <translation>Exportar el historial de transacción</translation> </message> <message> <location line="+19"/> <source>Exporting Failed</source> - <translation type="unfinished"/> + <translation>Fallo en la exportación</translation> </message> <message> <location line="+0"/> <source>There was an error trying to save the transaction history to %1.</source> - <translation type="unfinished"/> + <translation>Ocurrio un error intentando guardar el historial de transaciones a %1</translation> </message> <message> <location line="+4"/> <source>Exporting Successful</source> - <translation type="unfinished"/> + <translation>Exportacion satisfactoria</translation> </message> <message> <location line="+0"/> <source>The transaction history was successfully saved to %1.</source> - <translation type="unfinished"/> + <translation>el historial de transaciones ha sido guardado exitosamente en 1%</translation> </message> <message> <location line="-22"/> @@ -3138,7 +3190,7 @@ Address: %4 <message> <location filename="../walletframe.cpp" line="+26"/> <source>No wallet has been loaded.</source> - <translation type="unfinished"/> + <translation>No se há cargado la cartera.</translation> </message> </context> <context> @@ -3179,12 +3231,12 @@ Address: %4 <message> <location line="+0"/> <source>There was an error trying to save the wallet data to %1.</source> - <translation type="unfinished"/> + <translation>Ocurrio un error tratando de guardar la información de la cartera %1</translation> </message> <message> <location line="+4"/> <source>The wallet data was successfully saved to %1.</source> - <translation type="unfinished"/> + <translation>La información de la cartera fué guardada exitosamente a 1%</translation> </message> <message> <location line="+0"/> @@ -3195,12 +3247,12 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+223"/> <source>Usage:</source> <translation>Uso:</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>List commands</source> <translation>Lista de comandos</translation> </message> @@ -3255,12 +3307,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation type="unfinished"/> </message> <message> - <location line="-148"/> + <location line="-150"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"/> </message> @@ -3280,17 +3332,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Run in the background as a daemon and accept commands</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <location line="+40"/> <source>Use the test network</source> <translation type="unfinished"/> </message> <message> - <location line="-118"/> + <location line="-120"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> @@ -3397,7 +3449,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+9"/> <source><category> can be:</source> - <translation type="unfinished"/> + <translation><categoria> puede ser:</translation> </message> <message> <location line="+6"/> @@ -3421,6 +3473,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation type="unfinished"/> </message> @@ -3631,6 +3688,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Start Bitcoin server</source> <translation>Iniciar servidor Bitcoin</translation> </message> @@ -3667,7 +3729,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+2"/> <source>Wallet options:</source> - <translation type="unfinished"/> + <translation>Opciones de cartera:</translation> </message> <message> <location line="+2"/> @@ -3680,12 +3742,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-79"/> + <location line="-80"/> <source>Imports blocks from external blk000??.dat file</source> <translation type="unfinished"/> </message> <message> - <location line="-105"/> + <location line="-106"/> <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> @@ -3705,7 +3767,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+89"/> + <location line="+90"/> <source>Information</source> <translation type="unfinished"/> </message> @@ -3775,7 +3837,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+7"/> <source>System error: </source> <translation type="unfinished"/> </message> @@ -3821,6 +3883,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>version</source> <translation>Versión</translation> </message> @@ -3830,32 +3897,32 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-58"/> + <location line="-60"/> <source>Password for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-70"/> + <location line="-71"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation type="unfinished"/> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+161"/> + <location line="+163"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"/> </message> <message> - <location line="-24"/> + <location line="-25"/> <source>Set key pool size to <n> (default: 100)</source> <translation type="unfinished"/> </message> @@ -3865,12 +3932,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+38"/> + <location line="+39"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-30"/> + <location line="-31"/> <source>Server certificate file (default: server.cert)</source> <translation type="unfinished"/> </message> @@ -3880,7 +3947,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+17"/> <source>This help message</source> <translation type="unfinished"/> </message> @@ -3890,12 +3957,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-107"/> + <location line="-109"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation type="unfinished"/> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Loading addresses...</source> <translation>Cargando direcciones...</translation> </message> @@ -3910,12 +3977,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+98"/> + <location line="+99"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation type="unfinished"/> </message> <message> - <location line="-100"/> + <location line="-101"/> <source>Error loading wallet.dat</source> <translation type="unfinished"/> </message> @@ -3925,7 +3992,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+56"/> + <location line="+57"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation type="unfinished"/> </message> @@ -3935,7 +4002,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-101"/> + <location line="-103"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -3945,7 +4012,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+48"/> + <location line="+49"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation type="unfinished"/> </message> @@ -3965,7 +4032,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Cargando indice de bloques... </translation> </message> <message> - <location line="-62"/> + <location line="-63"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"/> </message> @@ -3975,12 +4042,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+95"/> + <location line="+96"/> <source>Loading wallet...</source> <translation>Cargando billetera...</translation> </message> <message> - <location line="-56"/> + <location line="-57"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> @@ -3990,7 +4057,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+67"/> + <location line="+68"/> <source>Rescanning...</source> <translation type="unfinished"/> </message> @@ -4000,17 +4067,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Carga completa</translation> </message> <message> - <location line="+85"/> + <location line="+86"/> <source>To use the %s option</source> <translation type="unfinished"/> </message> <message> - <location line="-77"/> + <location line="-78"/> <source>Error</source> <translation type="unfinished"/> </message> <message> - <location line="-35"/> + <location line="-36"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_es_UY.ts b/src/qt/locale/bitcoin_es_UY.ts index 748a588419..4cd1ca70e2 100644 --- a/src/qt/locale/bitcoin_es_UY.ts +++ b/src/qt/locale/bitcoin_es_UY.ts @@ -31,6 +31,12 @@ This product includes software developed by the OpenSSL Project for use in the O <source>The Bitcoin Core developers</source> <translation type="unfinished"/> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source> (%1-bit)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>AddressBookPage</name> @@ -612,6 +618,16 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation type="unfinished"/> @@ -681,7 +697,7 @@ Address: %4 <translation>El Monedero esta <b>cifrado</b> y actualmente <b>bloqueado</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+435"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -742,7 +758,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation type="unfinished"/> </message> @@ -757,7 +773,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation type="unfinished"/> </message> @@ -769,7 +785,7 @@ Address: %4 <message> <location line="+5"/> <source>Date</source> - <translation type="unfinished"/> + <translation>Fecha</translation> </message> <message> <location line="+5"/> @@ -908,7 +924,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation type="unfinished"/> </message> @@ -1090,7 +1106,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation type="unfinished"/> </message> @@ -1234,7 +1250,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+122"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation type="unfinished"/> </message> @@ -1244,7 +1260,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="-131"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation type="unfinished"/> </message> @@ -1259,12 +1275,7 @@ Address: %4 <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"/> + <location line="+16"/> <source>MB</source> <translation type="unfinished"/> </message> @@ -1279,7 +1290,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+58"/> + <location line="+107"/> + <source>&Spend unconfirmed change (experts only)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+37"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation type="unfinished"/> </message> @@ -1314,7 +1330,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="-86"/> + <source>W&allet</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+52"/> + <source>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.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+40"/> <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> @@ -1429,17 +1455,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+70"/> <source>default</source> <translation type="unfinished"/> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation type="unfinished"/> </message> <message> - <location line="+75"/> + <location line="+78"/> <source>Confirm options reset</source> <translation type="unfinished"/> </message> @@ -1479,18 +1505,13 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-155"/> - <source>Unconfirmed:</source> - <translation>Sin confirmar:</translation> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation type="unfinished"/> </message> <message> <location line="+51"/> - <source>Confirmed:</source> + <source>Available:</source> <translation type="unfinished"/> </message> <message> @@ -1499,7 +1520,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation type="unfinished"/> </message> @@ -2048,7 +2074,7 @@ Address: %4 <message> <location filename="../recentrequeststablemodel.cpp" line="+24"/> <source>Date</source> - <translation type="unfinished"/> + <translation>Fecha</translation> </message> <message> <location line="+0"/> @@ -2663,6 +2689,11 @@ Address: %4 </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation type="unfinished"/> </message> @@ -2689,7 +2720,7 @@ Address: %4 <message> <location line="+4"/> <source>Date</source> - <translation type="unfinished"/> + <translation>Fecha</translation> </message> <message> <location line="+7"/> @@ -2824,14 +2855,14 @@ Address: %4 <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> - <translation type="unfinished"/> + <translation>desconocido</translation> </message> </context> <context> @@ -2852,7 +2883,7 @@ Address: %4 <message> <location filename="../transactiontablemodel.cpp" line="+234"/> <source>Date</source> - <translation type="unfinished"/> + <translation>Fecha</translation> </message> <message> <location line="+0"/> @@ -2870,12 +2901,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> @@ -2885,33 +2916,42 @@ Address: %4 <translation>Abrir hasta %1</translation> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> + <location line="+12"/> + <source>Confirmed (%1 confirmations)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+9"/> + <source>This block was not received by any other nodes and will probably not be accepted!</source> <translation type="unfinished"/> </message> <message> <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> + <source>Generated but not accepted</source> <translation type="unfinished"/> </message> <message> - <location line="-22"/> - <location line="+25"/> - <source>Confirmed (%1 confirmations)</source> + <location line="-21"/> + <source>Offline</source> <translation type="unfinished"/> </message> <message> - <location line="-22"/> - <source>This block was not received by any other nodes and will probably not be accepted!</source> + <location line="+3"/> + <source>Unconfirmed</source> <translation type="unfinished"/> </message> <message> <location line="+3"/> - <source>Generated but not accepted</source> + <source>Confirming (%1 of %2 recommended confirmations)</source> <translation type="unfinished"/> </message> <message> - <location line="+62"/> + <location line="+6"/> + <source>Conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation type="unfinished"/> </message> @@ -2941,7 +2981,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation type="unfinished"/> </message> @@ -3107,7 +3147,7 @@ Address: %4 <message> <location line="+1"/> <source>Date</source> - <translation type="unfinished"/> + <translation>Fecha</translation> </message> <message> <location line="+1"/> @@ -3207,12 +3247,12 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+223"/> <source>Usage:</source> <translation type="unfinished"/> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>List commands</source> <translation type="unfinished"/> </message> @@ -3267,12 +3307,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation type="unfinished"/> </message> <message> - <location line="-148"/> + <location line="-150"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"/> </message> @@ -3292,17 +3332,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Run in the background as a daemon and accept commands</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <location line="+40"/> <source>Use the test network</source> <translation type="unfinished"/> </message> <message> - <location line="-118"/> + <location line="-120"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> @@ -3433,6 +3473,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation type="unfinished"/> </message> @@ -3643,6 +3688,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Start Bitcoin server</source> <translation type="unfinished"/> </message> @@ -3692,12 +3742,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-79"/> + <location line="-80"/> <source>Imports blocks from external blk000??.dat file</source> <translation type="unfinished"/> </message> <message> - <location line="-105"/> + <location line="-106"/> <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> @@ -3717,7 +3767,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+89"/> + <location line="+90"/> <source>Information</source> <translation type="unfinished"/> </message> @@ -3787,7 +3837,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+7"/> <source>System error: </source> <translation type="unfinished"/> </message> @@ -3833,6 +3883,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>version</source> <translation type="unfinished"/> </message> @@ -3842,32 +3897,32 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-58"/> + <location line="-60"/> <source>Password for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-70"/> + <location line="-71"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation type="unfinished"/> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+161"/> + <location line="+163"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"/> </message> <message> - <location line="-24"/> + <location line="-25"/> <source>Set key pool size to <n> (default: 100)</source> <translation type="unfinished"/> </message> @@ -3877,12 +3932,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+38"/> + <location line="+39"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-30"/> + <location line="-31"/> <source>Server certificate file (default: server.cert)</source> <translation type="unfinished"/> </message> @@ -3892,7 +3947,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+17"/> <source>This help message</source> <translation type="unfinished"/> </message> @@ -3902,12 +3957,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-107"/> + <location line="-109"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation type="unfinished"/> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Loading addresses...</source> <translation type="unfinished"/> </message> @@ -3922,12 +3977,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+98"/> + <location line="+99"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation type="unfinished"/> </message> <message> - <location line="-100"/> + <location line="-101"/> <source>Error loading wallet.dat</source> <translation type="unfinished"/> </message> @@ -3937,7 +3992,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+56"/> + <location line="+57"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation type="unfinished"/> </message> @@ -3947,7 +4002,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-101"/> + <location line="-103"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -3957,7 +4012,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+48"/> + <location line="+49"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation type="unfinished"/> </message> @@ -3977,7 +4032,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-62"/> + <location line="-63"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"/> </message> @@ -3987,12 +4042,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+95"/> + <location line="+96"/> <source>Loading wallet...</source> <translation type="unfinished"/> </message> <message> - <location line="-56"/> + <location line="-57"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> @@ -4002,7 +4057,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+67"/> + <location line="+68"/> <source>Rescanning...</source> <translation type="unfinished"/> </message> @@ -4012,17 +4067,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+85"/> + <location line="+86"/> <source>To use the %s option</source> <translation type="unfinished"/> </message> <message> - <location line="-77"/> + <location line="-78"/> <source>Error</source> <translation type="unfinished"/> </message> <message> - <location line="-35"/> + <location line="-36"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_et.ts b/src/qt/locale/bitcoin_et.ts index 9addf3009c..957e30581e 100644 --- a/src/qt/locale/bitcoin_et.ts +++ b/src/qt/locale/bitcoin_et.ts @@ -36,6 +36,12 @@ Toode sisaldab OpenSSL Projekti all toodetud tarkvara, mis on kasutamiseks OpenS <source>The Bitcoin Core developers</source> <translation type="unfinished"/> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source> (%1-bit)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>AddressBookPage</name> @@ -617,6 +623,16 @@ Toode sisaldab OpenSSL Projekti all toodetud tarkvara, mis on kasutamiseks OpenS <translation><numerusform>%n nädal</numerusform><numerusform>%n nädalat</numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation>%1 maas</translation> @@ -689,7 +705,7 @@ Aadress: %4âŽ</translation> <translation>Rahakott on <b>krüpteeritud</b> ning hetkel <b>suletud</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+435"/> <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> @@ -750,7 +766,7 @@ Aadress: %4âŽ</translation> <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation type="unfinished"/> </message> @@ -765,7 +781,7 @@ Aadress: %4âŽ</translation> <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation>Kogus</translation> </message> @@ -916,7 +932,7 @@ Aadress: %4âŽ</translation> <translation type="unfinished"/> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation type="unfinished"/> </message> @@ -1098,7 +1114,7 @@ Aadress: %4âŽ</translation> <translation type="unfinished"/> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation>Bitcoini tuumik</translation> </message> @@ -1242,7 +1258,7 @@ Aadress: %4âŽ</translation> <translation>%Peamine</translation> </message> <message> - <location line="+6"/> + <location line="+122"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation type="unfinished"/> </message> @@ -1252,7 +1268,7 @@ Aadress: %4âŽ</translation> <translation>Tasu tehingu &fee</translation> </message> <message> - <location line="+31"/> + <location line="-131"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation>Käivita Bitcoin süsteemi logimisel.</translation> </message> @@ -1267,12 +1283,7 @@ Aadress: %4âŽ</translation> <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"/> + <location line="+16"/> <source>MB</source> <translation type="unfinished"/> </message> @@ -1287,7 +1298,12 @@ Aadress: %4âŽ</translation> <translation type="unfinished"/> </message> <message> - <location line="+58"/> + <location line="+107"/> + <source>&Spend unconfirmed change (experts only)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+37"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation type="unfinished"/> </message> @@ -1322,7 +1338,17 @@ Aadress: %4âŽ</translation> <translation>&Võrk</translation> </message> <message> - <location line="+6"/> + <location line="-86"/> + <source>W&allet</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+52"/> + <source>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.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+40"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>Bitcoini kliendi pordi automaatne avamine ruuteris. Toimib, kui sinu ruuter aktsepteerib UPnP ühendust.</translation> </message> @@ -1437,17 +1463,17 @@ Aadress: %4âŽ</translation> <translation>&Katkesta</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+70"/> <source>default</source> <translation>vaikeväärtus</translation> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation type="unfinished"/> </message> <message> - <location line="+75"/> + <location line="+78"/> <source>Confirm options reset</source> <translation>Kinnita valikute algseadistamine</translation> </message> @@ -1487,18 +1513,13 @@ Aadress: %4âŽ</translation> <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="-155"/> - <source>Unconfirmed:</source> - <translation>Kinnitamata:</translation> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation>Rahakott</translation> </message> <message> <location line="+51"/> - <source>Confirmed:</source> + <source>Available:</source> <translation type="unfinished"/> </message> <message> @@ -1507,7 +1528,12 @@ Aadress: %4âŽ</translation> <translation type="unfinished"/> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation type="unfinished"/> </message> @@ -1655,6 +1681,11 @@ Aadress: %4âŽ</translation> <source>Error: Invalid combination of -regtest and -testnet.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../guiutil.cpp" line="+82"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>Sisesta Bitcoini aadress (nt: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> </context> <context> <name>QRImageWidget</name> @@ -1875,22 +1906,22 @@ Aadress: %4âŽ</translation> <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+83"/> + <location filename="../forms/receivecoinsdialog.ui" line="+107"/> <source>&Amount:</source> <translation type="unfinished"/> </message> <message> - <location line="-13"/> + <location line="-16"/> <source>&Label:</source> <translation>&Märgis</translation> </message> <message> - <location line="-34"/> + <location line="-37"/> <source>&Message:</source> <translation type="unfinished"/> </message> <message> - <location line="-17"/> + <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"/> </message> @@ -1900,27 +1931,30 @@ Aadress: %4âŽ</translation> <translation type="unfinished"/> </message> <message> - <location line="+27"/> - <source>An optional 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"/> </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> + <location line="-7"/> + <location line="+21"/> + <source>An optional label to associate with the new receiving address.</source> <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="-7"/> <source>Use this form to request payments. All fields are <b>optional</b>.</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <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"/> </message> <message> - <location line="+17"/> + <location line="+32"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -1930,17 +1964,17 @@ Aadress: %4âŽ</translation> <translation type="unfinished"/> </message> <message> - <location line="+36"/> - <source>&Request payment</source> + <location line="+78"/> + <source>Requested payments history</source> <translation type="unfinished"/> </message> <message> - <location line="+47"/> - <source>Requested payments</source> + <location line="-98"/> + <source>&Request payment</source> <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+120"/> <source>Show the selected request (does the same as double clicking an entry)</source> <translation type="unfinished"/> </message> @@ -1959,6 +1993,21 @@ Aadress: %4âŽ</translation> <source>Remove</source> <translation type="unfinished"/> </message> + <message> + <location filename="../receivecoinsdialog.cpp" line="+38"/> + <source>Copy label</source> + <translation>Märgise kopeerimine</translation> + </message> + <message> + <location line="+1"/> + <source>Copy message</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation>Kopeeri summa</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -2060,12 +2109,17 @@ Aadress: %4âŽ</translation> <source>(no message)</source> <translation type="unfinished"/> </message> + <message> + <location line="+8"/> + <source>(no amount)</source> + <translation type="unfinished"/> + </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>Müntide saatmine</translation> @@ -2141,7 +2195,7 @@ Aadress: %4âŽ</translation> <translation type="unfinished"/> </message> <message> - <location line="+115"/> + <location line="+164"/> <source>Send to multiple recipients at once</source> <translation>Saatmine mitmele korraga</translation> </message> @@ -2151,7 +2205,7 @@ Aadress: %4âŽ</translation> <translation>Lisa &Saaja</translation> </message> <message> - <location line="+20"/> + <location line="-23"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -2161,12 +2215,12 @@ Aadress: %4âŽ</translation> <translation>Puhasta &Kõik</translation> </message> <message> - <location line="+22"/> + <location line="+52"/> <source>Balance:</source> <translation>Jääk:</translation> </message> <message> - <location line="+41"/> + <location line="-78"/> <source>Confirm the send action</source> <translation>Saatmise kinnitamine</translation> </message> @@ -2176,7 +2230,7 @@ Aadress: %4âŽ</translation> <translation>S&aada</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-228"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation>Müntide saatmise kinnitamine</translation> </message> @@ -2189,12 +2243,7 @@ Aadress: %4âŽ</translation> <translation type="unfinished"/> </message> <message> - <location line="-136"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Sisesta Bitcoini aadress (nt: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> - <message> - <location line="+15"/> + <location line="-121"/> <source>Copy quantity</source> <translation type="unfinished"/> </message> @@ -2244,7 +2293,7 @@ Aadress: %4âŽ</translation> <translation type="unfinished"/> </message> <message> - <location line="+202"/> + <location line="+203"/> <source>The recipient address is not valid, please recheck.</source> <translation>Saaja aadress ei ole kehtiv, palun kontrolli.</translation> </message> @@ -2279,12 +2328,12 @@ Aadress: %4âŽ</translation> <translation type="unfinished"/> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Warning: Invalid Bitcoin address</source> <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+20"/> <source>(no label)</source> <translation>(silti pole)</translation> </message> @@ -2294,7 +2343,7 @@ Aadress: %4âŽ</translation> <translation type="unfinished"/> </message> <message> - <location line="-366"/> + <location line="-367"/> <source>Are you sure you want to send?</source> <translation type="unfinished"/> </message> @@ -2304,7 +2353,7 @@ Aadress: %4âŽ</translation> <translation type="unfinished"/> </message> <message> - <location line="+170"/> + <location line="+171"/> <source>Payment request expired</source> <translation type="unfinished"/> </message> @@ -2381,12 +2430,7 @@ Aadress: %4âŽ</translation> <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"/> + <location line="+968"/> <source>This is a verified payment request.</source> <translation type="unfinished"/> </message> @@ -2396,7 +2440,12 @@ Aadress: %4âŽ</translation> <translation type="unfinished"/> </message> <message> - <location line="+459"/> + <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"/> + </message> + <message> + <location line="+426"/> <source>This is an unverified payment request.</source> <translation type="unfinished"/> </message> @@ -2412,11 +2461,6 @@ Aadress: %4âŽ</translation> <source>Memo:</source> <translation type="unfinished"/> </message> - <message> - <location filename="../sendcoinsentry.cpp" line="+1"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Sisesta Bitcoini aadress (nt: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> </context> <context> <name>ShutdownWindow</name> @@ -2454,19 +2498,19 @@ Aadress: %4âŽ</translation> <translation>Sõnumi signeerimise aadress (nt: 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"/> </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>Kleebi aadress vahemälust</translation> </message> @@ -2507,12 +2551,12 @@ Aadress: %4âŽ</translation> </message> <message> <location line="+3"/> - <location line="+146"/> + <location line="+143"/> <source>Clear &All</source> <translation>Puhasta &Kõik</translation> </message> <message> - <location line="-87"/> + <location line="-84"/> <source>&Verify Message</source> <translation>&Kinnita Sõnum</translation> </message> @@ -2527,7 +2571,7 @@ Aadress: %4âŽ</translation> <translation>Aadress, millega sõnum allkirjastati (nt: 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>Kinnita sõnum tõestamaks selle allkirjastatust määratud Bitcoini aadressiga.</translation> </message> @@ -2542,43 +2586,37 @@ Aadress: %4âŽ</translation> <translation>Tühjenda kõik sõnumi kinnitamise väljad</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>Sisesta Bitcoini aadress (nt: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location line="-2"/> + <location line="-1"/> <source>Click "Sign Message" to generate signature</source> <translation>Signatuuri genereerimiseks vajuta "Allkirjasta Sõnum"</translation> </message> <message> - <location line="+3"/> - <source>Enter Bitcoin signature</source> - <translation>Sisesta Bitcoini allkiri</translation> - </message> - <message> <location line="+84"/> - <location line="+81"/> + <location line="+80"/> <source>The entered address is invalid.</source> <translation>Sisestatud aadress ei kehti.</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>Palun kontrolli aadressi ning proovi uuesti.</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>Sisestatud aadress ei viita võtmele.</translation> </message> <message> - <location line="-73"/> + <location line="-72"/> <source>Wallet unlock was cancelled.</source> <translation>Rahakoti avamine katkestati.</translation> </message> @@ -2598,7 +2636,7 @@ Aadress: %4âŽ</translation> <translation>Sõnum signeeritud.</translation> </message> <message> - <location line="+59"/> + <location line="+58"/> <source>The signature could not be decoded.</source> <translation>Signatuuri ei õnnestunud dekodeerida.</translation> </message> @@ -2659,6 +2697,11 @@ Aadress: %4âŽ</translation> </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation>%/1offline'is</translation> </message> @@ -2820,12 +2863,12 @@ Aadress: %4âŽ</translation> <translation>, veel esitlemata</translation> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <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> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation>tundmatu</translation> </message> @@ -2866,12 +2909,12 @@ Aadress: %4âŽ</translation> <translation>Kogus</translation> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <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> @@ -2881,23 +2924,12 @@ Aadress: %4âŽ</translation> <translation>Avatud kuni %1</translation> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> - <translation>Ãœhenduseta (%1 kinnitust)</translation> - </message> - <message> - <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation>Kinnitamata (%1/%2 kinnitust)</translation> - </message> - <message> - <location line="-22"/> - <location line="+25"/> + <location line="+12"/> <source>Confirmed (%1 confirmations)</source> <translation>Kinnitatud (%1 kinnitust)</translation> </message> <message> - <location line="-22"/> + <location line="+9"/> <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> @@ -2907,7 +2939,27 @@ Aadress: %4âŽ</translation> <translation>Loodud, kuid aktsepteerimata</translation> </message> <message> - <location line="+62"/> + <location line="-21"/> + <source>Offline</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Unconfirmed</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation>Saadud koos</translation> </message> @@ -2937,7 +2989,7 @@ Aadress: %4âŽ</translation> <translation>(n/a)</translation> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation>Tehingu staatus. Kinnituste arvu kuvamiseks liigu hiire noolega selle peale.</translation> </message> @@ -3203,12 +3255,12 @@ Aadress: %4âŽ</translation> <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+223"/> <source>Usage:</source> <translation>Kasutus:</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>List commands</source> <translation>Käskluste loetelu</translation> </message> @@ -3263,12 +3315,12 @@ Aadress: %4âŽ</translation> <translation>Täpsusta enda avalik aadress</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation>Ulakate peeride valulävi (vaikeväärtus: 100)</translation> </message> <message> - <location line="-148"/> + <location line="-150"/> <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> @@ -3288,17 +3340,17 @@ Aadress: %4âŽ</translation> <translation>Luba käsurea ning JSON-RPC käsklusi</translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <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="+39"/> + <location line="+40"/> <source>Use the test network</source> <translation>Testvõrgu kasutamine</translation> </message> <message> - <location line="-118"/> + <location line="-120"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>Luba välisühendusi (vaikeväärtus: 1 kui puudub -proxy või -connect)</translation> </message> @@ -3439,6 +3491,11 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com </message> <message> <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation>Ãœhendu ainult määratud node'i(de)ga</translation> </message> @@ -3649,6 +3706,11 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com </message> <message> <location line="+2"/> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Start Bitcoin server</source> <translation type="unfinished"/> </message> @@ -3698,12 +3760,12 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com <translation type="unfinished"/> </message> <message> - <location line="-79"/> + <location line="-80"/> <source>Imports blocks from external blk000??.dat file</source> <translation>Impordi blokid välisest blk000??.dat failist</translation> </message> <message> - <location line="-105"/> + <location line="-106"/> <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> @@ -3723,7 +3785,7 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com <translation type="unfinished"/> </message> <message> - <location line="+89"/> + <location line="+90"/> <source>Information</source> <translation>Informatsioon</translation> </message> @@ -3793,7 +3855,7 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com <translation>Sea ühenduse timeout millisekundites (vaikeväärtus: 5000)</translation> </message> <message> - <location line="+6"/> + <location line="+7"/> <source>System error: </source> <translation>Süsteemi tõrge:</translation> </message> @@ -3839,6 +3901,11 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>version</source> <translation>versioon</translation> </message> @@ -3848,32 +3915,32 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com <translation>wallet.dat fail on katki, päästmine ebaõnnestus</translation> </message> <message> - <location line="-58"/> + <location line="-60"/> <source>Password for JSON-RPC connections</source> <translation>JSON-RPC ühenduste salasõna</translation> </message> <message> - <location line="-70"/> + <location line="-71"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>JSON-RPC ühenduste lubamine kindla IP pealt</translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>Saada käsklusi node'ile IP'ga <ip> (vaikeväärtus: 127.0.0.1)</translation> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>Käivita käsklus, kui parim plokk muutub (käskluse %s asendatakse ploki hash'iga)</translation> </message> <message> - <location line="+161"/> + <location line="+163"/> <source>Upgrade wallet to latest format</source> <translation>Uuenda rahakott uusimasse vormingusse</translation> </message> <message> - <location line="-24"/> + <location line="-25"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Sea võtmete hulgaks <n> (vaikeväärtus: 100)</translation> </message> @@ -3883,12 +3950,12 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com <translation>Otsi ploki jadast rahakoti kadunud tehinguid</translation> </message> <message> - <location line="+38"/> + <location line="+39"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Kasuta JSON-RPC ühenduste jaoks OpenSSL'i (https)</translation> </message> <message> - <location line="-30"/> + <location line="-31"/> <source>Server certificate file (default: server.cert)</source> <translation>Serveri sertifikaadifail (vaikeväärtus: server.cert)</translation> </message> @@ -3898,7 +3965,7 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com <translation>Serveri privaatvõti (vaikeväärtus: server.pem)</translation> </message> <message> - <location line="+16"/> + <location line="+17"/> <source>This help message</source> <translation>Käesolev abitekst</translation> </message> @@ -3908,12 +3975,12 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com <translation>Selle arvutiga ei ole võimalik siduda %s külge (katse nurjus %d, %s tõttu)</translation> </message> <message> - <location line="-107"/> + <location line="-109"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>-addnode, -seednode ja -connect tohivad kasutada DNS lookup'i</translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Loading addresses...</source> <translation>Aadresside laadimine...</translation> </message> @@ -3928,12 +3995,12 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com <translation>Viga wallet.dat käivitamisel: Rahakott nõuab Bitcoini uusimat versiooni</translation> </message> <message> - <location line="+98"/> + <location line="+99"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>Rahakott tuli ümberkirjutada: toimingu lõpetamiseks taaskäivita Bitcoin</translation> </message> <message> - <location line="-100"/> + <location line="-101"/> <source>Error loading wallet.dat</source> <translation>Viga wallet.dat käivitamisel</translation> </message> @@ -3943,7 +4010,7 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com <translation>Vigane -proxi aadress: '%s'</translation> </message> <message> - <location line="+56"/> + <location line="+57"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Kirjeldatud tundmatu võrgustik -onlynet'is: '%s'</translation> </message> @@ -3953,7 +4020,7 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com <translation>Küsitud tundmatu -socks proxi versioon: %i</translation> </message> <message> - <location line="-101"/> + <location line="-103"/> <source>Cannot resolve -bind address: '%s'</source> <translation>Tundmatu -bind aadress: '%s'</translation> </message> @@ -3963,7 +4030,7 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com <translation>Tundmatu -externalip aadress: '%s'</translation> </message> <message> - <location line="+48"/> + <location line="+49"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>-paytxfee=<amount> jaoks vigane kogus: '%s'</translation> </message> @@ -3983,7 +4050,7 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com <translation>Klotside indeksi laadimine...</translation> </message> <message> - <location line="-62"/> + <location line="-63"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>Lisa node ning hoia ühendus avatud</translation> </message> @@ -3993,12 +4060,12 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com <translation>%s'ga ei ole võimalik sellest arvutist siduda. Bitcoin juba töötab.</translation> </message> <message> - <location line="+95"/> + <location line="+96"/> <source>Loading wallet...</source> <translation>Rahakoti laadimine...</translation> </message> <message> - <location line="-56"/> + <location line="-57"/> <source>Cannot downgrade wallet</source> <translation>Rahakoti vanandamine ebaõnnestus</translation> </message> @@ -4008,7 +4075,7 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com <translation>Tõrge vaikimisi aadressi kirjutamisel</translation> </message> <message> - <location line="+67"/> + <location line="+68"/> <source>Rescanning...</source> <translation>Ãœleskaneerimine...</translation> </message> @@ -4018,17 +4085,17 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com <translation>Laetud</translation> </message> <message> - <location line="+85"/> + <location line="+86"/> <source>To use the %s option</source> <translation>%s valiku kasutamine</translation> </message> <message> - <location line="-77"/> + <location line="-78"/> <source>Error</source> <translation>Tõrge</translation> </message> <message> - <location line="-35"/> + <location line="-36"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_eu_ES.ts b/src/qt/locale/bitcoin_eu_ES.ts index 074c2dbaf8..801991282a 100644 --- a/src/qt/locale/bitcoin_eu_ES.ts +++ b/src/qt/locale/bitcoin_eu_ES.ts @@ -31,6 +31,12 @@ This product includes software developed by the OpenSSL Project for use in the O <source>The Bitcoin Core developers</source> <translation type="unfinished"/> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source> (%1-bit)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>AddressBookPage</name> @@ -612,6 +618,16 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation type="unfinished"/> @@ -681,7 +697,7 @@ Address: %4 <translation>Zorroa <b>enkriptatuta</b> eta <b>blokeatuta</b> dago une honetan</translation> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+435"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -742,7 +758,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation type="unfinished"/> </message> @@ -757,7 +773,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation>Kopurua</translation> </message> @@ -908,7 +924,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation type="unfinished"/> </message> @@ -1090,7 +1106,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation type="unfinished"/> </message> @@ -1234,7 +1250,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+122"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation type="unfinished"/> </message> @@ -1244,7 +1260,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="-131"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation type="unfinished"/> </message> @@ -1259,12 +1275,7 @@ Address: %4 <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"/> + <location line="+16"/> <source>MB</source> <translation type="unfinished"/> </message> @@ -1279,7 +1290,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+58"/> + <location line="+107"/> + <source>&Spend unconfirmed change (experts only)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+37"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation type="unfinished"/> </message> @@ -1314,7 +1330,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="-86"/> + <source>W&allet</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+52"/> + <source>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.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+40"/> <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> @@ -1429,17 +1455,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+70"/> <source>default</source> <translation type="unfinished"/> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation type="unfinished"/> </message> <message> - <location line="+75"/> + <location line="+78"/> <source>Confirm options reset</source> <translation type="unfinished"/> </message> @@ -1479,18 +1505,13 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-155"/> - <source>Unconfirmed:</source> - <translation>Konfirmatu gabe:</translation> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation type="unfinished"/> </message> <message> <location line="+51"/> - <source>Confirmed:</source> + <source>Available:</source> <translation type="unfinished"/> </message> <message> @@ -1499,7 +1520,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation type="unfinished"/> </message> @@ -1647,6 +1673,11 @@ Address: %4 <source>Error: Invalid combination of -regtest and -testnet.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../guiutil.cpp" line="+82"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>Sartu Bitocin helbide bat (adb.: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L) </translation> + </message> </context> <context> <name>QRImageWidget</name> @@ -1867,22 +1898,22 @@ Address: %4 <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+83"/> + <location filename="../forms/receivecoinsdialog.ui" line="+107"/> <source>&Amount:</source> <translation type="unfinished"/> </message> <message> - <location line="-13"/> + <location line="-16"/> <source>&Label:</source> <translation>&Etiketa:</translation> </message> <message> - <location line="-34"/> + <location line="-37"/> <source>&Message:</source> <translation type="unfinished"/> </message> <message> - <location line="-17"/> + <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"/> </message> @@ -1892,27 +1923,30 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+27"/> - <source>An optional 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"/> </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> + <location line="-7"/> + <location line="+21"/> + <source>An optional label to associate with the new receiving address.</source> <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="-7"/> <source>Use this form to request payments. All fields are <b>optional</b>.</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <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"/> </message> <message> - <location line="+17"/> + <location line="+32"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -1922,17 +1956,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+36"/> - <source>&Request payment</source> + <location line="+78"/> + <source>Requested payments history</source> <translation type="unfinished"/> </message> <message> - <location line="+47"/> - <source>Requested payments</source> + <location line="-98"/> + <source>&Request payment</source> <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+120"/> <source>Show the selected request (does the same as double clicking an entry)</source> <translation type="unfinished"/> </message> @@ -1951,6 +1985,21 @@ Address: %4 <source>Remove</source> <translation type="unfinished"/> </message> + <message> + <location filename="../receivecoinsdialog.cpp" line="+38"/> + <source>Copy label</source> + <translation>Kopiatu etiketa</translation> + </message> + <message> + <location line="+1"/> + <source>Copy message</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation type="unfinished"/> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -2052,12 +2101,17 @@ Address: %4 <source>(no message)</source> <translation type="unfinished"/> </message> + <message> + <location line="+8"/> + <source>(no amount)</source> + <translation type="unfinished"/> + </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>Bidali txanponak</translation> @@ -2133,7 +2187,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+115"/> + <location line="+164"/> <source>Send to multiple recipients at once</source> <translation>Bidali hainbat jasotzaileri batera</translation> </message> @@ -2143,7 +2197,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+20"/> + <location line="-23"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -2153,12 +2207,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+22"/> + <location line="+52"/> <source>Balance:</source> <translation>Saldoa:</translation> </message> <message> - <location line="+41"/> + <location line="-78"/> <source>Confirm the send action</source> <translation>Berretsi bidaltzeko ekintza</translation> </message> @@ -2168,7 +2222,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-228"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation>Berretsi txanponak bidaltzea</translation> </message> @@ -2181,12 +2235,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <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"/> + <location line="-121"/> <source>Copy quantity</source> <translation type="unfinished"/> </message> @@ -2236,7 +2285,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+202"/> + <location line="+203"/> <source>The recipient address is not valid, please recheck.</source> <translation type="unfinished"/> </message> @@ -2271,12 +2320,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Warning: Invalid Bitcoin address</source> <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+20"/> <source>(no label)</source> <translation>(etiketarik ez)</translation> </message> @@ -2286,7 +2335,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-366"/> + <location line="-367"/> <source>Are you sure you want to send?</source> <translation type="unfinished"/> </message> @@ -2296,7 +2345,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+170"/> + <location line="+171"/> <source>Payment request expired</source> <translation type="unfinished"/> </message> @@ -2373,12 +2422,7 @@ Address: %4 <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"/> + <location line="+968"/> <source>This is a verified payment request.</source> <translation type="unfinished"/> </message> @@ -2388,7 +2432,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+459"/> + <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"/> + </message> + <message> + <location line="+426"/> <source>This is an unverified payment request.</source> <translation type="unfinished"/> </message> @@ -2404,11 +2453,6 @@ Address: %4 <source>Memo:</source> <translation type="unfinished"/> </message> - <message> - <location filename="../sendcoinsentry.cpp" line="+1"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Sartu Bitocin helbide bat (adb.: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L) </translation> - </message> </context> <context> <name>ShutdownWindow</name> @@ -2446,19 +2490,19 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+10"/> - <location line="+213"/> + <location line="+7"/> + <location line="+210"/> <source>Choose previously used address</source> <translation type="unfinished"/> </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>Itsatsi helbidea arbeletik</translation> </message> @@ -2499,12 +2543,12 @@ Address: %4 </message> <message> <location line="+3"/> - <location line="+146"/> + <location line="+143"/> <source>Clear &All</source> <translation type="unfinished"/> </message> <message> - <location line="-87"/> + <location line="-84"/> <source>&Verify Message</source> <translation type="unfinished"/> </message> @@ -2519,7 +2563,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+40"/> + <location line="+37"/> <source>Verify the message to ensure it was signed with the specified Bitcoin address</source> <translation type="unfinished"/> </message> @@ -2534,43 +2578,37 @@ Address: %4 <translation type="unfinished"/> </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>Sartu Bitocin helbide bat (adb.: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L) </translation> </message> <message> - <location line="-2"/> + <location line="-1"/> <source>Click "Sign Message" to generate signature</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Enter Bitcoin signature</source> - <translation type="unfinished"/> - </message> - <message> <location line="+84"/> - <location line="+81"/> + <location line="+80"/> <source>The entered address is invalid.</source> <translation type="unfinished"/> </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 type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location line="-73"/> + <location line="-72"/> <source>Wallet unlock was cancelled.</source> <translation type="unfinished"/> </message> @@ -2590,7 +2628,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+59"/> + <location line="+58"/> <source>The signature could not be decoded.</source> <translation type="unfinished"/> </message> @@ -2651,6 +2689,11 @@ Address: %4 </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation type="unfinished"/> </message> @@ -2812,12 +2855,12 @@ Address: %4 <translation>, ez da arrakastaz emititu oraindik</translation> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation>ezezaguna</translation> </message> @@ -2858,12 +2901,12 @@ Address: %4 <translation>Kopurua</translation> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> @@ -2873,23 +2916,12 @@ Address: %4 <translation>Zabalik %1 arte</translation> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> - <translation>Offline (%1 konfirmazio)</translation> - </message> - <message> - <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-22"/> - <location line="+25"/> + <location line="+12"/> <source>Confirmed (%1 confirmations)</source> <translation>Konfirmatuta (%1 konfirmazio)</translation> </message> <message> - <location line="-22"/> + <location line="+9"/> <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> @@ -2899,7 +2931,27 @@ Address: %4 <translation>Sortua, baina ez onartua</translation> </message> <message> - <location line="+62"/> + <location line="-21"/> + <source>Offline</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Unconfirmed</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation>Jasoa honekin: </translation> </message> @@ -2929,7 +2981,7 @@ Address: %4 <translation>(n/a)</translation> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation>Transakzioaren egoera. Pasatu sagua gainetik konfirmazio kopurua ikusteko.</translation> </message> @@ -3195,12 +3247,12 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+223"/> <source>Usage:</source> <translation type="unfinished"/> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>List commands</source> <translation>Komandoen lista</translation> </message> @@ -3255,12 +3307,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation type="unfinished"/> </message> <message> - <location line="-148"/> + <location line="-150"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"/> </message> @@ -3280,17 +3332,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Run in the background as a daemon and accept commands</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <location line="+40"/> <source>Use the test network</source> <translation type="unfinished"/> </message> <message> - <location line="-118"/> + <location line="-120"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> @@ -3421,6 +3473,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation type="unfinished"/> </message> @@ -3631,6 +3688,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Start Bitcoin server</source> <translation type="unfinished"/> </message> @@ -3680,12 +3742,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-79"/> + <location line="-80"/> <source>Imports blocks from external blk000??.dat file</source> <translation type="unfinished"/> </message> <message> - <location line="-105"/> + <location line="-106"/> <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> @@ -3705,7 +3767,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+89"/> + <location line="+90"/> <source>Information</source> <translation type="unfinished"/> </message> @@ -3775,7 +3837,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+7"/> <source>System error: </source> <translation type="unfinished"/> </message> @@ -3821,6 +3883,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>version</source> <translation type="unfinished"/> </message> @@ -3830,32 +3897,32 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-58"/> + <location line="-60"/> <source>Password for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-70"/> + <location line="-71"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation type="unfinished"/> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+161"/> + <location line="+163"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"/> </message> <message> - <location line="-24"/> + <location line="-25"/> <source>Set key pool size to <n> (default: 100)</source> <translation type="unfinished"/> </message> @@ -3865,12 +3932,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+38"/> + <location line="+39"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-30"/> + <location line="-31"/> <source>Server certificate file (default: server.cert)</source> <translation type="unfinished"/> </message> @@ -3880,7 +3947,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+17"/> <source>This help message</source> <translation>Laguntza mezu hau</translation> </message> @@ -3890,12 +3957,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-107"/> + <location line="-109"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation type="unfinished"/> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Loading addresses...</source> <translation type="unfinished"/> </message> @@ -3910,12 +3977,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+98"/> + <location line="+99"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation type="unfinished"/> </message> <message> - <location line="-100"/> + <location line="-101"/> <source>Error loading wallet.dat</source> <translation type="unfinished"/> </message> @@ -3925,7 +3992,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+56"/> + <location line="+57"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation type="unfinished"/> </message> @@ -3935,7 +4002,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-101"/> + <location line="-103"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -3945,7 +4012,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+48"/> + <location line="+49"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation type="unfinished"/> </message> @@ -3965,7 +4032,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-62"/> + <location line="-63"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"/> </message> @@ -3975,12 +4042,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+95"/> + <location line="+96"/> <source>Loading wallet...</source> <translation type="unfinished"/> </message> <message> - <location line="-56"/> + <location line="-57"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> @@ -3990,7 +4057,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+67"/> + <location line="+68"/> <source>Rescanning...</source> <translation>Birbilatzen...</translation> </message> @@ -4000,17 +4067,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Zamaketa amaitua</translation> </message> <message> - <location line="+85"/> + <location line="+86"/> <source>To use the %s option</source> <translation type="unfinished"/> </message> <message> - <location line="-77"/> + <location line="-78"/> <source>Error</source> <translation type="unfinished"/> </message> <message> - <location line="-35"/> + <location line="-36"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_fa.ts b/src/qt/locale/bitcoin_fa.ts index 201b18d6b0..8feb80a61b 100644 --- a/src/qt/locale/bitcoin_fa.ts +++ b/src/qt/locale/bitcoin_fa.ts @@ -31,6 +31,12 @@ This product includes software developed by the OpenSSL Project for use in the O <source>The Bitcoin Core developers</source> <translation type="unfinished"/> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source> (%1-bit)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>AddressBookPage</name> @@ -612,6 +618,16 @@ This product includes software developed by the OpenSSL Project for use in the O <translation><numerusform>%n Ù‡Ùته</numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation type="unfinished"><numerusform></numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation>%1 عقب‌تر</translation> @@ -685,7 +701,7 @@ Address: %4 <translation>کی٠پول <b>رمزنگاری شده</b> است Ùˆ هم‌اکنون <b>Ù‚ÙÙ„</b> است</translation> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+435"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>یک خطای مهلک اتÙاق اÙتاده است. بیت‌کوین نمی‌تواند بدون مشکل به کار خود ادامه دهد Ùˆ بسته خواهد شد.</translation> </message> @@ -746,7 +762,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation type="unfinished"/> </message> @@ -761,7 +777,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation>مبلغ</translation> </message> @@ -912,7 +928,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation type="unfinished"/> </message> @@ -1094,7 +1110,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation> هسته Bitcoin </translation> </message> @@ -1238,7 +1254,7 @@ Address: %4 <translation>&عمومی</translation> </message> <message> - <location line="+6"/> + <location line="+122"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation>کارمزد اختیاری٠هر کیلوبایت برای انتقال سریع‌تر تراکنش. اکثر تراکنش‌ها Û± کیلوبایتی هستند.</translation> </message> @@ -1248,7 +1264,7 @@ Address: %4 <translation>پرداخت &کارمزد تراکنش</translation> </message> <message> - <location line="+31"/> + <location line="-131"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation>اجرای خودکار بیت‌کوین در زمان ورود به سیستم.</translation> </message> @@ -1263,12 +1279,7 @@ Address: %4 <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"/> + <location line="+16"/> <source>MB</source> <translation type="unfinished"/> </message> @@ -1283,7 +1294,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+58"/> + <location line="+107"/> + <source>&Spend unconfirmed change (experts only)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+37"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation type="unfinished"/> </message> @@ -1318,7 +1334,17 @@ Address: %4 <translation>&شبکه</translation> </message> <message> - <location line="+6"/> + <location line="-86"/> + <source>W&allet</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+52"/> + <source>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.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+40"/> <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> @@ -1433,17 +1459,17 @@ Address: %4 <translation>&لغو</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+70"/> <source>default</source> <translation>پیش‌Ùرض</translation> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation type="unfinished"/> </message> <message> - <location line="+75"/> + <location line="+78"/> <source>Confirm options reset</source> <translation>تأیید٠بازنشانی گزینه‌ها</translation> </message> @@ -1483,19 +1509,14 @@ Address: %4 <translation>اطلاعات نمایش‌داده شده ممکن است قدیمی باشند. بعد از این Ú©Ù‡ یک اتصال با شبکه برقرار شد، کی٠پول شما به‌صورت خودکار با شبکهٔ بیت‌کوین همگام‌سازی می‌شود. اما این روند هنوز کامل نشده است.</translation> </message> <message> - <location line="-155"/> - <source>Unconfirmed:</source> - <translation>تأیید نشده:</translation> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation>کی٠پول</translation> </message> <message> <location line="+51"/> - <source>Confirmed:</source> - <translation>تأیید شده:</translation> + <source>Available:</source> + <translation type="unfinished"/> </message> <message> <location line="+16"/> @@ -1503,7 +1524,12 @@ Address: %4 <translation>تراز علی‌الØساب شما</translation> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation>مجموع تراکنش‌هایی Ú©Ù‡ هنوز تأیید نشده‌اند؛ Ùˆ هنوز روی تراز علی‌الØساب اعمال نشده‌اند</translation> </message> @@ -1651,6 +1677,11 @@ Address: %4 <source>Error: Invalid combination of -regtest and -testnet.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../guiutil.cpp" line="+82"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>یک آدرس بیت‌کوین وارد کنید (مثلاً 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> </context> <context> <name>QRImageWidget</name> @@ -1871,22 +1902,22 @@ Address: %4 <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+83"/> + <location filename="../forms/receivecoinsdialog.ui" line="+107"/> <source>&Amount:</source> <translation type="unfinished"/> </message> <message> - <location line="-13"/> + <location line="-16"/> <source>&Label:</source> <translation>&برچسب:</translation> </message> <message> - <location line="-34"/> + <location line="-37"/> <source>&Message:</source> <translation type="unfinished"/> </message> <message> - <location line="-17"/> + <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"/> </message> @@ -1896,27 +1927,30 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+27"/> - <source>An optional 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"/> </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> + <location line="-7"/> + <location line="+21"/> + <source>An optional label to associate with the new receiving address.</source> <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="-7"/> <source>Use this form to request payments. All fields are <b>optional</b>.</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <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"/> </message> <message> - <location line="+17"/> + <location line="+32"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -1926,17 +1960,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+36"/> - <source>&Request payment</source> + <location line="+78"/> + <source>Requested payments history</source> <translation type="unfinished"/> </message> <message> - <location line="+47"/> - <source>Requested payments</source> + <location line="-98"/> + <source>&Request payment</source> <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+120"/> <source>Show the selected request (does the same as double clicking an entry)</source> <translation type="unfinished"/> </message> @@ -1955,6 +1989,21 @@ Address: %4 <source>Remove</source> <translation type="unfinished"/> </message> + <message> + <location filename="../receivecoinsdialog.cpp" line="+38"/> + <source>Copy label</source> + <translation>Ú©Ù¾ÛŒ برچسب</translation> + </message> + <message> + <location line="+1"/> + <source>Copy message</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation>Ú©Ù¾ÛŒ مقدار</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -2056,12 +2105,17 @@ Address: %4 <source>(no message)</source> <translation type="unfinished"/> </message> + <message> + <location line="+8"/> + <source>(no amount)</source> + <translation type="unfinished"/> + </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>ارسال سکه</translation> @@ -2137,7 +2191,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+115"/> + <location line="+164"/> <source>Send to multiple recipients at once</source> <translation>ارسال به چند دریاÙت‌کنندهٔ به‌طور همزمان</translation> </message> @@ -2147,7 +2201,7 @@ Address: %4 <translation>&دریاÙت‌کنندهٔ جدید</translation> </message> <message> - <location line="+20"/> + <location line="-23"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -2157,12 +2211,12 @@ Address: %4 <translation>پاکسازی &همه</translation> </message> <message> - <location line="+22"/> + <location line="+52"/> <source>Balance:</source> <translation>تزار:</translation> </message> <message> - <location line="+41"/> + <location line="-78"/> <source>Confirm the send action</source> <translation>عملیات ارسال را تأیید کنید</translation> </message> @@ -2172,7 +2226,7 @@ Address: %4 <translation>&ارسال</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-228"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation>ارسال سکه را تأیید کنید</translation> </message> @@ -2185,12 +2239,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-136"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>یک آدرس بیت‌کوین وارد کنید (مثلاً 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> - <message> - <location line="+15"/> + <location line="-121"/> <source>Copy quantity</source> <translation type="unfinished"/> </message> @@ -2240,7 +2289,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+202"/> + <location line="+203"/> <source>The recipient address is not valid, please recheck.</source> <translation>نشانی گیرنده معتبر نیست؛ لطÙا دوباره بررسی کنید.</translation> </message> @@ -2275,12 +2324,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Warning: Invalid Bitcoin address</source> <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+20"/> <source>(no label)</source> <translation>(بدون برچسب)</translation> </message> @@ -2290,7 +2339,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-366"/> + <location line="-367"/> <source>Are you sure you want to send?</source> <translation type="unfinished"/> </message> @@ -2300,7 +2349,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+170"/> + <location line="+171"/> <source>Payment request expired</source> <translation type="unfinished"/> </message> @@ -2377,12 +2426,7 @@ Address: %4 <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"/> + <location line="+968"/> <source>This is a verified payment request.</source> <translation type="unfinished"/> </message> @@ -2392,7 +2436,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+459"/> + <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"/> + </message> + <message> + <location line="+426"/> <source>This is an unverified payment request.</source> <translation type="unfinished"/> </message> @@ -2408,11 +2457,6 @@ Address: %4 <source>Memo:</source> <translation type="unfinished"/> </message> - <message> - <location filename="../sendcoinsentry.cpp" line="+1"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>یک آدرس بیت‌کوین وارد کنید (مثلاً 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> </context> <context> <name>ShutdownWindow</name> @@ -2450,19 +2494,19 @@ Address: %4 <translation>نشانی مورد استÙاده برای امضا کردن پیام (برای مثال 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"/> </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>چسباندن نشانی از ØاÙظهٔ سیستم</translation> </message> @@ -2503,12 +2547,12 @@ Address: %4 </message> <message> <location line="+3"/> - <location line="+146"/> + <location line="+143"/> <source>Clear &All</source> <translation>پاک &کردن همه</translation> </message> <message> - <location line="-87"/> + <location line="-84"/> <source>&Verify Message</source> <translation>&شناسایی پیام</translation> </message> @@ -2523,7 +2567,7 @@ Address: %4 <translation>نشانی مورد استÙاده برای امضا کردن پیام (برای مثال 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>برای Øصول اطمینان از اینکه پیام با نشانی بیت‌کوین مشخص شده امضا است یا خیر، پیام را شناسایی کنید</translation> </message> @@ -2538,43 +2582,37 @@ Address: %4 <translation>بازنشانی تمام Ùیلدهای پیام</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>یک نشانی بیت‌کوین وارد کنید (مثلاً 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location line="-2"/> + <location line="-1"/> <source>Click "Sign Message" to generate signature</source> <translation>برای ایجاد یک امضای جدید روی «امضای پیام» کلیک کنید</translation> </message> <message> - <location line="+3"/> - <source>Enter Bitcoin signature</source> - <translation>امضای بیت‌کوین را وارد کنید</translation> - </message> - <message> <location line="+84"/> - <location line="+81"/> + <location line="+80"/> <source>The entered address is invalid.</source> <translation>نشانی وارد شده نامعتبر است.</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>لطÙاً نشانی را بررسی کنید Ùˆ دوباره تلاش کنید.</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>نشانی وارد شده به هیچ کلیدی اشاره نمی‌کند.</translation> </message> <message> - <location line="-73"/> + <location line="-72"/> <source>Wallet unlock was cancelled.</source> <translation>عملیات باز کرن Ù‚ÙÙ„ کی٠پول لغو شد.</translation> </message> @@ -2594,7 +2632,7 @@ Address: %4 <translation>پیام امضا شد.</translation> </message> <message> - <location line="+59"/> + <location line="+58"/> <source>The signature could not be decoded.</source> <translation>امضا نمی‌تواند کدگشایی شود.</translation> </message> @@ -2655,6 +2693,11 @@ Address: %4 </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation>%1/Ø¢Ùلاین</translation> </message> @@ -2816,12 +2859,12 @@ Address: %4 <translation>ØŒ هنوز با موÙقیت ارسال نشده</translation> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <source>Open for %n more block(s)</source> <translation><numerusform>باز برای %n بلوک دیگر</numerusform></translation> </message> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation>ناشناس</translation> </message> @@ -2862,12 +2905,12 @@ Address: %4 <translation>مبلغ</translation> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <source>Open for %n more block(s)</source> <translation><numerusform>باز برای %n بلوک دیگر</numerusform></translation> </message> @@ -2877,23 +2920,12 @@ Address: %4 <translation>باز شده تا %1</translation> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> - <translation>Ø¢Ùلاین (%1 تأییدیه)</translation> - </message> - <message> - <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation>تأیید نشده (%1 از %2 تأییدیه)</translation> - </message> - <message> - <location line="-22"/> - <location line="+25"/> + <location line="+12"/> <source>Confirmed (%1 confirmations)</source> <translation>تأیید شده (%1 تأییدیه)</translation> </message> <message> - <location line="-22"/> + <location line="+9"/> <source>This block was not received by any other nodes and will probably not be accepted!</source> <translation>این بلوک از هیچ همتای دیگری دریاÙت نشده است Ùˆ اØتمال می‌رود پذیرÙته نشود!</translation> </message> @@ -2903,7 +2935,27 @@ Address: %4 <translation>تولید شده ولی قبول نشده</translation> </message> <message> - <location line="+62"/> + <location line="-21"/> + <source>Offline</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Unconfirmed</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation>دریاÙت‌شده با</translation> </message> @@ -2933,7 +2985,7 @@ Address: %4 <translation>(ناموجود)</translation> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation>وضعیت تراکنش. نشانگر را روی این Ùیلد Ù†Ú¯Ù‡ دارید تا تعداد تأییدیه‌ها نشان داده شود.</translation> </message> @@ -3199,12 +3251,12 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+223"/> <source>Usage:</source> <translation>استÙاده:</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>List commands</source> <translation>نمایش لیست Ùرمان‌ها</translation> </message> @@ -3259,12 +3311,12 @@ Address: %4 <translation>آدرس عمومی خود را مشخص کنید</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation>Øد آستانه برای قطع ارتباط با همتایان بدرÙتار (پیش‌Ùرض: Û±Û°Û°)</translation> </message> <message> - <location line="-148"/> + <location line="-150"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>مدت زمان جلوگیری از اتصال مجدد همتایان بدرÙتار، به ثانیه (پیش‌Ùرض: Û¸Û´Û¶Û°Û°)</translation> </message> @@ -3284,17 +3336,17 @@ Address: %4 <translation>پذیرش دستورات خط Ùرمان Ùˆ دستورات JSON-RPC</translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Run in the background as a daemon and accept commands</source> <translation>اجرا در پشت زمینه به‌صورت یک سرویس Ùˆ پذیرش دستورات</translation> </message> <message> - <location line="+39"/> + <location line="+40"/> <source>Use the test network</source> <translation>استÙاده از شبکهٔ آزمایش</translation> </message> <message> - <location line="-118"/> + <location line="-120"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>پذیرش اتصالات از بیرون (پیش Ùرض:1 بدون پراکسی یا اتصال)</translation> </message> @@ -3425,6 +3477,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation>تنها در گره (های) مشخص شده متصل شوید</translation> </message> @@ -3635,6 +3692,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Start Bitcoin server</source> <translation type="unfinished"/> </message> @@ -3684,12 +3746,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-79"/> + <location line="-80"/> <source>Imports blocks from external blk000??.dat file</source> <translation type="unfinished"/> </message> <message> - <location line="-105"/> + <location line="-106"/> <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> @@ -3709,7 +3771,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+89"/> + <location line="+90"/> <source>Information</source> <translation>اطلاعات</translation> </message> @@ -3779,7 +3841,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>(میلی ثانیه )Ùاصله ارتباط خاص</translation> </message> <message> - <location line="+6"/> + <location line="+7"/> <source>System error: </source> <translation>خطای سامانه</translation> </message> @@ -3825,6 +3887,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>version</source> <translation>نسخه</translation> </message> @@ -3834,32 +3901,32 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-58"/> + <location line="-60"/> <source>Password for JSON-RPC connections</source> <translation>JSON-RPC عبارت عبور برای ارتباطات</translation> </message> <message> - <location line="-70"/> + <location line="-71"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>از آدرس Ø¢ÛŒ Ù¾ÛŒ خاص JSON-RPC قبول ارتباطات</translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>(127.0.0.1پیش Ùرض: ) &lt;ip&gt; دادن Ùرمانها برای استÙاده گره ها روی</translation> </message> <message> - <location line="-132"/> + <location line="-133"/> <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="+161"/> + <location line="+163"/> <source>Upgrade wallet to latest format</source> <translation>wallet را به جدیدترین Ùرمت روزآمد کنید</translation> </message> <message> - <location line="-24"/> + <location line="-25"/> <source>Set key pool size to <n> (default: 100)</source> <translation> (100پیش Ùرض:)&lt;n&gt; گذاشتن اندازه کلید روی </translation> </message> @@ -3869,12 +3936,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>اسکان مجدد زنجیر بلوکها برای Ú¯Ù… والت معامله</translation> </message> <message> - <location line="+38"/> + <location line="+39"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>JSON-RPCبرای ارتباطات استÙاده کنید OpenSSL (https)</translation> </message> <message> - <location line="-30"/> + <location line="-31"/> <source>Server certificate file (default: server.cert)</source> <translation> (server.certپیش Ùرض: )گواهی نامه سرور</translation> </message> @@ -3884,7 +3951,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>(server.pemپیش Ùرض: ) کلید خصوصی سرور</translation> </message> <message> - <location line="+16"/> + <location line="+17"/> <source>This help message</source> <translation>پیام Ú©Ù…Ú©ÛŒ</translation> </message> @@ -3894,12 +3961,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>امکان اتصال به %s از این رایانه وجود ندارد ( bind returned error %d, %s)</translation> </message> <message> - <location line="-107"/> + <location line="-109"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>به DNS اجازه بده تا برای addnode ØŒ seednode Ùˆ اتصال جستجو کند</translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Loading addresses...</source> <translation>بار گیری آدرس ها</translation> </message> @@ -3914,12 +3981,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>خطا در بارگیری wallet.dat: کی٠پول به ویرایش جدیدتری از Biticon نیاز دارد</translation> </message> <message> - <location line="+98"/> + <location line="+99"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>سلام</translation> </message> <message> - <location line="-100"/> + <location line="-101"/> <source>Error loading wallet.dat</source> <translation>خطا در بارگیری wallet.dat</translation> </message> @@ -3929,7 +3996,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>آدرس پراکسی اشتباه %s</translation> </message> <message> - <location line="+56"/> + <location line="+57"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>شبکه مشخص شده غیرقابل شناسایی در onlynet: '%s'</translation> </message> @@ -3939,7 +4006,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>نسخه پراکسی ساکس غیرقابل شناسایی درخواست شده است: %i</translation> </message> <message> - <location line="-101"/> + <location line="-103"/> <source>Cannot resolve -bind address: '%s'</source> <translation>آدرس قابل اتصال- شناسایی نیست %s</translation> </message> @@ -3949,7 +4016,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>آدرس خارجی قابل اتصال- شناسایی نیست %s</translation> </message> <message> - <location line="+48"/> + <location line="+49"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>میزان وجه اشتباه برای paytxfee=<میزان وجه>: %s</translation> </message> @@ -3969,7 +4036,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>بار گیری شاخص بلوک</translation> </message> <message> - <location line="-62"/> + <location line="-63"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>به اتصال یک گره اضاÙÙ‡ کنید Ùˆ اتصال را باز نگاه دارید</translation> </message> @@ -3979,12 +4046,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>اتصال به %s از این رایانه امکان پذیر نیست. Bitcoin اØتمالا در Øال اجراست.</translation> </message> <message> - <location line="+95"/> + <location line="+96"/> <source>Loading wallet...</source> <translation>بار گیری والت</translation> </message> <message> - <location line="-56"/> + <location line="-57"/> <source>Cannot downgrade wallet</source> <translation>امکان تنزل نسخه در wallet وجود ندارد</translation> </message> @@ -3994,7 +4061,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>آدرس پیش Ùرض قابل ذخیره نیست</translation> </message> <message> - <location line="+67"/> + <location line="+68"/> <source>Rescanning...</source> <translation>اسکان مجدد</translation> </message> @@ -4004,17 +4071,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>بار گیری انجام شده است</translation> </message> <message> - <location line="+85"/> + <location line="+86"/> <source>To use the %s option</source> <translation>برای استÙاده از %s از انتخابات</translation> </message> <message> - <location line="-77"/> + <location line="-78"/> <source>Error</source> <translation>خطا</translation> </message> <message> - <location line="-35"/> + <location line="-36"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_fa_IR.ts b/src/qt/locale/bitcoin_fa_IR.ts index fe547113d9..bd2c9a9ca3 100644 --- a/src/qt/locale/bitcoin_fa_IR.ts +++ b/src/qt/locale/bitcoin_fa_IR.ts @@ -31,6 +31,12 @@ This product includes software developed by the OpenSSL Project for use in the O <source>The Bitcoin Core developers</source> <translation type="unfinished"/> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source> (%1-bit)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>AddressBookPage</name> @@ -613,6 +619,16 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation type="unfinished"><numerusform></numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation type="unfinished"/> @@ -683,7 +699,7 @@ Address: %4 <translation>wallet رمزگذاری شد Ùˆ در Øال Øاضر Ù‚ÙÙ„ است</translation> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+435"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -744,7 +760,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation type="unfinished"/> </message> @@ -759,7 +775,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation>میزان</translation> </message> @@ -910,7 +926,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation type="unfinished"/> </message> @@ -1093,7 +1109,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation type="unfinished"/> </message> @@ -1237,7 +1253,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+122"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation type="unfinished"/> </message> @@ -1247,7 +1263,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="-131"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation type="unfinished"/> </message> @@ -1262,12 +1278,7 @@ Address: %4 <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"/> + <location line="+16"/> <source>MB</source> <translation type="unfinished"/> </message> @@ -1282,7 +1293,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+58"/> + <location line="+107"/> + <source>&Spend unconfirmed change (experts only)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+37"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation type="unfinished"/> </message> @@ -1317,7 +1333,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="-86"/> + <source>W&allet</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+52"/> + <source>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.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+40"/> <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> @@ -1432,17 +1458,17 @@ Address: %4 <translation>Ùˆ رد</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+70"/> <source>default</source> <translation>پیش Ùرض</translation> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation type="unfinished"/> </message> <message> - <location line="+75"/> + <location line="+78"/> <source>Confirm options reset</source> <translation type="unfinished"/> </message> @@ -1482,18 +1508,13 @@ Address: %4 <translation>اطلاعات نمایش داده شده ممکن است روزآمد نباشد. wallet شما به صورت خودکار بعد از برقراری اتصال با شبکه bitcoin به روز Ù…ÛŒ شود اما این Ùرایند هنوز تکمیل نشده است.</translation> </message> <message> - <location line="-155"/> - <source>Unconfirmed:</source> - <translation>تایید نشده</translation> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation>کی٠پول</translation> </message> <message> <location line="+51"/> - <source>Confirmed:</source> + <source>Available:</source> <translation type="unfinished"/> </message> <message> @@ -1502,7 +1523,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation type="unfinished"/> </message> @@ -1650,6 +1676,11 @@ Address: %4 <source>Error: Invalid combination of -regtest and -testnet.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../guiutil.cpp" line="+82"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>یک آدرس bitcoin وارد کنید (مثال 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> </context> <context> <name>QRImageWidget</name> @@ -1870,22 +1901,22 @@ Address: %4 <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+83"/> + <location filename="../forms/receivecoinsdialog.ui" line="+107"/> <source>&Amount:</source> <translation type="unfinished"/> </message> <message> - <location line="-13"/> + <location line="-16"/> <source>&Label:</source> <translation>Ùˆ برچسب</translation> </message> <message> - <location line="-34"/> + <location line="-37"/> <source>&Message:</source> <translation type="unfinished"/> </message> <message> - <location line="-17"/> + <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"/> </message> @@ -1895,27 +1926,30 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+27"/> - <source>An optional 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"/> </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> + <location line="-7"/> + <location line="+21"/> + <source>An optional label to associate with the new receiving address.</source> <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="-7"/> <source>Use this form to request payments. All fields are <b>optional</b>.</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <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"/> </message> <message> - <location line="+17"/> + <location line="+32"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -1925,17 +1959,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+36"/> - <source>&Request payment</source> + <location line="+78"/> + <source>Requested payments history</source> <translation type="unfinished"/> </message> <message> - <location line="+47"/> - <source>Requested payments</source> + <location line="-98"/> + <source>&Request payment</source> <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+120"/> <source>Show the selected request (does the same as double clicking an entry)</source> <translation type="unfinished"/> </message> @@ -1954,6 +1988,21 @@ Address: %4 <source>Remove</source> <translation type="unfinished"/> </message> + <message> + <location filename="../receivecoinsdialog.cpp" line="+38"/> + <source>Copy label</source> + <translation>برچسب را Ú©Ù¾ÛŒ کنید</translation> + </message> + <message> + <location line="+1"/> + <source>Copy message</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation>میزان وجه Ú©Ù¾ÛŒ شود</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -2055,12 +2104,17 @@ Address: %4 <source>(no message)</source> <translation type="unfinished"/> </message> + <message> + <location line="+8"/> + <source>(no amount)</source> + <translation type="unfinished"/> + </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>سکه های ارسالی</translation> @@ -2136,7 +2190,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+115"/> + <location line="+164"/> <source>Send to multiple recipients at once</source> <translation>ارسال همزمان به گیرنده های متعدد</translation> </message> @@ -2146,7 +2200,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+20"/> + <location line="-23"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -2156,12 +2210,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+22"/> + <location line="+52"/> <source>Balance:</source> <translation>مانده Øساب:</translation> </message> <message> - <location line="+41"/> + <location line="-78"/> <source>Confirm the send action</source> <translation>تایید عملیات ارسال </translation> </message> @@ -2171,7 +2225,7 @@ Address: %4 <translation>Ùˆ ارسال</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-228"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation>تایید ارسال بیت کوین ها</translation> </message> @@ -2184,12 +2238,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-136"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>یک آدرس bitcoin وارد کنید (مثال 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> - <message> - <location line="+15"/> + <location line="-121"/> <source>Copy quantity</source> <translation type="unfinished"/> </message> @@ -2239,7 +2288,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+202"/> + <location line="+203"/> <source>The recipient address is not valid, please recheck.</source> <translation type="unfinished"/> </message> @@ -2274,12 +2323,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Warning: Invalid Bitcoin address</source> <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+20"/> <source>(no label)</source> <translation>(برچسب ندارد)</translation> </message> @@ -2289,7 +2338,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-366"/> + <location line="-367"/> <source>Are you sure you want to send?</source> <translation type="unfinished"/> </message> @@ -2299,7 +2348,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+170"/> + <location line="+171"/> <source>Payment request expired</source> <translation type="unfinished"/> </message> @@ -2376,12 +2425,7 @@ Address: %4 <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"/> + <location line="+968"/> <source>This is a verified payment request.</source> <translation type="unfinished"/> </message> @@ -2391,7 +2435,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+459"/> + <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"/> + </message> + <message> + <location line="+426"/> <source>This is an unverified payment request.</source> <translation type="unfinished"/> </message> @@ -2407,11 +2456,6 @@ Address: %4 <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> @@ -2449,19 +2493,19 @@ Address: %4 <translation>یک آدرس bitcoin وارد کنید (مثال 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"/> </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>آدرس را بر کلیپ بورد Ú©Ù¾ÛŒ کنید</translation> </message> @@ -2502,12 +2546,12 @@ Address: %4 </message> <message> <location line="+3"/> - <location line="+146"/> + <location line="+143"/> <source>Clear &All</source> <translation type="unfinished"/> </message> <message> - <location line="-87"/> + <location line="-84"/> <source>&Verify Message</source> <translation type="unfinished"/> </message> @@ -2522,7 +2566,7 @@ Address: %4 <translation>یک آدرس bitcoin وارد کنید (مثال 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 type="unfinished"/> </message> @@ -2537,43 +2581,37 @@ Address: %4 <translation type="unfinished"/> </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>یک آدرس bitcoin وارد کنید (مثال 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location line="-2"/> + <location line="-1"/> <source>Click "Sign Message" to generate signature</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Enter Bitcoin signature</source> - <translation type="unfinished"/> - </message> - <message> <location line="+84"/> - <location line="+81"/> + <location line="+80"/> <source>The entered address is invalid.</source> <translation type="unfinished"/> </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 type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location line="-73"/> + <location line="-72"/> <source>Wallet unlock was cancelled.</source> <translation type="unfinished"/> </message> @@ -2593,7 +2631,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+59"/> + <location line="+58"/> <source>The signature could not be decoded.</source> <translation type="unfinished"/> </message> @@ -2654,6 +2692,11 @@ Address: %4 </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation type="unfinished"/> </message> @@ -2815,12 +2858,12 @@ Address: %4 <translation>ØŒ هنوز با موÙقیت ارسال نگردیده است</translation> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation>ناشناس</translation> </message> @@ -2861,12 +2904,12 @@ Address: %4 <translation>میزان وجه</translation> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform></translation> </message> @@ -2876,23 +2919,12 @@ Address: %4 <translation>باز Ú©Ù† تا %1</translation> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> - <translation>برون خطی (%1 تاییدها)</translation> - </message> - <message> - <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation>تایید نشده (%1 از %2 تاییدها)</translation> - </message> - <message> - <location line="-22"/> - <location line="+25"/> + <location line="+12"/> <source>Confirmed (%1 confirmations)</source> <translation>تایید شده (%1 تاییدها)</translation> </message> <message> - <location line="-22"/> + <location line="+9"/> <source>This block was not received by any other nodes and will probably not be accepted!</source> <translation>این block توسط گره های دیگری دریاÙت نشده است Ùˆ ممکن است قبول نشود</translation> </message> @@ -2902,7 +2934,27 @@ Address: %4 <translation>تولید شده اما قبول نشده است</translation> </message> <message> - <location line="+62"/> + <location line="-21"/> + <source>Offline</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Unconfirmed</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation>قبول با </translation> </message> @@ -2932,7 +2984,7 @@ Address: %4 <translation>خالی</translation> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation>وضعیت تراکنش. با اشاره به این بخش تعداد تاییدها نمایش داده Ù…ÛŒ شود</translation> </message> @@ -3198,12 +3250,12 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+223"/> <source>Usage:</source> <translation>میزان استÙاده:</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>List commands</source> <translation>Ùهرست دستورها</translation> </message> @@ -3258,12 +3310,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation>آستانه قطع برای قرینه سازی اشتباه (پیش Ùرض:100)</translation> </message> <message> - <location line="-148"/> + <location line="-150"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>تعداد ثانیه ها برای اتصال دوباره قرینه های اشتباه (پیش Ùرض:86400)</translation> </message> @@ -3283,17 +3335,17 @@ Address: %4 <translation>command line Ùˆ JSON-RPC commands را قبول کنید</translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Run in the background as a daemon and accept commands</source> <translation>به عنوان daemon بک گراند را اجرا کنید Ùˆ دستورات را قبول نمایید</translation> </message> <message> - <location line="+39"/> + <location line="+40"/> <source>Use the test network</source> <translation>از تست٠شبکه استÙاده نمایید</translation> </message> <message> - <location line="-118"/> + <location line="-120"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> @@ -3424,6 +3476,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation type="unfinished"/> </message> @@ -3634,6 +3691,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Start Bitcoin server</source> <translation type="unfinished"/> </message> @@ -3683,12 +3745,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-79"/> + <location line="-80"/> <source>Imports blocks from external blk000??.dat file</source> <translation type="unfinished"/> </message> <message> - <location line="-105"/> + <location line="-106"/> <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> @@ -3708,7 +3770,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+89"/> + <location line="+90"/> <source>Information</source> <translation type="unfinished"/> </message> @@ -3778,7 +3840,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>تعیین مدت زمان وقÙÙ‡ (time out) به هزارم ثانیه</translation> </message> <message> - <location line="+6"/> + <location line="+7"/> <source>System error: </source> <translation type="unfinished"/> </message> @@ -3824,6 +3886,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>version</source> <translation>نسخه</translation> </message> @@ -3833,32 +3900,32 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-58"/> + <location line="-60"/> <source>Password for JSON-RPC connections</source> <translation>رمز برای ارتباطات٠JSON-RPC</translation> </message> <message> - <location line="-70"/> + <location line="-71"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>ارتباطات٠JSON-RPC را از آدرس Ø¢ÛŒ.Ù¾ÛŒ. مشخصی برقرار کنید.</translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>دستورات را به گره اجرا شده در<ip> ارسال کنید (پیش Ùرض:127.0.0.1)</translation> </message> <message> - <location line="-132"/> + <location line="-133"/> <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="+161"/> + <location line="+163"/> <source>Upgrade wallet to latest format</source> <translation>wallet را به جدیدترین نسخه روزآمد کنید</translation> </message> <message> - <location line="-24"/> + <location line="-25"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Øجم key pool را به اندازه <n> تنظیم کنید (پیش Ùرض:100)</translation> </message> @@ -3868,12 +3935,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>زنجیره بلاک را برای تراکنش جا اÙتاده در WALLET دوباره اسکن کنید</translation> </message> <message> - <location line="+38"/> + <location line="+39"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>برای ارتباطات٠JSON-RPC از OpenSSL (https) استÙاده کنید</translation> </message> <message> - <location line="-30"/> + <location line="-31"/> <source>Server certificate file (default: server.cert)</source> <translation>Ùایل certificate سرور (پیش Ùرض server.cert)</translation> </message> @@ -3883,7 +3950,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>رمز اختصاصی سرور (پیش Ùرض: server.pem)</translation> </message> <message> - <location line="+16"/> + <location line="+17"/> <source>This help message</source> <translation>این پیام راهنما</translation> </message> @@ -3893,12 +3960,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-107"/> + <location line="-109"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation type="unfinished"/> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Loading addresses...</source> <translation>لود شدن آدرسها..</translation> </message> @@ -3913,12 +3980,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>خطا در هنگام لود شدن wallet.dat. به نسخه جدید Bitocin برای wallet نیاز است.</translation> </message> <message> - <location line="+98"/> + <location line="+99"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>wallet نیاز به بازنویسی دارد. Bitcoin را برای تکمیل عملیات دوباره اجرا کنید.</translation> </message> <message> - <location line="-100"/> + <location line="-101"/> <source>Error loading wallet.dat</source> <translation>خطا در هنگام لود شدن wallet.dat</translation> </message> @@ -3928,7 +3995,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+56"/> + <location line="+57"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation type="unfinished"/> </message> @@ -3938,7 +4005,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-101"/> + <location line="-103"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -3948,7 +4015,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+48"/> + <location line="+49"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>میزان اشتباه است for -paytxfee=<amount>: '%s'</translation> </message> @@ -3968,7 +4035,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>لود شدن نمایه بلاکها..</translation> </message> <message> - <location line="-62"/> + <location line="-63"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>یک گره برای اتصال اضاÙÙ‡ کنید Ùˆ تلاش کنید تا اتصال را باز نگاه دارید</translation> </message> @@ -3978,12 +4045,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+95"/> + <location line="+96"/> <source>Loading wallet...</source> <translation>wallet در Øال لود شدن است...</translation> </message> <message> - <location line="-56"/> + <location line="-57"/> <source>Cannot downgrade wallet</source> <translation>قابلیت برگشت به نسخه قبلی برای wallet امکان پذیر نیست</translation> </message> @@ -3993,7 +4060,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>آدرس پیش Ùرض قابل ذخیره نیست</translation> </message> <message> - <location line="+67"/> + <location line="+68"/> <source>Rescanning...</source> <translation>اسکن٠دوباره...</translation> </message> @@ -4003,17 +4070,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>اتمام لود شدن</translation> </message> <message> - <location line="+85"/> + <location line="+86"/> <source>To use the %s option</source> <translation>برای استÙاده از %s از اختیارات</translation> </message> <message> - <location line="-77"/> + <location line="-78"/> <source>Error</source> <translation>خطا</translation> </message> <message> - <location line="-35"/> + <location line="-36"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_fi.ts b/src/qt/locale/bitcoin_fi.ts index 2006db509d..0b4bb7e822 100644 --- a/src/qt/locale/bitcoin_fi.ts +++ b/src/qt/locale/bitcoin_fi.ts @@ -37,6 +37,12 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o <source>The Bitcoin Core developers</source> <translation type="unfinished"/> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source> (%1-bit)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>AddressBookPage</name> @@ -618,6 +624,16 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o <translation><numerusform>%n viikko</numerusform><numerusform>%n viikkoa</numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation type="unfinished"/> @@ -690,7 +706,7 @@ Osoite: %4</translation> <translation>Lompakko on <b>salattu</b> ja tällä hetkellä <b>lukittuna</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+435"/> <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> @@ -751,7 +767,7 @@ Osoite: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation type="unfinished"/> </message> @@ -766,7 +782,7 @@ Osoite: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation>Määrä</translation> </message> @@ -917,7 +933,7 @@ Osoite: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation type="unfinished"/> </message> @@ -1099,7 +1115,7 @@ Osoite: %4</translation> <translation type="unfinished"/> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation>Bitcoin-ydin</translation> </message> @@ -1243,7 +1259,7 @@ Osoite: %4</translation> <translation>&Yleiset</translation> </message> <message> - <location line="+6"/> + <location line="+122"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation type="unfinished"/> </message> @@ -1253,7 +1269,7 @@ Osoite: %4</translation> <translation>Maksa rahansiirtopalkkio</translation> </message> <message> - <location line="+31"/> + <location line="-131"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation>Käynnistä Bitcoin kirjautumisen yhteydessä.</translation> </message> @@ -1268,12 +1284,7 @@ Osoite: %4</translation> <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"/> + <location line="+16"/> <source>MB</source> <translation type="unfinished"/> </message> @@ -1288,7 +1299,12 @@ Osoite: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+58"/> + <location line="+107"/> + <source>&Spend unconfirmed change (experts only)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+37"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation type="unfinished"/> </message> @@ -1323,7 +1339,17 @@ Osoite: %4</translation> <translation>&Verkko</translation> </message> <message> - <location line="+6"/> + <location line="-86"/> + <source>W&allet</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+52"/> + <source>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.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+40"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>Avaa Bitcoin-asiakasohjelman portti reitittimellä automaattisesti. Tämä toimii vain, jos reitittimesi tukee UPnP:tä ja se on käytössä.</translation> </message> @@ -1438,17 +1464,17 @@ Osoite: %4</translation> <translation>&Peruuta</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+70"/> <source>default</source> <translation>oletus</translation> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation type="unfinished"/> </message> <message> - <location line="+75"/> + <location line="+78"/> <source>Confirm options reset</source> <translation type="unfinished"/> </message> @@ -1488,19 +1514,14 @@ Osoite: %4</translation> <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="-155"/> - <source>Unconfirmed:</source> - <translation>Vahvistamatta:</translation> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation>Lompakko</translation> </message> <message> <location line="+51"/> - <source>Confirmed:</source> - <translation>Vahvistettu</translation> + <source>Available:</source> + <translation type="unfinished"/> </message> <message> <location line="+16"/> @@ -1508,7 +1529,12 @@ Osoite: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation type="unfinished"/> </message> @@ -1656,6 +1682,11 @@ Osoite: %4</translation> <source>Error: Invalid combination of -regtest and -testnet.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../guiutil.cpp" line="+82"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>Anna Bitcoin-osoite (esim. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> </context> <context> <name>QRImageWidget</name> @@ -1876,22 +1907,22 @@ Osoite: %4</translation> <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+83"/> + <location filename="../forms/receivecoinsdialog.ui" line="+107"/> <source>&Amount:</source> <translation type="unfinished"/> </message> <message> - <location line="-13"/> + <location line="-16"/> <source>&Label:</source> <translation>&Nimi:</translation> </message> <message> - <location line="-34"/> + <location line="-37"/> <source>&Message:</source> <translation type="unfinished"/> </message> <message> - <location line="-17"/> + <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"/> </message> @@ -1901,27 +1932,30 @@ Osoite: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+27"/> - <source>An optional 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"/> </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> + <location line="-7"/> + <location line="+21"/> + <source>An optional label to associate with the new receiving address.</source> <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="-7"/> <source>Use this form to request payments. All fields are <b>optional</b>.</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <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"/> </message> <message> - <location line="+17"/> + <location line="+32"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -1931,17 +1965,17 @@ Osoite: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+36"/> - <source>&Request payment</source> + <location line="+78"/> + <source>Requested payments history</source> <translation type="unfinished"/> </message> <message> - <location line="+47"/> - <source>Requested payments</source> + <location line="-98"/> + <source>&Request payment</source> <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+120"/> <source>Show the selected request (does the same as double clicking an entry)</source> <translation type="unfinished"/> </message> @@ -1960,6 +1994,21 @@ Osoite: %4</translation> <source>Remove</source> <translation type="unfinished"/> </message> + <message> + <location filename="../receivecoinsdialog.cpp" line="+38"/> + <source>Copy label</source> + <translation>Kopioi nimi</translation> + </message> + <message> + <location line="+1"/> + <source>Copy message</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation>Kopioi määrä</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -2061,12 +2110,17 @@ Osoite: %4</translation> <source>(no message)</source> <translation type="unfinished"/> </message> + <message> + <location line="+8"/> + <source>(no amount)</source> + <translation type="unfinished"/> + </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>Lähetä Bitcoineja</translation> @@ -2142,7 +2196,7 @@ Osoite: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+115"/> + <location line="+164"/> <source>Send to multiple recipients at once</source> <translation>Lähetä monelle vastaanottajalle</translation> </message> @@ -2152,7 +2206,7 @@ Osoite: %4</translation> <translation>Lisää &Vastaanottaja</translation> </message> <message> - <location line="+20"/> + <location line="-23"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -2162,12 +2216,12 @@ Osoite: %4</translation> <translation>&Tyhjennnä Kaikki</translation> </message> <message> - <location line="+22"/> + <location line="+52"/> <source>Balance:</source> <translation>Saldo:</translation> </message> <message> - <location line="+41"/> + <location line="-78"/> <source>Confirm the send action</source> <translation>Vahvista lähetys</translation> </message> @@ -2177,7 +2231,7 @@ Osoite: %4</translation> <translation>&Lähetä</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-228"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation>Hyväksy Bitcoinien lähettäminen</translation> </message> @@ -2190,12 +2244,7 @@ Osoite: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="-136"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Anna Bitcoin-osoite (esim. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> - <message> - <location line="+15"/> + <location line="-121"/> <source>Copy quantity</source> <translation type="unfinished"/> </message> @@ -2245,7 +2294,7 @@ Osoite: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+202"/> + <location line="+203"/> <source>The recipient address is not valid, please recheck.</source> <translation>Vastaanottajan osoite on virheellinen. Tarkista osoite.</translation> </message> @@ -2280,12 +2329,12 @@ Osoite: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Warning: Invalid Bitcoin address</source> <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+20"/> <source>(no label)</source> <translation>(ei nimeä)</translation> </message> @@ -2295,7 +2344,7 @@ Osoite: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="-366"/> + <location line="-367"/> <source>Are you sure you want to send?</source> <translation type="unfinished"/> </message> @@ -2305,7 +2354,7 @@ Osoite: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+170"/> + <location line="+171"/> <source>Payment request expired</source> <translation type="unfinished"/> </message> @@ -2382,12 +2431,7 @@ Osoite: %4</translation> <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"/> + <location line="+968"/> <source>This is a verified payment request.</source> <translation type="unfinished"/> </message> @@ -2397,7 +2441,12 @@ Osoite: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+459"/> + <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"/> + </message> + <message> + <location line="+426"/> <source>This is an unverified payment request.</source> <translation type="unfinished"/> </message> @@ -2413,11 +2462,6 @@ Osoite: %4</translation> <source>Memo:</source> <translation type="unfinished"/> </message> - <message> - <location filename="../sendcoinsentry.cpp" line="+1"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Anna Bitcoin-osoite (esim. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> </context> <context> <name>ShutdownWindow</name> @@ -2455,19 +2499,19 @@ Osoite: %4</translation> <translation>Osoite, jolla viesti allekirjoitetaan (esimerkiksi 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"/> </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>Liitä osoite leikepöydältä</translation> </message> @@ -2508,12 +2552,12 @@ Osoite: %4</translation> </message> <message> <location line="+3"/> - <location line="+146"/> + <location line="+143"/> <source>Clear &All</source> <translation>&Tyhjennä Kaikki</translation> </message> <message> - <location line="-87"/> + <location line="-84"/> <source>&Verify Message</source> <translation>&Varmista viesti</translation> </message> @@ -2528,7 +2572,7 @@ Osoite: %4</translation> <translation>Osoite, jolla viesti allekirjoitettiin (esimerkiksi 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>Tarkista viestin allekirjoitus varmistaaksesi, että se allekirjoitettiin tietyllä Bitcoin-osoitteella</translation> </message> @@ -2543,43 +2587,37 @@ Osoite: %4</translation> <translation>Tyhjennä kaikki varmista-viesti-kentät</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>Anna Bitcoin-osoite (esim. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location line="-2"/> + <location line="-1"/> <source>Click "Sign Message" to generate signature</source> <translation>Klikkaa "Allekirjoita Viesti luodaksesi allekirjoituksen </translation> </message> <message> - <location line="+3"/> - <source>Enter Bitcoin signature</source> - <translation>Syötä Bitcoin-allekirjoitus</translation> - </message> - <message> <location line="+84"/> - <location line="+81"/> + <location line="+80"/> <source>The entered address is invalid.</source> <translation>Syötetty osoite on virheellinen.</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>Tarkista osoite ja yritä uudelleen.</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>Syötetyn osoitteen avainta ei löydy.</translation> </message> <message> - <location line="-73"/> + <location line="-72"/> <source>Wallet unlock was cancelled.</source> <translation>Lompakon avaaminen peruttiin.</translation> </message> @@ -2599,7 +2637,7 @@ Osoite: %4</translation> <translation>Viesti allekirjoitettu.</translation> </message> <message> - <location line="+59"/> + <location line="+58"/> <source>The signature could not be decoded.</source> <translation>Allekirjoitusta ei pystytty tulkitsemaan.</translation> </message> @@ -2660,6 +2698,11 @@ Osoite: %4</translation> </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation>%1/offline</translation> </message> @@ -2821,12 +2864,12 @@ Osoite: %4</translation> <translation>, ei ole vielä onnistuneesti lähetetty</translation> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation>tuntematon</translation> </message> @@ -2867,12 +2910,12 @@ Osoite: %4</translation> <translation>Määrä</translation> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> @@ -2882,23 +2925,12 @@ Osoite: %4</translation> <translation>Avoinna %1 asti</translation> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> - <translation>Ei yhteyttä verkkoon (%1 vahvistusta)</translation> - </message> - <message> - <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation>Vahvistamatta (%1/%2 vahvistusta)</translation> - </message> - <message> - <location line="-22"/> - <location line="+25"/> + <location line="+12"/> <source>Confirmed (%1 confirmations)</source> <translation>Vahvistettu (%1 vahvistusta)</translation> </message> <message> - <location line="-22"/> + <location line="+9"/> <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> @@ -2908,7 +2940,27 @@ Osoite: %4</translation> <translation>Generoitu mutta ei hyväksytty</translation> </message> <message> - <location line="+62"/> + <location line="-21"/> + <source>Offline</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Unconfirmed</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation>Vastaanotettu osoitteella</translation> </message> @@ -2938,7 +2990,7 @@ Osoite: %4</translation> <translation>(ei saatavilla)</translation> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation>Rahansiirron tila. Siirrä osoitin kentän päälle nähdäksesi vahvistusten lukumäärä.</translation> </message> @@ -3204,12 +3256,12 @@ Osoite: %4</translation> <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+223"/> <source>Usage:</source> <translation>Käyttö:</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>List commands</source> <translation>Lista komennoista</translation> </message> @@ -3264,12 +3316,12 @@ Osoite: %4</translation> <translation>Määritä julkinen osoitteesi</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation>Kynnysarvo aikakatkaisulle heikosti toimiville verkoille (oletus: 100)</translation> </message> <message> - <location line="-148"/> + <location line="-150"/> <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> @@ -3289,17 +3341,17 @@ Osoite: %4</translation> <translation>Hyväksy merkkipohjaiset- ja JSON-RPC-käskyt</translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <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="+39"/> + <location line="+40"/> <source>Use the test network</source> <translation>Käytä test -verkkoa</translation> </message> <message> - <location line="-118"/> + <location line="-120"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>Hyväksy yhteyksiä ulkopuolelta (vakioasetus: 1 jos -proxy tai -connect ei määritelty)</translation> </message> @@ -3430,6 +3482,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation>Yhidstä ainoastaan määrättyihin noodeihin</translation> </message> @@ -3640,6 +3697,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Start Bitcoin server</source> <translation type="unfinished"/> </message> @@ -3689,12 +3751,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-79"/> + <location line="-80"/> <source>Imports blocks from external blk000??.dat file</source> <translation>Tuodaan lohkoja ulkoisesta blk000??.dat tiedostosta</translation> </message> <message> - <location line="-105"/> + <location line="-106"/> <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> @@ -3714,7 +3776,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+89"/> + <location line="+90"/> <source>Information</source> <translation>Tietoa</translation> </message> @@ -3784,7 +3846,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Määritä yhteyden aikakataisu millisekunneissa (vakioasetus: 5000)</translation> </message> <message> - <location line="+6"/> + <location line="+7"/> <source>System error: </source> <translation>Järjestelmävirhe:</translation> </message> @@ -3830,6 +3892,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>version</source> <translation>versio</translation> </message> @@ -3839,32 +3906,32 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-58"/> + <location line="-60"/> <source>Password for JSON-RPC connections</source> <translation>Salasana JSON-RPC-yhteyksille</translation> </message> <message> - <location line="-70"/> + <location line="-71"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Salli JSON-RPC yhteydet tietystä ip-osoitteesta</translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>Lähetä käskyjä solmuun osoitteessa <ip> (oletus: 127.0.0.1)</translation> </message> <message> - <location line="-132"/> + <location line="-133"/> <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="+161"/> + <location line="+163"/> <source>Upgrade wallet to latest format</source> <translation>Päivitä lompakko uusimpaan formaattiin</translation> </message> <message> - <location line="-24"/> + <location line="-25"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Aseta avainpoolin koko arvoon <n> (oletus: 100)</translation> </message> @@ -3874,12 +3941,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Skannaa uudelleen lohkoketju lompakon puuttuvien rahasiirtojen vuoksi</translation> </message> <message> - <location line="+38"/> + <location line="+39"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Käytä OpenSSL:ää (https) JSON-RPC-yhteyksille</translation> </message> <message> - <location line="-30"/> + <location line="-31"/> <source>Server certificate file (default: server.cert)</source> <translation>Palvelimen sertifikaatti-tiedosto (oletus: server.cert)</translation> </message> @@ -3889,7 +3956,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Palvelimen yksityisavain (oletus: server.pem)</translation> </message> <message> - <location line="+16"/> + <location line="+17"/> <source>This help message</source> <translation>Tämä ohjeviesti</translation> </message> @@ -3899,12 +3966,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Kytkeytyminen %s tällä tietokonella ei onnistu (kytkeytyminen palautti virheen %d, %s)</translation> </message> <message> - <location line="-107"/> + <location line="-109"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>Salli DNS kyselyt -addnode, -seednode ja -connect yhteydessä</translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Loading addresses...</source> <translation>Ladataan osoitteita...</translation> </message> @@ -3919,12 +3986,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Virhe ladattaessa wallet.dat-tiedostoa: Tarvitset uudemman version Bitcoinista</translation> </message> <message> - <location line="+98"/> + <location line="+99"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>Lompakko tarvitsee uudelleenkirjoittaa: käynnistä Bitcoin uudelleen</translation> </message> <message> - <location line="-100"/> + <location line="-101"/> <source>Error loading wallet.dat</source> <translation>Virhe ladattaessa wallet.dat-tiedostoa</translation> </message> @@ -3934,7 +4001,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Virheellinen proxy-osoite '%s'</translation> </message> <message> - <location line="+56"/> + <location line="+57"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Tuntematon verkko -onlynet parametrina: '%s'</translation> </message> @@ -3944,7 +4011,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Tuntematon -socks proxy versio pyydetty: %i</translation> </message> <message> - <location line="-101"/> + <location line="-103"/> <source>Cannot resolve -bind address: '%s'</source> <translation>-bind osoitteen '%s' selvittäminen epäonnistui</translation> </message> @@ -3954,7 +4021,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>-externalip osoitteen '%s' selvittäminen epäonnistui</translation> </message> <message> - <location line="+48"/> + <location line="+49"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>-paytxfee=<amount>: '%s' on virheellinen</translation> </message> @@ -3974,7 +4041,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Ladataan lohkoindeksiä...</translation> </message> <message> - <location line="-62"/> + <location line="-63"/> <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> @@ -3984,12 +4051,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Kytkeytyminen %s ei onnistu tällä tietokoneella. Bitcoin on todennäköisesti jo ajamassa.</translation> </message> <message> - <location line="+95"/> + <location line="+96"/> <source>Loading wallet...</source> <translation>Ladataan lompakkoa...</translation> </message> <message> - <location line="-56"/> + <location line="-57"/> <source>Cannot downgrade wallet</source> <translation>Et voi päivittää lompakkoasi vanhempaan versioon</translation> </message> @@ -3999,7 +4066,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Oletusosoitetta ei voi kirjoittaa</translation> </message> <message> - <location line="+67"/> + <location line="+68"/> <source>Rescanning...</source> <translation>Skannataan uudelleen...</translation> </message> @@ -4009,17 +4076,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Lataus on valmis</translation> </message> <message> - <location line="+85"/> + <location line="+86"/> <source>To use the %s option</source> <translation>Käytä %s optiota</translation> </message> <message> - <location line="-77"/> + <location line="-78"/> <source>Error</source> <translation>Virhe</translation> </message> <message> - <location line="-35"/> + <location line="-36"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_fr.ts b/src/qt/locale/bitcoin_fr.ts index 3ae5a8154c..f53b5fe16d 100644 --- a/src/qt/locale/bitcoin_fr.ts +++ b/src/qt/locale/bitcoin_fr.ts @@ -36,6 +36,12 @@ This product includes software developed by the OpenSSL Project for use in the O <source>The Bitcoin Core developers</source> <translation>Les développeurs Bitcoin Core</translation> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source> (%1-bit)</source> + <translation> (%1-bit)</translation> + </message> </context> <context> <name>AddressBookPage</name> @@ -617,6 +623,16 @@ This product includes software developed by the OpenSSL Project for use in the O <translation><numerusform>%n semaine</numerusform><numerusform>%n semaines</numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation>%1 et %2</translation> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation><numerusform>%n an</numerusform><numerusform>%n ans</numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation>%1 en retard</translation> @@ -690,7 +706,7 @@ Adresse : %4 <translation>Le portefeuille est <b>chiffré</b> et actuellement <b>verrouillé</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+435"/> <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'arrêter.</translation> </message> @@ -751,7 +767,7 @@ Adresse : %4 <translation>Monnaie :</translation> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation>Tout (dé)sélectionner</translation> </message> @@ -766,7 +782,7 @@ Adresse : %4 <translation>Mode liste</translation> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation>Montant</translation> </message> @@ -917,7 +933,7 @@ Adresse : %4 <translation>aucun</translation> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation>Poussière</translation> </message> @@ -1099,7 +1115,7 @@ Adresse : %4 <translation>Bitcoin Core - Options de ligne de commande</translation> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation>Bitcoin Core</translation> </message> @@ -1243,7 +1259,7 @@ Adresse : %4 <translation>Réglages &principaux</translation> </message> <message> - <location line="+6"/> + <location line="+122"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation>Frais de transaction optionnel par ko qui aident à garantir un traitement rapide des transactions. La plupart des transactions utilisent 1 ko.</translation> </message> @@ -1253,7 +1269,7 @@ Adresse : %4 <translation>Payer des &frais de transaction</translation> </message> <message> - <location line="+31"/> + <location line="-131"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation>Démarrer Bitcoin automatiquement après avoir ouvert une session sur l'ordinateur.</translation> </message> @@ -1268,12 +1284,7 @@ Adresse : %4 <translation>Taille du cache de la base de &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"/> + <location line="+16"/> <source>MB</source> <translation>Mo</translation> </message> @@ -1288,7 +1299,12 @@ Adresse : %4 <translation>Défini le nombre d'exétrons de vérification de script (jusqu'à 16, 0 = auto, <0 = laisse autant de cÅ“urs libre, par défaut : 0)</translation> </message> <message> - <location line="+58"/> + <location line="+107"/> + <source>&Spend unconfirmed change (experts only)</source> + <translation>&Dépenser la monnaie non confirmée (experts seulement)</translation> + </message> + <message> + <location line="+37"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation>Se connecter au réseau Bitcoin par un mandataire SOCKS.</translation> </message> @@ -1323,7 +1339,17 @@ Adresse : %4 <translation>&Réseau</translation> </message> <message> - <location line="+6"/> + <location line="-86"/> + <source>W&allet</source> + <translation>&Portefeuille</translation> + </message> + <message> + <location line="+52"/> + <source>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.</source> + <translation>Si vous désactivé la dépense de la monnaie non confirmée, la monnaie d'une transaction ne peut pas être utilisée tant que cette transaction n'a pas reçu au moins une confirmation. Ceci affecte aussi comment votre solde est calculé.</translation> + </message> + <message> + <location line="+40"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>Ouvrir le port du client Bitcoin automatiquement sur le routeur. Ceci ne fonctionne que si votre routeur supporte l'UPnP et si la fonctionnalité est activée.</translation> </message> @@ -1438,17 +1464,17 @@ Adresse : %4 <translation>A&nnuler</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+70"/> <source>default</source> <translation>par défaut</translation> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation>aucune</translation> </message> <message> - <location line="+75"/> + <location line="+78"/> <source>Confirm options reset</source> <translation>Confirmer la réinitialisation des options</translation> </message> @@ -1488,19 +1514,14 @@ Adresse : %4 <translation>Les informations affichées peuvent être obsolètes. Votre portefeuille est automatiquement synchronisé avec le réseau Bitcoin lorsque la connexion s'établit, or ce processus n'est pas encore terminé.</translation> </message> <message> - <location line="-155"/> - <source>Unconfirmed:</source> - <translation>Non confirmé :</translation> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation>Portefeuille</translation> </message> <message> <location line="+51"/> - <source>Confirmed:</source> - <translation>Confirmé :</translation> + <source>Available:</source> + <translation>Disponible :</translation> </message> <message> <location line="+16"/> @@ -1508,7 +1529,12 @@ Adresse : %4 <translation>Votre solde actuel pouvant être dépensé</translation> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation>En attente :</translation> + </message> + <message> + <location line="+16"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation>Total des transactions qui doivent encore être confirmées et qu'il n'est pas encore possible de dépenser</translation> </message> @@ -1656,6 +1682,11 @@ Adresse : %4 <source>Error: Invalid combination of -regtest and -testnet.</source> <translation>Erreur : combinaison invalide de -regtest et de -testnet.</translation> </message> + <message> + <location filename="../guiutil.cpp" line="+82"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>Saisir une adresse Bitcoin (par ex. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> </context> <context> <name>QRImageWidget</name> @@ -1876,22 +1907,22 @@ Adresse : %4 <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+83"/> + <location filename="../forms/receivecoinsdialog.ui" line="+107"/> <source>&Amount:</source> <translation>&Montant :</translation> </message> <message> - <location line="-13"/> + <location line="-16"/> <source>&Label:</source> <translation>&Étiquette :</translation> </message> <message> - <location line="-34"/> + <location line="-37"/> <source>&Message:</source> <translation>M&essage :</translation> </message> <message> - <location line="-17"/> + <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>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'utilisez pas cette option sauf si vous générez à nouveau une demande de paiement déjà faite.</translation> </message> @@ -1901,27 +1932,30 @@ Adresse : %4 <translation>Ré&utiliser une adresse de réception existante (non recommandé)</translation> </message> <message> - <location line="+27"/> - <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="+7"/> + <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>Un message optionnel à joindre à la demande de paiement qui sera affiché à l'ouverture de celle-ci. Note : le message ne sera pas envoyé avec le paiement par le réseau Bitcoin.</translation> </message> <message> - <location line="+7"/> + <location line="-7"/> + <location line="+21"/> + <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="-7"/> <source>Use this form to request payments. All fields are <b>optional</b>.</source> <translation>Utiliser ce formulaire pour demander des paiements. Tous les champs sont <b>optionnels</b>.</translation> </message> <message> - <location line="+39"/> + <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>Un montant optionnel à demander. Laisser ceci vide ou à zéro pour ne pas demander de montant spécifique.</translation> </message> <message> - <location line="+17"/> + <location line="+32"/> <source>Clear all fields of the form.</source> <translation>Effacer tous les champs du formulaire.</translation> </message> @@ -1931,17 +1965,17 @@ Adresse : %4 <translation>Effacer</translation> </message> <message> - <location line="+36"/> - <source>&Request payment</source> - <translation>&Demande de paiement</translation> + <location line="+78"/> + <source>Requested payments history</source> + <translation>Historique des paiements demandés</translation> </message> <message> - <location line="+47"/> - <source>Requested payments</source> - <translation>Paiements demandés</translation> + <location line="-98"/> + <source>&Request payment</source> + <translation>&Demande de paiement</translation> </message> <message> - <location line="+16"/> + <location line="+120"/> <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> @@ -1960,6 +1994,21 @@ Adresse : %4 <source>Remove</source> <translation>Enlever</translation> </message> + <message> + <location filename="../receivecoinsdialog.cpp" line="+38"/> + <source>Copy label</source> + <translation>Copier l’étiquette</translation> + </message> + <message> + <location line="+1"/> + <source>Copy message</source> + <translation>Copier le message</translation> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation>Copier le montant</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -2061,12 +2110,17 @@ Adresse : %4 <source>(no message)</source> <translation>(pas de message)</translation> </message> + <message> + <location line="+8"/> + <source>(no amount)</source> + <translation>(aucun montant)</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>Envoyer des pièces</translation> @@ -2142,7 +2196,7 @@ Adresse : %4 <translation>Adresse personnalisée de monnaie rendue</translation> </message> <message> - <location line="+115"/> + <location line="+164"/> <source>Send to multiple recipients at once</source> <translation>Envoyer à plusieurs destinataires à la fois</translation> </message> @@ -2152,7 +2206,7 @@ Adresse : %4 <translation>Ajouter un &destinataire</translation> </message> <message> - <location line="+20"/> + <location line="-23"/> <source>Clear all fields of the form.</source> <translation>Effacer tous les champs du formulaire.</translation> </message> @@ -2162,12 +2216,12 @@ Adresse : %4 <translation>&Tout nettoyer</translation> </message> <message> - <location line="+22"/> + <location line="+52"/> <source>Balance:</source> <translation>Solde :</translation> </message> <message> - <location line="+41"/> + <location line="-78"/> <source>Confirm the send action</source> <translation>Confirmer l’action d'envoi</translation> </message> @@ -2177,7 +2231,7 @@ Adresse : %4 <translation>E&nvoyer</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-228"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation>Confirmer l’envoi des pièces</translation> </message> @@ -2190,12 +2244,7 @@ Adresse : %4 <translation>%1 à %2</translation> </message> <message> - <location line="-136"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Saisir une adresse Bitcoin (par ex. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> - <message> - <location line="+15"/> + <location line="-121"/> <source>Copy quantity</source> <translation>Copier la quantité</translation> </message> @@ -2245,7 +2294,7 @@ Adresse : %4 <translation>ou</translation> </message> <message> - <location line="+202"/> + <location line="+203"/> <source>The recipient address is not valid, please recheck.</source> <translation>L'adresse du destinataire n’est pas valide, veuillez la vérifier.</translation> </message> @@ -2280,12 +2329,12 @@ 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="+112"/> + <location line="+113"/> <source>Warning: Invalid Bitcoin address</source> <translation>Attention : adresse Bitcoin invalide</translation> </message> <message> - <location line="+21"/> + <location line="+20"/> <source>(no label)</source> <translation>(pas d'étiquette)</translation> </message> @@ -2295,7 +2344,7 @@ Adresse : %4 <translation>Attention : adresse de monnaie rendue inconnue</translation> </message> <message> - <location line="-366"/> + <location line="-367"/> <source>Are you sure you want to send?</source> <translation>Êtes-vous sûr de vouloir envoyer ?</translation> </message> @@ -2305,7 +2354,7 @@ Adresse : %4 <translation>ajouté en tant que frais de transaction</translation> </message> <message> - <location line="+170"/> + <location line="+171"/> <source>Payment request expired</source> <translation>La demande de paiement a expiré</translation> </message> @@ -2382,12 +2431,7 @@ Adresse : %4 <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'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"/> + <location line="+968"/> <source>This is a verified payment request.</source> <translation>Ceci est une demande de paiement vérifiée.</translation> </message> @@ -2397,7 +2441,12 @@ Adresse : %4 <translation>Saisir une étiquette pour cette adresse afin de l'ajouter à la liste d'adresses utilisées</translation> </message> <message> - <location line="+459"/> + <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>Un message qui était joint à l'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="+426"/> <source>This is an unverified payment request.</source> <translation>Ceci est une demande de paiement non vérifiée.</translation> </message> @@ -2413,11 +2462,6 @@ Adresse : %4 <source>Memo:</source> <translation>Mémo :</translation> </message> - <message> - <location filename="../sendcoinsentry.cpp" line="+1"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Saisir une adresse Bitcoin (par ex. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> </context> <context> <name>ShutdownWindow</name> @@ -2455,19 +2499,19 @@ Adresse : %4 <translation>L'adresse avec laquelle le message sera signé (par ex. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location line="+10"/> - <location line="+213"/> + <location line="+7"/> + <location line="+210"/> <source>Choose previously used address</source> <translation>Choisir une adresse précédemment utilisée</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>Coller une adresse depuis le presse-papier</translation> </message> @@ -2508,12 +2552,12 @@ Adresse : %4 </message> <message> <location line="+3"/> - <location line="+146"/> + <location line="+143"/> <source>Clear &All</source> <translation>&Tout nettoyer</translation> </message> <message> - <location line="-87"/> + <location line="-84"/> <source>&Verify Message</source> <translation>&Vérifier un message</translation> </message> @@ -2528,7 +2572,7 @@ Adresse : %4 <translation>L'adresse avec laquelle le message a été signé (par ex. 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>Vérifier le message pour vous assurer qu'il a bien été signé par l'adresse Bitcoin spécifiée</translation> </message> @@ -2543,43 +2587,37 @@ Adresse : %4 <translation>Réinitialiser tous les champs de vérification de message</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>Saisir une adresse Bitcoin (par ex. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location line="-2"/> + <location line="-1"/> <source>Click "Sign Message" to generate signature</source> <translation>Cliquez sur « Signer le message » pour générer la signature</translation> </message> <message> - <location line="+3"/> - <source>Enter Bitcoin signature</source> - <translation>Saisir une signature Bitcoin</translation> - </message> - <message> <location line="+84"/> - <location line="+81"/> + <location line="+80"/> <source>The entered address is invalid.</source> <translation>L'adresse saisie est invalide.</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>Veuillez vérifier l'adresse et réessayer.</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>L'adresse saisie ne fait pas référence à une clef.</translation> </message> <message> - <location line="-73"/> + <location line="-72"/> <source>Wallet unlock was cancelled.</source> <translation>Le déverrouillage du portefeuille a été annulé.</translation> </message> @@ -2599,7 +2637,7 @@ Adresse : %4 <translation>Le message a été signé.</translation> </message> <message> - <location line="+59"/> + <location line="+58"/> <source>The signature could not be decoded.</source> <translation>La signature n'a pu être décodée.</translation> </message> @@ -2660,6 +2698,11 @@ Adresse : %4 </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation>en conflit</translation> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation>%1/hors ligne</translation> </message> @@ -2821,12 +2864,12 @@ Adresse : %4 <translation>, n’a pas encore été diffusée avec succès</translation> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <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> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation>inconnu</translation> </message> @@ -2867,12 +2910,12 @@ Adresse : %4 <translation>Montant</translation> </message> <message> - <location line="+59"/> + <location line="+78"/> <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="+16"/> + <location line="-21"/> <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> @@ -2882,23 +2925,12 @@ Adresse : %4 <translation>Ouvert jusqu'à %1</translation> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> - <translation>Hors ligne (%1 confirmations)</translation> - </message> - <message> - <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation>Non confirmée (%1 confirmations sur %2)</translation> - </message> - <message> - <location line="-22"/> - <location line="+25"/> + <location line="+12"/> <source>Confirmed (%1 confirmations)</source> <translation>Confirmée (%1 confirmations)</translation> </message> <message> - <location line="-22"/> + <location line="+9"/> <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> @@ -2908,7 +2940,27 @@ Adresse : %4 <translation>Généré mais pas accepté</translation> </message> <message> - <location line="+62"/> + <location line="-21"/> + <source>Offline</source> + <translation>Hors ligne</translation> + </message> + <message> + <location line="+3"/> + <source>Unconfirmed</source> + <translation>Non confirmé</translation> + </message> + <message> + <location line="+3"/> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation>Confirmation (%1 sur %2 confirmations recommandées)</translation> + </message> + <message> + <location line="+6"/> + <source>Conflicted</source> + <translation>En conflit</translation> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation>Reçue avec</translation> </message> @@ -2938,7 +2990,7 @@ Adresse : %4 <translation>(n.d)</translation> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation>État de la transaction. Laissez le pointeur de la souris sur ce champ pour voir le nombre de confirmations.</translation> </message> @@ -3204,12 +3256,12 @@ Adresse : %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+223"/> <source>Usage:</source> <translation>Utilisation :</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>List commands</source> <translation>Lister les commandes</translation> </message> @@ -3264,12 +3316,12 @@ Adresse : %4 <translation>Spécifier votre propre adresse publique</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <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="-148"/> + <location line="-150"/> <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> @@ -3289,17 +3341,17 @@ Adresse : %4 <translation>Accepter les commandes de JSON-RPC et de la ligne de commande</translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Run in the background as a daemon and accept commands</source> <translation>Fonctionner en arrière-plan en tant que démon et accepter les commandes</translation> </message> <message> - <location line="+39"/> + <location line="+40"/> <source>Use the test network</source> <translation>Utiliser le réseau de test</translation> </message> <message> - <location line="-118"/> + <location line="-120"/> <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> @@ -3440,6 +3492,11 @@ par exemple : alertnotify=echo %%s | mail -s "Alerte Bitcoin" admin@fo </message> <message> <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation>Effacer la liste des transactions du portefeuille (outil de diagnostic, implique un nouveau balayage -rescan)</translation> + </message> + <message> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation>Ne se connecter qu'au(x) nÅ“ud(s) spécifié(s)</translation> </message> @@ -3650,6 +3707,11 @@ par exemple : alertnotify=echo %%s | mail -s "Alerte Bitcoin" admin@fo </message> <message> <location line="+2"/> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation>Dépenser la monnaie non confirmée lors de l'envoi de transactions (par défaut : 1)</translation> + </message> + <message> + <location line="+1"/> <source>Start Bitcoin server</source> <translation>Démarrer le serveur Bitcoin</translation> </message> @@ -3699,12 +3761,12 @@ par exemple : alertnotify=echo %%s | mail -s "Alerte Bitcoin" admin@fo <translation>Vous devez reconstruire la base de données en utilisant -reindex afin de modifier -txindex</translation> </message> <message> - <location line="-79"/> + <location line="-80"/> <source>Imports blocks from external blk000??.dat file</source> <translation>Importe des blocs depuis un fichier blk000??.dat externe</translation> </message> <message> - <location line="-105"/> + <location line="-106"/> <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'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> @@ -3724,7 +3786,7 @@ par exemple : alertnotify=echo %%s | mail -s "Alerte Bitcoin" admin@fo <translation>Définir le nombre d'exétrons de vérification des scripts (maximum 16, 0 = auto, < 0 = laisser ce nombre de cÅ“urs libres, par défaut : 0)</translation> </message> <message> - <location line="+89"/> + <location line="+90"/> <source>Information</source> <translation>Informations</translation> </message> @@ -3794,7 +3856,7 @@ par exemple : alertnotify=echo %%s | mail -s "Alerte Bitcoin" admin@fo <translation>Spécifier le délai d'expiration de la connexion en millisecondes (par défaut : 5 000)</translation> </message> <message> - <location line="+6"/> + <location line="+7"/> <source>System error: </source> <translation>Erreur système :</translation> </message> @@ -3840,6 +3902,11 @@ par exemple : alertnotify=echo %%s | mail -s "Alerte Bitcoin" admin@fo </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation>Supprimer toutes les transactions du portefeuille...</translation> + </message> + <message> + <location line="+1"/> <source>version</source> <translation>version</translation> </message> @@ -3849,32 +3916,32 @@ par exemple : alertnotify=echo %%s | mail -s "Alerte Bitcoin" admin@fo <translation>wallet.dat corrompu, la récupération a échoué</translation> </message> <message> - <location line="-58"/> + <location line="-60"/> <source>Password for JSON-RPC connections</source> <translation>Mot de passe pour les connexions JSON-RPC</translation> </message> <message> - <location line="-70"/> + <location line="-71"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Autoriser les connexions JSON-RPC depuis l'adresse IP spécifiée</translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>Envoyer des commandes au nÅ“ud fonctionnant sur <ip> (par défaut : 127.0.0.1)</translation> </message> <message> - <location line="-132"/> + <location line="-133"/> <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="+161"/> + <location line="+163"/> <source>Upgrade wallet to latest format</source> <translation>Mettre à niveau le portefeuille vers le format le plus récent</translation> </message> <message> - <location line="-24"/> + <location line="-25"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Régler la taille de la réserve de clefs sur <n> (par défaut : 100)</translation> </message> @@ -3884,12 +3951,12 @@ par exemple : alertnotify=echo %%s | mail -s "Alerte Bitcoin" admin@fo <translation>Réanalyser la chaîne de blocs pour les transactions de portefeuille manquantes</translation> </message> <message> - <location line="+38"/> + <location line="+39"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Utiliser OpenSSL (https) pour les connexions JSON-RPC</translation> </message> <message> - <location line="-30"/> + <location line="-31"/> <source>Server certificate file (default: server.cert)</source> <translation>Fichier de certificat serveur (par défaut : server.cert)</translation> </message> @@ -3899,7 +3966,7 @@ par exemple : alertnotify=echo %%s | mail -s "Alerte Bitcoin" admin@fo <translation>Clef privée du serveur (par défaut : server.pem)</translation> </message> <message> - <location line="+16"/> + <location line="+17"/> <source>This help message</source> <translation>Ce message d'aide</translation> </message> @@ -3909,12 +3976,12 @@ par exemple : alertnotify=echo %%s | mail -s "Alerte Bitcoin" admin@fo <translation>Impossible de se lier à %s sur cet ordinateur (bind a retourné l'erreur %d, %s)</translation> </message> <message> - <location line="-107"/> + <location line="-109"/> <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="+60"/> + <location line="+61"/> <source>Loading addresses...</source> <translation>Chargement des adresses…</translation> </message> @@ -3929,12 +3996,12 @@ par exemple : alertnotify=echo %%s | mail -s "Alerte Bitcoin" admin@fo <translation>Erreur lors du chargement de wallet.dat : le portefeuille exige une version plus récente de Bitcoin</translation> </message> <message> - <location line="+98"/> + <location line="+99"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>Le portefeuille devait être réécrit : redémarrer Bitcoin pour terminer l'opération.</translation> </message> <message> - <location line="-100"/> + <location line="-101"/> <source>Error loading wallet.dat</source> <translation>Erreur lors du chargement de wallet.dat</translation> </message> @@ -3944,7 +4011,7 @@ par exemple : alertnotify=echo %%s | mail -s "Alerte Bitcoin" admin@fo <translation>Adresse -proxy invalide : « %s »</translation> </message> <message> - <location line="+56"/> + <location line="+57"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Réseau inconnu spécifié sur -onlynet : « %s »</translation> </message> @@ -3954,7 +4021,7 @@ par exemple : alertnotify=echo %%s | mail -s "Alerte Bitcoin" admin@fo <translation>Version inconnue de serveur mandataire -socks demandée : %i</translation> </message> <message> - <location line="-101"/> + <location line="-103"/> <source>Cannot resolve -bind address: '%s'</source> <translation>Impossible de résoudre l'adresse -bind : « %s »</translation> </message> @@ -3964,7 +4031,7 @@ par exemple : alertnotify=echo %%s | mail -s "Alerte Bitcoin" admin@fo <translation>Impossible de résoudre l'adresse -externalip : « %s »</translation> </message> <message> - <location line="+48"/> + <location line="+49"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>Montant invalide pour -paytxfee=<montant> : « %s »</translation> </message> @@ -3984,7 +4051,7 @@ par exemple : alertnotify=echo %%s | mail -s "Alerte Bitcoin" admin@fo <translation>Chargement de l’index des blocs…</translation> </message> <message> - <location line="-62"/> + <location line="-63"/> <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> @@ -3994,12 +4061,12 @@ par exemple : alertnotify=echo %%s | mail -s "Alerte Bitcoin" admin@fo <translation>Impossible de se lier à %s sur cet ordinateur. Bitcoin fonctionne probablement déjà .</translation> </message> <message> - <location line="+95"/> + <location line="+96"/> <source>Loading wallet...</source> <translation>Chargement du portefeuille…</translation> </message> <message> - <location line="-56"/> + <location line="-57"/> <source>Cannot downgrade wallet</source> <translation>Impossible de revenir à une version inférieure du portefeuille</translation> </message> @@ -4009,7 +4076,7 @@ par exemple : alertnotify=echo %%s | mail -s "Alerte Bitcoin" admin@fo <translation>Impossible d'écrire l'adresse par défaut</translation> </message> <message> - <location line="+67"/> + <location line="+68"/> <source>Rescanning...</source> <translation>Nouvelle analyse…</translation> </message> @@ -4019,17 +4086,17 @@ par exemple : alertnotify=echo %%s | mail -s "Alerte Bitcoin" admin@fo <translation>Chargement terminé</translation> </message> <message> - <location line="+85"/> + <location line="+86"/> <source>To use the %s option</source> <translation>Pour utiliser l'option %s</translation> </message> <message> - <location line="-77"/> + <location line="-78"/> <source>Error</source> <translation>Erreur</translation> </message> <message> - <location line="-35"/> + <location line="-36"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_fr_CA.ts b/src/qt/locale/bitcoin_fr_CA.ts index 71de06dea0..d35a1ea6e9 100644 --- a/src/qt/locale/bitcoin_fr_CA.ts +++ b/src/qt/locale/bitcoin_fr_CA.ts @@ -36,6 +36,12 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être <source>The Bitcoin Core developers</source> <translation type="unfinished"/> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source> (%1-bit)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>AddressBookPage</name> @@ -617,6 +623,16 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation type="unfinished"/> @@ -686,7 +702,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+435"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -747,7 +763,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation type="unfinished"/> </message> @@ -762,7 +778,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation type="unfinished"/> </message> @@ -913,7 +929,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation type="unfinished"/> </message> @@ -1095,7 +1111,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation type="unfinished"/> </message> @@ -1239,7 +1255,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+122"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation type="unfinished"/> </message> @@ -1249,7 +1265,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="-131"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation type="unfinished"/> </message> @@ -1264,12 +1280,7 @@ Address: %4 <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"/> + <location line="+16"/> <source>MB</source> <translation type="unfinished"/> </message> @@ -1284,7 +1295,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+58"/> + <location line="+107"/> + <source>&Spend unconfirmed change (experts only)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+37"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation type="unfinished"/> </message> @@ -1319,7 +1335,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="-86"/> + <source>W&allet</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+52"/> + <source>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.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+40"/> <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> @@ -1434,17 +1460,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+70"/> <source>default</source> <translation type="unfinished"/> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation type="unfinished"/> </message> <message> - <location line="+75"/> + <location line="+78"/> <source>Confirm options reset</source> <translation type="unfinished"/> </message> @@ -1484,18 +1510,13 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-155"/> - <source>Unconfirmed:</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation type="unfinished"/> </message> <message> <location line="+51"/> - <source>Confirmed:</source> + <source>Available:</source> <translation type="unfinished"/> </message> <message> @@ -1504,7 +1525,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation type="unfinished"/> </message> @@ -1652,6 +1678,11 @@ Address: %4 <source>Error: Invalid combination of -regtest and -testnet.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../guiutil.cpp" line="+82"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>QRImageWidget</name> @@ -1872,22 +1903,22 @@ Address: %4 <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+83"/> + <location filename="../forms/receivecoinsdialog.ui" line="+107"/> <source>&Amount:</source> <translation type="unfinished"/> </message> <message> - <location line="-13"/> + <location line="-16"/> <source>&Label:</source> <translation type="unfinished"/> </message> <message> - <location line="-34"/> + <location line="-37"/> <source>&Message:</source> <translation type="unfinished"/> </message> <message> - <location line="-17"/> + <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"/> </message> @@ -1897,27 +1928,30 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+27"/> - <source>An optional 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"/> </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> + <location line="-7"/> + <location line="+21"/> + <source>An optional label to associate with the new receiving address.</source> <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="-7"/> <source>Use this form to request payments. All fields are <b>optional</b>.</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <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"/> </message> <message> - <location line="+17"/> + <location line="+32"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -1927,17 +1961,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+36"/> - <source>&Request payment</source> + <location line="+78"/> + <source>Requested payments history</source> <translation type="unfinished"/> </message> <message> - <location line="+47"/> - <source>Requested payments</source> + <location line="-98"/> + <source>&Request payment</source> <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+120"/> <source>Show the selected request (does the same as double clicking an entry)</source> <translation type="unfinished"/> </message> @@ -1956,6 +1990,21 @@ Address: %4 <source>Remove</source> <translation type="unfinished"/> </message> + <message> + <location filename="../receivecoinsdialog.cpp" line="+38"/> + <source>Copy label</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy message</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation type="unfinished"/> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -2057,12 +2106,17 @@ Address: %4 <source>(no message)</source> <translation type="unfinished"/> </message> + <message> + <location line="+8"/> + <source>(no amount)</source> + <translation type="unfinished"/> + </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 type="unfinished"/> @@ -2138,7 +2192,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+115"/> + <location line="+164"/> <source>Send to multiple recipients at once</source> <translation type="unfinished"/> </message> @@ -2148,7 +2202,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+20"/> + <location line="-23"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -2158,12 +2212,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+22"/> + <location line="+52"/> <source>Balance:</source> <translation type="unfinished"/> </message> <message> - <location line="+41"/> + <location line="-78"/> <source>Confirm the send action</source> <translation type="unfinished"/> </message> @@ -2173,7 +2227,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-228"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation type="unfinished"/> </message> @@ -2186,12 +2240,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-136"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+15"/> + <location line="-121"/> <source>Copy quantity</source> <translation type="unfinished"/> </message> @@ -2241,7 +2290,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+202"/> + <location line="+203"/> <source>The recipient address is not valid, please recheck.</source> <translation type="unfinished"/> </message> @@ -2276,12 +2325,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Warning: Invalid Bitcoin address</source> <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+20"/> <source>(no label)</source> <translation type="unfinished"/> </message> @@ -2291,7 +2340,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-366"/> + <location line="-367"/> <source>Are you sure you want to send?</source> <translation type="unfinished"/> </message> @@ -2301,7 +2350,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+170"/> + <location line="+171"/> <source>Payment request expired</source> <translation type="unfinished"/> </message> @@ -2378,12 +2427,7 @@ Address: %4 <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"/> + <location line="+968"/> <source>This is a verified payment request.</source> <translation type="unfinished"/> </message> @@ -2393,7 +2437,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+459"/> + <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"/> + </message> + <message> + <location line="+426"/> <source>This is an unverified payment request.</source> <translation type="unfinished"/> </message> @@ -2409,11 +2458,6 @@ Address: %4 <source>Memo:</source> <translation type="unfinished"/> </message> - <message> - <location filename="../sendcoinsentry.cpp" line="+1"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"/> - </message> </context> <context> <name>ShutdownWindow</name> @@ -2451,19 +2495,19 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+10"/> - <location line="+213"/> + <location line="+7"/> + <location line="+210"/> <source>Choose previously used address</source> <translation type="unfinished"/> </message> <message> - <location line="-203"/> - <location line="+213"/> + <location line="-200"/> + <location line="+210"/> <source>Alt+A</source> <translation type="unfinished"/> </message> <message> - <location line="-203"/> + <location line="-200"/> <source>Paste address from clipboard</source> <translation type="unfinished"/> </message> @@ -2504,12 +2548,12 @@ Address: %4 </message> <message> <location line="+3"/> - <location line="+146"/> + <location line="+143"/> <source>Clear &All</source> <translation type="unfinished"/> </message> <message> - <location line="-87"/> + <location line="-84"/> <source>&Verify Message</source> <translation type="unfinished"/> </message> @@ -2524,7 +2568,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+40"/> + <location line="+37"/> <source>Verify the message to ensure it was signed with the specified Bitcoin address</source> <translation type="unfinished"/> </message> @@ -2539,43 +2583,37 @@ Address: %4 <translation type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location line="-2"/> + <location line="-1"/> <source>Click "Sign Message" to generate signature</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Enter Bitcoin signature</source> - <translation type="unfinished"/> - </message> - <message> <location line="+84"/> - <location line="+81"/> + <location line="+80"/> <source>The entered address is invalid.</source> <translation type="unfinished"/> </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 type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location line="-73"/> + <location line="-72"/> <source>Wallet unlock was cancelled.</source> <translation type="unfinished"/> </message> @@ -2595,7 +2633,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+59"/> + <location line="+58"/> <source>The signature could not be decoded.</source> <translation type="unfinished"/> </message> @@ -2656,6 +2694,11 @@ Address: %4 </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation type="unfinished"/> </message> @@ -2817,12 +2860,12 @@ Address: %4 <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation type="unfinished"/> </message> @@ -2863,12 +2906,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> @@ -2878,33 +2921,42 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> + <location line="+12"/> + <source>Confirmed (%1 confirmations)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+9"/> + <source>This block was not received by any other nodes and will probably not be accepted!</source> <translation type="unfinished"/> </message> <message> <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> + <source>Generated but not accepted</source> <translation type="unfinished"/> </message> <message> - <location line="-22"/> - <location line="+25"/> - <source>Confirmed (%1 confirmations)</source> + <location line="-21"/> + <source>Offline</source> <translation type="unfinished"/> </message> <message> - <location line="-22"/> - <source>This block was not received by any other nodes and will probably not be accepted!</source> + <location line="+3"/> + <source>Unconfirmed</source> <translation type="unfinished"/> </message> <message> <location line="+3"/> - <source>Generated but not accepted</source> + <source>Confirming (%1 of %2 recommended confirmations)</source> <translation type="unfinished"/> </message> <message> - <location line="+62"/> + <location line="+6"/> + <source>Conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation type="unfinished"/> </message> @@ -2934,7 +2986,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation type="unfinished"/> </message> @@ -3200,12 +3252,12 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+223"/> <source>Usage:</source> <translation type="unfinished"/> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>List commands</source> <translation type="unfinished"/> </message> @@ -3260,12 +3312,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation type="unfinished"/> </message> <message> - <location line="-148"/> + <location line="-150"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"/> </message> @@ -3285,17 +3337,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Run in the background as a daemon and accept commands</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <location line="+40"/> <source>Use the test network</source> <translation type="unfinished"/> </message> <message> - <location line="-118"/> + <location line="-120"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> @@ -3426,6 +3478,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation type="unfinished"/> </message> @@ -3636,6 +3693,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Start Bitcoin server</source> <translation type="unfinished"/> </message> @@ -3685,12 +3747,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-79"/> + <location line="-80"/> <source>Imports blocks from external blk000??.dat file</source> <translation type="unfinished"/> </message> <message> - <location line="-105"/> + <location line="-106"/> <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> @@ -3710,7 +3772,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+89"/> + <location line="+90"/> <source>Information</source> <translation type="unfinished"/> </message> @@ -3780,7 +3842,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+7"/> <source>System error: </source> <translation type="unfinished"/> </message> @@ -3826,6 +3888,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>version</source> <translation type="unfinished"/> </message> @@ -3835,32 +3902,32 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-58"/> + <location line="-60"/> <source>Password for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-70"/> + <location line="-71"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation type="unfinished"/> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+161"/> + <location line="+163"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"/> </message> <message> - <location line="-24"/> + <location line="-25"/> <source>Set key pool size to <n> (default: 100)</source> <translation type="unfinished"/> </message> @@ -3870,12 +3937,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+38"/> + <location line="+39"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-30"/> + <location line="-31"/> <source>Server certificate file (default: server.cert)</source> <translation type="unfinished"/> </message> @@ -3885,7 +3952,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+17"/> <source>This help message</source> <translation type="unfinished"/> </message> @@ -3895,12 +3962,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-107"/> + <location line="-109"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation type="unfinished"/> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Loading addresses...</source> <translation type="unfinished"/> </message> @@ -3915,12 +3982,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+98"/> + <location line="+99"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation type="unfinished"/> </message> <message> - <location line="-100"/> + <location line="-101"/> <source>Error loading wallet.dat</source> <translation type="unfinished"/> </message> @@ -3930,7 +3997,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+56"/> + <location line="+57"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation type="unfinished"/> </message> @@ -3940,7 +4007,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-101"/> + <location line="-103"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -3950,7 +4017,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+48"/> + <location line="+49"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation type="unfinished"/> </message> @@ -3970,7 +4037,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-62"/> + <location line="-63"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"/> </message> @@ -3980,12 +4047,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+95"/> + <location line="+96"/> <source>Loading wallet...</source> <translation type="unfinished"/> </message> <message> - <location line="-56"/> + <location line="-57"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> @@ -3995,7 +4062,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+67"/> + <location line="+68"/> <source>Rescanning...</source> <translation type="unfinished"/> </message> @@ -4005,17 +4072,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+85"/> + <location line="+86"/> <source>To use the %s option</source> <translation type="unfinished"/> </message> <message> - <location line="-77"/> + <location line="-78"/> <source>Error</source> <translation type="unfinished"/> </message> <message> - <location line="-35"/> + <location line="-36"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_gu_IN.ts b/src/qt/locale/bitcoin_gu_IN.ts index c261c07dbb..3b351f1dfb 100644 --- a/src/qt/locale/bitcoin_gu_IN.ts +++ b/src/qt/locale/bitcoin_gu_IN.ts @@ -31,6 +31,12 @@ This product includes software developed by the OpenSSL Project for use in the O <source>The Bitcoin Core developers</source> <translation type="unfinished"/> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source> (%1-bit)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>AddressBookPage</name> @@ -612,6 +618,16 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation type="unfinished"/> @@ -681,7 +697,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+435"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -742,7 +758,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation type="unfinished"/> </message> @@ -757,7 +773,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation type="unfinished"/> </message> @@ -908,7 +924,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation type="unfinished"/> </message> @@ -1090,7 +1106,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation type="unfinished"/> </message> @@ -1234,7 +1250,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+122"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation type="unfinished"/> </message> @@ -1244,7 +1260,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="-131"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation type="unfinished"/> </message> @@ -1259,12 +1275,7 @@ Address: %4 <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"/> + <location line="+16"/> <source>MB</source> <translation type="unfinished"/> </message> @@ -1279,7 +1290,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+58"/> + <location line="+107"/> + <source>&Spend unconfirmed change (experts only)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+37"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation type="unfinished"/> </message> @@ -1314,7 +1330,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="-86"/> + <source>W&allet</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+52"/> + <source>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.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+40"/> <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> @@ -1429,17 +1455,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+70"/> <source>default</source> <translation type="unfinished"/> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation type="unfinished"/> </message> <message> - <location line="+75"/> + <location line="+78"/> <source>Confirm options reset</source> <translation type="unfinished"/> </message> @@ -1479,18 +1505,13 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-155"/> - <source>Unconfirmed:</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation type="unfinished"/> </message> <message> <location line="+51"/> - <source>Confirmed:</source> + <source>Available:</source> <translation type="unfinished"/> </message> <message> @@ -1499,7 +1520,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation type="unfinished"/> </message> @@ -1647,6 +1673,11 @@ Address: %4 <source>Error: Invalid combination of -regtest and -testnet.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../guiutil.cpp" line="+82"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>QRImageWidget</name> @@ -1867,22 +1898,22 @@ Address: %4 <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+83"/> + <location filename="../forms/receivecoinsdialog.ui" line="+107"/> <source>&Amount:</source> <translation type="unfinished"/> </message> <message> - <location line="-13"/> + <location line="-16"/> <source>&Label:</source> <translation type="unfinished"/> </message> <message> - <location line="-34"/> + <location line="-37"/> <source>&Message:</source> <translation type="unfinished"/> </message> <message> - <location line="-17"/> + <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"/> </message> @@ -1892,27 +1923,30 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+27"/> - <source>An optional 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"/> </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> + <location line="-7"/> + <location line="+21"/> + <source>An optional label to associate with the new receiving address.</source> <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="-7"/> <source>Use this form to request payments. All fields are <b>optional</b>.</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <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"/> </message> <message> - <location line="+17"/> + <location line="+32"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -1922,17 +1956,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+36"/> - <source>&Request payment</source> + <location line="+78"/> + <source>Requested payments history</source> <translation type="unfinished"/> </message> <message> - <location line="+47"/> - <source>Requested payments</source> + <location line="-98"/> + <source>&Request payment</source> <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+120"/> <source>Show the selected request (does the same as double clicking an entry)</source> <translation type="unfinished"/> </message> @@ -1951,6 +1985,21 @@ Address: %4 <source>Remove</source> <translation type="unfinished"/> </message> + <message> + <location filename="../receivecoinsdialog.cpp" line="+38"/> + <source>Copy label</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy message</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation type="unfinished"/> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -2052,12 +2101,17 @@ Address: %4 <source>(no message)</source> <translation type="unfinished"/> </message> + <message> + <location line="+8"/> + <source>(no amount)</source> + <translation type="unfinished"/> + </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 type="unfinished"/> @@ -2133,7 +2187,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+115"/> + <location line="+164"/> <source>Send to multiple recipients at once</source> <translation type="unfinished"/> </message> @@ -2143,7 +2197,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+20"/> + <location line="-23"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -2153,12 +2207,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+22"/> + <location line="+52"/> <source>Balance:</source> <translation type="unfinished"/> </message> <message> - <location line="+41"/> + <location line="-78"/> <source>Confirm the send action</source> <translation type="unfinished"/> </message> @@ -2168,7 +2222,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-228"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation type="unfinished"/> </message> @@ -2181,12 +2235,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-136"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+15"/> + <location line="-121"/> <source>Copy quantity</source> <translation type="unfinished"/> </message> @@ -2236,7 +2285,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+202"/> + <location line="+203"/> <source>The recipient address is not valid, please recheck.</source> <translation type="unfinished"/> </message> @@ -2271,12 +2320,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Warning: Invalid Bitcoin address</source> <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+20"/> <source>(no label)</source> <translation type="unfinished"/> </message> @@ -2286,7 +2335,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-366"/> + <location line="-367"/> <source>Are you sure you want to send?</source> <translation type="unfinished"/> </message> @@ -2296,7 +2345,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+170"/> + <location line="+171"/> <source>Payment request expired</source> <translation type="unfinished"/> </message> @@ -2373,12 +2422,7 @@ Address: %4 <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"/> + <location line="+968"/> <source>This is a verified payment request.</source> <translation type="unfinished"/> </message> @@ -2388,7 +2432,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+459"/> + <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"/> + </message> + <message> + <location line="+426"/> <source>This is an unverified payment request.</source> <translation type="unfinished"/> </message> @@ -2404,11 +2453,6 @@ Address: %4 <source>Memo:</source> <translation type="unfinished"/> </message> - <message> - <location filename="../sendcoinsentry.cpp" line="+1"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"/> - </message> </context> <context> <name>ShutdownWindow</name> @@ -2446,19 +2490,19 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+10"/> - <location line="+213"/> + <location line="+7"/> + <location line="+210"/> <source>Choose previously used address</source> <translation type="unfinished"/> </message> <message> - <location line="-203"/> - <location line="+213"/> + <location line="-200"/> + <location line="+210"/> <source>Alt+A</source> <translation type="unfinished"/> </message> <message> - <location line="-203"/> + <location line="-200"/> <source>Paste address from clipboard</source> <translation type="unfinished"/> </message> @@ -2499,12 +2543,12 @@ Address: %4 </message> <message> <location line="+3"/> - <location line="+146"/> + <location line="+143"/> <source>Clear &All</source> <translation type="unfinished"/> </message> <message> - <location line="-87"/> + <location line="-84"/> <source>&Verify Message</source> <translation type="unfinished"/> </message> @@ -2519,7 +2563,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+40"/> + <location line="+37"/> <source>Verify the message to ensure it was signed with the specified Bitcoin address</source> <translation type="unfinished"/> </message> @@ -2534,43 +2578,37 @@ Address: %4 <translation type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location line="-2"/> + <location line="-1"/> <source>Click "Sign Message" to generate signature</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Enter Bitcoin signature</source> - <translation type="unfinished"/> - </message> - <message> <location line="+84"/> - <location line="+81"/> + <location line="+80"/> <source>The entered address is invalid.</source> <translation type="unfinished"/> </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 type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location line="-73"/> + <location line="-72"/> <source>Wallet unlock was cancelled.</source> <translation type="unfinished"/> </message> @@ -2590,7 +2628,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+59"/> + <location line="+58"/> <source>The signature could not be decoded.</source> <translation type="unfinished"/> </message> @@ -2651,6 +2689,11 @@ Address: %4 </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation type="unfinished"/> </message> @@ -2812,12 +2855,12 @@ Address: %4 <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation type="unfinished"/> </message> @@ -2858,12 +2901,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> @@ -2873,33 +2916,42 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> + <location line="+12"/> + <source>Confirmed (%1 confirmations)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+9"/> + <source>This block was not received by any other nodes and will probably not be accepted!</source> <translation type="unfinished"/> </message> <message> <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> + <source>Generated but not accepted</source> <translation type="unfinished"/> </message> <message> - <location line="-22"/> - <location line="+25"/> - <source>Confirmed (%1 confirmations)</source> + <location line="-21"/> + <source>Offline</source> <translation type="unfinished"/> </message> <message> - <location line="-22"/> - <source>This block was not received by any other nodes and will probably not be accepted!</source> + <location line="+3"/> + <source>Unconfirmed</source> <translation type="unfinished"/> </message> <message> <location line="+3"/> - <source>Generated but not accepted</source> + <source>Confirming (%1 of %2 recommended confirmations)</source> <translation type="unfinished"/> </message> <message> - <location line="+62"/> + <location line="+6"/> + <source>Conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation type="unfinished"/> </message> @@ -2929,7 +2981,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation type="unfinished"/> </message> @@ -3195,12 +3247,12 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+223"/> <source>Usage:</source> <translation type="unfinished"/> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>List commands</source> <translation type="unfinished"/> </message> @@ -3255,12 +3307,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation type="unfinished"/> </message> <message> - <location line="-148"/> + <location line="-150"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"/> </message> @@ -3280,17 +3332,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Run in the background as a daemon and accept commands</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <location line="+40"/> <source>Use the test network</source> <translation type="unfinished"/> </message> <message> - <location line="-118"/> + <location line="-120"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> @@ -3421,6 +3473,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation type="unfinished"/> </message> @@ -3631,6 +3688,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Start Bitcoin server</source> <translation type="unfinished"/> </message> @@ -3680,12 +3742,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-79"/> + <location line="-80"/> <source>Imports blocks from external blk000??.dat file</source> <translation type="unfinished"/> </message> <message> - <location line="-105"/> + <location line="-106"/> <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> @@ -3705,7 +3767,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+89"/> + <location line="+90"/> <source>Information</source> <translation type="unfinished"/> </message> @@ -3775,7 +3837,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+7"/> <source>System error: </source> <translation type="unfinished"/> </message> @@ -3821,6 +3883,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>version</source> <translation type="unfinished"/> </message> @@ -3830,32 +3897,32 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-58"/> + <location line="-60"/> <source>Password for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-70"/> + <location line="-71"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation type="unfinished"/> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+161"/> + <location line="+163"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"/> </message> <message> - <location line="-24"/> + <location line="-25"/> <source>Set key pool size to <n> (default: 100)</source> <translation type="unfinished"/> </message> @@ -3865,12 +3932,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+38"/> + <location line="+39"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-30"/> + <location line="-31"/> <source>Server certificate file (default: server.cert)</source> <translation type="unfinished"/> </message> @@ -3880,7 +3947,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+17"/> <source>This help message</source> <translation type="unfinished"/> </message> @@ -3890,12 +3957,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-107"/> + <location line="-109"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation type="unfinished"/> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Loading addresses...</source> <translation type="unfinished"/> </message> @@ -3910,12 +3977,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+98"/> + <location line="+99"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation type="unfinished"/> </message> <message> - <location line="-100"/> + <location line="-101"/> <source>Error loading wallet.dat</source> <translation type="unfinished"/> </message> @@ -3925,7 +3992,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+56"/> + <location line="+57"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation type="unfinished"/> </message> @@ -3935,7 +4002,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-101"/> + <location line="-103"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -3945,7 +4012,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+48"/> + <location line="+49"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation type="unfinished"/> </message> @@ -3965,7 +4032,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-62"/> + <location line="-63"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"/> </message> @@ -3975,12 +4042,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+95"/> + <location line="+96"/> <source>Loading wallet...</source> <translation type="unfinished"/> </message> <message> - <location line="-56"/> + <location line="-57"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> @@ -3990,7 +4057,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+67"/> + <location line="+68"/> <source>Rescanning...</source> <translation type="unfinished"/> </message> @@ -4000,17 +4067,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+85"/> + <location line="+86"/> <source>To use the %s option</source> <translation type="unfinished"/> </message> <message> - <location line="-77"/> + <location line="-78"/> <source>Error</source> <translation type="unfinished"/> </message> <message> - <location line="-35"/> + <location line="-36"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_he.ts b/src/qt/locale/bitcoin_he.ts index 3a13801dae..2d56efe8ae 100644 --- a/src/qt/locale/bitcoin_he.ts +++ b/src/qt/locale/bitcoin_he.ts @@ -1,10 +1,10 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="he" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="he" version="2.1"> <context> <name>AboutDialog</name> <message> <location filename="../forms/aboutdialog.ui" line="+14"/> <source>About Bitcoin Core</source> - <translation type="unfinished"/> + <translation>על ×ודות ליבת ביטקוין</translation> </message> <message> <location line="+39"/> @@ -36,6 +36,12 @@ This product includes software developed by the OpenSSL Project for use in the O <source>The Bitcoin Core developers</source> <translation type="unfinished"/> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source> (%1-bit)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>AddressBookPage</name> @@ -65,7 +71,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+58"/> <source>C&lose</source> <translation type="unfinished"/> </message> @@ -75,7 +81,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>העתק כתובת</translation> </message> <message> - <location filename="../forms/addressbookpage.ui" line="-41"/> + <location filename="../forms/addressbookpage.ui" line="-47"/> <source>Delete the currently selected address from the list</source> <translation>מחק ×ת הכתובת ×©× ×‘×—×¨×” מהרשימה</translation> </message> @@ -322,7 +328,7 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+295"/> + <location filename="../bitcoingui.cpp" line="+294"/> <source>Sign &message...</source> <translation>×—×ª×•× ×¢×œ הודעה</translation> </message> @@ -337,12 +343,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&סקירה</translation> </message> <message> - <location line="-137"/> + <location line="-136"/> <source>Node</source> <translation type="unfinished"/> </message> <message> - <location line="+138"/> + <location line="+137"/> <source>Show general overview of wallet</source> <translation>הצג סקירה כללית של ×”××¨× ×§</translation> </message> @@ -463,17 +469,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>×מת הודעה...</translation> </message> <message> - <location line="+430"/> + <location line="+440"/> <source>Bitcoin</source> <translation>ביטקוין</translation> </message> <message> - <location line="-643"/> + <location line="-652"/> <source>Wallet</source> <translation>××¨× ×§</translation> </message> <message> - <location line="+146"/> + <location line="+145"/> <source>&Send</source> <translation>&שלח</translation> </message> @@ -529,20 +535,20 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>סרגל ×›×œ×™× ×˜×בי×</translation> </message> <message> - <location line="-284"/> - <location line="+376"/> + <location line="-283"/> + <location line="+375"/> <source>[testnet]</source> <translation>[רשת-בדיקה]</translation> </message> <message> - <location line="-401"/> + <location line="-400"/> <source>Bitcoin Core</source> <translation>ליבת ביטקוין</translation> </message> <message> - <location line="+163"/> + <location line="+162"/> <source>Request payments (generates QR codes and bitcoin: URIs)</source> - <translation type="unfinished"/> + <translation>בקש ×ª×©×œ×•×ž×™× (מייצר קודיי QR וסכימות URI של :bitcoin)</translation> </message> <message> <location line="+29"/> @@ -602,7 +608,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>×”×•×©×œ× ×¢×™×‘×•×“ של %1 ×‘×œ×•×§×™× ×©×œ היסטוריית פעולות.</translation> </message> <message numerus="yes"> - <location line="+23"/> + <location line="+27"/> <source>%n hour(s)</source> <translation><numerusform>%n שעה</numerusform><numerusform>%n שעות</numerusform></translation> </message> @@ -613,10 +619,21 @@ This product includes software developed by the OpenSSL Project for use in the O </message> <message numerus="yes"> <location line="+4"/> + <location line="+6"/> <source>%n week(s)</source> <translation><numerusform>%n שבוע</numerusform><numerusform>%n שבועות</numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation>1% מ×חור</translation> @@ -647,12 +664,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>מידע</translation> </message> <message> - <location line="-85"/> + <location line="-95"/> <source>Up to date</source> <translation>×¢×“×›× ×™</translation> </message> <message> - <location line="+34"/> + <location line="+44"/> <source>Catching up...</source> <translation>מתעדכן...</translation> </message> @@ -689,7 +706,7 @@ Address: %4 <translation>×”××¨× ×§ <b>מוצפן</b> וכרגע <b>× ×¢×•×œ</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+441"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>שגי××” ×¡×•×¤× ×™×ª ×ירעה. ביטקוין ××™× ×• יכול להמשיך לפעול בבטחה ולכן ייסגר.</translation> </message> @@ -697,7 +714,7 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+119"/> + <location filename="../clientmodel.cpp" line="+128"/> <source>Network Alert</source> <translation>×זעקת רשת</translation> </message> @@ -750,7 +767,7 @@ Address: %4 <translation>×©×™× ×•×™:</translation> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation>(מחק)(בחר) הכל</translation> </message> @@ -765,7 +782,7 @@ Address: %4 <translation>מצר רשימה</translation> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation>כמות</translation> </message> @@ -795,7 +812,7 @@ Address: %4 <translation>קדימות</translation> </message> <message> - <location filename="../coincontroldialog.cpp" line="+42"/> + <location filename="../coincontroldialog.cpp" line="+41"/> <source>Copy address</source> <translation>העתק כתובת</translation> </message> @@ -861,7 +878,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+323"/> + <location line="+332"/> <source>highest</source> <translation>×”×›×™ גבוה</translation> </message> @@ -916,7 +933,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation>×בק</translation> </message> @@ -979,7 +996,7 @@ Address: %4 </message> <message> <location line="+43"/> - <location line="+66"/> + <location line="+63"/> <source>(no label)</source> <translation>(×œ×œ× ×ª×•×™×ª)</translation> </message> @@ -1067,7 +1084,7 @@ Address: %4 <message> <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"/> @@ -1077,17 +1094,17 @@ Address: %4 <message> <location line="+2"/> <source>Directory already exists. Add %1 if you intend to create a new directory here.</source> - <translation type="unfinished"/> + <translation>הספריה כבר קיימת. הוסף %1 ×× ×‘×¨×¦×•× ×š ליצור ספריה חדשה ×›×ן.</translation> </message> <message> <location line="+3"/> <source>Path already exists, and is not a directory.</source> - <translation type="unfinished"/> + <translation>×”× ×ª×™×‘ כבר ×§×™×™× ×•××™× ×• מצביע על ספרייה.</translation> </message> <message> <location line="+7"/> <source>Cannot create data directory here.</source> - <translation type="unfinished"/> + <translation>×œ× × ×™×ª×Ÿ ליצור ספריית מידע ×›×ן.</translation> </message> </context> <context> @@ -1098,7 +1115,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation>ליבת ביטקוין</translation> </message> @@ -1168,15 +1185,15 @@ Address: %4 <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="+85"/> + <location filename="../intro.cpp" line="+82"/> <source>Bitcoin</source> <translation>ביטקוין</translation> </message> @@ -1193,12 +1210,12 @@ Address: %4 <message> <location line="+9"/> <source>GB of free space available</source> - <translation type="unfinished"/> + <translation>×’"ב של שטח ×חסון ×¤× ×•×™</translation> </message> <message> <location line="+3"/> <source>(of %1GB needed)</source> - <translation type="unfinished"/> + <translation>(מתוך %1 ×’"ב × ×—×•×¦×™×)</translation> </message> </context> <context> @@ -1242,9 +1259,9 @@ Address: %4 <translation>ר×שי</translation> </message> <message> - <location line="+6"/> + <location line="+122"/> <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. מומלצת עמלה בסך 0.01.</translation> + <translation>עמלת פעולה ××•×¤×¦×™×•× ×œ×™×ª לכל kB תבטיח שהפעולה שלך תעובד בזריזות. רוב הפעולות הן 1 kB.</translation> </message> <message> <location line="+15"/> @@ -1252,7 +1269,7 @@ Address: %4 <translation>×©×œ× &עמלת פעולה</translation> </message> <message> - <location line="+31"/> + <location line="-131"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation>הפעל ×ת ביטקוין ב×ופן עצמ××™ ל×חר התחברות למערכת.</translation> </message> @@ -1267,12 +1284,7 @@ Address: %4 <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"/> + <location line="+16"/> <source>MB</source> <translation>מגה בייט</translation> </message> @@ -1287,7 +1299,7 @@ Address: %4 <translation>קבע ×ת מספר ×ª×”×œ×™×›×•× ×™ ×ימות ×”×¡×§×¨×™×¤×˜×™× (1-16, 0 = ×וטומטי, ברירת מחדל: 0)</translation> </message> <message> - <location line="+58"/> + <location line="+153"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation type="unfinished"/> </message> @@ -1302,7 +1314,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+224"/> + <location line="+214"/> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1317,12 +1329,37 @@ Address: %4 <translation>×יפוס ×פשרויות</translation> </message> <message> - <location line="-323"/> + <location line="-313"/> <source>&Network</source> <translation>רשת</translation> </message> <message> - <location line="+6"/> + <location line="-95"/> + <source>W&allet</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+65"/> + <source>Expert</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+9"/> + <source>Enable coin &control features</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> + <source>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.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>&Spend unconfirmed change</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+17"/> <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> @@ -1417,17 +1454,12 @@ Address: %4 <translation>הצג כתובות ברשימת הפעולות</translation> </message> <message> - <location line="+7"/> + <location line="-262"/> <source>Whether to show coin control features or not.</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Display coin &control features (experts only)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+136"/> + <location line="+398"/> <source>&OK</source> <translation>×ישור</translation> </message> @@ -1437,17 +1469,17 @@ Address: %4 <translation>ביטול</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+70"/> <source>default</source> <translation>ברירת מחדל</translation> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation type="unfinished"/> </message> <message> - <location line="+75"/> + <location line="+78"/> <source>Confirm options reset</source> <translation>×שר ×ת ×יפוס ×”×פשרויות</translation> </message> @@ -1487,19 +1519,14 @@ Address: %4 <translation>המידע המוצג עשוי להיות מיושן. ×”××¨× ×§ שלך ×ž×¡×ª× ×›×¨×Ÿ ב×ופן ×וטומטי ×¢× ×¨×©×ª הביטקוין ל×חר ×›×™× ×•×Ÿ חיבור, ×ך התהליך ×˜×¨× ×”×¡×ª×™×™×.</translation> </message> <message> - <location line="-155"/> - <source>Unconfirmed:</source> - <translation>ממתין ל×ישור:</translation> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation>××¨× ×§</translation> </message> <message> <location line="+51"/> - <source>Confirmed:</source> - <translation>מ×ושר:</translation> + <source>Available:</source> + <translation type="unfinished"/> </message> <message> <location line="+16"/> @@ -1507,7 +1534,12 @@ Address: %4 <translation>היתרה ×”×–×ž×™× ×” ×”× ×•×›×—×™×ª</translation> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation>×”×¡×›×•× ×”×›×•×œ×œ של פעולות ×©×˜×¨× ×ושרו, ועוד ××™× ×Ÿ × ×¡×¤×¨×•×ª בחישוב היתרה ×”×–×ž×™× ×”</translation> </message> @@ -1559,7 +1591,7 @@ Address: %4 <message> <location line="+96"/> <source>Requested payment amount of %1 is too small (considered dust).</source> - <translation type="unfinished"/> + <translation>×”×¡×›×•× ×”× ×“×¨×© ×œ×ª×©×œ×•× %1 קטן מדי (× ×—×©×‘ ל×בק)</translation> </message> <message> <location line="-221"/> @@ -1604,7 +1636,7 @@ Address: %4 <message> <location line="+73"/> <source>Unverified payment requests to custom payment scripts are unsupported.</source> - <translation type="unfinished"/> + <translation>בקשות ×œ×ª×©×œ×•× ×œ×¡×§×¨×™×¤×˜×™×™ ×ª×©×œ×•× ×ž×•×ª××ž×™× ×ישית ××™× ×Ÿ × ×ª×ž×›×•×ª.</translation> </message> <message> <location line="+59"/> @@ -1614,7 +1646,7 @@ Address: %4 <message> <location line="+43"/> <source>Error communicating with %1: %2</source> - <translation type="unfinished"/> + <translation>שגי××” בתקשורת ×¢× %1: %2</translation> </message> <message> <location line="+24"/> @@ -1624,7 +1656,7 @@ Address: %4 <message> <location line="+11"/> <source>Bad response from server %1</source> - <translation type="unfinished"/> + <translation>×ž×¢× ×” שגוי משרת %1</translation> </message> <message> <location line="+33"/> @@ -1640,20 +1672,25 @@ Address: %4 <context> <name>QObject</name> <message> - <location filename="../bitcoin.cpp" line="+71"/> - <location line="+11"/> + <location filename="../bitcoin.cpp" line="+63"/> + <location line="+14"/> <source>Bitcoin</source> <translation>ביטקוין</translation> </message> <message> - <location line="+1"/> + <location line="-13"/> <source>Error: Specified data directory "%1" does not exist.</source> - <translation type="unfinished"/> + <translation>שגי××”: הספריה "%1" ×œ× ×§×™×™×ž×ª.</translation> </message> <message> - <location line="-12"/> + <location line="+13"/> <source>Error: Invalid combination of -regtest and -testnet.</source> - <translation type="unfinished"/> + <translation>שגי××”: שילוב בלתי חוקי של regtest- ו testnet-.</translation> + </message> + <message> + <location filename="../guiutil.cpp" line="+82"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>×”×›× ×¡ כתובת ביטקוין (למשל 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> </context> <context> @@ -1697,7 +1734,7 @@ Address: %4 <location line="+36"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+359"/> + <location filename="../rpcconsole.cpp" line="+373"/> <source>N/A</source> <translation>N/A</translation> </message> @@ -1793,11 +1830,13 @@ Address: %4 </message> <message> <location line="+64"/> + <location filename="../rpcconsole.cpp" line="-10"/> <source>In:</source> <translation>× ×›× ×¡:</translation> </message> <message> <location line="+80"/> + <location filename="../rpcconsole.cpp" line="+1"/> <source>Out:</source> <translation>יוצ×:</translation> </message> @@ -1822,7 +1861,7 @@ Address: %4 <translation>× ×§×” לוח בקרה</translation> </message> <message> - <location filename="../rpcconsole.cpp" line="-30"/> + <location filename="../rpcconsole.cpp" line="-35"/> <source>Welcome to the Bitcoin RPC console.</source> <translation>×‘×¨×•×›×™× ×”×‘××™× ×œ×œ×•×— בקרת RPC של ביטקוין</translation> </message> @@ -1837,7 +1876,7 @@ Address: %4 <translation>הקלד <b>help</b> בשביל סקירה של הפקודות ×”×–×ž×™× ×•×ª.</translation> </message> <message> - <location line="+122"/> + <location line="+136"/> <source>%1 B</source> <translation>%1 בייט</translation> </message> @@ -1875,24 +1914,24 @@ Address: %4 <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+83"/> + <location filename="../forms/receivecoinsdialog.ui" line="+107"/> <source>&Amount:</source> <translation type="unfinished"/> </message> <message> - <location line="-13"/> + <location line="-16"/> <source>&Label:</source> <translation>ת&וית:</translation> </message> <message> - <location line="-34"/> + <location line="-37"/> <source>&Message:</source> <translation type="unfinished"/> </message> <message> - <location line="-17"/> + <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>השתמש שוב ב×חת מכתובות הקבלה שכבר × ×¢×©×” בהן שימוש. לשימוש חוזר בכתובות ישהן השלכות ×בטחה ופרטיות. השתמש בזה רק ×× ×תה מייצר מחדש בקשת ×ª×©×œ×•× ×©×›×‘×¨ × ×¢×©×ª×”.</translation> </message> <message> <location line="+3"/> @@ -1900,27 +1939,30 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+27"/> - <source>An optional 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"/> </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> + <location line="-7"/> + <location line="+21"/> + <source>An optional label to associate with the new receiving address.</source> <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="-7"/> <source>Use this form to request payments. All fields are <b>optional</b>.</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <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"/> </message> <message> - <location line="+17"/> + <location line="+32"/> <source>Clear all fields of the form.</source> <translation>× ×§×” ×ת כל השדות</translation> </message> @@ -1930,17 +1972,17 @@ Address: %4 <translation>× ×§×”</translation> </message> <message> - <location line="+36"/> - <source>&Request payment</source> + <location line="+78"/> + <source>Requested payments history</source> <translation type="unfinished"/> </message> <message> - <location line="+47"/> - <source>Requested payments</source> + <location line="-98"/> + <source>&Request payment</source> <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+120"/> <source>Show the selected request (does the same as double clicking an entry)</source> <translation type="unfinished"/> </message> @@ -1950,7 +1992,7 @@ Address: %4 <translation>הצג</translation> </message> <message> - <location line="+11"/> + <location line="+14"/> <source>Remove the selected entries from the list</source> <translation type="unfinished"/> </message> @@ -1959,6 +2001,21 @@ Address: %4 <source>Remove</source> <translation>הסר</translation> </message> + <message> + <location filename="../receivecoinsdialog.cpp" line="+39"/> + <source>Copy label</source> + <translation>העתק תוית</translation> + </message> + <message> + <location line="+1"/> + <source>Copy message</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation>העתק כמות</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -1995,7 +2052,7 @@ Address: %4 <message> <location line="+1"/> <source>URI</source> - <translation type="unfinished"/> + <translation>כתובת (×תר ×ו מש×ב)</translation> </message> <message> <location line="+2"/> @@ -2060,12 +2117,17 @@ Address: %4 <source>(no message)</source> <translation>(×ין הודעות)</translation> </message> + <message> + <location line="+8"/> + <source>(no amount)</source> + <translation type="unfinished"/> + </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>שלח מטבעות</translation> @@ -2141,7 +2203,7 @@ Address: %4 <translation>כתובת לעודף מות×מת ×ישית</translation> </message> <message> - <location line="+115"/> + <location line="+164"/> <source>Send to multiple recipients at once</source> <translation>שלח למספר ×ž×§×‘×œ×™× ×‘×•-×–×ž× ×™×ª</translation> </message> @@ -2151,7 +2213,7 @@ Address: %4 <translation>הוסף מקבל</translation> </message> <message> - <location line="+20"/> + <location line="-23"/> <source>Clear all fields of the form.</source> <translation>× ×§×” ×ת כל השדות</translation> </message> @@ -2161,12 +2223,12 @@ Address: %4 <translation>× ×§×” הכל</translation> </message> <message> - <location line="+22"/> + <location line="+58"/> <source>Balance:</source> <translation>יתרה:</translation> </message> <message> - <location line="+41"/> + <location line="-84"/> <source>Confirm the send action</source> <translation>×שר ×ת פעולת השליחה</translation> </message> @@ -2176,7 +2238,7 @@ Address: %4 <translation>שלח</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-228"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation>×שר שליחת מטבעות</translation> </message> @@ -2186,15 +2248,10 @@ Address: %4 <location line="+5"/> <location line="+4"/> <source>%1 to %2</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-136"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>×”×›× ×¡ כתובת ביטקוין (למשל 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + <translation>%1 ×ל %2</translation> </message> <message> - <location line="+15"/> + <location line="-121"/> <source>Copy quantity</source> <translation>העתק כמות</translation> </message> @@ -2244,7 +2301,7 @@ Address: %4 <translation>×ו</translation> </message> <message> - <location line="+202"/> + <location line="+203"/> <source>The recipient address is not valid, please recheck.</source> <translation>כתובת המקבל ××™× ×” ×ª×§×™× ×”, ×× × ×‘×“×•×§ ×©× ×™×ª.</translation> </message> @@ -2279,12 +2336,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Warning: Invalid Bitcoin address</source> <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+20"/> <source>(no label)</source> <translation>(×œ×œ× ×ª×•×™×ª)</translation> </message> @@ -2294,7 +2351,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-366"/> + <location line="-367"/> <source>Are you sure you want to send?</source> <translation>×”×× ×כן לשלוח?</translation> </message> @@ -2304,14 +2361,14 @@ Address: %4 <translation>הוסף מחיר טיפול</translation> </message> <message> - <location line="+170"/> + <location line="+171"/> <source>Payment request expired</source> <translation>תוקף בקשת ×ª×©×œ×•× ×¤×’</translation> </message> <message> <location line="+8"/> <source>Invalid payment address %1</source> - <translation type="unfinished"/> + <translation>כתובת ×ª×©×œ×•× ×©×’×•×™×” %1</translation> </message> </context> <context> @@ -2381,22 +2438,22 @@ Address: %4 <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"/> + <location line="+968"/> <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>הקלד תווית עבור כתובת זו בכדי להוסיף ×ותה לרשימת הכתובות בשימוש</translation> + </message> + <message> + <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"/> </message> <message> - <location line="+459"/> + <location line="+426"/> <source>This is an unverified payment request.</source> <translation>זוהי בקשת ×ª×©×œ×•× ×‘×œ×ª×™Ö¾×ž×ומתת.</translation> </message> @@ -2412,11 +2469,6 @@ Address: %4 <source>Memo:</source> <translation>תזכורת:</translation> </message> - <message> - <location filename="../sendcoinsentry.cpp" line="+1"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>×”×›× ×¡ כתובת ביטקוין (למשל 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> </context> <context> <name>ShutdownWindow</name> @@ -2454,19 +2506,19 @@ Address: %4 <translation>הכתובת ×יתה ×œ×—×ª×•× ×¢×œ ההודעה (למשל 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location line="+10"/> - <location line="+213"/> + <location line="+7"/> + <location line="+210"/> <source>Choose previously used address</source> <translation>בחר כתובת שהייתה בשימוש</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>הדבק כתובת מהלוח</translation> </message> @@ -2507,12 +2559,12 @@ Address: %4 </message> <message> <location line="+3"/> - <location line="+146"/> + <location line="+143"/> <source>Clear &All</source> <translation>× ×§×” הכל</translation> </message> <message> - <location line="-87"/> + <location line="-84"/> <source>&Verify Message</source> <translation>×מת הודעה</translation> </message> @@ -2527,7 +2579,7 @@ Address: %4 <translation>הכתובת ×יתה ההודעה × ×—×ª×ž×” (למשל 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>×מת ×ת ההודעה כדי להבטיח ×©×”×™× × ×—×ª×ž×” ×¢× ×›×ª×•×‘×ª הביטקוין ×”× ×ª×•× ×”</translation> </message> @@ -2542,43 +2594,37 @@ Address: %4 <translation>×פס ×ת כל שדות ×ימות הודעה</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>×”×›× ×¡ כתובת ביטקוין (למשל 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location line="-2"/> + <location line="-1"/> <source>Click "Sign Message" to generate signature</source> <translation>לחץ "×—×ª×•× ×¢×œ ההודעה" כדי לחולל חתימה</translation> </message> <message> - <location line="+3"/> - <source>Enter Bitcoin signature</source> - <translation>×”×›× ×¡ חתימת ביטקוין</translation> - </message> - <message> <location line="+84"/> - <location line="+81"/> + <location line="+80"/> <source>The entered address is invalid.</source> <translation>הכתובת ×©×”×•×›× ×¡×” ××™× ×” ×ª×§×™× ×”.</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>×× × ×‘×“×•×§ ×ת הכתובת ×•× ×¡×” ×©× ×™×ª.</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>הכתובת ×©×”×•×›× ×¡×” ××™× ×” מתייחסת למפתח.</translation> </message> <message> - <location line="-73"/> + <location line="-72"/> <source>Wallet unlock was cancelled.</source> <translation>פתיחת ×”××¨× ×§ בוטלה.</translation> </message> @@ -2598,7 +2644,7 @@ Address: %4 <translation>ההודעה × ×—×ª×ž×”.</translation> </message> <message> - <location line="+59"/> + <location line="+58"/> <source>The signature could not be decoded.</source> <translation>×œ× × ×™×ª×Ÿ ×œ×¤×¢× ×— ×ת החתימה.</translation> </message> @@ -2659,6 +2705,11 @@ Address: %4 </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation>%1/×ž× ×•×ª×§</translation> </message> @@ -2777,12 +2828,12 @@ Address: %4 <message> <location line="+18"/> <source>Merchant</source> - <translation type="unfinished"/> + <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 "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source> - <translation type="unfinished"/> + <translation>מטבעות ×—×“×©×™× ×©× ×•×¦×¨×• ×—×™×™×‘×™× ×œ×”×‘×©×™×œ במשך %1 ×‘×œ×•×§×™× ×œ×¤× ×™ ×©× ×™×ª×Ÿ ×œ× ×¦×œ ×ות×. כשבלוק ×–×” × ×•×¦×¨ ×”×•× ×©×•×“×¨ ברשת על ×ž× ×ª ×©×™×™×›× ×¡ לשרשרת הבלוקי×. במקרה ×•×”×•× ×œ× ×™×™×›× ×¡ לשרשרת, מצבו ×™×©×ª× ×” ל"×œ× ×”×ª×§×‘×œ" ×•×œ× × ×™×ª×Ÿ ×™×”×™×” ×œ× ×¦×œ×•. ×–×” יכול לקרות מדי ×¤×¢× ×× ×‘×ž×§×¨×” צומת ×חרת ייצרה בלוק בהבדל של ×©× ×™×•×ª בודדות ממך.</translation> </message> <message> <location line="+8"/> @@ -2820,12 +2871,12 @@ Address: %4 <translation>, ×˜×¨× ×©×•×“×¨ בהצלחה</translation> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <source>Open for %n more block(s)</source> <translation><numerusform>פתח למשך בלוק %n יותר</numerusform><numerusform>פתח למשך %n ×‘×œ×•×§×™× × ×•×¡×¤×™×</numerusform></translation> </message> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation>×œ× ×™×“×•×¢</translation> </message> @@ -2866,12 +2917,12 @@ Address: %4 <translation>כמות</translation> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <source>Open for %n more block(s)</source> <translation><numerusform>פתח למשך בלוק %n יותר</numerusform><numerusform>פתח למשך %n ×‘×œ×•×§×™× × ×•×¡×¤×™×</numerusform></translation> </message> @@ -2881,23 +2932,12 @@ Address: %4 <translation>פתוח עד %1</translation> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> - <translation>×œ× ×ž×—×•×‘×¨ (%1 ×ישורי×)</translation> - </message> - <message> - <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation>ממתין ל×ישור (%1 מתוך %2 ×ישורי×)</translation> - </message> - <message> - <location line="-22"/> - <location line="+25"/> + <location line="+12"/> <source>Confirmed (%1 confirmations)</source> <translation>מ×ושר (%1 ×ישורי×)</translation> </message> <message> - <location line="-22"/> + <location line="+9"/> <source>This block was not received by any other nodes and will probably not be accepted!</source> <translation>הבלוק ×”×–×” ×œ× × ×§×œ×˜ על ידי ××£ צומת ×חר, ×•×›× ×¨××” ×œ× ×™×ª×§×‘×œ!</translation> </message> @@ -2907,7 +2947,27 @@ Address: %4 <translation>× ×•×¦×¨ ×ך ×œ× ×”×ª×§×‘×œ</translation> </message> <message> - <location line="+62"/> + <location line="-21"/> + <source>Offline</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Unconfirmed</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation>התקבל ×¢×</translation> </message> @@ -2937,7 +2997,7 @@ Address: %4 <translation>(n/a)</translation> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation>מצב הפעולה. השהה ×ת הסמן מעל שדה ×–×” כדי לר×ות ×ת מספר ×”×ישורי×.</translation> </message> @@ -3066,7 +3126,7 @@ Address: %4 <translation>הצג פרטי פעולה</translation> </message> <message> - <location line="+142"/> + <location line="+140"/> <source>Export Transaction History</source> <translation>×™×¦×•× ×”×™×¡×˜×•×¨×™×™×ª פעולות</translation> </message> @@ -3203,12 +3263,12 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+226"/> <source>Usage:</source> <translation>שימוש:</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>List commands</source> <translation>רשימת פקודות</translation> </message> @@ -3238,12 +3298,7 @@ Address: %4 <translation>ציין תיקיית × ×ª×•× ×™×</translation> </message> <message> - <location line="-9"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation>קבע ×ת גודל המטמון של מסד ×”× ×ª×•× ×™× ×‘×ž×’×”×‘×™×™×˜ (ברירת מחדל: 25)</translation> - </message> - <message> - <location line="-26"/> + <location line="-35"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>×”×זן ×œ×—×™×‘×•×¨×™× ×‘<פורט> (ברירת מחדל: 8333 ×ו ברשת הבדיקה: 18333)</translation> </message> @@ -3263,47 +3318,47 @@ Address: %4 <translation>ציין ×ת הכתובת הפומבית שלך</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation>סף ×œ×”×ª× ×ª×§×•×ª ×ž×¢×ž×™×ª×™× ×”× ×•×”×’×™× ×©×œ× ×›×”×œ×›×” (ברירת מחדל: 100)</translation> </message> <message> - <location line="-148"/> + <location line="-151"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>מספר ×©× ×™×•×ª ×œ×ž× ×•×¢ ×ž×¢×ž×™×ª×™× ×”× ×•×”×’×™× ×©×œ× ×›×”×œ×›×” מלהתחבר מחדש (ברירת מחדל: 86400)</translation> </message> <message> - <location line="-36"/> + <location line="-38"/> <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="+34"/> + <location line="+36"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation>×”×זן לחיבורי JSON-RPC ב- <port> (ברירת מחדל: 8332 ×ו רשת בדיקה: 18332)</translation> </message> <message> - <location line="+45"/> + <location line="+46"/> <source>Accept command line and JSON-RPC commands</source> <translation>קבל פקודות משורת הפקודה ו- JSON-RPC</translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Run in the background as a daemon and accept commands</source> <translation>רוץ ברקע כדימון וקבל פקודות</translation> </message> <message> - <location line="+39"/> + <location line="+40"/> <source>Use the test network</source> <translation>השתמש ברשת הבדיקה</translation> </message> <message> - <location line="-118"/> + <location line="-120"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>קבל ×—×™×‘×•×¨×™× ×ž×‘×—×•×¥ (ברירת מחדל: 1 ×œ×œ× -proxy ×ו -connect)</translation> </message> <message> - <location line="-95"/> + <location line="-98"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -3330,7 +3385,7 @@ rpcpassword=%s <message> <location line="+12"/> <source>Acceptable ciphers (default: TLSv1.2+HIGH:TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!3DES:@STRENGTH)</source> - <translation type="unfinished"/> + <translation>×¦×¤× ×™× ×§×‘×™×œ×™× (ברירת מחדל: TLSv1.2+HIGH:TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!3DES:@STRENGTH)</translation> </message> <message> <location line="+5"/> @@ -3343,14 +3398,9 @@ rpcpassword=%s <translation>קשור ×¢× ×›×ª×•×‘×ª × ×ª×•× ×” וה×זן לה תמיד. השתמש בסימון [host]:port עבוד IPv6.</translation> </message> <message> - <location line="+3"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> - <translation>×œ× ×ž×¡×•×’×œ להשיג × ×¢×™×œ×” על תיקיית ×”× ×ª×•× ×™× %s. ×›× ×¨××” שביטקוין כבר רץ.</translation> - </message> - <message> - <location line="+3"/> + <location line="+6"/> <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>×›× ×™×¡×” למצב בדיקת רגרסיה, בה × ×¢×©×” שימוש בשרשרת מיוחדת המ×פשרת פתרון מיידי של בלוקי×. מצב ×–×” מיועד לכלי בדיקת רגרסיה ופיתוח ×ª×•×›× ×”.</translation> </message> <message> <location line="+4"/> @@ -3359,6 +3409,11 @@ rpcpassword=%s </message> <message> <location line="+3"/> + <source>Error: Listening for incoming connections failed (listen returned error %d)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <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> @@ -3378,7 +3433,12 @@ rpcpassword=%s <translation>זוהי ×‘× ×™×™×ª × ×™×¡×™×•×Ÿ טרו×-שחרור - השימוש בה על ×חריותך - ×ין להשתמש לצורך כריה ×ו יישומי מסחר</translation> </message> <message> - <location line="+5"/> + <location line="+3"/> + <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source> <translation type="unfinished"/> </message> @@ -3395,12 +3455,12 @@ rpcpassword=%s <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>×זהרה: × ×¨××” ×©×œ× ×›×œ הרשת מסכימה! × ×¨××” ×©×™×©× × ×›×•×¨×™× ×שר × ×ª×§×œ×™× ×‘×‘×¢×™×•×ª.</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>×זהרה: × ×¨××” ש×× ×—× ×• ×œ× ×ž×¡×›×™×ž×™× ×œ×—×œ×•×˜×™×Ÿ ×¢× ×”×¢×ž×™×ª×™× ×©×œ× ×•! ייתכן ו×× ×—× ×• ×¦×¨×™×›×™× ×œ×©×“×¨×’, ×ו ×©×¦×ž×ª×™× ×חרות צריכות לשדרג.</translation> </message> <message> <location line="+3"/> @@ -3430,7 +3490,7 @@ rpcpassword=%s <message> <location line="+1"/> <source>Bitcoin RPC client version</source> - <translation type="unfinished"/> + <translation>גרסת לקוח RPC של ביטקוין</translation> </message> <message> <location line="+1"/> @@ -3439,6 +3499,11 @@ rpcpassword=%s </message> <message> <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation>התחבר רק ×œ×¦×ž×ª×™× ×”×ž×¦×•×™× ×™×</translation> </message> @@ -3450,7 +3515,7 @@ rpcpassword=%s <message> <location line="+1"/> <source>Connect to JSON-RPC on <port> (default: 8332 or testnet: 18332)</source> - <translation type="unfinished"/> + <translation>התחבר ל JSON-RPC ב <port> (ברירת מחדל: 8332 ×ו ברשת בדיקה: 18332)</translation> </message> <message> <location line="+2"/> @@ -3595,12 +3660,12 @@ rpcpassword=%s <message> <location line="+2"/> <source>Incorrect or no genesis block found. Wrong datadir for network?</source> - <translation type="unfinished"/> + <translation>בלוק בר×שית ×”×™× ×• שגוי ×ו ×œ× × ×ž×¦×. ספריית מידע ×œ× × ×›×•× ×” עבור הרשת?</translation> </message> <message> <location line="+3"/> <source>Invalid -onion address: '%s'</source> - <translation type="unfinished"/> + <translation>כתובת onion- שגויה: '%s'</translation> </message> <message> <location line="+15"/> @@ -3633,7 +3698,12 @@ rpcpassword=%s <translation>שליחת פקודה לשרת הביטקוין</translation> </message> <message> - <location line="+7"/> + <location line="+5"/> + <source>Set database cache size in megabytes (%d to %d, default: %d)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>Set maximum block size in bytes (default: %d)</source> <translation type="unfinished"/> </message> @@ -3645,10 +3715,15 @@ rpcpassword=%s <message> <location line="+7"/> <source>Specify wallet file (within data directory)</source> - <translation type="unfinished"/> + <translation>ציין קובץ ××¨× ×§ (בתוך ספריית המידע)</translation> </message> <message> <location line="+2"/> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Start Bitcoin server</source> <translation>הפעל ביטקוין סרוור</translation> </message> @@ -3660,7 +3735,7 @@ rpcpassword=%s <message> <location line="+10"/> <source>Usage (deprecated, use bitcoin-cli):</source> - <translation type="unfinished"/> + <translation>שימוש (מיושן, השתמש ב bitcoin-cli):</translation> </message> <message> <location line="+7"/> @@ -3680,7 +3755,7 @@ rpcpassword=%s <message> <location line="+1"/> <source>Wallet %s resides outside data directory %s</source> - <translation type="unfinished"/> + <translation>×”××¨× ×§ %s יושב מחוץ לספריית המידע %s</translation> </message> <message> <location line="+2"/> @@ -3698,16 +3773,21 @@ rpcpassword=%s <translation>עליך ×œ×‘× ×•×ª מחדש ×ת מסד ×”× ×ª×•× ×™× ×ª×•×š שימוש ב- -reindex על ×ž× ×ª ×œ×©× ×•×ª ×ת -txindex</translation> </message> <message> - <location line="-79"/> + <location line="-80"/> <source>Imports blocks from external blk000??.dat file</source> <translation>×ž×™×™×‘× ×‘×œ×•×§×™× ×ž×§×•×‘×¦×™ blk000??.dat ×—×™×¦×•× ×™×™×</translation> </message> <message> - <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> + <location line="-126"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source> <translation type="unfinished"/> </message> <message> + <location line="+19"/> + <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="+14"/> <source>Output debugging information (default: 0, supplying <category> is optional)</source> <translation type="unfinished"/> @@ -3723,7 +3803,7 @@ rpcpassword=%s <translation>קבע ×ת מספר ×ª×”×œ×™×›×•× ×™ ×ימות ×”×¡×§×¨×™×¤×˜×™× (1-16, 0 = ×וטומטי, ברירת מחדל: 0)</translation> </message> <message> - <location line="+89"/> + <location line="+91"/> <source>Information</source> <translation>מידע</translation> </message> @@ -3793,7 +3873,7 @@ rpcpassword=%s <translation>ציין הגבלת זמן לחיבור ×‘×ž×™×œ×™×©× ×™×•×ª (ברירת מחדל: 5000)</translation> </message> <message> - <location line="+6"/> + <location line="+7"/> <source>System error: </source> <translation>שגי×ת מערכת:</translation> </message> @@ -3839,6 +3919,11 @@ rpcpassword=%s </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>version</source> <translation>גרסה</translation> </message> @@ -3848,32 +3933,32 @@ rpcpassword=%s <translation>קובץ wallet.dat מושחת, החילוץ × ×›×©×œ</translation> </message> <message> - <location line="-58"/> + <location line="-60"/> <source>Password for JSON-RPC connections</source> <translation>סיסמה לחיבורי JSON-RPC</translation> </message> <message> - <location line="-70"/> + <location line="-71"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>×פשר חיבורי JSON-RPC מכתובת ×”××™× ×˜×¨× ×˜ ×”×ž×¦×•×™× ×ª</translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>שלח פקודות לצומת ב-<ip> (ברירת מחדל: 127.0.0.1)</translation> </message> <message> - <location line="-132"/> + <location line="-134"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>בצע פקודה זו כשהבלוק הטוב ביותר ×ž×©×ª× ×” (%s בפקודה יוחלף בגיבוב הבלוק)</translation> </message> <message> - <location line="+161"/> + <location line="+164"/> <source>Upgrade wallet to latest format</source> <translation>שדרג ×ת ×”××¨× ×§ לפורמט ×”×¢×“×›× ×™</translation> </message> <message> - <location line="-24"/> + <location line="-25"/> <source>Set key pool size to <n> (default: 100)</source> <translation>קבע ×ת גודל המ×גר ל -<n> (ברירת מחדל: 100)</translation> </message> @@ -3883,12 +3968,12 @@ rpcpassword=%s <translation>סרוק מחדש ×ת שרשרת ×”×‘×œ×•×§×™× ×œ×ž×¦×™×ת פעולות חסרות ב××¨× ×§</translation> </message> <message> - <location line="+38"/> + <location line="+39"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>השתמש ב-OpenSSL (https( עבור חיבורי JSON-RPC</translation> </message> <message> - <location line="-30"/> + <location line="-31"/> <source>Server certificate file (default: server.cert)</source> <translation>קובץ תעודת שרת (ברירת מחדל: server.cert)</translation> </message> @@ -3898,7 +3983,7 @@ rpcpassword=%s <translation>מפתח פרטי של השרת (ברירת מחדל: server.pem)</translation> </message> <message> - <location line="+16"/> + <location line="+17"/> <source>This help message</source> <translation>הודעת העזרה הזו</translation> </message> @@ -3908,12 +3993,12 @@ rpcpassword=%s <translation>×œ× ×ž×¡×•×’×œ לקשור ל-%s במחשב ×–×” (הקשירה החזירה שגי××” %d, %s)</translation> </message> <message> - <location line="-107"/> + <location line="-109"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>×פשר בדיקת DNS עבור -addnode, -seednode ו- -connect</translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Loading addresses...</source> <translation>טוען כתובות...</translation> </message> @@ -3928,12 +4013,12 @@ rpcpassword=%s <translation>שגי××” ×‘×˜×¢×™× ×ª הקובץ wallet.dat: ×”××¨× ×§ דורש גרסה חדשה יותר של ביטקוין</translation> </message> <message> - <location line="+98"/> + <location line="+99"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>יש לכתוב מחדש ×ת ×”××¨× ×§: ×תחל ×ת ביטקוין לסיו×</translation> </message> <message> - <location line="-100"/> + <location line="-101"/> <source>Error loading wallet.dat</source> <translation>שגי××” ×‘×˜×¢×™× ×ª הקובץ wallet.dat</translation> </message> @@ -3943,7 +4028,7 @@ rpcpassword=%s <translation>כתובת -proxy ×œ× ×ª×§×™× ×”: '%s'</translation> </message> <message> - <location line="+56"/> + <location line="+57"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>רשת ×œ× ×™×“×•×¢×” ×¦×•×™× ×” ב- -onlynet: '%s'</translation> </message> @@ -3953,7 +4038,7 @@ rpcpassword=%s <translation>התבקשה גרסת פרוקסי -socks ×œ× ×™×“×•×¢×”: %i</translation> </message> <message> - <location line="-101"/> + <location line="-103"/> <source>Cannot resolve -bind address: '%s'</source> <translation>×œ× ×ž×¡×•×’×œ לפתור כתובת -bind: '%s'</translation> </message> @@ -3963,7 +4048,7 @@ rpcpassword=%s <translation>×œ× ×ž×¡×•×’×œ לפתור כתובת -externalip: '%s'</translation> </message> <message> - <location line="+48"/> + <location line="+49"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>כמות ×œ× ×ª×§×™× ×” עבור -paytxfee=<amount>: '%s'</translation> </message> @@ -3983,22 +4068,17 @@ rpcpassword=%s <translation>טוען ×ת ××™× ×“×§×¡ הבלוקי×...</translation> </message> <message> - <location line="-62"/> + <location line="-63"/> <source>Add a node to connect to and attempt to keep the connection open</source> <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> - </message> - <message> - <location line="+95"/> + <location line="+64"/> <source>Loading wallet...</source> <translation>טוען ××¨× ×§...</translation> </message> <message> - <location line="-56"/> + <location line="-57"/> <source>Cannot downgrade wallet</source> <translation>×œ× ×™×›×•×œ להוריד דרגת ×”××¨× ×§</translation> </message> @@ -4008,7 +4088,7 @@ rpcpassword=%s <translation>×œ× ×™×›×•×œ לכתוב ×ת כתובת ברירת המחדל</translation> </message> <message> - <location line="+67"/> + <location line="+68"/> <source>Rescanning...</source> <translation>סורק מחדש...</translation> </message> @@ -4018,17 +4098,17 @@ rpcpassword=%s <translation>×˜×¢×™× ×” הושלמה</translation> </message> <message> - <location line="+85"/> + <location line="+86"/> <source>To use the %s option</source> <translation>להשתמש ב×פשרות %s</translation> </message> <message> - <location line="-77"/> + <location line="-78"/> <source>Error</source> <translation>שגי××”</translation> </message> <message> - <location line="-35"/> + <location line="-36"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_hi_IN.ts b/src/qt/locale/bitcoin_hi_IN.ts index ba10250526..e62e1daa16 100644 --- a/src/qt/locale/bitcoin_hi_IN.ts +++ b/src/qt/locale/bitcoin_hi_IN.ts @@ -31,6 +31,12 @@ This product includes software developed by the OpenSSL Project for use in the O <source>The Bitcoin Core developers</source> <translation type="unfinished"/> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source> (%1-bit)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>AddressBookPage</name> @@ -613,6 +619,16 @@ This product includes software developed by the OpenSSL Project for use in the O <translation><numerusform>%n हफ़à¥à¤¤à¤¾</numerusform><numerusform>%n हफà¥à¤¤à¥‡</numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation>%1 पीछे</translation> @@ -685,7 +701,7 @@ Address: %4 <translation>वॉलेट à¤à¤¨à¥à¤•à¥à¤°à¤¿à¤ªà¥à¤Ÿà¥‡à¤¡ है तथा अà¤à¥€ लॉकà¥à¤¡ है</translation> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+435"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -746,7 +762,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation type="unfinished"/> </message> @@ -761,7 +777,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation>राशि</translation> </message> @@ -912,7 +928,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation type="unfinished"/> </message> @@ -1094,7 +1110,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation type="unfinished"/> </message> @@ -1238,7 +1254,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+122"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation type="unfinished"/> </message> @@ -1248,7 +1264,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="-131"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation type="unfinished"/> </message> @@ -1263,12 +1279,7 @@ Address: %4 <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"/> + <location line="+16"/> <source>MB</source> <translation type="unfinished"/> </message> @@ -1283,7 +1294,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+58"/> + <location line="+107"/> + <source>&Spend unconfirmed change (experts only)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+37"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation type="unfinished"/> </message> @@ -1318,7 +1334,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="-86"/> + <source>W&allet</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+52"/> + <source>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.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+40"/> <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> @@ -1433,17 +1459,17 @@ Address: %4 <translation>&कैनà¥à¤¸à¤²</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+70"/> <source>default</source> <translation type="unfinished"/> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation type="unfinished"/> </message> <message> - <location line="+75"/> + <location line="+78"/> <source>Confirm options reset</source> <translation type="unfinished"/> </message> @@ -1483,18 +1509,13 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-155"/> - <source>Unconfirmed:</source> - <translation>अपà¥à¤·à¥à¤Ÿ :</translation> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation>वॉलेट</translation> </message> <message> <location line="+51"/> - <source>Confirmed:</source> + <source>Available:</source> <translation type="unfinished"/> </message> <message> @@ -1503,7 +1524,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation type="unfinished"/> </message> @@ -1651,6 +1677,11 @@ Address: %4 <source>Error: Invalid combination of -regtest and -testnet.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../guiutil.cpp" line="+82"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>Bitcoin à¤à¤¡à¥à¤°à¥‡à¤¸ लिखें (उदाहरण: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> </context> <context> <name>QRImageWidget</name> @@ -1872,22 +1903,22 @@ Address: %4 <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+83"/> + <location filename="../forms/receivecoinsdialog.ui" line="+107"/> <source>&Amount:</source> <translation type="unfinished"/> </message> <message> - <location line="-13"/> + <location line="-16"/> <source>&Label:</source> <translation>लेबल:</translation> </message> <message> - <location line="-34"/> + <location line="-37"/> <source>&Message:</source> <translation type="unfinished"/> </message> <message> - <location line="-17"/> + <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"/> </message> @@ -1897,27 +1928,30 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+27"/> - <source>An optional 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"/> </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> + <location line="-7"/> + <location line="+21"/> + <source>An optional label to associate with the new receiving address.</source> <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="-7"/> <source>Use this form to request payments. All fields are <b>optional</b>.</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <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"/> </message> <message> - <location line="+17"/> + <location line="+32"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -1927,17 +1961,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+36"/> - <source>&Request payment</source> + <location line="+78"/> + <source>Requested payments history</source> <translation type="unfinished"/> </message> <message> - <location line="+47"/> - <source>Requested payments</source> + <location line="-98"/> + <source>&Request payment</source> <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+120"/> <source>Show the selected request (does the same as double clicking an entry)</source> <translation type="unfinished"/> </message> @@ -1956,6 +1990,21 @@ Address: %4 <source>Remove</source> <translation type="unfinished"/> </message> + <message> + <location filename="../receivecoinsdialog.cpp" line="+38"/> + <source>Copy label</source> + <translation>लेबल कॉपी करे </translation> + </message> + <message> + <location line="+1"/> + <source>Copy message</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation>कॉपी राशि</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -2057,12 +2106,17 @@ Address: %4 <source>(no message)</source> <translation type="unfinished"/> </message> + <message> + <location line="+8"/> + <source>(no amount)</source> + <translation type="unfinished"/> + </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>सिकà¥à¤•à¥‡ à¤à¥‡à¤œà¥‡à¤‚|</translation> @@ -2138,7 +2192,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+115"/> + <location line="+164"/> <source>Send to multiple recipients at once</source> <translation>à¤à¤• साथ कई पà¥à¤°à¤¾à¤ªà¥à¤¤à¤•à¤°à¥à¤¤à¤¾à¤“ं को à¤à¥‡à¤œà¥‡à¤‚</translation> </message> @@ -2148,7 +2202,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+20"/> + <location line="-23"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -2158,12 +2212,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+22"/> + <location line="+52"/> <source>Balance:</source> <translation>बाकी रकम :</translation> </message> <message> - <location line="+41"/> + <location line="-78"/> <source>Confirm the send action</source> <translation>à¤à¥‡à¤œà¤¨à¥‡ की पà¥à¤·à¥à¤Ÿà¤¿ करें</translation> </message> @@ -2173,7 +2227,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-228"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation>सिकà¥à¤•à¥‡ à¤à¥‡à¤œà¤¨à¥‡ की पà¥à¤·à¥à¤Ÿà¤¿ करें</translation> </message> @@ -2186,12 +2240,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-136"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Bitcoin à¤à¤¡à¥à¤°à¥‡à¤¸ लिखें (उदाहरण: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> - <message> - <location line="+15"/> + <location line="-121"/> <source>Copy quantity</source> <translation type="unfinished"/> </message> @@ -2241,7 +2290,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+202"/> + <location line="+203"/> <source>The recipient address is not valid, please recheck.</source> <translation type="unfinished"/> </message> @@ -2276,12 +2325,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Warning: Invalid Bitcoin address</source> <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+20"/> <source>(no label)</source> <translation>(कोई लेबल नही !)</translation> </message> @@ -2291,7 +2340,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-366"/> + <location line="-367"/> <source>Are you sure you want to send?</source> <translation type="unfinished"/> </message> @@ -2301,7 +2350,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+170"/> + <location line="+171"/> <source>Payment request expired</source> <translation type="unfinished"/> </message> @@ -2378,12 +2427,7 @@ Address: %4 <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"/> + <location line="+968"/> <source>This is a verified payment request.</source> <translation type="unfinished"/> </message> @@ -2393,7 +2437,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+459"/> + <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"/> + </message> + <message> + <location line="+426"/> <source>This is an unverified payment request.</source> <translation type="unfinished"/> </message> @@ -2409,11 +2458,6 @@ Address: %4 <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> @@ -2451,19 +2495,19 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+10"/> - <location line="+213"/> + <location line="+7"/> + <location line="+210"/> <source>Choose previously used address</source> <translation type="unfinished"/> </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>Clipboard से à¤à¤¡à¥à¤°à¥‡à¤¸ paste करें</translation> </message> @@ -2504,12 +2548,12 @@ Address: %4 </message> <message> <location line="+3"/> - <location line="+146"/> + <location line="+143"/> <source>Clear &All</source> <translation type="unfinished"/> </message> <message> - <location line="-87"/> + <location line="-84"/> <source>&Verify Message</source> <translation type="unfinished"/> </message> @@ -2524,7 +2568,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+40"/> + <location line="+37"/> <source>Verify the message to ensure it was signed with the specified Bitcoin address</source> <translation type="unfinished"/> </message> @@ -2539,43 +2583,37 @@ Address: %4 <translation type="unfinished"/> </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>Bitcoin à¤à¤¡à¥à¤°à¥‡à¤¸ लिखें (उदाहरण: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location line="-2"/> + <location line="-1"/> <source>Click "Sign Message" to generate signature</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Enter Bitcoin signature</source> - <translation type="unfinished"/> - </message> - <message> <location line="+84"/> - <location line="+81"/> + <location line="+80"/> <source>The entered address is invalid.</source> <translation type="unfinished"/> </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 type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location line="-73"/> + <location line="-72"/> <source>Wallet unlock was cancelled.</source> <translation type="unfinished"/> </message> @@ -2595,7 +2633,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+59"/> + <location line="+58"/> <source>The signature could not be decoded.</source> <translation type="unfinished"/> </message> @@ -2656,6 +2694,11 @@ Address: %4 </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation type="unfinished"/> </message> @@ -2817,12 +2860,12 @@ Address: %4 <translation>, अà¤à¥€ तक सफलतापूरà¥à¤µà¤• पà¥à¤°à¤¸à¤¾à¤°à¤¿à¤¤ नहीं किया गया है</translation> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation>अजà¥à¤žà¤¾à¤¤</translation> </message> @@ -2863,12 +2906,12 @@ Address: %4 <translation>राशि</translation> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> @@ -2878,23 +2921,12 @@ Address: %4 <translation>खà¥à¤²à¤¾ है जबतक %1</translation> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> - <translation>ऑफलाइन ( %1 पकà¥à¤•à¤¾ करना)</translation> - </message> - <message> - <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation>अपà¥à¤·à¥à¤Ÿ ( %1 मे %2 पकà¥à¤•à¥‡ )</translation> - </message> - <message> - <location line="-22"/> - <location line="+25"/> + <location line="+12"/> <source>Confirmed (%1 confirmations)</source> <translation>पकà¥à¤•à¥‡ ( %1 पकà¥à¤•à¤¾ करना)</translation> </message> <message> - <location line="-22"/> + <location line="+9"/> <source>This block was not received by any other nodes and will probably not be accepted!</source> <translation>यह बà¥à¤²à¥‰à¤• किसी à¤à¥€ और नोड को मिला नही है ! शायद यह बà¥à¤²à¥‰à¤• कोई à¤à¥€ नोड सà¥à¤µà¥€à¤•à¤¾à¤°à¥‡ गा नही !</translation> </message> @@ -2904,7 +2936,27 @@ Address: %4 <translation>जेनरेट किया गया किंतॠसà¥à¤µà¥€à¤•à¤¾à¤°à¤¾ नही गया !</translation> </message> <message> - <location line="+62"/> + <location line="-21"/> + <source>Offline</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Unconfirmed</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation>सà¥à¤µà¥€à¤•à¤¾à¤°à¤¾ गया</translation> </message> @@ -2934,7 +2986,7 @@ Address: %4 <translation>(लागू नहीं)</translation> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation>टà¥à¤°à¤¾à¤‚सेकà¥à¤¶à¤¨ सà¥à¤¤à¤¿à¤¥à¤¿| पà¥à¤·à¥à¤Ÿà¤¿à¤¯à¥‹à¤‚ की संखà¥à¤¯à¤¾ जानने के लिठइस जगह पर माउस लायें|</translation> </message> @@ -3200,12 +3252,12 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+223"/> <source>Usage:</source> <translation>खपत :</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>List commands</source> <translation>commands की लिसà¥à¤Ÿ बनाà¤à¤‚</translation> </message> @@ -3260,12 +3312,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation type="unfinished"/> </message> <message> - <location line="-148"/> + <location line="-150"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"/> </message> @@ -3285,17 +3337,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Run in the background as a daemon and accept commands</source> <translation>बैकगà¥à¤°à¤¾à¤‰à¤‚ड में डेमॉन बन कर रन करे तथा कमांडà¥à¤¸ सà¥à¤µà¥€à¤•à¤¾à¤° करें </translation> </message> <message> - <location line="+39"/> + <location line="+40"/> <source>Use the test network</source> <translation>टेसà¥à¤Ÿ नेटवरà¥à¤• का इसà¥à¤¤à¥‡à¤®à¤¾à¤² करे </translation> </message> <message> - <location line="-118"/> + <location line="-120"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> @@ -3426,6 +3478,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation type="unfinished"/> </message> @@ -3636,6 +3693,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Start Bitcoin server</source> <translation type="unfinished"/> </message> @@ -3685,12 +3747,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-79"/> + <location line="-80"/> <source>Imports blocks from external blk000??.dat file</source> <translation type="unfinished"/> </message> <message> - <location line="-105"/> + <location line="-106"/> <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> @@ -3710,7 +3772,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+89"/> + <location line="+90"/> <source>Information</source> <translation>जानकारी</translation> </message> @@ -3780,7 +3842,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+7"/> <source>System error: </source> <translation type="unfinished"/> </message> @@ -3826,6 +3888,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>version</source> <translation>संसà¥à¤•à¤°à¤£</translation> </message> @@ -3835,32 +3902,32 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-58"/> + <location line="-60"/> <source>Password for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-70"/> + <location line="-71"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation type="unfinished"/> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+161"/> + <location line="+163"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"/> </message> <message> - <location line="-24"/> + <location line="-25"/> <source>Set key pool size to <n> (default: 100)</source> <translation type="unfinished"/> </message> @@ -3870,12 +3937,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+38"/> + <location line="+39"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-30"/> + <location line="-31"/> <source>Server certificate file (default: server.cert)</source> <translation type="unfinished"/> </message> @@ -3885,7 +3952,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+17"/> <source>This help message</source> <translation type="unfinished"/> </message> @@ -3895,12 +3962,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-107"/> + <location line="-109"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation type="unfinished"/> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Loading addresses...</source> <translation>पता पà¥à¤¸à¥à¤¤à¤• आ रही है...</translation> </message> @@ -3915,12 +3982,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+98"/> + <location line="+99"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation type="unfinished"/> </message> <message> - <location line="-100"/> + <location line="-101"/> <source>Error loading wallet.dat</source> <translation type="unfinished"/> </message> @@ -3930,7 +3997,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+56"/> + <location line="+57"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation type="unfinished"/> </message> @@ -3940,7 +4007,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-101"/> + <location line="-103"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -3950,7 +4017,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+48"/> + <location line="+49"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation type="unfinished"/> </message> @@ -3970,7 +4037,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>बà¥à¤²à¥‰à¤• इंडेकà¥à¤¸ आ रहा है...</translation> </message> <message> - <location line="-62"/> + <location line="-63"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"/> </message> @@ -3980,12 +4047,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+95"/> + <location line="+96"/> <source>Loading wallet...</source> <translation>वॉलेट आ रहा है...</translation> </message> <message> - <location line="-56"/> + <location line="-57"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> @@ -3995,7 +4062,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+67"/> + <location line="+68"/> <source>Rescanning...</source> <translation>रि-सà¥à¤•à¥‡à¤¨à¥€-इंग...</translation> </message> @@ -4005,17 +4072,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>लोड हो गया|</translation> </message> <message> - <location line="+85"/> + <location line="+86"/> <source>To use the %s option</source> <translation type="unfinished"/> </message> <message> - <location line="-77"/> + <location line="-78"/> <source>Error</source> <translation>à¤à¥‚ल</translation> </message> <message> - <location line="-35"/> + <location line="-36"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_hr.ts b/src/qt/locale/bitcoin_hr.ts index e3143e9964..e503f1313a 100644 --- a/src/qt/locale/bitcoin_hr.ts +++ b/src/qt/locale/bitcoin_hr.ts @@ -31,6 +31,12 @@ This product includes software developed by the OpenSSL Project for use in the O <source>The Bitcoin Core developers</source> <translation type="unfinished"/> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source> (%1-bit)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>AddressBookPage</name> @@ -612,6 +618,16 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation type="unfinished"/> @@ -685,7 +701,7 @@ Adresa:%4 <translation>NovÄanik je <b>Å¡ifriran</b> i trenutno <b>zakljuÄan</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+435"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -746,7 +762,7 @@ Adresa:%4 <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation type="unfinished"/> </message> @@ -761,7 +777,7 @@ Adresa:%4 <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation>Iznos</translation> </message> @@ -912,7 +928,7 @@ Adresa:%4 <translation type="unfinished"/> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation type="unfinished"/> </message> @@ -1094,7 +1110,7 @@ Adresa:%4 <translation type="unfinished"/> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation>Bitcoin Jezgra</translation> </message> @@ -1238,7 +1254,7 @@ Adresa:%4 <translation>&Glavno</translation> </message> <message> - <location line="+6"/> + <location line="+122"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation type="unfinished"/> </message> @@ -1248,7 +1264,7 @@ Adresa:%4 <translation>Plati &naknadu za transakciju</translation> </message> <message> - <location line="+31"/> + <location line="-131"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation>Automatski pokreni Bitcoin kad se ukljuÄi raÄunalo</translation> </message> @@ -1263,12 +1279,7 @@ Adresa:%4 <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"/> + <location line="+16"/> <source>MB</source> <translation type="unfinished"/> </message> @@ -1283,7 +1294,12 @@ Adresa:%4 <translation type="unfinished"/> </message> <message> - <location line="+58"/> + <location line="+107"/> + <source>&Spend unconfirmed change (experts only)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+37"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation type="unfinished"/> </message> @@ -1318,7 +1334,17 @@ Adresa:%4 <translation>&Mreža</translation> </message> <message> - <location line="+6"/> + <location line="-86"/> + <source>W&allet</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+52"/> + <source>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.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+40"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>Automatski otvori port Bitcoin klijenta na ruteru. To radi samo ako ruter podržava UPnP i ako je omogućen.</translation> </message> @@ -1433,17 +1459,17 @@ Adresa:%4 <translation>&Odustani</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+70"/> <source>default</source> <translation>standardne vrijednosti</translation> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation type="unfinished"/> </message> <message> - <location line="+75"/> + <location line="+78"/> <source>Confirm options reset</source> <translation type="unfinished"/> </message> @@ -1483,19 +1509,14 @@ Adresa:%4 <translation type="unfinished"/> </message> <message> - <location line="-155"/> - <source>Unconfirmed:</source> - <translation>NepotvrÄ‘ene:</translation> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation>NovÄanik</translation> </message> <message> <location line="+51"/> - <source>Confirmed:</source> - <translation>PotvrÄ‘eno:</translation> + <source>Available:</source> + <translation type="unfinished"/> </message> <message> <location line="+16"/> @@ -1503,7 +1524,12 @@ Adresa:%4 <translation type="unfinished"/> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation type="unfinished"/> </message> @@ -1651,6 +1677,11 @@ Adresa:%4 <source>Error: Invalid combination of -regtest and -testnet.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../guiutil.cpp" line="+82"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>Unesite Bitcoin adresu (npr. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> </context> <context> <name>QRImageWidget</name> @@ -1871,22 +1902,22 @@ Adresa:%4 <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+83"/> + <location filename="../forms/receivecoinsdialog.ui" line="+107"/> <source>&Amount:</source> <translation type="unfinished"/> </message> <message> - <location line="-13"/> + <location line="-16"/> <source>&Label:</source> <translation>&Oznaka:</translation> </message> <message> - <location line="-34"/> + <location line="-37"/> <source>&Message:</source> <translation type="unfinished"/> </message> <message> - <location line="-17"/> + <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"/> </message> @@ -1896,27 +1927,30 @@ Adresa:%4 <translation type="unfinished"/> </message> <message> - <location line="+27"/> - <source>An optional 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"/> </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> + <location line="-7"/> + <location line="+21"/> + <source>An optional label to associate with the new receiving address.</source> <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="-7"/> <source>Use this form to request payments. All fields are <b>optional</b>.</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <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"/> </message> <message> - <location line="+17"/> + <location line="+32"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -1926,17 +1960,17 @@ Adresa:%4 <translation type="unfinished"/> </message> <message> - <location line="+36"/> - <source>&Request payment</source> + <location line="+78"/> + <source>Requested payments history</source> <translation type="unfinished"/> </message> <message> - <location line="+47"/> - <source>Requested payments</source> + <location line="-98"/> + <source>&Request payment</source> <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+120"/> <source>Show the selected request (does the same as double clicking an entry)</source> <translation type="unfinished"/> </message> @@ -1955,6 +1989,21 @@ Adresa:%4 <source>Remove</source> <translation type="unfinished"/> </message> + <message> + <location filename="../receivecoinsdialog.cpp" line="+38"/> + <source>Copy label</source> + <translation>Kopirati oznaku</translation> + </message> + <message> + <location line="+1"/> + <source>Copy message</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation>Kopiraj iznos</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -2056,12 +2105,17 @@ Adresa:%4 <source>(no message)</source> <translation type="unfinished"/> </message> + <message> + <location line="+8"/> + <source>(no amount)</source> + <translation type="unfinished"/> + </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>Slanje novca</translation> @@ -2137,7 +2191,7 @@ Adresa:%4 <translation type="unfinished"/> </message> <message> - <location line="+115"/> + <location line="+164"/> <source>Send to multiple recipients at once</source> <translation>PoÅ¡alji k nekoliko primatelja odjednom</translation> </message> @@ -2147,7 +2201,7 @@ Adresa:%4 <translation>&Dodaj primatelja</translation> </message> <message> - <location line="+20"/> + <location line="-23"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -2157,12 +2211,12 @@ Adresa:%4 <translation>ObriÅ¡i &sve</translation> </message> <message> - <location line="+22"/> + <location line="+52"/> <source>Balance:</source> <translation>Stanje:</translation> </message> <message> - <location line="+41"/> + <location line="-78"/> <source>Confirm the send action</source> <translation>Potvrdi akciju slanja</translation> </message> @@ -2172,7 +2226,7 @@ Adresa:%4 <translation>&PoÅ¡alji</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-228"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation>Potvrdi slanje novca</translation> </message> @@ -2185,12 +2239,7 @@ Adresa:%4 <translation type="unfinished"/> </message> <message> - <location line="-136"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Unesite Bitcoin adresu (npr. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> - <message> - <location line="+15"/> + <location line="-121"/> <source>Copy quantity</source> <translation type="unfinished"/> </message> @@ -2240,7 +2289,7 @@ Adresa:%4 <translation>ili</translation> </message> <message> - <location line="+202"/> + <location line="+203"/> <source>The recipient address is not valid, please recheck.</source> <translation>Adresa primatelja je nevaljala, molimo provjerite je ponovo.</translation> </message> @@ -2275,12 +2324,12 @@ Adresa:%4 <translation type="unfinished"/> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Warning: Invalid Bitcoin address</source> <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+20"/> <source>(no label)</source> <translation>(bez oznake)</translation> </message> @@ -2290,7 +2339,7 @@ Adresa:%4 <translation type="unfinished"/> </message> <message> - <location line="-366"/> + <location line="-367"/> <source>Are you sure you want to send?</source> <translation type="unfinished"/> </message> @@ -2300,7 +2349,7 @@ Adresa:%4 <translation type="unfinished"/> </message> <message> - <location line="+170"/> + <location line="+171"/> <source>Payment request expired</source> <translation type="unfinished"/> </message> @@ -2377,12 +2426,7 @@ Adresa:%4 <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"/> + <location line="+968"/> <source>This is a verified payment request.</source> <translation type="unfinished"/> </message> @@ -2392,7 +2436,12 @@ Adresa:%4 <translation type="unfinished"/> </message> <message> - <location line="+459"/> + <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"/> + </message> + <message> + <location line="+426"/> <source>This is an unverified payment request.</source> <translation type="unfinished"/> </message> @@ -2408,11 +2457,6 @@ Adresa:%4 <source>Memo:</source> <translation type="unfinished"/> </message> - <message> - <location filename="../sendcoinsentry.cpp" line="+1"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Unesite Bitcoin adresu (npr. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> </context> <context> <name>ShutdownWindow</name> @@ -2450,19 +2494,19 @@ Adresa:%4 <translation>Unesite Bitcoin adresu (npr. 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"/> </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>Zalijepi adresu iz meÄ‘uspremnika</translation> </message> @@ -2503,12 +2547,12 @@ Adresa:%4 </message> <message> <location line="+3"/> - <location line="+146"/> + <location line="+143"/> <source>Clear &All</source> <translation>ObriÅ¡i &sve</translation> </message> <message> - <location line="-87"/> + <location line="-84"/> <source>&Verify Message</source> <translation>&Potvrdite poruku</translation> </message> @@ -2523,7 +2567,7 @@ Adresa:%4 <translation>Unesite Bitcoin adresu (npr. 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 type="unfinished"/> </message> @@ -2538,43 +2582,37 @@ Adresa:%4 <translation type="unfinished"/> </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>Unesite Bitcoin adresu (npr. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location line="-2"/> + <location line="-1"/> <source>Click "Sign Message" to generate signature</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Enter Bitcoin signature</source> - <translation type="unfinished"/> - </message> - <message> <location line="+84"/> - <location line="+81"/> + <location line="+80"/> <source>The entered address is invalid.</source> <translation type="unfinished"/> </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 type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location line="-73"/> + <location line="-72"/> <source>Wallet unlock was cancelled.</source> <translation>OtkljuÄavanje novÄanika je otkazano.</translation> </message> @@ -2594,7 +2632,7 @@ Adresa:%4 <translation>Poruka je potpisana.</translation> </message> <message> - <location line="+59"/> + <location line="+58"/> <source>The signature could not be decoded.</source> <translation type="unfinished"/> </message> @@ -2655,6 +2693,11 @@ Adresa:%4 </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation>%1 nije dostupan</translation> </message> @@ -2816,12 +2859,12 @@ Adresa:%4 <translation>, joÅ¡ nije bio uspjeÅ¡no emitiran</translation> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation>nepoznato</translation> </message> @@ -2862,12 +2905,12 @@ Adresa:%4 <translation>Iznos</translation> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> @@ -2877,23 +2920,12 @@ Adresa:%4 <translation>Otvoren do %1</translation> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> - <translation>Nije na mreži (%1 potvrda)</translation> - </message> - <message> - <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation>NepotvrÄ‘en (%1 od %2 potvrda)</translation> - </message> - <message> - <location line="-22"/> - <location line="+25"/> + <location line="+12"/> <source>Confirmed (%1 confirmations)</source> <translation>PotvrÄ‘en (%1 potvrda)</translation> </message> <message> - <location line="-22"/> + <location line="+9"/> <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> @@ -2903,7 +2935,27 @@ Adresa:%4 <translation>Generirano, ali nije prihvaćeno</translation> </message> <message> - <location line="+62"/> + <location line="-21"/> + <source>Offline</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Unconfirmed</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation>Primljeno s</translation> </message> @@ -2933,7 +2985,7 @@ Adresa:%4 <translation>(n/d)</translation> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation>Status transakcije</translation> </message> @@ -3199,12 +3251,12 @@ Adresa:%4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+223"/> <source>Usage:</source> <translation>Upotreba:</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>List commands</source> <translation>Prikaži komande</translation> </message> @@ -3259,12 +3311,12 @@ Adresa:%4 <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+6"/> <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="-148"/> + <location line="-150"/> <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> @@ -3284,17 +3336,17 @@ Adresa:%4 <translation>Prihvati komande iz tekst moda i JSON-RPC</translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Run in the background as a daemon and accept commands</source> <translation>IzvrÅ¡avaj u pozadini kao uslužnik i prihvaćaj komande</translation> </message> <message> - <location line="+39"/> + <location line="+40"/> <source>Use the test network</source> <translation>Koristi test mrežu</translation> </message> <message> - <location line="-118"/> + <location line="-120"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> @@ -3425,6 +3477,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation>Poveži se samo sa odreÄ‘enim nodom</translation> </message> @@ -3635,6 +3692,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Start Bitcoin server</source> <translation type="unfinished"/> </message> @@ -3684,12 +3746,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-79"/> + <location line="-80"/> <source>Imports blocks from external blk000??.dat file</source> <translation>Importiraj blokove sa vanjskog blk000??.dat fajla</translation> </message> <message> - <location line="-105"/> + <location line="-106"/> <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> @@ -3709,7 +3771,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+89"/> + <location line="+90"/> <source>Information</source> <translation>Informacija</translation> </message> @@ -3779,7 +3841,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Odredi vremenski prozor za spajanje na mrežu u milisekundama (ugraÄ‘eni izbor: 5000)</translation> </message> <message> - <location line="+6"/> + <location line="+7"/> <source>System error: </source> <translation>PogreÅ¡ka sistema:</translation> </message> @@ -3825,6 +3887,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>version</source> <translation>verzija</translation> </message> @@ -3834,32 +3901,32 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-58"/> + <location line="-60"/> <source>Password for JSON-RPC connections</source> <translation>Lozinka za JSON-RPC veze</translation> </message> <message> - <location line="-70"/> + <location line="-71"/> <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="+80"/> + <location line="+81"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>PoÅ¡alji komande nodu na adresi <ip> (ugraÄ‘eni izbor: 127.0.0.1)</translation> </message> <message> - <location line="-132"/> + <location line="-133"/> <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="+161"/> + <location line="+163"/> <source>Upgrade wallet to latest format</source> <translation>Nadogradite novÄanik u posljednji format.</translation> </message> <message> - <location line="-24"/> + <location line="-25"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Podesi memorijski prostor za kljuÄeve na <n> (ugraÄ‘eni izbor: 100)</translation> </message> @@ -3869,12 +3936,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Ponovno pretraži lanac blokova za transakcije koje nedostaju</translation> </message> <message> - <location line="+38"/> + <location line="+39"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Koristi OpenSSL (https) za JSON-RPC povezivanje</translation> </message> <message> - <location line="-30"/> + <location line="-31"/> <source>Server certificate file (default: server.cert)</source> <translation>Uslužnikov SSL certifikat (ugraÄ‘eni izbor: server.cert)</translation> </message> @@ -3884,7 +3951,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Uslužnikov privatni kljuÄ (ugraÄ‘eni izbor: server.pem)</translation> </message> <message> - <location line="+16"/> + <location line="+17"/> <source>This help message</source> <translation>Ova poruka za pomoć</translation> </message> @@ -3894,12 +3961,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Program ne može koristiti %s na ovom raÄunalu (bind returned error %d, %s)</translation> </message> <message> - <location line="-107"/> + <location line="-109"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>Dozvoli DNS upite za dodavanje nodova i povezivanje</translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Loading addresses...</source> <translation>UÄitavanje adresa...</translation> </message> @@ -3914,12 +3981,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>GreÅ¡ka kod uÄitavanja wallet.dat: NovÄanik zahtjeva noviju verziju Bitcoina</translation> </message> <message> - <location line="+98"/> + <location line="+99"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>NovÄanik je trebao prepravak: ponovo pokrenite Bitcoin</translation> </message> <message> - <location line="-100"/> + <location line="-101"/> <source>Error loading wallet.dat</source> <translation>GreÅ¡ka kod uÄitavanja wallet.dat</translation> </message> @@ -3929,7 +3996,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Nevaljala -proxy adresa: '%s'</translation> </message> <message> - <location line="+56"/> + <location line="+57"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation type="unfinished"/> </message> @@ -3939,7 +4006,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-101"/> + <location line="-103"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -3949,7 +4016,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+48"/> + <location line="+49"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>Nevaljali iznos za opciju -paytxfee=<amount>: '%s'</translation> </message> @@ -3969,7 +4036,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>UÄitavanje indeksa blokova...</translation> </message> <message> - <location line="-62"/> + <location line="-63"/> <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> @@ -3979,12 +4046,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Program ne može koristiti %s na ovom raÄunalu. Bitcoin program je vjerojatno već pokrenut.</translation> </message> <message> - <location line="+95"/> + <location line="+96"/> <source>Loading wallet...</source> <translation>UÄitavanje novÄanika...</translation> </message> <message> - <location line="-56"/> + <location line="-57"/> <source>Cannot downgrade wallet</source> <translation>Nije moguće novÄanik vratiti na prijaÅ¡nju verziju.</translation> </message> @@ -3994,7 +4061,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Nije moguće upisati zadanu adresu.</translation> </message> <message> - <location line="+67"/> + <location line="+68"/> <source>Rescanning...</source> <translation>Rescaniranje</translation> </message> @@ -4004,17 +4071,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>UÄitavanje gotovo</translation> </message> <message> - <location line="+85"/> + <location line="+86"/> <source>To use the %s option</source> <translation type="unfinished"/> </message> <message> - <location line="-77"/> + <location line="-78"/> <source>Error</source> <translation>GreÅ¡ka</translation> </message> <message> - <location line="-35"/> + <location line="-36"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_hu.ts b/src/qt/locale/bitcoin_hu.ts index ee4152aa5b..e24871dc13 100644 --- a/src/qt/locale/bitcoin_hu.ts +++ b/src/qt/locale/bitcoin_hu.ts @@ -35,6 +35,12 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt <source>The Bitcoin Core developers</source> <translation type="unfinished"/> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source> (%1-bit)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>AddressBookPage</name> @@ -616,6 +622,16 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt <translation><numerusform>%n hét</numerusform><numerusform>%n hét</numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation>%1 lemaradás</translation> @@ -689,7 +705,7 @@ CÃm: %4 <translation>Tárca <b>kódolva</b> és jelenleg <b>zárva</b>.</translation> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+435"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -750,7 +766,7 @@ CÃm: %4 <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation type="unfinished"/> </message> @@ -765,7 +781,7 @@ CÃm: %4 <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation>Összeg</translation> </message> @@ -916,7 +932,7 @@ CÃm: %4 <translation type="unfinished"/> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation type="unfinished"/> </message> @@ -1098,7 +1114,7 @@ CÃm: %4 <translation type="unfinished"/> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation>Bitcoin Core</translation> </message> @@ -1243,7 +1259,7 @@ CÃm: %4 <translation>&FÅ‘</translation> </message> <message> - <location line="+6"/> + <location line="+122"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation>Opcionális, kB-onkénti tranzakciós dÃj a tranzakcióid minél gyorsabb feldolgozásának elÅ‘segÃtésére. A legtöbb tranzakció 1 kB-os.</translation> </message> @@ -1253,7 +1269,7 @@ CÃm: %4 <translation>Tranzakciós &dÃj fizetése</translation> </message> <message> - <location line="+31"/> + <location line="-131"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation>Induljon el a Bitcoin a számÃtógép bekapcsolásakor</translation> </message> @@ -1268,12 +1284,7 @@ CÃm: %4 <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"/> + <location line="+16"/> <source>MB</source> <translation type="unfinished"/> </message> @@ -1288,7 +1299,12 @@ CÃm: %4 <translation>SzkriptellenÅ‘rzési szálak számának beállÃtása (maximum 16, 0 = automatikus, <0 = szabadon hagyott magok száma, alapértelmezett: 0)</translation> </message> <message> - <location line="+58"/> + <location line="+107"/> + <source>&Spend unconfirmed change (experts only)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+37"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation type="unfinished"/> </message> @@ -1323,7 +1339,17 @@ CÃm: %4 <translation>&Hálózat</translation> </message> <message> - <location line="+6"/> + <location line="-86"/> + <source>W&allet</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+52"/> + <source>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.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+40"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>A Bitcoin-kliens portjának automatikus megnyitása a routeren. Ez csak akkor működik, ha a routered támogatja az UPnP-t és az engedélyezve is van rajta.</translation> </message> @@ -1438,17 +1464,17 @@ CÃm: %4 <translation>MegszakÃtás</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+70"/> <source>default</source> <translation>alapértelmezett</translation> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation type="unfinished"/> </message> <message> - <location line="+75"/> + <location line="+78"/> <source>Confirm options reset</source> <translation>BeállÃtások törlésének jóváhagyása.</translation> </message> @@ -1488,19 +1514,14 @@ CÃm: %4 <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="-155"/> - <source>Unconfirmed:</source> - <translation>MegerÅ‘sÃtetlen:</translation> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation>Tárca</translation> </message> <message> <location line="+51"/> - <source>Confirmed:</source> - <translation>MegerÅ‘sÃtve:</translation> + <source>Available:</source> + <translation type="unfinished"/> </message> <message> <location line="+16"/> @@ -1508,7 +1529,12 @@ CÃm: %4 <translation>Jelenlegi egyenleg</translation> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> <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> @@ -1656,6 +1682,11 @@ CÃm: %4 <source>Error: Invalid combination of -regtest and -testnet.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../guiutil.cpp" line="+82"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>Adj meg egy Bitcoin-cÃmet (pl.: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L )</translation> + </message> </context> <context> <name>QRImageWidget</name> @@ -1876,22 +1907,22 @@ CÃm: %4 <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+83"/> + <location filename="../forms/receivecoinsdialog.ui" line="+107"/> <source>&Amount:</source> <translation type="unfinished"/> </message> <message> - <location line="-13"/> + <location line="-16"/> <source>&Label:</source> <translation>CÃmke:</translation> </message> <message> - <location line="-34"/> + <location line="-37"/> <source>&Message:</source> <translation type="unfinished"/> </message> <message> - <location line="-17"/> + <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"/> </message> @@ -1901,27 +1932,30 @@ CÃm: %4 <translation type="unfinished"/> </message> <message> - <location line="+27"/> - <source>An optional 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"/> </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> + <location line="-7"/> + <location line="+21"/> + <source>An optional label to associate with the new receiving address.</source> <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="-7"/> <source>Use this form to request payments. All fields are <b>optional</b>.</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <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"/> </message> <message> - <location line="+17"/> + <location line="+32"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -1931,17 +1965,17 @@ CÃm: %4 <translation type="unfinished"/> </message> <message> - <location line="+36"/> - <source>&Request payment</source> + <location line="+78"/> + <source>Requested payments history</source> <translation type="unfinished"/> </message> <message> - <location line="+47"/> - <source>Requested payments</source> + <location line="-98"/> + <source>&Request payment</source> <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+120"/> <source>Show the selected request (does the same as double clicking an entry)</source> <translation type="unfinished"/> </message> @@ -1960,6 +1994,21 @@ CÃm: %4 <source>Remove</source> <translation type="unfinished"/> </message> + <message> + <location filename="../receivecoinsdialog.cpp" line="+38"/> + <source>Copy label</source> + <translation>CÃmke másolása</translation> + </message> + <message> + <location line="+1"/> + <source>Copy message</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation>Összeg másolása</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -2061,12 +2110,17 @@ CÃm: %4 <source>(no message)</source> <translation type="unfinished"/> </message> + <message> + <location line="+8"/> + <source>(no amount)</source> + <translation type="unfinished"/> + </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>Érmék küldése</translation> @@ -2142,7 +2196,7 @@ CÃm: %4 <translation type="unfinished"/> </message> <message> - <location line="+115"/> + <location line="+164"/> <source>Send to multiple recipients at once</source> <translation>Küldés több cÃmzettnek egyszerre</translation> </message> @@ -2152,7 +2206,7 @@ CÃm: %4 <translation>&CÃmzett hozzáadása</translation> </message> <message> - <location line="+20"/> + <location line="-23"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -2162,12 +2216,12 @@ CÃm: %4 <translation>Mindent &töröl</translation> </message> <message> - <location line="+22"/> + <location line="+52"/> <source>Balance:</source> <translation>Egyenleg:</translation> </message> <message> - <location line="+41"/> + <location line="-78"/> <source>Confirm the send action</source> <translation>Küldés megerÅ‘sÃtése</translation> </message> @@ -2177,7 +2231,7 @@ CÃm: %4 <translation>&Küldés</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-228"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation>Küldés megerÅ‘sÃtése</translation> </message> @@ -2190,12 +2244,7 @@ CÃm: %4 <translation type="unfinished"/> </message> <message> - <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"/> + <location line="-121"/> <source>Copy quantity</source> <translation type="unfinished"/> </message> @@ -2245,7 +2294,7 @@ CÃm: %4 <translation type="unfinished"/> </message> <message> - <location line="+202"/> + <location line="+203"/> <source>The recipient address is not valid, please recheck.</source> <translation>A cÃmzett cÃme érvénytelen, kérlek, ellenÅ‘rizd.</translation> </message> @@ -2280,12 +2329,12 @@ CÃm: %4 <translation type="unfinished"/> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Warning: Invalid Bitcoin address</source> <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+20"/> <source>(no label)</source> <translation>(nincs cÃmke)</translation> </message> @@ -2295,7 +2344,7 @@ CÃm: %4 <translation type="unfinished"/> </message> <message> - <location line="-366"/> + <location line="-367"/> <source>Are you sure you want to send?</source> <translation type="unfinished"/> </message> @@ -2305,7 +2354,7 @@ CÃm: %4 <translation type="unfinished"/> </message> <message> - <location line="+170"/> + <location line="+171"/> <source>Payment request expired</source> <translation type="unfinished"/> </message> @@ -2383,12 +2432,7 @@ CÃm: %4 <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"/> + <location line="+968"/> <source>This is a verified payment request.</source> <translation type="unfinished"/> </message> @@ -2398,7 +2442,12 @@ CÃm: %4 <translation type="unfinished"/> </message> <message> - <location line="+459"/> + <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"/> + </message> + <message> + <location line="+426"/> <source>This is an unverified payment request.</source> <translation type="unfinished"/> </message> @@ -2414,11 +2463,6 @@ CÃm: %4 <source>Memo:</source> <translation type="unfinished"/> </message> - <message> - <location filename="../sendcoinsentry.cpp" line="+1"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Adj meg egy Bitcoin-cÃmet (pl.: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L )</translation> - </message> </context> <context> <name>ShutdownWindow</name> @@ -2456,19 +2500,19 @@ CÃm: %4 <translation>Adj meg egy Bitcoin-cÃmet (pl.: 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"/> </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>CÃm beillesztése a vágólapról</translation> </message> @@ -2509,12 +2553,12 @@ CÃm: %4 </message> <message> <location line="+3"/> - <location line="+146"/> + <location line="+143"/> <source>Clear &All</source> <translation>Mindent &töröl</translation> </message> <message> - <location line="-87"/> + <location line="-84"/> <source>&Verify Message</source> <translation>Ãœzenet ellenÅ‘rzése</translation> </message> @@ -2529,7 +2573,7 @@ CÃm: %4 <translation>Adj meg egy Bitcoin-cÃmet (pl.: 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 type="unfinished"/> </message> @@ -2544,43 +2588,37 @@ CÃm: %4 <translation type="unfinished"/> </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>Adj meg egy Bitcoin-cÃmet (pl.: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L )</translation> </message> <message> - <location line="-2"/> + <location line="-1"/> <source>Click "Sign Message" to generate signature</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Enter Bitcoin signature</source> - <translation>Adja meg a Bitcoin aláÃrást</translation> - </message> - <message> <location line="+84"/> - <location line="+81"/> + <location line="+80"/> <source>The entered address is invalid.</source> <translation>A megadott cÃm nem érvényes.</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>EllenÅ‘rizze a cÃmet és próbálja meg újra.</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 type="unfinished"/> </message> <message> - <location line="-73"/> + <location line="-72"/> <source>Wallet unlock was cancelled.</source> <translation type="unfinished"/> </message> @@ -2600,7 +2638,7 @@ CÃm: %4 <translation>Ãœzenet aláÃrva.</translation> </message> <message> - <location line="+59"/> + <location line="+58"/> <source>The signature could not be decoded.</source> <translation>Az aláÃrást nem sikerült dekódolni.</translation> </message> @@ -2661,6 +2699,11 @@ CÃm: %4 </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation type="unfinished"/> </message> @@ -2822,12 +2865,12 @@ CÃm: %4 <translation>, még nem sikerült elküldeni.</translation> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <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> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation>ismeretlen</translation> </message> @@ -2868,12 +2911,12 @@ CÃm: %4 <translation>Összeg</translation> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <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> @@ -2883,23 +2926,12 @@ CÃm: %4 <translation>%1-ig megnyitva</translation> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> - <translation>Offline (%1 megerÅ‘sÃtés)</translation> - </message> - <message> - <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation>MegerÅ‘sÃtetlen (%1 %2 megerÅ‘sÃtésbÅ‘l)</translation> - </message> - <message> - <location line="-22"/> - <location line="+25"/> + <location line="+12"/> <source>Confirmed (%1 confirmations)</source> <translation>MegerÅ‘sÃtve (%1 megerÅ‘sÃtés)</translation> </message> <message> - <location line="-22"/> + <location line="+9"/> <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> @@ -2909,7 +2941,27 @@ CÃm: %4 <translation>Legenerálva, de még el nem fogadva.</translation> </message> <message> - <location line="+62"/> + <location line="-21"/> + <source>Offline</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Unconfirmed</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation>Erre a cÃmre</translation> </message> @@ -2939,7 +2991,7 @@ CÃm: %4 <translation>(nincs)</translation> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation>Tranzakció állapota. Húzd ide a kurzort, hogy lásd a megerÅ‘sÃtések számát.</translation> </message> @@ -3205,12 +3257,12 @@ CÃm: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+223"/> <source>Usage:</source> <translation>Használat:</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>List commands</source> <translation>Parancsok kilistázása </translation> @@ -3271,12 +3323,12 @@ CÃm: %4 <translation>Adja meg az Ön saját nyilvános cÃmét</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <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="-148"/> + <location line="-150"/> <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> @@ -3297,19 +3349,19 @@ CÃm: %4 </translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <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="+39"/> + <location line="+40"/> <source>Use the test network</source> <translation>Teszthálózat használata </translation> </message> <message> - <location line="-118"/> + <location line="-120"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> @@ -3440,6 +3492,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation>Csatlakozás csak a megadott csomóponthoz</translation> </message> @@ -3650,6 +3707,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Start Bitcoin server</source> <translation>Bitcoin szerver indÃtása</translation> </message> @@ -3699,12 +3761,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Az adatbázist újra kell épÃteni -reindex használatával (módosÃtás -tindex).</translation> </message> <message> - <location line="-79"/> + <location line="-80"/> <source>Imports blocks from external blk000??.dat file</source> <translation type="unfinished"/> </message> <message> - <location line="-105"/> + <location line="-106"/> <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> @@ -3724,7 +3786,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>SzkriptellenÅ‘rzési szálak számának beállÃtása (maximum 16, 0 = automatikus, <0 = szabadon hagyott magok száma, alapértelmezett: 0)</translation> </message> <message> - <location line="+89"/> + <location line="+90"/> <source>Information</source> <translation>Információ</translation> </message> @@ -3794,7 +3856,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Csatlakozás idÅ‘kerete milliszekundumban (alapértelmezett: 5000)</translation> </message> <message> - <location line="+6"/> + <location line="+7"/> <source>System error: </source> <translation>Rendszerhiba:</translation> </message> @@ -3841,6 +3903,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>version</source> <translation>verzió</translation> </message> @@ -3850,35 +3917,35 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-58"/> + <location line="-60"/> <source>Password for JSON-RPC connections</source> <translation>Jelszó JSON-RPC csatlakozásokhoz </translation> </message> <message> - <location line="-70"/> + <location line="-71"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>JSON-RPC csatlakozások engedélyezése meghatározott IP-cÃmrÅ‘l </translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>Parancsok küldése <ip> cÃmen működÅ‘ csomóponthoz (alapértelmezett: 127.0.0.1) </translation> </message> <message> - <location line="-132"/> + <location line="-133"/> <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="+161"/> + <location line="+163"/> <source>Upgrade wallet to latest format</source> <translation>A Tárca frissÃtése a legfrissebb formátumra</translation> </message> <message> - <location line="-24"/> + <location line="-25"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Kulcskarika mérete <n> (alapértelmezett: 100) </translation> @@ -3890,13 +3957,13 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </translation> </message> <message> - <location line="+38"/> + <location line="+39"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>OpenSSL (https) használata JSON-RPC csatalkozásokhoz </translation> </message> <message> - <location line="-30"/> + <location line="-31"/> <source>Server certificate file (default: server.cert)</source> <translation>SzervertanúsÃtvány-fájl (alapértelmezett: server.cert) </translation> @@ -3908,7 +3975,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </translation> </message> <message> - <location line="+16"/> + <location line="+17"/> <source>This help message</source> <translation>Ez a súgó-üzenet </translation> @@ -3919,12 +3986,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>A %s nem elérhetÅ‘ ezen a gépen (bind returned error %d, %s)</translation> </message> <message> - <location line="-107"/> + <location line="-109"/> <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="+60"/> + <location line="+61"/> <source>Loading addresses...</source> <translation>CÃmek betöltése...</translation> </message> @@ -3939,12 +4006,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Hiba a wallet.dat betöltése közben: ehhez a tárcához újabb verziójú Bitcoin-kliens szükséges</translation> </message> <message> - <location line="+98"/> + <location line="+99"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>A Tárca újraÃrása szükséges: IndÃtsa újra a teljesen a Bitcoin-t</translation> </message> <message> - <location line="-100"/> + <location line="-101"/> <source>Error loading wallet.dat</source> <translation>Hiba az wallet.dat betöltése közben</translation> </message> @@ -3954,7 +4021,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Érvénytelen -proxy cÃm: '%s'</translation> </message> <message> - <location line="+56"/> + <location line="+57"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Ismeretlen hálózat lett megadva -onlynet: '%s'</translation> </message> @@ -3964,7 +4031,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Ismeretlen -socks proxy kérése: %i</translation> </message> <message> - <location line="-101"/> + <location line="-103"/> <source>Cannot resolve -bind address: '%s'</source> <translation>Csatlakozási cÃm (-bind address) feloldása nem sikerült: '%s'</translation> </message> @@ -3974,7 +4041,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>KülsÅ‘ cÃm (-externalip address) feloldása nem sikerült: '%s'</translation> </message> <message> - <location line="+48"/> + <location line="+49"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>Étvénytelen -paytxfee=<összeg> összeg: '%s'</translation> </message> @@ -3994,7 +4061,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Blokkindex betöltése...</translation> </message> <message> - <location line="-62"/> + <location line="-63"/> <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> @@ -4004,12 +4071,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>A %s nem elérhetÅ‘ ezen a gépen. A Bitcoin valószÃnűleg fut már.</translation> </message> <message> - <location line="+95"/> + <location line="+96"/> <source>Loading wallet...</source> <translation>Tárca betöltése...</translation> </message> <message> - <location line="-56"/> + <location line="-57"/> <source>Cannot downgrade wallet</source> <translation>Nem sikerült a Tárca visszaállÃtása a korábbi verzióra</translation> </message> @@ -4019,7 +4086,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Nem sikerült az alapértelmezett cÃmet Ãrni.</translation> </message> <message> - <location line="+67"/> + <location line="+68"/> <source>Rescanning...</source> <translation>Újraszkennelés...</translation> </message> @@ -4029,17 +4096,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Betöltés befejezve.</translation> </message> <message> - <location line="+85"/> + <location line="+86"/> <source>To use the %s option</source> <translation>Használd a %s opciót</translation> </message> <message> - <location line="-77"/> + <location line="-78"/> <source>Error</source> <translation>Hiba</translation> </message> <message> - <location line="-35"/> + <location line="-36"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_id_ID.ts b/src/qt/locale/bitcoin_id_ID.ts index 6c28be4dc8..ff97375f67 100644 --- a/src/qt/locale/bitcoin_id_ID.ts +++ b/src/qt/locale/bitcoin_id_ID.ts @@ -31,6 +31,12 @@ This product includes software developed by the OpenSSL Project for use in the O <source>The Bitcoin Core developers</source> <translation type="unfinished"/> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source> (%1-bit)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>AddressBookPage</name> @@ -612,6 +618,16 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation type="unfinished"><numerusform></numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation type="unfinished"/> @@ -685,7 +701,7 @@ Alamat: %4 <translation>Dompet saat ini <b>terenkripsi</b> dan <b>terkunci</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+435"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -746,7 +762,7 @@ Alamat: %4 <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation type="unfinished"/> </message> @@ -761,7 +777,7 @@ Alamat: %4 <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation>Jumlah</translation> </message> @@ -912,7 +928,7 @@ Alamat: %4 <translation type="unfinished"/> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation type="unfinished"/> </message> @@ -1094,7 +1110,7 @@ Alamat: %4 <translation type="unfinished"/> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation type="unfinished"/> </message> @@ -1238,7 +1254,7 @@ Alamat: %4 <translation>&Utama</translation> </message> <message> - <location line="+6"/> + <location line="+122"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation type="unfinished"/> </message> @@ -1248,7 +1264,7 @@ Alamat: %4 <translation>Bayar &biaya transaksi</translation> </message> <message> - <location line="+31"/> + <location line="-131"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation>Menyalakan Bitcoin secara otomatis setelah masuk ke dalam sistem.</translation> </message> @@ -1263,12 +1279,7 @@ Alamat: %4 <translation type="unfinished"/> </message> <message> - <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"/> + <location line="+16"/> <source>MB</source> <translation type="unfinished"/> </message> @@ -1283,7 +1294,12 @@ Alamat: %4 <translation type="unfinished"/> </message> <message> - <location line="+58"/> + <location line="+107"/> + <source>&Spend unconfirmed change (experts only)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+37"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation type="unfinished"/> </message> @@ -1318,7 +1334,17 @@ Alamat: %4 <translation>&Jaringan</translation> </message> <message> - <location line="+6"/> + <location line="-86"/> + <source>W&allet</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+52"/> + <source>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.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+40"/> <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> @@ -1433,17 +1459,17 @@ Alamat: %4 <translation>&Batal</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+70"/> <source>default</source> <translation>standar</translation> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation type="unfinished"/> </message> <message> - <location line="+75"/> + <location line="+78"/> <source>Confirm options reset</source> <translation type="unfinished"/> </message> @@ -1483,18 +1509,13 @@ Alamat: %4 <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="-155"/> - <source>Unconfirmed:</source> - <translation>Tidak terkonfirmasi:</translation> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation>Dompet</translation> </message> <message> <location line="+51"/> - <source>Confirmed:</source> + <source>Available:</source> <translation type="unfinished"/> </message> <message> @@ -1503,7 +1524,12 @@ Alamat: %4 <translation type="unfinished"/> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation type="unfinished"/> </message> @@ -1651,6 +1677,11 @@ Alamat: %4 <source>Error: Invalid combination of -regtest and -testnet.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../guiutil.cpp" line="+82"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>Masukkan alamat Bitcoin (cth. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> </context> <context> <name>QRImageWidget</name> @@ -1871,22 +1902,22 @@ Alamat: %4 <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+83"/> + <location filename="../forms/receivecoinsdialog.ui" line="+107"/> <source>&Amount:</source> <translation type="unfinished"/> </message> <message> - <location line="-13"/> + <location line="-16"/> <source>&Label:</source> <translation>&Label:</translation> </message> <message> - <location line="-34"/> + <location line="-37"/> <source>&Message:</source> <translation type="unfinished"/> </message> <message> - <location line="-17"/> + <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"/> </message> @@ -1896,27 +1927,30 @@ Alamat: %4 <translation type="unfinished"/> </message> <message> - <location line="+27"/> - <source>An optional 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"/> </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> + <location line="-7"/> + <location line="+21"/> + <source>An optional label to associate with the new receiving address.</source> <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="-7"/> <source>Use this form to request payments. All fields are <b>optional</b>.</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <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"/> </message> <message> - <location line="+17"/> + <location line="+32"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -1926,17 +1960,17 @@ Alamat: %4 <translation type="unfinished"/> </message> <message> - <location line="+36"/> - <source>&Request payment</source> + <location line="+78"/> + <source>Requested payments history</source> <translation type="unfinished"/> </message> <message> - <location line="+47"/> - <source>Requested payments</source> + <location line="-98"/> + <source>&Request payment</source> <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+120"/> <source>Show the selected request (does the same as double clicking an entry)</source> <translation type="unfinished"/> </message> @@ -1955,6 +1989,21 @@ Alamat: %4 <source>Remove</source> <translation type="unfinished"/> </message> + <message> + <location filename="../receivecoinsdialog.cpp" line="+38"/> + <source>Copy label</source> + <translation>Salin label</translation> + </message> + <message> + <location line="+1"/> + <source>Copy message</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation>Salin jumlah</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -2056,12 +2105,17 @@ Alamat: %4 <source>(no message)</source> <translation type="unfinished"/> </message> + <message> + <location line="+8"/> + <source>(no amount)</source> + <translation type="unfinished"/> + </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>Kirim Koin</translation> @@ -2137,7 +2191,7 @@ Alamat: %4 <translation type="unfinished"/> </message> <message> - <location line="+115"/> + <location line="+164"/> <source>Send to multiple recipients at once</source> <translation>Kirim ke beberapa penerima sekaligus</translation> </message> @@ -2147,7 +2201,7 @@ Alamat: %4 <translation type="unfinished"/> </message> <message> - <location line="+20"/> + <location line="-23"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -2157,12 +2211,12 @@ Alamat: %4 <translation>Hapus %Semua</translation> </message> <message> - <location line="+22"/> + <location line="+52"/> <source>Balance:</source> <translation>Saldo:</translation> </message> <message> - <location line="+41"/> + <location line="-78"/> <source>Confirm the send action</source> <translation>Konfirmasi aksi pengiriman</translation> </message> @@ -2172,7 +2226,7 @@ Alamat: %4 <translation type="unfinished"/> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-228"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation>Konfirmasi pengiriman koin</translation> </message> @@ -2185,12 +2239,7 @@ Alamat: %4 <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"/> + <location line="-121"/> <source>Copy quantity</source> <translation type="unfinished"/> </message> @@ -2240,7 +2289,7 @@ Alamat: %4 <translation type="unfinished"/> </message> <message> - <location line="+202"/> + <location line="+203"/> <source>The recipient address is not valid, please recheck.</source> <translation type="unfinished"/> </message> @@ -2275,12 +2324,12 @@ Alamat: %4 <translation type="unfinished"/> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Warning: Invalid Bitcoin address</source> <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+20"/> <source>(no label)</source> <translation>(tidak ada label)</translation> </message> @@ -2290,7 +2339,7 @@ Alamat: %4 <translation type="unfinished"/> </message> <message> - <location line="-366"/> + <location line="-367"/> <source>Are you sure you want to send?</source> <translation type="unfinished"/> </message> @@ -2300,7 +2349,7 @@ Alamat: %4 <translation type="unfinished"/> </message> <message> - <location line="+170"/> + <location line="+171"/> <source>Payment request expired</source> <translation type="unfinished"/> </message> @@ -2377,12 +2426,7 @@ Alamat: %4 <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"/> + <location line="+968"/> <source>This is a verified payment request.</source> <translation type="unfinished"/> </message> @@ -2392,7 +2436,12 @@ Alamat: %4 <translation type="unfinished"/> </message> <message> - <location line="+459"/> + <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"/> + </message> + <message> + <location line="+426"/> <source>This is an unverified payment request.</source> <translation type="unfinished"/> </message> @@ -2408,11 +2457,6 @@ Alamat: %4 <source>Memo:</source> <translation type="unfinished"/> </message> - <message> - <location filename="../sendcoinsentry.cpp" line="+1"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Masukkan alamat Bitcoin (cth. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> </context> <context> <name>ShutdownWindow</name> @@ -2450,19 +2494,19 @@ Alamat: %4 <translation type="unfinished"/> </message> <message> - <location line="+10"/> - <location line="+213"/> + <location line="+7"/> + <location line="+210"/> <source>Choose previously used address</source> <translation>Pilih alamat yang telah digunakan sebelumnya</translation> </message> <message> - <location line="-203"/> - <location line="+213"/> + <location line="-200"/> + <location line="+210"/> <source>Alt+A</source> <translation>Alt+J</translation> </message> <message> - <location line="-203"/> + <location line="-200"/> <source>Paste address from clipboard</source> <translation>Tempel alamat dari salinan</translation> </message> @@ -2503,12 +2547,12 @@ Alamat: %4 </message> <message> <location line="+3"/> - <location line="+146"/> + <location line="+143"/> <source>Clear &All</source> <translation>Hapus %Semua</translation> </message> <message> - <location line="-87"/> + <location line="-84"/> <source>&Verify Message</source> <translation type="unfinished"/> </message> @@ -2523,7 +2567,7 @@ Alamat: %4 <translation type="unfinished"/> </message> <message> - <location line="+40"/> + <location line="+37"/> <source>Verify the message to ensure it was signed with the specified Bitcoin address</source> <translation type="unfinished"/> </message> @@ -2538,43 +2582,37 @@ Alamat: %4 <translation type="unfinished"/> </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>Masukkan alamat Bitcoin (cth. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location line="-2"/> + <location line="-1"/> <source>Click "Sign Message" to generate signature</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Enter Bitcoin signature</source> - <translation type="unfinished"/> - </message> - <message> <location line="+84"/> - <location line="+81"/> + <location line="+80"/> <source>The entered address is invalid.</source> <translation>Alamat yang dimasukkan tidak sesuai.</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>Silahkan periksa alamat dan coba lagi.</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 type="unfinished"/> </message> <message> - <location line="-73"/> + <location line="-72"/> <source>Wallet unlock was cancelled.</source> <translation type="unfinished"/> </message> @@ -2594,7 +2632,7 @@ Alamat: %4 <translation type="unfinished"/> </message> <message> - <location line="+59"/> + <location line="+58"/> <source>The signature could not be decoded.</source> <translation type="unfinished"/> </message> @@ -2655,6 +2693,11 @@ Alamat: %4 </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation type="unfinished"/> </message> @@ -2816,12 +2859,12 @@ Alamat: %4 <translation>, belum berhasil disiarkan</translation> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation>tidak diketahui</translation> </message> @@ -2862,12 +2905,12 @@ Alamat: %4 <translation>Jumlah</translation> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform></translation> </message> @@ -2877,23 +2920,12 @@ Alamat: %4 <translation>Buka hingga %1</translation> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> - <translation>Offline (%1 konfirmasi)</translation> - </message> - <message> - <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation>Tidak terkonfirmasi (%1 dari %2 konfirmasi)</translation> - </message> - <message> - <location line="-22"/> - <location line="+25"/> + <location line="+12"/> <source>Confirmed (%1 confirmations)</source> <translation>Terkonfirmasi (%1 konfirmasi)</translation> </message> <message> - <location line="-22"/> + <location line="+9"/> <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> @@ -2903,7 +2935,27 @@ Alamat: %4 <translation>Terbuat tetapi tidak diterima</translation> </message> <message> - <location line="+62"/> + <location line="-21"/> + <source>Offline</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Unconfirmed</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation>Diterima dengan</translation> </message> @@ -2933,7 +2985,7 @@ Alamat: %4 <translation>(t/s)</translation> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation>Status transaksi. Arahkan ke bagian ini untuk menampilkan jumlah konfrimasi.</translation> </message> @@ -3199,12 +3251,12 @@ Alamat: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+223"/> <source>Usage:</source> <translation>Penggunaan:</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>List commands</source> <translation>Daftar perintah</translation> </message> @@ -3259,12 +3311,12 @@ Alamat: %4 <translation>Tentukan alamat publik Anda sendiri</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation>Batas untuk memutuskan peer buruk (standar: 100)</translation> </message> <message> - <location line="-148"/> + <location line="-150"/> <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> @@ -3284,17 +3336,17 @@ Alamat: %4 <translation>Menerima perintah baris perintah dan JSON-RPC</translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <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="+39"/> + <location line="+40"/> <source>Use the test network</source> <translation>Gunakan jaringan uji</translation> </message> <message> - <location line="-118"/> + <location line="-120"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> @@ -3425,6 +3477,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation type="unfinished"/> </message> @@ -3635,6 +3692,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Start Bitcoin server</source> <translation>Mulai Bitcoin server</translation> </message> @@ -3684,12 +3746,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-79"/> + <location line="-80"/> <source>Imports blocks from external blk000??.dat file</source> <translation type="unfinished"/> </message> <message> - <location line="-105"/> + <location line="-106"/> <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> @@ -3709,7 +3771,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+89"/> + <location line="+90"/> <source>Information</source> <translation>Informasi</translation> </message> @@ -3779,7 +3841,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+7"/> <source>System error: </source> <translation type="unfinished"/> </message> @@ -3825,6 +3887,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>version</source> <translation>versi</translation> </message> @@ -3834,32 +3901,32 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-58"/> + <location line="-60"/> <source>Password for JSON-RPC connections</source> <translation>Kata sandi untuk hubungan JSON-RPC</translation> </message> <message> - <location line="-70"/> + <location line="-71"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Izinkan hubungan JSON-RPC dari alamat IP yang ditentukan</translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>Kirim perintah ke node berjalan pada <ip> (standar: 127.0.0.1)</translation> </message> <message> - <location line="-132"/> + <location line="-133"/> <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="+161"/> + <location line="+163"/> <source>Upgrade wallet to latest format</source> <translation>Perbarui dompet ke format terbaru</translation> </message> <message> - <location line="-24"/> + <location line="-25"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Kirim ukuran kolam kunci ke <n> (standar: 100)</translation> </message> @@ -3869,12 +3936,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Pindai ulang rantai-blok untuk transaksi dompet yang hilang</translation> </message> <message> - <location line="+38"/> + <location line="+39"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Gunakan OpenSSL (https) untuk hubungan JSON-RPC</translation> </message> <message> - <location line="-30"/> + <location line="-31"/> <source>Server certificate file (default: server.cert)</source> <translation>Berkas sertifikat server (standar: server.cert)</translation> </message> @@ -3884,7 +3951,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Kunci pribadi server (standar: server.pem)</translation> </message> <message> - <location line="+16"/> + <location line="+17"/> <source>This help message</source> <translation>Pesan bantuan ini</translation> </message> @@ -3894,12 +3961,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Tidak dapat mengikat ke %s dengan komputer ini (ikatan gagal %d, %s)</translation> </message> <message> - <location line="-107"/> + <location line="-109"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>Izinkan peninjauan DNS untuk -addnote, -seednode dan -connect</translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Loading addresses...</source> <translation>Memuat alamat...</translation> </message> @@ -3914,12 +3981,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Gagal memuat wallet.dat: Dompet memerlukan versi Bitcoin yang terbaru</translation> </message> <message> - <location line="+98"/> + <location line="+99"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>Dompet diperlukan untuk disimpan-ulang: nyala-ulangkan Bitcoin untuk menyelesaikan</translation> </message> <message> - <location line="-100"/> + <location line="-101"/> <source>Error loading wallet.dat</source> <translation>Gagal memuat wallet.dat</translation> </message> @@ -3929,7 +3996,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Alamat -proxy salah: '%s'</translation> </message> <message> - <location line="+56"/> + <location line="+57"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Jaringan tidak diketahui yang ditentukan dalam -onlynet: '%s'</translation> </message> @@ -3939,7 +4006,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Diminta versi proxy -socks tidak diketahui: %i</translation> </message> <message> - <location line="-101"/> + <location line="-103"/> <source>Cannot resolve -bind address: '%s'</source> <translation>Tidak dapat menyelesaikan alamat -bind: '%s'</translation> </message> @@ -3949,7 +4016,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Tidak dapat menyelesaikan alamat -externalip: '%s'</translation> </message> <message> - <location line="+48"/> + <location line="+49"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>Jumlah salah untuk -paytxfee=<amount>: '%s'</translation> </message> @@ -3969,7 +4036,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Memuat indeks blok...</translation> </message> <message> - <location line="-62"/> + <location line="-63"/> <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> @@ -3979,12 +4046,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+95"/> + <location line="+96"/> <source>Loading wallet...</source> <translation>Memuat dompet...</translation> </message> <message> - <location line="-56"/> + <location line="-57"/> <source>Cannot downgrade wallet</source> <translation>Tidak dapat menurunkan versi dompet</translation> </message> @@ -3994,7 +4061,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Tidak dapat menyimpan alamat standar</translation> </message> <message> - <location line="+67"/> + <location line="+68"/> <source>Rescanning...</source> <translation>Memindai ulang...</translation> </message> @@ -4004,17 +4071,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Memuat selesai</translation> </message> <message> - <location line="+85"/> + <location line="+86"/> <source>To use the %s option</source> <translation>Gunakan pilihan %s</translation> </message> <message> - <location line="-77"/> + <location line="-78"/> <source>Error</source> <translation>Gagal</translation> </message> <message> - <location line="-35"/> + <location line="-36"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_it.ts b/src/qt/locale/bitcoin_it.ts index 11d539d8c2..4d3c84132d 100644 --- a/src/qt/locale/bitcoin_it.ts +++ b/src/qt/locale/bitcoin_it.ts @@ -36,6 +36,12 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l'uso <source>The Bitcoin Core developers</source> <translation>Gli sviluppatori del Bitcoin Core</translation> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source> (%1-bit)</source> + <translation>(%1-bit)</translation> + </message> </context> <context> <name>AddressBookPage</name> @@ -617,9 +623,19 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l'uso <translation><numerusform>%n settimana</numerusform><numerusform>%n settimane</numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation>%1 e %2</translation> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation><numerusform>%n anno</numerusform><numerusform>%n anni</numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> - <translation>%1 dietro</translation> + <translation>Indietro di %1</translation> </message> <message> <location line="+21"/> @@ -691,7 +707,7 @@ Indirizzo: %4 <translation>Il portamonete è <b>cifrato</b> e attualmente <b>bloccato</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+435"/> <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> @@ -752,7 +768,7 @@ Indirizzo: %4 <translation>Resto:</translation> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation>(de)seleziona tutto</translation> </message> @@ -767,7 +783,7 @@ Indirizzo: %4 <translation>Modalità Lista</translation> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation>Importo</translation> </message> @@ -918,7 +934,7 @@ Indirizzo: %4 <translation>nessuno</translation> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation>Trascurabile</translation> </message> @@ -1100,7 +1116,7 @@ Indirizzo: %4 <translation>Bitcoin Core - Opzioni linea di comando</translation> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation>Bitcoin Core</translation> </message> @@ -1244,7 +1260,7 @@ Indirizzo: %4 <translation>&Principale</translation> </message> <message> - <location line="+6"/> + <location line="+122"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation>Commissione di transazione per kB; è opzionale e contribuisce ad assicurare che le transazioni siano elaborate velocemente. Le transazioni sono per la maggior parte da 1 kB. Commissione raccomandata 0,01.</translation> </message> @@ -1254,7 +1270,7 @@ Indirizzo: %4 <translation>Paga la &commissione</translation> </message> <message> - <location line="+31"/> + <location line="-131"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation>Avvia automaticamente Bitcoin all'accensione del computer</translation> </message> @@ -1269,12 +1285,7 @@ Indirizzo: %4 <translation>Dimensione della cache del &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"/> + <location line="+16"/> <source>MB</source> <translation>MB</translation> </message> @@ -1289,7 +1300,12 @@ Indirizzo: %4 <translation>Imposta il numero di thread di verifica script (fino a 16, 0 = auto, <0 = lascia il maggior numero di core liberi, predefinito: 0)</translation> </message> <message> - <location line="+58"/> + <location line="+107"/> + <source>&Spend unconfirmed change (experts only)</source> + <translation>&Spendere resti non confermati (solo per esperti)</translation> + </message> + <message> + <location line="+37"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation>Connetti alla rete Bitcoin attraverso un proxy SOCKS.</translation> </message> @@ -1324,7 +1340,17 @@ Indirizzo: %4 <translation>Rete</translation> </message> <message> - <location line="+6"/> + <location line="-86"/> + <source>W&allet</source> + <translation>Port&afoglio</translation> + </message> + <message> + <location line="+52"/> + <source>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.</source> + <translation>Se disabiliti l'uso di resti non confermati, il resto di una transazione non potrà essere usato fintanto che la transazione non avrà almeno una conferma. Questo influisce anche su come è calcolato il saldo.</translation> + </message> + <message> + <location line="+40"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>Apri automaticamente la porta del client Bitcoin sul router. Questo funziona solo se il router supporta UPnP ed è abilitato.</translation> </message> @@ -1439,17 +1465,17 @@ Indirizzo: %4 <translation>&Cancella</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+70"/> <source>default</source> <translation>predefinito</translation> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation>nessuno</translation> </message> <message> - <location line="+75"/> + <location line="+78"/> <source>Confirm options reset</source> <translation>Conferma ripristino opzioni</translation> </message> @@ -1489,19 +1515,14 @@ Indirizzo: %4 <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="-155"/> - <source>Unconfirmed:</source> - <translation>Non confermato:</translation> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation>Portamonete</translation> </message> <message> <location line="+51"/> - <source>Confirmed:</source> - <translation>Confermato:</translation> + <source>Available:</source> + <translation>Disponibile:</translation> </message> <message> <location line="+16"/> @@ -1509,7 +1530,12 @@ Indirizzo: %4 <translation>Saldo spendibile attuale</translation> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation>In attesa:</translation> + </message> + <message> + <location line="+16"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation>Totale delle transazioni in corso di conferma, che non sono ancora incluse nel saldo spendibile attuale</translation> </message> @@ -1657,6 +1683,11 @@ Indirizzo: %4 <source>Error: Invalid combination of -regtest and -testnet.</source> <translation>Errore: combinazione di -regtest e -testnet non valida.</translation> </message> + <message> + <location filename="../guiutil.cpp" line="+82"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>Inserisci un indirizzo Bitcoin (ad esempio 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> </context> <context> <name>QRImageWidget</name> @@ -1877,22 +1908,22 @@ Indirizzo: %4 <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+83"/> + <location filename="../forms/receivecoinsdialog.ui" line="+107"/> <source>&Amount:</source> <translation>&Importo:</translation> </message> <message> - <location line="-13"/> + <location line="-16"/> <source>&Label:</source> <translation>&Etichetta</translation> </message> <message> - <location line="-34"/> + <location line="-37"/> <source>&Message:</source> <translation>&Messaggio:</translation> </message> <message> - <location line="-17"/> + <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>Riutilizza un indirizzo di ricezione già usato. Riutilizzare indirizza non è sicuro. Non usare senza rigenerare una richiesta di pagamanto.</translation> </message> @@ -1902,27 +1933,30 @@ Indirizzo: %4 <translation>R&iusa un indirizzo di pagamento (non raccomandato)</translation> </message> <message> - <location line="+27"/> - <source>An optional label to associate with the new receiving address</source> - <translation>Un'etichetta facoltativa da associare al nuovo indirizzo ricevente</translation> - </message> - <message> - <location line="+7"/> + <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>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="+7"/> + <location line="-7"/> + <location line="+21"/> + <source>An optional label to associate with the new receiving address.</source> + <translation>Un'etichetta facoltativa da associare al nuovo indirizzo ricevente</translation> + </message> + <message> + <location line="-7"/> <source>Use this form to request payments. All fields are <b>optional</b>.</source> <translation>Usa questo modulo per richiedere pagamenti. Tutti i campi sono <b>opzionali</b>.</translation> </message> <message> - <location line="+39"/> + <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>Un importo facoltativo da richiedere. Lasciare vuoto o a zero per non richiedere un importo specifico.</translation> </message> <message> - <location line="+17"/> + <location line="+32"/> <source>Clear all fields of the form.</source> <translation>Cancellare tutti i campi del modulo.</translation> </message> @@ -1932,17 +1966,17 @@ Indirizzo: %4 <translation>Cancella</translation> </message> <message> - <location line="+36"/> - <source>&Request payment</source> - <translation>&Richiedi pagamento</translation> + <location line="+78"/> + <source>Requested payments history</source> + <translation>Cronologia pagamenti richiesti</translation> </message> <message> - <location line="+47"/> - <source>Requested payments</source> - <translation>Pagamenti richiesti</translation> + <location line="-98"/> + <source>&Request payment</source> + <translation>&Richiedi pagamento</translation> </message> <message> - <location line="+16"/> + <location line="+120"/> <source>Show the selected request (does the same as double clicking an entry)</source> <translation>Mostra la richiesta selezionata (fa la stessa cosa che il doppio click sul campo)</translation> </message> @@ -1961,6 +1995,21 @@ Indirizzo: %4 <source>Remove</source> <translation>Rimuovi</translation> </message> + <message> + <location filename="../receivecoinsdialog.cpp" line="+38"/> + <source>Copy label</source> + <translation>Copia l'etichetta</translation> + </message> + <message> + <location line="+1"/> + <source>Copy message</source> + <translation>Copia messaggio</translation> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation>Copia l'importo</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -2062,12 +2111,17 @@ Indirizzo: %4 <source>(no message)</source> <translation>(nessun messaggio)</translation> </message> + <message> + <location line="+8"/> + <source>(no amount)</source> + <translation>(nessun importo)</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>Spedisci Bitcoin</translation> @@ -2143,7 +2197,7 @@ Indirizzo: %4 <translation>Personalizza indirizzo di resto</translation> </message> <message> - <location line="+115"/> + <location line="+164"/> <source>Send to multiple recipients at once</source> <translation>Spedisci a diversi beneficiari in una volta sola</translation> </message> @@ -2153,7 +2207,7 @@ Indirizzo: %4 <translation>&Aggiungi beneficiario</translation> </message> <message> - <location line="+20"/> + <location line="-23"/> <source>Clear all fields of the form.</source> <translation>Cancellare tutti i campi del modulo.</translation> </message> @@ -2163,12 +2217,12 @@ Indirizzo: %4 <translation>Cancella &tutto</translation> </message> <message> - <location line="+22"/> + <location line="+52"/> <source>Balance:</source> <translation>Saldo:</translation> </message> <message> - <location line="+41"/> + <location line="-78"/> <source>Confirm the send action</source> <translation>Conferma la spedizione</translation> </message> @@ -2178,7 +2232,7 @@ Indirizzo: %4 <translation>&Spedisci</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-228"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation>Conferma la spedizione di bitcoin</translation> </message> @@ -2191,12 +2245,7 @@ Indirizzo: %4 <translation>%1 a %2</translation> </message> <message> - <location line="-136"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Inserisci un indirizzo Bitcoin (ad esempio 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> - <message> - <location line="+15"/> + <location line="-121"/> <source>Copy quantity</source> <translation>Copia quantità </translation> </message> @@ -2246,7 +2295,7 @@ Indirizzo: %4 <translation>o</translation> </message> <message> - <location line="+202"/> + <location line="+203"/> <source>The recipient address is not valid, please recheck.</source> <translation>L'indirizzo del beneficiario non è valido, per cortesia controlla.</translation> </message> @@ -2281,12 +2330,12 @@ Indirizzo: %4 <translation>La transazione e' stata rifiutata! Questo puo' accadere se alcune delle monete nel tuo portafoglio sono gia' state spese, per esempio se hai fatto una copia di un file wallet.dat le quali monete eran gia' state spese, ma non marcate come tali nel file.</translation> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Warning: Invalid Bitcoin address</source> <translation>Attenzione: Indirizzo Bitcoin non valido</translation> </message> <message> - <location line="+21"/> + <location line="+20"/> <source>(no label)</source> <translation>(nessuna etichetta)</translation> </message> @@ -2296,7 +2345,7 @@ Indirizzo: %4 <translation>Attenzione: Indirizzo di ritorno sconosciuto</translation> </message> <message> - <location line="-366"/> + <location line="-367"/> <source>Are you sure you want to send?</source> <translation>Sei sicuro di voler inviare?</translation> </message> @@ -2306,7 +2355,7 @@ Indirizzo: %4 <translation>aggiunto come tassa di transazione</translation> </message> <message> - <location line="+170"/> + <location line="+171"/> <source>Payment request expired</source> <translation>Richiesta di pagamento scaduta</translation> </message> @@ -2383,12 +2432,7 @@ Indirizzo: %4 <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"/> + <location line="+968"/> <source>This is a verified payment request.</source> <translation>Questa è una richiesta di pagamento verificata.</translation> </message> @@ -2398,7 +2442,12 @@ Indirizzo: %4 <translation>Inserisci un'etichetta per questo indirizzo per aggiungerlo nella rubrica</translation> </message> <message> - <location line="+459"/> + <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>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="+426"/> <source>This is an unverified payment request.</source> <translation>Questa è una richiesta di pagamento non verificata.</translation> </message> @@ -2414,11 +2463,6 @@ Indirizzo: %4 <source>Memo:</source> <translation>Memo:</translation> </message> - <message> - <location filename="../sendcoinsentry.cpp" line="+1"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Inserisci un indirizzo Bitcoin (ad esempio 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> </context> <context> <name>ShutdownWindow</name> @@ -2456,19 +2500,19 @@ Indirizzo: %4 <translation>Inserisci un indirizzo Bitcoin (ad esempio 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location line="+10"/> - <location line="+213"/> + <location line="+7"/> + <location line="+210"/> <source>Choose previously used address</source> <translation>Scegli indirizzo usato precedentemente</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>Incollare l'indirizzo dagli appunti</translation> </message> @@ -2509,12 +2553,12 @@ Indirizzo: %4 </message> <message> <location line="+3"/> - <location line="+146"/> + <location line="+143"/> <source>Clear &All</source> <translation>Cancella &tutto</translation> </message> <message> - <location line="-87"/> + <location line="-84"/> <source>&Verify Message</source> <translation>&Verifica Messaggio</translation> </message> @@ -2529,7 +2573,7 @@ Indirizzo: %4 <translation>Inserisci un indirizzo Bitcoin (ad esempio 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>Verifica il messaggio per assicurarsi che sia stato firmato con l'indirizzo Bitcoin specificato</translation> </message> @@ -2544,43 +2588,37 @@ Indirizzo: %4 <translation>Reimposta tutti i campi della verifica messaggio</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>Inserisci un indirizzo Bitcoin (ad esempio 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location line="-2"/> + <location line="-1"/> <source>Click "Sign Message" to generate signature</source> <translation>Clicca "Firma il messaggio" per ottenere la firma</translation> </message> <message> - <location line="+3"/> - <source>Enter Bitcoin signature</source> - <translation>Inserisci firma Bitcoin</translation> - </message> - <message> <location line="+84"/> - <location line="+81"/> + <location line="+80"/> <source>The entered address is invalid.</source> <translation>L'indirizzo inserito non è valido.</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>Per favore controlla l'indirizzo e prova ancora</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>L'indirizzo bitcoin inserito non è associato a nessuna chiave.</translation> </message> <message> - <location line="-73"/> + <location line="-72"/> <source>Wallet unlock was cancelled.</source> <translation>Sblocco del portafoglio annullato.</translation> </message> @@ -2600,7 +2638,7 @@ Indirizzo: %4 <translation>Messaggio firmato.</translation> </message> <message> - <location line="+59"/> + <location line="+58"/> <source>The signature could not be decoded.</source> <translation>Non è stato possibile decodificare la firma.</translation> </message> @@ -2661,6 +2699,11 @@ Indirizzo: %4 </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation>in conflitto</translation> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation>%1/offline</translation> </message> @@ -2822,12 +2865,12 @@ Indirizzo: %4 <translation>, non è stato ancora trasmesso con successo</translation> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <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> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation>sconosciuto</translation> </message> @@ -2868,12 +2911,12 @@ Indirizzo: %4 <translation>Importo</translation> </message> <message> - <location line="+59"/> + <location line="+78"/> <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="+16"/> + <location line="-21"/> <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> @@ -2883,23 +2926,12 @@ Indirizzo: %4 <translation>Aperto fino a %1</translation> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> - <translation>Offline (%1 conferme)</translation> - </message> - <message> - <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation>Non confermati (%1 su %2 conferme)</translation> - </message> - <message> - <location line="-22"/> - <location line="+25"/> + <location line="+12"/> <source>Confirmed (%1 confirmations)</source> <translation>Confermato (%1 conferme)</translation> </message> <message> - <location line="-22"/> + <location line="+9"/> <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> @@ -2909,7 +2941,27 @@ Indirizzo: %4 <translation>Generati, ma non accettati</translation> </message> <message> - <location line="+62"/> + <location line="-21"/> + <source>Offline</source> + <translation>Offline</translation> + </message> + <message> + <location line="+3"/> + <source>Unconfirmed</source> + <translation>Non confermato:</translation> + </message> + <message> + <location line="+3"/> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation>In conferma (%1 di %2 conferme raccomandate)</translation> + </message> + <message> + <location line="+6"/> + <source>Conflicted</source> + <translation>In conflitto</translation> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation>Ricevuto tramite</translation> </message> @@ -2939,7 +2991,7 @@ Indirizzo: %4 <translation>(N / a)</translation> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation>Stato della transazione. Passare con il mouse su questo campo per vedere il numero di conferme.</translation> </message> @@ -3205,12 +3257,12 @@ Indirizzo: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+223"/> <source>Usage:</source> <translation>Utilizzo:</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>List commands</source> <translation>Lista comandi </translation> @@ -3269,12 +3321,12 @@ Indirizzo: %4 <translation>Specifica il tuo indirizzo pubblico</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation>Soglia di disconnessione dei peer di cattiva qualità (predefinita: 100)</translation> </message> <message> - <location line="-148"/> + <location line="-150"/> <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 (predefiniti: 86400)</translation> </message> @@ -3295,19 +3347,19 @@ Indirizzo: %4 </translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Run in the background as a daemon and accept commands</source> <translation>Esegui in background come demone e accetta i comandi </translation> </message> <message> - <location line="+39"/> + <location line="+40"/> <source>Use the test network</source> <translation>Utilizza la rete di prova </translation> </message> <message> - <location line="-118"/> + <location line="-120"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>Accetta connessioni dall'esterno (predefinito: 1 se no -proxy o -connect)</translation> </message> @@ -3448,6 +3500,11 @@ per esempio: alertnotify=echo %%s | mail -s "Allarme Bitcoin" admin@fo </message> <message> <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation>Elenco chiaro delle transazioni sul portafoglio (strumento di diagnostica; implica -rescan)</translation> + </message> + <message> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation>Connetti solo al nodo specificato</translation> </message> @@ -3658,6 +3715,11 @@ per esempio: alertnotify=echo %%s | mail -s "Allarme Bitcoin" admin@fo </message> <message> <location line="+2"/> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation>Spendere il resto non confermato con l'invio delle transazioni (predefinito: 1)</translation> + </message> + <message> + <location line="+1"/> <source>Start Bitcoin server</source> <translation>Avvia server Bitcoin</translation> </message> @@ -3707,12 +3769,12 @@ per esempio: alertnotify=echo %%s | mail -s "Allarme Bitcoin" admin@fo <translation>Serve ricostruire il database usando -reindex per cambiare -txindex</translation> </message> <message> - <location line="-79"/> + <location line="-80"/> <source>Imports blocks from external blk000??.dat file</source> <translation>Importa blocchi da un file blk000??.dat esterno</translation> </message> <message> - <location line="-105"/> + <location line="-106"/> <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> @@ -3732,7 +3794,7 @@ per esempio: alertnotify=echo %%s | mail -s "Allarme Bitcoin" admin@fo <translation>Imposta il numero di thread di verifica script (fino a 16, 0 = auto, <0 = lascia il maggior numero di core liberi, predefinito: 0)</translation> </message> <message> - <location line="+89"/> + <location line="+90"/> <source>Information</source> <translation>Informazioni</translation> </message> @@ -3802,7 +3864,7 @@ per esempio: alertnotify=echo %%s | mail -s "Allarme Bitcoin" admin@fo <translation>Specifica il timeout di connessione in millisecondi (predefinito: 5000)</translation> </message> <message> - <location line="+6"/> + <location line="+7"/> <source>System error: </source> <translation>Errore di sistema:</translation> </message> @@ -3849,6 +3911,11 @@ per esempio: alertnotify=echo %%s | mail -s "Allarme Bitcoin" admin@fo </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation>Cancella e ricompila tutte le transazioni dal wallet...</translation> + </message> + <message> + <location line="+1"/> <source>version</source> <translation>versione</translation> </message> @@ -3858,34 +3925,34 @@ per esempio: alertnotify=echo %%s | mail -s "Allarme Bitcoin" admin@fo <translation>wallet.dat corrotto, salvataggio fallito</translation> </message> <message> - <location line="-58"/> + <location line="-60"/> <source>Password for JSON-RPC connections</source> <translation>Password per connessioni JSON-RPC </translation> </message> <message> - <location line="-70"/> + <location line="-71"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Consenti connessioni JSON-RPC dall'indirizzo IP specificato </translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>Inviare comandi al nodo in esecuzione su <ip> (predefinito: 127.0.0.1)</translation> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>Esegui il comando quando il miglior block cambia(%s nel cmd è sostituito dall'hash del blocco)</translation> </message> <message> - <location line="+161"/> + <location line="+163"/> <source>Upgrade wallet to latest format</source> <translation>Aggiorna il wallet all'ultimo formato</translation> </message> <message> - <location line="-24"/> + <location line="-25"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Impostare la quantità di chiavi di riserva a <n> (predefinita: 100)</translation> </message> @@ -3896,13 +3963,13 @@ per esempio: alertnotify=echo %%s | mail -s "Allarme Bitcoin" admin@fo </translation> </message> <message> - <location line="+38"/> + <location line="+39"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Utilizzare OpenSSL (https) per le connessioni JSON-RPC </translation> </message> <message> - <location line="-30"/> + <location line="-31"/> <source>Server certificate file (default: server.cert)</source> <translation>File certificato del server (predefinito: server.cert)</translation> </message> @@ -3912,7 +3979,7 @@ per esempio: alertnotify=echo %%s | mail -s "Allarme Bitcoin" admin@fo <translation>Chiave privata del server (predefinito: server.pem)</translation> </message> <message> - <location line="+16"/> + <location line="+17"/> <source>This help message</source> <translation>Questo messaggio di aiuto </translation> @@ -3923,13 +3990,13 @@ per esempio: alertnotify=echo %%s | mail -s "Allarme Bitcoin" admin@fo <translation>Impossibile collegarsi alla %s su questo computer (bind returned error %d, %s)</translation> </message> <message> - <location line="-107"/> + <location line="-109"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>Consenti ricerche DNS per aggiungere nodi e collegare </translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Loading addresses...</source> <translation>Caricamento indirizzi...</translation> </message> @@ -3944,12 +4011,12 @@ per esempio: alertnotify=echo %%s | mail -s "Allarme Bitcoin" admin@fo <translation>Errore caricamento wallet.dat: il wallet richiede una versione nuova di Bitcoin</translation> </message> <message> - <location line="+98"/> + <location line="+99"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>Il portamonete deve essere riscritto: riavviare Bitcoin per completare</translation> </message> <message> - <location line="-100"/> + <location line="-101"/> <source>Error loading wallet.dat</source> <translation>Errore caricamento wallet.dat</translation> </message> @@ -3959,7 +4026,7 @@ per esempio: alertnotify=echo %%s | mail -s "Allarme Bitcoin" admin@fo <translation>Indirizzo -proxy non valido: '%s'</translation> </message> <message> - <location line="+56"/> + <location line="+57"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Rete sconosciuta specificata in -onlynet: '%s'</translation> </message> @@ -3969,7 +4036,7 @@ per esempio: alertnotify=echo %%s | mail -s "Allarme Bitcoin" admin@fo <translation>Versione -socks proxy sconosciuta richiesta: %i</translation> </message> <message> - <location line="-101"/> + <location line="-103"/> <source>Cannot resolve -bind address: '%s'</source> <translation>Impossibile risolvere -bind address: '%s'</translation> </message> @@ -3979,7 +4046,7 @@ per esempio: alertnotify=echo %%s | mail -s "Allarme Bitcoin" admin@fo <translation>Impossibile risolvere indirizzo -externalip: '%s'</translation> </message> <message> - <location line="+48"/> + <location line="+49"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>Importo non valido per -paytxfee=<amount>: '%s'</translation> </message> @@ -3999,7 +4066,7 @@ per esempio: alertnotify=echo %%s | mail -s "Allarme Bitcoin" admin@fo <translation>Caricamento dell'indice del blocco...</translation> </message> <message> - <location line="-62"/> + <location line="-63"/> <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> @@ -4009,12 +4076,12 @@ per esempio: alertnotify=echo %%s | mail -s "Allarme Bitcoin" admin@fo <translation>Impossibile collegarsi alla %s su questo computer. Probabilmente Bitcoin è già in esecuzione.</translation> </message> <message> - <location line="+95"/> + <location line="+96"/> <source>Loading wallet...</source> <translation>Caricamento portamonete...</translation> </message> <message> - <location line="-56"/> + <location line="-57"/> <source>Cannot downgrade wallet</source> <translation>Non è possibile retrocedere il wallet</translation> </message> @@ -4024,7 +4091,7 @@ per esempio: alertnotify=echo %%s | mail -s "Allarme Bitcoin" admin@fo <translation>Non è possibile scrivere l'indirizzo predefinito</translation> </message> <message> - <location line="+67"/> + <location line="+68"/> <source>Rescanning...</source> <translation>Ripetere la scansione...</translation> </message> @@ -4034,17 +4101,17 @@ per esempio: alertnotify=echo %%s | mail -s "Allarme Bitcoin" admin@fo <translation>Caricamento completato</translation> </message> <message> - <location line="+85"/> + <location line="+86"/> <source>To use the %s option</source> <translation>Per usare la opzione %s</translation> </message> <message> - <location line="-77"/> + <location line="-78"/> <source>Error</source> <translation>Errore</translation> </message> <message> - <location line="-35"/> + <location line="-36"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_ja.ts b/src/qt/locale/bitcoin_ja.ts index 216f23c46e..808f377a20 100644 --- a/src/qt/locale/bitcoin_ja.ts +++ b/src/qt/locale/bitcoin_ja.ts @@ -36,6 +36,12 @@ MIT/X11 ソフトウェア ライセンスã®ä¸‹ã§é…布ã•ã‚Œã¦ã„ã¾ã™ã€‚è© <source>The Bitcoin Core developers</source> <translation type="unfinished"/> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source> (%1-bit)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>AddressBookPage</name> @@ -617,6 +623,16 @@ MIT/X11 ソフトウェア ライセンスã®ä¸‹ã§é…布ã•ã‚Œã¦ã„ã¾ã™ã€‚è© <translation><numerusform>%n 週間</numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation type="unfinished"><numerusform></numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation>%1 é…延</translation> @@ -689,7 +705,7 @@ Address: %4 <translation>ウォレットã¯<b>æš—å·åŒ–ã•ã‚Œã¦ã€ãƒãƒƒã‚¯ã•ã‚Œã¦ã„ã¾ã™</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+435"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>致命的ãªã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚Bitcoin ã¯å®‰å…¨ã«ç¶™ç¶šã™ã‚‹ã“ã¨ãŒã§ããšçµ‚了ã™ã‚‹ã§ã—ょã†ã€‚ </translation> @@ -751,7 +767,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation type="unfinished"/> </message> @@ -766,7 +782,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation>ç·é¡</translation> </message> @@ -917,7 +933,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation type="unfinished"/> </message> @@ -1099,7 +1115,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation>Bitcoin ã®ã‚³ã‚¢</translation> </message> @@ -1243,7 +1259,7 @@ Address: %4 <translation>メイン (&M)</translation> </message> <message> - <location line="+6"/> + <location line="+122"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation>ã‚ãŸãªã®å–引ãŒæ—©ã処ç†ã•ã‚Œã‚‹ã‚ˆã†ã«ä»»æ„㧠kB 毎ã®å–引手数料をè¨å®šã—ã¾ã™ã€‚ã»ã¨ã‚“ã©ã®å–引㯠1 kB ã§ã™ã€‚</translation> </message> @@ -1253,7 +1269,7 @@ Address: %4 <translation>支払ã†å–引手数料 (&f)</translation> </message> <message> - <location line="+31"/> + <location line="-131"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation>システムã«ãƒã‚°ã‚¤ãƒ³ã—ãŸæ™‚ã«è‡ªå‹•çš„ã« Bitcoin ã‚’èµ·å‹•ã—ã¾ã™ã€‚</translation> </message> @@ -1268,12 +1284,7 @@ Address: %4 <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"/> + <location line="+16"/> <source>MB</source> <translation type="unfinished"/> </message> @@ -1288,7 +1299,12 @@ Address: %4 <translation>スクリプト検証スレッドをè¨å®š (最大 16, 0 = 自動, <0 = ãŸãã•ã‚“ã®ã‚³ã‚¢ã‚’自由ã«ã—ã¦ãŠã, åˆæœŸå€¤: 0)</translation> </message> <message> - <location line="+58"/> + <location line="+107"/> + <source>&Spend unconfirmed change (experts only)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+37"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation type="unfinished"/> </message> @@ -1323,7 +1339,17 @@ Address: %4 <translation>ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ (&N)</translation> </message> <message> - <location line="+6"/> + <location line="-86"/> + <source>W&allet</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+52"/> + <source>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.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+40"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>自動的ã«ãƒ«ãƒ¼ã‚¿ãƒ¼ä¸Šã® Bitcoin クライアントã®ãƒãƒ¼ãƒˆã‚’é–‹ãã¾ã™ã€‚ã‚ãªãŸã®ãƒ«ãƒ¼ã‚¿ãƒ¼ãŒ UPnP ã«å¯¾å¿œã—ã¦ã„ã¦ã€ãã‚ŒãŒæœ‰åŠ¹ã«ãªã£ã¦ã„ã‚‹å ´åˆã«ä½œå‹•ã—ã¾ã™ã€‚</translation> </message> @@ -1438,17 +1464,17 @@ Address: %4 <translation>ã‚ャンセル (&C)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+70"/> <source>default</source> <translation>åˆæœŸå€¤</translation> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation type="unfinished"/> </message> <message> - <location line="+75"/> + <location line="+78"/> <source>Confirm options reset</source> <translation>オプションã®ãƒªã‚»ãƒƒãƒˆã®ç¢ºèª</translation> </message> @@ -1488,19 +1514,14 @@ Address: %4 <translation>表示ã•ã‚ŒãŸæƒ…å ±ã¯å¤ã„ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。接続ãŒç¢ºç«‹ã•ã‚Œã‚‹ã¨ã€ã‚ãªãŸã®ã‚¦ã‚©ãƒ¬ãƒƒãƒˆã¯ Bitcoin ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã¨è‡ªå‹•çš„ã«åŒæœŸã—ã¾ã™ãŒã€ã“ã®ãƒ—ãƒã‚»ã‚¹ã¯ã¾ã 完了ã—ã¦ã„ã¾ã›ã‚“。</translation> </message> <message> - <location line="-155"/> - <source>Unconfirmed:</source> - <translation>未確èªï¼š</translation> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation>ウォレット</translation> </message> <message> <location line="+51"/> - <source>Confirmed:</source> - <translation>確èªæ¸ˆã¿:</translation> + <source>Available:</source> + <translation type="unfinished"/> </message> <message> <location line="+16"/> @@ -1508,7 +1529,12 @@ Address: %4 <translation>ã‚ãªãŸã®åˆ©ç”¨å¯èƒ½æ®‹é«˜</translation> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation>未検証ã®å–引ã§åˆ©ç”¨å¯èƒ½æ®‹é«˜ã«åæ˜ ã•ã‚Œã¦ã„ãªã„æ•°</translation> </message> @@ -1657,6 +1683,11 @@ Address: %4 <source>Error: Invalid combination of -regtest and -testnet.</source> <translation>エラー：　-regtestã¨-testnetã¯ä¸€ç·’ã«ã™ã‚‹ã®ã¯ç„¡åŠ¹ã§ã™ã€‚</translation> </message> + <message> + <location filename="../guiutil.cpp" line="+82"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>Bitcoin アドレスを入力ã—ã¾ã™ (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> </context> <context> <name>QRImageWidget</name> @@ -1877,22 +1908,22 @@ Address: %4 <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+83"/> + <location filename="../forms/receivecoinsdialog.ui" line="+107"/> <source>&Amount:</source> <translation type="unfinished"/> </message> <message> - <location line="-13"/> + <location line="-16"/> <source>&Label:</source> <translation>ラベル(&L):</translation> </message> <message> - <location line="-34"/> + <location line="-37"/> <source>&Message:</source> <translation type="unfinished"/> </message> <message> - <location line="-17"/> + <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"/> </message> @@ -1902,27 +1933,30 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+27"/> - <source>An optional 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"/> </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> + <location line="-7"/> + <location line="+21"/> + <source>An optional label to associate with the new receiving address.</source> <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="-7"/> <source>Use this form to request payments. All fields are <b>optional</b>.</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <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"/> </message> <message> - <location line="+17"/> + <location line="+32"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -1932,17 +1966,17 @@ Address: %4 <translation>クリア</translation> </message> <message> - <location line="+36"/> - <source>&Request payment</source> + <location line="+78"/> + <source>Requested payments history</source> <translation type="unfinished"/> </message> <message> - <location line="+47"/> - <source>Requested payments</source> + <location line="-98"/> + <source>&Request payment</source> <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+120"/> <source>Show the selected request (does the same as double clicking an entry)</source> <translation type="unfinished"/> </message> @@ -1961,6 +1995,21 @@ Address: %4 <source>Remove</source> <translation type="unfinished"/> </message> + <message> + <location filename="../receivecoinsdialog.cpp" line="+38"/> + <source>Copy label</source> + <translation>ラベルをコピーã™ã‚‹</translation> + </message> + <message> + <location line="+1"/> + <source>Copy message</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation>ç·é¡ã®ã‚³ãƒ”ー</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -2062,12 +2111,17 @@ Address: %4 <source>(no message)</source> <translation type="unfinished"/> </message> + <message> + <location line="+8"/> + <source>(no amount)</source> + <translation type="unfinished"/> + </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>コインをé€ã‚‹</translation> @@ -2143,7 +2197,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+115"/> + <location line="+164"/> <source>Send to multiple recipients at once</source> <translation>一度ã«è¤‡æ•°ã®äººã«é€ã‚‹</translation> </message> @@ -2153,7 +2207,7 @@ Address: %4 <translation>å—å–äººã‚’è¿½åŠ (&R)</translation> </message> <message> - <location line="+20"/> + <location line="-23"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -2163,12 +2217,12 @@ Address: %4 <translation>ã™ã¹ã¦ã‚¯ãƒªã‚¢ (&A)</translation> </message> <message> - <location line="+22"/> + <location line="+52"/> <source>Balance:</source> <translation>残高:</translation> </message> <message> - <location line="+41"/> + <location line="-78"/> <source>Confirm the send action</source> <translation>é€ã‚‹æ“作を確èªã™ã‚‹</translation> </message> @@ -2178,7 +2232,7 @@ Address: %4 <translation>é€ã‚‹ (&e)</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-228"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation>コインをé€ã‚‹ç¢ºèª</translation> </message> @@ -2191,12 +2245,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-136"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Bitcoin アドレスを入力ã—ã¾ã™ (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> - <message> - <location line="+15"/> + <location line="-121"/> <source>Copy quantity</source> <translation type="unfinished"/> </message> @@ -2246,7 +2295,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+202"/> + <location line="+203"/> <source>The recipient address is not valid, please recheck.</source> <translation>å—å–人ã®ã‚¢ãƒ‰ãƒ¬ã‚¹ãŒä¸æ£ã§ã™ã€‚å†ç¢ºèªã—ã¦ãã ã•ã„。</translation> </message> @@ -2281,12 +2330,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Warning: Invalid Bitcoin address</source> <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+20"/> <source>(no label)</source> <translation>（ラベル無ã—）</translation> </message> @@ -2296,7 +2345,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-366"/> + <location line="-367"/> <source>Are you sure you want to send?</source> <translation>é€ã£ã¦ã‚ˆã‚ã—ã„ã§ã™ã‹ï¼Ÿ</translation> </message> @@ -2306,7 +2355,7 @@ Address: %4 <translation>å–引手数料ã¨ã—ã¦è¿½åŠ ã•ã‚ŒãŸ</translation> </message> <message> - <location line="+170"/> + <location line="+171"/> <source>Payment request expired</source> <translation>支払ã„ã®ãƒªã‚¯ã‚¨ã‚¹ãƒˆã¯æœŸé™åˆ‡ã‚Œã§ã™</translation> </message> @@ -2383,12 +2432,7 @@ Address: %4 <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"/> + <location line="+968"/> <source>This is a verified payment request.</source> <translation type="unfinished"/> </message> @@ -2398,7 +2442,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+459"/> + <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"/> + </message> + <message> + <location line="+426"/> <source>This is an unverified payment request.</source> <translation type="unfinished"/> </message> @@ -2414,11 +2463,6 @@ Address: %4 <source>Memo:</source> <translation>メモ：</translation> </message> - <message> - <location filename="../sendcoinsentry.cpp" line="+1"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Bitcoin アドレスを入力ã—ã¾ã™ (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> </context> <context> <name>ShutdownWindow</name> @@ -2456,19 +2500,19 @@ Address: %4 <translation>メッセージã®ç½²åã«ä½¿ã†ã‚¢ãƒ‰ãƒ¬ã‚¹ (例 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location line="+10"/> - <location line="+213"/> + <location line="+7"/> + <location line="+210"/> <source>Choose previously used address</source> <translation>å‰ã«ä½¿ç”¨ã—ãŸã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’é¸ã¶</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>クリップボードã‹ã‚‰ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’貼付ã‘ã‚‹</translation> </message> @@ -2509,12 +2553,12 @@ Address: %4 </message> <message> <location line="+3"/> - <location line="+146"/> + <location line="+143"/> <source>Clear &All</source> <translation>ã™ã¹ã¦ã‚¯ãƒªã‚¢ (&A)</translation> </message> <message> - <location line="-87"/> + <location line="-84"/> <source>&Verify Message</source> <translation>メッセージã®æ¤œè¨¼ (&V)</translation> </message> @@ -2529,7 +2573,7 @@ Address: %4 <translation>メッセージãŒç½²åã•ã‚ŒãŸã‚¢ãƒ‰ãƒ¬ã‚¹ (例 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>指定ã•ã‚ŒãŸ Bitcoin アドレスã§ç½²åã•ã‚ŒãŸã“ã¨ã‚’ä¿è¨¼ã™ã‚‹ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’検証</translation> </message> @@ -2544,43 +2588,37 @@ Address: %4 <translation>å…¥åŠ›é …ç›®ã®å†…容をã™ã¹ã¦æ¶ˆåŽ»ã—ã¾ã™</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>Bitcoin アドレスを入力ã—ã¾ã™ (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location line="-2"/> + <location line="-1"/> <source>Click "Sign Message" to generate signature</source> <translation>ç½²åを作æˆã™ã‚‹ã«ã¯"メッセージã®ç½²å"をクリック</translation> </message> <message> - <location line="+3"/> - <source>Enter Bitcoin signature</source> - <translation>Bitcoin ç½²åを入力</translation> - </message> - <message> <location line="+84"/> - <location line="+81"/> + <location line="+80"/> <source>The entered address is invalid.</source> <translation>ä¸æ£ãªã‚¢ãƒ‰ãƒ¬ã‚¹ãŒå…¥åŠ›ã•ã‚Œã¾ã—ãŸã€‚</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>アドレスを確ã‹ã‚ã¦ã‹ã‚‰ã‚‚ã†ä¸€åº¦è©¦ã—ã¦ãã ã•ã„。</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>入力ã•ã‚ŒãŸã‚¢ãƒ‰ãƒ¬ã‚¹ã«é–¢é€£ã™ã‚‹ã‚ーãŒã‚ã‚Šã¾ã›ã‚“。</translation> </message> <message> - <location line="-73"/> + <location line="-72"/> <source>Wallet unlock was cancelled.</source> <translation>ウォレットã®ã‚¢ãƒ³ãƒãƒƒã‚¯ã¯ã‚ャンセルã•ã‚Œã¾ã—ãŸã€‚</translation> </message> @@ -2600,7 +2638,7 @@ Address: %4 <translation>メッセージã«ç½²åã—ã¾ã—ãŸã€‚</translation> </message> <message> - <location line="+59"/> + <location line="+58"/> <source>The signature could not be decoded.</source> <translation>ç½²åãŒãƒ‡ã‚³ãƒ¼ãƒ‰ã§ãã¾ã›ã‚“。</translation> </message> @@ -2661,6 +2699,11 @@ Address: %4 </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation>%1/オフライン</translation> </message> @@ -2822,12 +2865,12 @@ Address: %4 <translation>ã¾ã ブãƒãƒ¼ãƒ‰ã‚ャストãŒæˆåŠŸã—ã¦ã„ã¾ã›ã‚“</translation> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <source>Open for %n more block(s)</source> <translation><numerusform>%n 以上ã®ãƒ–ãƒãƒƒã‚¯ã‚’é–‹ã</numerusform></translation> </message> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation>未確èª</translation> </message> @@ -2868,12 +2911,12 @@ Address: %4 <translation>ç·é¡</translation> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <source>Open for %n more block(s)</source> <translation><numerusform>%n 以上ã®ãƒ–ãƒãƒƒã‚¯ã‚’é–‹ã</numerusform></translation> </message> @@ -2883,23 +2926,12 @@ Address: %4 <translation>ユニット %1 ã‚’é–‹ã</translation> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> - <translation>オフライン (%1 検証済ã¿)</translation> - </message> - <message> - <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation>検証済㿠(%2) 未検証 (%1)</translation> - </message> - <message> - <location line="-22"/> - <location line="+25"/> + <location line="+12"/> <source>Confirmed (%1 confirmations)</source> <translation>検証ã•ã‚Œã¾ã—㟠(%1 検証済ã¿)</translation> </message> <message> - <location line="-22"/> + <location line="+9"/> <source>This block was not received by any other nodes and will probably not be accepted!</source> <translation>ã“ã®ãƒ–ãƒãƒƒã‚¯ã¯ä»–ã®ã©ã®ãƒŽãƒ¼ãƒ‰ã«ã‚ˆã£ã¦ã‚‚å—ã‘å–られãªã„ã§ã€å¤šåˆ†å—ã‘入れられãªã„ã§ã—ょã†ï¼</translation> </message> @@ -2909,7 +2941,27 @@ Address: %4 <translation>生æˆã•ã‚Œã¾ã—ãŸãŒæ‰¿èªã•ã‚Œã¾ã›ã‚“ã§ã—ãŸ</translation> </message> <message> - <location line="+62"/> + <location line="-21"/> + <source>Offline</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Unconfirmed</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation>å—ä¿¡å…ƒ</translation> </message> @@ -2939,7 +2991,7 @@ Address: %4 <translation>(n/a)</translation> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation>å–引ã®çŠ¶æ³ã€‚ã“ã®ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ã®ä¸Šã«ã‚«ãƒ¼ã‚½ãƒ«ã‚’ç½®ãã¨æ¤œè¨¼ã®æ•°ã‚’表示ã—ã¾ã™ã€‚</translation> </message> @@ -3205,12 +3257,12 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+223"/> <source>Usage:</source> <translation>使用法:</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>List commands</source> <translation>コマンド一覧</translation> </message> @@ -3265,12 +3317,12 @@ Address: %4 <translation>ã‚ãªãŸè‡ªèº«ã®ãƒ‘ブリックãªã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’指定</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation>ä¸æ£ãªãƒ”アを切æ–ã™ã‚‹ãŸã‚ã®ã—ãã„値 (åˆæœŸå€¤: 100)</translation> </message> <message> - <location line="-148"/> + <location line="-150"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>ä¸æ£ãªãƒ”アをå†æŽ¥ç¶šã™ã‚‹ã¾ã§ã®ç§’æ•° (åˆæœŸå€¤: 86400)</translation> </message> @@ -3290,17 +3342,17 @@ Address: %4 <translation>コマンドライン㨠JSON-RPC コマンドを許å¯</translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Run in the background as a daemon and accept commands</source> <translation>デーモンã¨ã—ã¦ãƒãƒƒã‚¯ã‚°ãƒ©ãƒ³ãƒ‰ã§å®Ÿè¡Œã—コマンドを許å¯</translation> </message> <message> - <location line="+39"/> + <location line="+40"/> <source>Use the test network</source> <translation>テストã®ãŸã‚ã®ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’使用</translation> </message> <message> - <location line="-118"/> + <location line="-120"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>外部ã‹ã‚‰ã®æŽ¥ç¶šã‚’è¨±å¯ (åˆæœŸå€¤: -proxy ã¾ãŸã¯ -connect を使用ã—ã¦ã„ãªã„å ´åˆã¯1)</translation> </message> @@ -3440,6 +3492,11 @@ rpcpassword=%s </message> <message> <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation>指定ã—ãŸãƒŽãƒ¼ãƒ‰ã ã‘ã«æŽ¥ç¶š</translation> </message> @@ -3651,6 +3708,11 @@ rpcpassword=%s </message> <message> <location line="+2"/> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Start Bitcoin server</source> <translation>Bitcoinサーãƒãƒ¼ã‚’始ã‚ã‚‹</translation> </message> @@ -3700,12 +3762,12 @@ rpcpassword=%s <translation>-txindex を変更ã™ã‚‹ã«ã¯ -reindex を使用ã—ã¦ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã‚’å†æ§‹ç¯‰ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™</translation> </message> <message> - <location line="-79"/> + <location line="-80"/> <source>Imports blocks from external blk000??.dat file</source> <translation>外部㮠blk000??.dat ファイルã‹ã‚‰ãƒ–ãƒãƒƒã‚¯ã‚’インãƒãƒ¼ãƒˆ</translation> </message> <message> - <location line="-105"/> + <location line="-106"/> <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> @@ -3725,7 +3787,7 @@ rpcpassword=%s <translation>スクリプト検証スレッドをè¨å®š (最大 16, 0 = 自動, <0 = ãŸãã•ã‚“ã®ã‚³ã‚¢ã‚’自由ã«ã—ã¦ãŠã, åˆæœŸå€¤: 0)</translation> </message> <message> - <location line="+89"/> + <location line="+90"/> <source>Information</source> <translation>æƒ…å ±</translation> </message> @@ -3795,7 +3857,7 @@ rpcpassword=%s <translation>接続ã®ã‚¿ã‚¤ãƒ アウトをミリセコンドã§æŒ‡å®š (åˆæœŸå€¤: 5000)</translation> </message> <message> - <location line="+6"/> + <location line="+7"/> <source>System error: </source> <translation>システムエラー:</translation> </message> @@ -3841,6 +3903,11 @@ rpcpassword=%s </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>version</source> <translation>ãƒãƒ¼ã‚¸ãƒ§ãƒ³</translation> </message> @@ -3850,32 +3917,32 @@ rpcpassword=%s <translation>wallet.dat ãŒå£Šã‚Œã€å¾©æ—§ã«å¤±æ•—ã—ã¾ã—ãŸ</translation> </message> <message> - <location line="-58"/> + <location line="-60"/> <source>Password for JSON-RPC connections</source> <translation>JSON-RPC 接続ã®ãƒ‘スワード</translation> </message> <message> - <location line="-70"/> + <location line="-71"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>指定ã—㟠IP アドレスã‹ã‚‰ã® JSON-RPC 接続を許å¯</translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation><ip> (åˆæœŸå€¤: 127.0.0.1) ã§å®Ÿè¡Œä¸ã®ãƒŽãƒ¼ãƒ‰ã«ã‚³ãƒžãƒ³ãƒ‰ã‚’é€ä¿¡</translation> </message> <message> - <location line="-132"/> + <location line="-133"/> <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="+161"/> + <location line="+163"/> <source>Upgrade wallet to latest format</source> <translation>ウォレットを最新ã®ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆã«ã‚¢ãƒƒãƒ—グレード</translation> </message> <message> - <location line="-24"/> + <location line="-25"/> <source>Set key pool size to <n> (default: 100)</source> <translation>key pool ã®ã‚µã‚¤ã‚ºã‚’ <n> (åˆæœŸå€¤: 100) ã«ã‚»ãƒƒãƒˆ</translation> </message> @@ -3885,12 +3952,12 @@ rpcpassword=%s <translation>失ã£ãŸã‚¦ã‚©ãƒ¬ãƒƒãƒˆã®å–引ã®ãƒ–ãƒãƒƒã‚¯ ãƒã‚§ãƒ¼ãƒ³ã‚’å†ã‚¹ã‚ャン</translation> </message> <message> - <location line="+38"/> + <location line="+39"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>JSON-RPC 接続㫠OpenSSL (https) を使用</translation> </message> <message> - <location line="-30"/> + <location line="-31"/> <source>Server certificate file (default: server.cert)</source> <translation>サーãƒè¨¼æ˜Žæ›¸ãƒ•ã‚¡ã‚¤ãƒ« (åˆæœŸå€¤: server.cert)</translation> </message> @@ -3900,7 +3967,7 @@ rpcpassword=%s <translation>サーãƒã®ç§˜å¯†éµ (åˆæœŸå€¤: server.pem)</translation> </message> <message> - <location line="+16"/> + <location line="+17"/> <source>This help message</source> <translation>ã“ã®ãƒ˜ãƒ«ãƒ— メッセージ</translation> </message> @@ -3910,12 +3977,12 @@ rpcpassword=%s <translation>ã“ã®ã‚³ãƒ³ãƒ”ュータ㮠%s ã«ãƒã‚¤ãƒ³ãƒ‰ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“ (ãƒã‚¤ãƒ³ãƒ‰ãŒè¿”ã—ãŸã‚¨ãƒ©ãƒ¼ã¯ %d, %s)</translation> </message> <message> - <location line="-107"/> + <location line="-109"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>-addnode, -seednode 㨠-connect 㧠DNS ルックアップを許å¯ã™ã‚‹</translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Loading addresses...</source> <translation>アドレスをèªã¿è¾¼ã‚“ã§ã„ã¾ã™...</translation> </message> @@ -3930,12 +3997,12 @@ rpcpassword=%s <translation>wallet.dat èªã¿è¾¼ã¿ã‚¨ãƒ©ãƒ¼: ウォレット㯠Bitcoin ã®æœ€æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’å¿…è¦ã¨ã—ã¾ã™</translation> </message> <message> - <location line="+98"/> + <location line="+99"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>ウォレットãŒæ›¸ãç›´ã•ã‚Œã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã—ãŸ: 完了ã™ã‚‹ãŸã‚ã« Bitcoin ã‚’å†èµ·å‹•ã—ã¾ã™</translation> </message> <message> - <location line="-100"/> + <location line="-101"/> <source>Error loading wallet.dat</source> <translation>wallet.dat èªã¿è¾¼ã¿ã‚¨ãƒ©ãƒ¼</translation> </message> @@ -3945,7 +4012,7 @@ rpcpassword=%s <translation>無効㪠-proxy アドレス: '%s'</translation> </message> <message> - <location line="+56"/> + <location line="+57"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>-onlynet ã§æŒ‡å®šã•ã‚ŒãŸ '%s' ã¯æœªçŸ¥ã®ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã§ã™</translation> </message> @@ -3955,7 +4022,7 @@ rpcpassword=%s <translation>-socks ã§æŒ‡å®šã•ã‚ŒãŸ %i ã¯æœªçŸ¥ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã§ã™</translation> </message> <message> - <location line="-101"/> + <location line="-103"/> <source>Cannot resolve -bind address: '%s'</source> <translation>-bind ã®ã‚¢ãƒ‰ãƒ¬ã‚¹ '%s' を解決ã§ãã¾ã›ã‚“</translation> </message> @@ -3965,7 +4032,7 @@ rpcpassword=%s <translation>-externalip ã®ã‚¢ãƒ‰ãƒ¬ã‚¹ '%s' を解決ã§ãã¾ã›ã‚“</translation> </message> <message> - <location line="+48"/> + <location line="+49"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>-paytxfee=<amount> ã®é¡ '%s' ãŒç„¡åŠ¹ã§ã™</translation> </message> @@ -3985,7 +4052,7 @@ rpcpassword=%s <translation>ブãƒãƒƒã‚¯ インデックスをèªã¿è¾¼ã‚“ã§ã„ã¾ã™...</translation> </message> <message> - <location line="-62"/> + <location line="-63"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>接続ã™ã‚‹ãƒŽãƒ¼ãƒ‰ã‚’è¿½åŠ ã—接続をæŒç¶šã™ã‚‹ã‚ˆã†ã«è©¦ã—ã¾ã™</translation> </message> @@ -3995,12 +4062,12 @@ rpcpassword=%s <translation>ã“ã®ã‚³ãƒ³ãƒ”ュータ㮠%s ã«ãƒã‚¤ãƒ³ãƒ‰ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“。ãŠãらã Bitcoin ã¯æ—¢ã«å®Ÿè¡Œã•ã‚Œã¦ã„ã¾ã™ã€‚</translation> </message> <message> - <location line="+95"/> + <location line="+96"/> <source>Loading wallet...</source> <translation>ウォレットをèªã¿è¾¼ã‚“ã§ã„ã¾ã™...</translation> </message> <message> - <location line="-56"/> + <location line="-57"/> <source>Cannot downgrade wallet</source> <translation>ウォレットã®ãƒ€ã‚¦ãƒ³ã‚°ãƒ¬ãƒ¼ãƒ‰ã¯ã§ãã¾ã›ã‚“</translation> </message> @@ -4010,7 +4077,7 @@ rpcpassword=%s <translation>åˆæœŸå€¤ã®ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’書ã込むã“ã¨ãŒã§ãã¾ã›ã‚“</translation> </message> <message> - <location line="+67"/> + <location line="+68"/> <source>Rescanning...</source> <translation>å†ã‚¹ã‚ャンä¸...</translation> </message> @@ -4020,17 +4087,17 @@ rpcpassword=%s <translation>èªã¿è¾¼ã¿å®Œäº†</translation> </message> <message> - <location line="+85"/> + <location line="+86"/> <source>To use the %s option</source> <translation>%s オプションを使ã†ã«ã¯</translation> </message> <message> - <location line="-77"/> + <location line="-78"/> <source>Error</source> <translation>エラー</translation> </message> <message> - <location line="-35"/> + <location line="-36"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_kk_KZ.ts b/src/qt/locale/bitcoin_kk_KZ.ts index f1aa412469..60849509de 100644 --- a/src/qt/locale/bitcoin_kk_KZ.ts +++ b/src/qt/locale/bitcoin_kk_KZ.ts @@ -31,6 +31,12 @@ This product includes software developed by the OpenSSL Project for use in the O <source>The Bitcoin Core developers</source> <translation type="unfinished"/> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source> (%1-bit)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>AddressBookPage</name> @@ -160,17 +166,17 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location filename="../addresstablemodel.cpp" line="+168"/> <source>Label</source> - <translation type="unfinished"/> + <translation>таңба</translation> </message> <message> <location line="+0"/> <source>Address</source> - <translation type="unfinished"/> + <translation>ÐдреÑ</translation> </message> <message> <location line="+36"/> <source>(no label)</source> - <translation type="unfinished"/> + <translation>(таңбаÑыз)</translation> </message> </context> <context> @@ -183,52 +189,52 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+21"/> <source>Enter passphrase</source> - <translation type="unfinished"/> + <translation>ÒšÒ±Ð¿Ð¸Ñ Ñөзді енгізу</translation> </message> <message> <location line="+14"/> <source>New passphrase</source> - <translation type="unfinished"/> + <translation>Жаңа Ò›Ò±Ð¿Ð¸Ñ Ñөзі</translation> </message> <message> <location line="+14"/> <source>Repeat new passphrase</source> - <translation type="unfinished"/> + <translation>Жаңа Ò›Ò±Ð¿Ð¸Ñ Ñөзді қайта енгізу</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="+40"/> <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>10 or more random characters</b>, or <b>eight or more words</b>.</source> - <translation type="unfinished"/> + <translation>ӘмиÑнға жаңа Ò›Ò¯Ð¿Ð¸Ñ Ñөзді енгізіңіз.<br/><b>10 немеÑе одан әрі кездейÑоқ белгілерді</b>, әлде <b>Ñегіз немеÑе одан әрі Ñөздерді</b>Ò›Ò±Ð¿Ð¸Ñ Ñөзіңізде пайдалану өтінеміз.</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"/> @@ -612,6 +618,16 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation type="unfinished"><numerusform></numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation type="unfinished"/> @@ -681,7 +697,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+435"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -742,7 +758,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation type="unfinished"/> </message> @@ -757,14 +773,14 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation type="unfinished"/> </message> <message> <location line="+10"/> <source>Address</source> - <translation type="unfinished"/> + <translation>ÐдреÑ</translation> </message> <message> <location line="+5"/> @@ -908,7 +924,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation type="unfinished"/> </message> @@ -973,7 +989,7 @@ Address: %4 <location line="+43"/> <location line="+66"/> <source>(no label)</source> - <translation type="unfinished"/> + <translation>(таңбаÑыз)</translation> </message> <message> <location line="-9"/> @@ -1090,7 +1106,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation type="unfinished"/> </message> @@ -1234,7 +1250,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+122"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation type="unfinished"/> </message> @@ -1244,7 +1260,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="-131"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation type="unfinished"/> </message> @@ -1259,12 +1275,7 @@ Address: %4 <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"/> + <location line="+16"/> <source>MB</source> <translation type="unfinished"/> </message> @@ -1279,7 +1290,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+58"/> + <location line="+107"/> + <source>&Spend unconfirmed change (experts only)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+37"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation type="unfinished"/> </message> @@ -1314,7 +1330,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="-86"/> + <source>W&allet</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+52"/> + <source>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.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+40"/> <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> @@ -1429,17 +1455,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+70"/> <source>default</source> <translation type="unfinished"/> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation type="unfinished"/> </message> <message> - <location line="+75"/> + <location line="+78"/> <source>Confirm options reset</source> <translation type="unfinished"/> </message> @@ -1479,18 +1505,13 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-155"/> - <source>Unconfirmed:</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation type="unfinished"/> </message> <message> <location line="+51"/> - <source>Confirmed:</source> + <source>Available:</source> <translation type="unfinished"/> </message> <message> @@ -1499,7 +1520,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation type="unfinished"/> </message> @@ -1647,6 +1673,11 @@ Address: %4 <source>Error: Invalid combination of -regtest and -testnet.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../guiutil.cpp" line="+82"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>QRImageWidget</name> @@ -1867,22 +1898,22 @@ Address: %4 <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+83"/> + <location filename="../forms/receivecoinsdialog.ui" line="+107"/> <source>&Amount:</source> <translation type="unfinished"/> </message> <message> - <location line="-13"/> + <location line="-16"/> <source>&Label:</source> <translation type="unfinished"/> </message> <message> - <location line="-34"/> + <location line="-37"/> <source>&Message:</source> <translation type="unfinished"/> </message> <message> - <location line="-17"/> + <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"/> </message> @@ -1892,27 +1923,30 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+27"/> - <source>An optional 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"/> </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> + <location line="-7"/> + <location line="+21"/> + <source>An optional label to associate with the new receiving address.</source> <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="-7"/> <source>Use this form to request payments. All fields are <b>optional</b>.</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <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"/> </message> <message> - <location line="+17"/> + <location line="+32"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -1922,17 +1956,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+36"/> - <source>&Request payment</source> + <location line="+78"/> + <source>Requested payments history</source> <translation type="unfinished"/> </message> <message> - <location line="+47"/> - <source>Requested payments</source> + <location line="-98"/> + <source>&Request payment</source> <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+120"/> <source>Show the selected request (does the same as double clicking an entry)</source> <translation type="unfinished"/> </message> @@ -1951,6 +1985,21 @@ Address: %4 <source>Remove</source> <translation type="unfinished"/> </message> + <message> + <location filename="../receivecoinsdialog.cpp" line="+38"/> + <source>Copy label</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy message</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation type="unfinished"/> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -1992,7 +2041,7 @@ Address: %4 <message> <location line="+2"/> <source>Address</source> - <translation type="unfinished"/> + <translation>ÐдреÑ</translation> </message> <message> <location line="+2"/> @@ -2002,7 +2051,7 @@ Address: %4 <message> <location line="+2"/> <source>Label</source> - <translation type="unfinished"/> + <translation>таңба</translation> </message> <message> <location line="+2"/> @@ -2030,7 +2079,7 @@ Address: %4 <message> <location line="+0"/> <source>Label</source> - <translation type="unfinished"/> + <translation>таңба</translation> </message> <message> <location line="+0"/> @@ -2045,19 +2094,24 @@ Address: %4 <message> <location line="+38"/> <source>(no label)</source> - <translation type="unfinished"/> + <translation>(таңбаÑыз)</translation> </message> <message> <location line="+9"/> <source>(no message)</source> <translation type="unfinished"/> </message> + <message> + <location line="+8"/> + <source>(no amount)</source> + <translation type="unfinished"/> + </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 type="unfinished"/> @@ -2133,7 +2187,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+115"/> + <location line="+164"/> <source>Send to multiple recipients at once</source> <translation type="unfinished"/> </message> @@ -2143,7 +2197,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+20"/> + <location line="-23"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -2153,12 +2207,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+22"/> + <location line="+52"/> <source>Balance:</source> <translation type="unfinished"/> </message> <message> - <location line="+41"/> + <location line="-78"/> <source>Confirm the send action</source> <translation type="unfinished"/> </message> @@ -2168,7 +2222,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-228"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation type="unfinished"/> </message> @@ -2181,12 +2235,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-136"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+15"/> + <location line="-121"/> <source>Copy quantity</source> <translation type="unfinished"/> </message> @@ -2236,7 +2285,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+202"/> + <location line="+203"/> <source>The recipient address is not valid, please recheck.</source> <translation type="unfinished"/> </message> @@ -2271,14 +2320,14 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Warning: Invalid Bitcoin address</source> <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+20"/> <source>(no label)</source> - <translation type="unfinished"/> + <translation>(таңбаÑыз)</translation> </message> <message> <location line="-11"/> @@ -2286,7 +2335,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-366"/> + <location line="-367"/> <source>Are you sure you want to send?</source> <translation type="unfinished"/> </message> @@ -2296,7 +2345,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+170"/> + <location line="+171"/> <source>Payment request expired</source> <translation type="unfinished"/> </message> @@ -2373,12 +2422,7 @@ Address: %4 <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"/> + <location line="+968"/> <source>This is a verified payment request.</source> <translation type="unfinished"/> </message> @@ -2388,7 +2432,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+459"/> + <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"/> + </message> + <message> + <location line="+426"/> <source>This is an unverified payment request.</source> <translation type="unfinished"/> </message> @@ -2404,11 +2453,6 @@ Address: %4 <source>Memo:</source> <translation type="unfinished"/> </message> - <message> - <location filename="../sendcoinsentry.cpp" line="+1"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"/> - </message> </context> <context> <name>ShutdownWindow</name> @@ -2446,19 +2490,19 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+10"/> - <location line="+213"/> + <location line="+7"/> + <location line="+210"/> <source>Choose previously used address</source> <translation type="unfinished"/> </message> <message> - <location line="-203"/> - <location line="+213"/> + <location line="-200"/> + <location line="+210"/> <source>Alt+A</source> <translation type="unfinished"/> </message> <message> - <location line="-203"/> + <location line="-200"/> <source>Paste address from clipboard</source> <translation type="unfinished"/> </message> @@ -2499,12 +2543,12 @@ Address: %4 </message> <message> <location line="+3"/> - <location line="+146"/> + <location line="+143"/> <source>Clear &All</source> <translation type="unfinished"/> </message> <message> - <location line="-87"/> + <location line="-84"/> <source>&Verify Message</source> <translation type="unfinished"/> </message> @@ -2519,7 +2563,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+40"/> + <location line="+37"/> <source>Verify the message to ensure it was signed with the specified Bitcoin address</source> <translation type="unfinished"/> </message> @@ -2534,43 +2578,37 @@ Address: %4 <translation type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location line="-2"/> + <location line="-1"/> <source>Click "Sign Message" to generate signature</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Enter Bitcoin signature</source> - <translation type="unfinished"/> - </message> - <message> <location line="+84"/> - <location line="+81"/> + <location line="+80"/> <source>The entered address is invalid.</source> <translation type="unfinished"/> </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 type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location line="-73"/> + <location line="-72"/> <source>Wallet unlock was cancelled.</source> <translation type="unfinished"/> </message> @@ -2590,7 +2628,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+59"/> + <location line="+58"/> <source>The signature could not be decoded.</source> <translation type="unfinished"/> </message> @@ -2651,6 +2689,11 @@ Address: %4 </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation type="unfinished"/> </message> @@ -2812,12 +2855,12 @@ Address: %4 <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation type="unfinished"/> </message> @@ -2850,7 +2893,7 @@ Address: %4 <message> <location line="+0"/> <source>Address</source> - <translation type="unfinished"/> + <translation>ÐдреÑ</translation> </message> <message> <location line="+0"/> @@ -2858,12 +2901,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform></translation> </message> @@ -2873,33 +2916,42 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> + <location line="+12"/> + <source>Confirmed (%1 confirmations)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+9"/> + <source>This block was not received by any other nodes and will probably not be accepted!</source> <translation type="unfinished"/> </message> <message> <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> + <source>Generated but not accepted</source> <translation type="unfinished"/> </message> <message> - <location line="-22"/> - <location line="+25"/> - <source>Confirmed (%1 confirmations)</source> + <location line="-21"/> + <source>Offline</source> <translation type="unfinished"/> </message> <message> - <location line="-22"/> - <source>This block was not received by any other nodes and will probably not be accepted!</source> + <location line="+3"/> + <source>Unconfirmed</source> <translation type="unfinished"/> </message> <message> <location line="+3"/> - <source>Generated but not accepted</source> + <source>Confirming (%1 of %2 recommended confirmations)</source> <translation type="unfinished"/> </message> <message> - <location line="+62"/> + <location line="+6"/> + <source>Conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation type="unfinished"/> </message> @@ -2929,7 +2981,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation type="unfinished"/> </message> @@ -3085,7 +3137,7 @@ Address: %4 <message> <location line="-22"/> <source>Comma separated file (*.csv)</source> - <translation>Үтірмен бөлінген текÑÑ‚ (*.csv)</translation> + <translation>Үтірмен бөлінген файл (*.csv)</translation> </message> <message> <location line="+9"/> @@ -3105,12 +3157,12 @@ Address: %4 <message> <location line="+1"/> <source>Label</source> - <translation type="unfinished"/> + <translation>таңба</translation> </message> <message> <location line="+1"/> <source>Address</source> - <translation type="unfinished"/> + <translation>ÐдреÑ</translation> </message> <message> <location line="+1"/> @@ -3195,12 +3247,12 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+223"/> <source>Usage:</source> <translation type="unfinished"/> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>List commands</source> <translation type="unfinished"/> </message> @@ -3255,12 +3307,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation type="unfinished"/> </message> <message> - <location line="-148"/> + <location line="-150"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"/> </message> @@ -3280,17 +3332,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Run in the background as a daemon and accept commands</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <location line="+40"/> <source>Use the test network</source> <translation type="unfinished"/> </message> <message> - <location line="-118"/> + <location line="-120"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> @@ -3421,6 +3473,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation type="unfinished"/> </message> @@ -3631,6 +3688,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Start Bitcoin server</source> <translation type="unfinished"/> </message> @@ -3680,12 +3742,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-79"/> + <location line="-80"/> <source>Imports blocks from external blk000??.dat file</source> <translation type="unfinished"/> </message> <message> - <location line="-105"/> + <location line="-106"/> <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> @@ -3705,7 +3767,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+89"/> + <location line="+90"/> <source>Information</source> <translation type="unfinished"/> </message> @@ -3775,7 +3837,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+7"/> <source>System error: </source> <translation type="unfinished"/> </message> @@ -3821,6 +3883,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>version</source> <translation type="unfinished"/> </message> @@ -3830,32 +3897,32 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-58"/> + <location line="-60"/> <source>Password for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-70"/> + <location line="-71"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation type="unfinished"/> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+161"/> + <location line="+163"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"/> </message> <message> - <location line="-24"/> + <location line="-25"/> <source>Set key pool size to <n> (default: 100)</source> <translation type="unfinished"/> </message> @@ -3865,12 +3932,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+38"/> + <location line="+39"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-30"/> + <location line="-31"/> <source>Server certificate file (default: server.cert)</source> <translation type="unfinished"/> </message> @@ -3880,7 +3947,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+17"/> <source>This help message</source> <translation type="unfinished"/> </message> @@ -3890,12 +3957,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-107"/> + <location line="-109"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation type="unfinished"/> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Loading addresses...</source> <translation type="unfinished"/> </message> @@ -3910,12 +3977,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+98"/> + <location line="+99"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation type="unfinished"/> </message> <message> - <location line="-100"/> + <location line="-101"/> <source>Error loading wallet.dat</source> <translation type="unfinished"/> </message> @@ -3925,7 +3992,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+56"/> + <location line="+57"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation type="unfinished"/> </message> @@ -3935,7 +4002,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-101"/> + <location line="-103"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -3945,7 +4012,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+48"/> + <location line="+49"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation type="unfinished"/> </message> @@ -3965,7 +4032,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-62"/> + <location line="-63"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"/> </message> @@ -3975,12 +4042,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+95"/> + <location line="+96"/> <source>Loading wallet...</source> <translation type="unfinished"/> </message> <message> - <location line="-56"/> + <location line="-57"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> @@ -3990,7 +4057,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+67"/> + <location line="+68"/> <source>Rescanning...</source> <translation type="unfinished"/> </message> @@ -4000,17 +4067,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+85"/> + <location line="+86"/> <source>To use the %s option</source> <translation type="unfinished"/> </message> <message> - <location line="-77"/> + <location line="-78"/> <source>Error</source> <translation type="unfinished"/> </message> <message> - <location line="-35"/> + <location line="-36"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_ko_KR.ts b/src/qt/locale/bitcoin_ko_KR.ts index 804805a216..54b29ce848 100644 --- a/src/qt/locale/bitcoin_ko_KR.ts +++ b/src/qt/locale/bitcoin_ko_KR.ts @@ -4,12 +4,12 @@ <message> <location filename="../forms/aboutdialog.ui" line="+14"/> <source>About Bitcoin Core</source> - <translation type="unfinished"/> + <translation>ë¹„íŠ¸ì½”ì¸ ì½”ì–´ 소개</translation> </message> <message> <location line="+39"/> <source><b>Bitcoin Core</b> version</source> - <translation type="unfinished"/> + <translation><b>ë¹„íŠ¸ì½”ì¸ ì½”ì–´</b> ë²„ì ¼</translation> </message> <message> <location line="+57"/> @@ -34,7 +34,13 @@ MIT/X11 프로그램 ë¼ì´ì„ ìŠ¤ì— ë”°ë¼ ë°°í¬í•©ë‹ˆë‹¤. COPYING ë˜ëŠ” http <message> <location line="+0"/> <source>The Bitcoin Core developers</source> - <translation type="unfinished"/> + <translation>비트코ì¸ì½”ì–´ 개발ìžë“¤</translation> + </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source> (%1-bit)</source> + <translation>(%1-비트)</translation> </message> </context> <context> @@ -42,7 +48,7 @@ MIT/X11 프로그램 ë¼ì´ì„ ìŠ¤ì— ë”°ë¼ ë°°í¬í•©ë‹ˆë‹¤. COPYING ë˜ëŠ” http <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"/> @@ -57,12 +63,12 @@ MIT/X11 프로그램 ë¼ì´ì„ ìŠ¤ì— ë”°ë¼ ë°°í¬í•©ë‹ˆë‹¤. COPYING ë˜ëŠ” http <message> <location line="+11"/> <source>Copy the currently selected address to the system clipboard</source> - <translation>현재 ì„ íƒí•œ 주로를 시스템 í´ë¦½ë³´ë“œë¡œ 복사하기</translation> + <translation>현재 ì„ íƒí•œ 주소를 시스템 í´ë¦½ë³´ë“œë¡œ 복사하기</translation> </message> <message> <location line="+3"/> <source>&Copy</source> - <translation type="unfinished"/> + <translation>복사</translation> </message> <message> <location line="+52"/> @@ -82,7 +88,7 @@ MIT/X11 프로그램 ë¼ì´ì„ ìŠ¤ì— ë”°ë¼ ë°°í¬í•©ë‹ˆë‹¤. COPYING ë˜ëŠ” http <message> <location line="+27"/> <source>Export the data in the current tab to a file</source> - <translation type="unfinished"/> + <translation>현재 íƒì— 있는 ë°ì´í„°ë¥¼ 파ì¼ë¡œ 내보내기</translation> </message> <message> <location line="+3"/> @@ -97,12 +103,12 @@ MIT/X11 프로그램 ë¼ì´ì„ ìŠ¤ì— ë”°ë¼ ë°°í¬í•©ë‹ˆë‹¤. COPYING ë˜ëŠ” http <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>ì½”ì¸ì„ 받으실 주소를 ì„ íƒí•˜ì„¸ìš”</translation> </message> <message> <location line="+5"/> @@ -112,12 +118,12 @@ MIT/X11 프로그램 ë¼ì´ì„ ìŠ¤ì— ë”°ë¼ ë°°í¬í•©ë‹ˆë‹¤. COPYING ë˜ëŠ” http <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"/> @@ -132,17 +138,17 @@ MIT/X11 프로그램 ë¼ì´ì„ ìŠ¤ì— ë”°ë¼ ë°°í¬í•©ë‹ˆë‹¤. COPYING ë˜ëŠ” http <message> <location line="+7"/> <source>Copy &Label</source> - <translation>ë ˆì´ë¸” 복사(&L)</translation> + <translation>í‘œ 복사</translation> </message> <message> <location line="+1"/> <source>&Edit</source> - <translation>편집(&E)</translation> + <translation>편집&</translation> </message> <message> <location line="+194"/> <source>Export Address List</source> - <translation type="unfinished"/> + <translation>주소 ëª©ë¡ ë‚´ë³´ë‚´ê¸°</translation> </message> <message> <location line="+1"/> @@ -152,7 +158,7 @@ MIT/X11 프로그램 ë¼ì´ì„ ìŠ¤ì— ë”°ë¼ ë°°í¬í•©ë‹ˆë‹¤. COPYING ë˜ëŠ” http <message> <location line="+13"/> <source>Exporting Failed</source> - <translation type="unfinished"/> + <translation>내보내기 실패</translation> </message> <message> <location line="+1"/> @@ -175,7 +181,7 @@ MIT/X11 프로그램 ë¼ì´ì„ ìŠ¤ì— ë”°ë¼ ë°°í¬í•©ë‹ˆë‹¤. COPYING ë˜ëŠ” http <message> <location line="+36"/> <source>(no label)</source> - <translation>(í‘œ 없슴)</translation> + <translation>(í‘œ ì—†ìŒ)</translation> </message> </context> <context> @@ -188,22 +194,22 @@ MIT/X11 프로그램 ë¼ì´ì„ ìŠ¤ì— ë”°ë¼ ë°°í¬í•©ë‹ˆë‹¤. COPYING ë˜ëŠ” http <message> <location line="+21"/> <source>Enter passphrase</source> - <translation>íŒ¨ìŠ¤í”„ë ˆì´ì¦ˆ ìž…ë ¥í•˜ê¸°</translation> + <translation>암호 ìž…ë ¥í•˜ê¸°</translation> </message> <message> <location line="+14"/> <source>New passphrase</source> - <translation>새로운 íŒ¨ìŠ¤í”„ë ˆì´ì¦ˆ</translation> + <translation>새로운 암호</translation> </message> <message> <location line="+14"/> <source>Repeat new passphrase</source> - <translation>새로운 íŒ¨ìŠ¤í”„ë ˆì´ì¦ˆ 반복</translation> + <translation>새 암호 반복</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="+40"/> <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>10 or more random characters</b>, or <b>eight or more words</b>.</source> - <translation>새로운 íŒ¨ìŠ¤í”„ë ˆì´ì¦ˆë¥¼ ì§€ê°‘ì— ìž…ë ¥. 8ìžë³´ë‹¤ ë§Žì€ ë‹¨ì–´ë¥¼ ìž…ë ¥í•˜ê±°ë‚˜ 10 ìžë³´ë‹¤ ë§Žì€ ë¬´ìž‘ìœ„ ìºëž™í„°ë¥¼ íŒ¨ìŠ¤í”„ë ˆì´ì¦ˆì— 사용하세요.</translation> + <translation>새로운 암호를 ì§€ê°‘ì— ìž…ë ¥. 8ìžë³´ë‹¤ ë§Žì€ ë‹¨ì–´ë¥¼ ìž…ë ¥í•˜ê±°ë‚˜ 10 ìžë³´ë‹¤ ë§Žì€ ì—¬ëŸ¬ 종류를 ì•”í˜¸ì— ì‚¬ìš©í•˜ì„¸ìš”.</translation> </message> <message> <location line="+1"/> @@ -213,7 +219,7 @@ MIT/X11 프로그램 ë¼ì´ì„ ìŠ¤ì— ë”°ë¼ ë°°í¬í•©ë‹ˆë‹¤. COPYING ë˜ëŠ” http <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"/> @@ -223,7 +229,7 @@ MIT/X11 프로그램 ë¼ì´ì„ ìŠ¤ì— ë”°ë¼ ë°°í¬í•©ë‹ˆë‹¤. COPYING ë˜ëŠ” http <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"/> @@ -233,12 +239,12 @@ MIT/X11 프로그램 ë¼ì´ì„ ìŠ¤ì— ë”°ë¼ ë°°í¬í•©ë‹ˆë‹¤. COPYING ë˜ëŠ” http <message> <location line="+3"/> <source>Change passphrase</source> - <translation>íŒ¨ìŠ¤í”„ë ˆì´ì¦ˆ 변경</translation> + <translation>암호 변경</translation> </message> <message> <location line="+1"/> <source>Enter the old and new passphrase to the wallet.</source> - <translation>ì§€ê°‘ì— ì „ê³¼ 새로운 íŒ¨ìŠ¤í”„ë ˆì´ì¦ˆë¥¼ ìž…ë ¥</translation> + <translation>ì§€ê°‘ì˜ ì˜ˆì „ 암호와 새로운 암호를 ìž…ë ¥</translation> </message> <message> <location line="+46"/> @@ -248,12 +254,12 @@ MIT/X11 프로그램 ë¼ì´ì„ ìŠ¤ì— ë”°ë¼ ë°°í¬í•©ë‹ˆë‹¤. COPYING ë˜ëŠ” http <message> <location line="+1"/> <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> - <translation type="unfinished"/> + <translation>ê²½ê³ : 만약 ë‹¹ì‹ ì˜ ì§€ê°‘ì„ ì•”í˜¸í™” í•˜ê³ ë¹„ë°€ë²ˆí˜¸ë¥¼ 잃어 버릴 경우, ë‹¹ì‹ ì˜ ëª¨ë“ ë¹„íŠ¸ì½”ì¸ë“¤ì„ 잃어버릴 수 있습니다!</translation> </message> <message> <location line="+0"/> <source>Are you sure you wish to encrypt your wallet?</source> - <translation type="unfinished"/> + <translation>지갑 암호화를 í—ˆìš©í•˜ì‹œê² ìŠµë‹ˆê¹Œ?</translation> </message> <message> <location line="+15"/> @@ -294,19 +300,19 @@ MIT/X11 프로그램 ë¼ì´ì„ ìŠ¤ì— ë”°ë¼ ë°°í¬í•©ë‹ˆë‹¤. COPYING ë˜ëŠ” http <location line="+7"/> <location line="+48"/> <source>The supplied passphrases do not match.</source> - <translation>ì œê³µëœ íŒ¨ìŠ¤í”„ë ˆì´ì¦ˆê°€ ì¼ì¹˜í•˜ì§€ 않습니다.</translation> + <translation>ì§€ì •í•œ 암호가 ì¼ì¹˜í•˜ì§€ 않습니다.</translation> </message> <message> <location line="-37"/> <source>Wallet unlock failed</source> - <translation>지갑 열기가 실패하였습니다.</translation> + <translation>지갑 열기를 실패하였습니다.</translation> </message> <message> <location line="+1"/> <location line="+11"/> <location line="+19"/> <source>The passphrase entered for the wallet decryption was incorrect.</source> - <translation>지갑 í•´ë…ì„ ìœ„í•œ íŒ¨ìŠ¤í”„ë ˆì´ì¦ˆê°€ í‹€ë ¸ìŠµë‹ˆë‹¤.</translation> + <translation>지갑 í•´ë…ì„ ìœ„í•œ 암호가 í‹€ë ¸ìŠµë‹ˆë‹¤.</translation> </message> <message> <location line="-20"/> @@ -316,7 +322,7 @@ MIT/X11 프로그램 ë¼ì´ì„ ìŠ¤ì— ë”°ë¼ ë°°í¬í•©ë‹ˆë‹¤. COPYING ë˜ëŠ” http <message> <location line="+14"/> <source>Wallet passphrase was successfully changed.</source> - <translation type="unfinished"/> + <translation>지갑 비밀번호가 성공ì 으로 변경ë˜ì—ˆìŠµë‹ˆë‹¤</translation> </message> </context> <context> @@ -324,7 +330,7 @@ MIT/X11 프로그램 ë¼ì´ì„ ìŠ¤ì— ë”°ë¼ ë°°í¬í•©ë‹ˆë‹¤. COPYING ë˜ëŠ” http <message> <location filename="../bitcoingui.cpp" line="+295"/> <source>Sign &message...</source> - <translation>메시지 서명(&M)...</translation> + <translation>메시지 서명&...</translation> </message> <message> <location line="+335"/> @@ -339,7 +345,7 @@ MIT/X11 프로그램 ë¼ì´ì„ ìŠ¤ì— ë”°ë¼ ë°°í¬í•©ë‹ˆë‹¤. COPYING ë˜ëŠ” http <message> <location line="-137"/> <source>Node</source> - <translation type="unfinished"/> + <translation>노드</translation> </message> <message> <location line="+138"/> @@ -390,32 +396,32 @@ MIT/X11 프로그램 ë¼ì´ì„ ìŠ¤ì— ë”°ë¼ ë°°í¬í•©ë‹ˆë‹¤. COPYING ë˜ëŠ” http <message> <location line="+9"/> <source>&Encrypt Wallet...</source> - <translation>지갑 암호화(&E)...</translation> + <translation>지갑 암호화&...</translation> </message> <message> <location line="+3"/> <source>&Backup Wallet...</source> - <translation>지갑 백업(&B)...</translation> + <translation>지갑 백업&...</translation> </message> <message> <location line="+2"/> <source>&Change Passphrase...</source> - <translation>암호문 변경(&C)...</translation> + <translation>암호문 변경&...</translation> </message> <message> <location line="+10"/> <source>&Sending addresses...</source> - <translation type="unfinished"/> + <translation>&주소 보내는 중</translation> </message> <message> <location line="+2"/> <source>&Receiving addresses...</source> - <translation type="unfinished"/> + <translation>& 주소 받는 중</translation> </message> <message> <location line="+3"/> <source>Open &URI...</source> - <translation type="unfinished"/> + <translation>URI&열기</translation> </message> <message> <location line="+325"/> @@ -440,17 +446,17 @@ MIT/X11 프로그램 ë¼ì´ì„ ìŠ¤ì— ë”°ë¼ ë°°í¬í•©ë‹ˆë‹¤. COPYING ë˜ëŠ” http <message> <location line="+12"/> <source>Backup wallet to another location</source> - <translation>ì§€ê°‘ì„ ë‹¤ë¥¸ìž¥ì†Œì— ì €ìž¥í•˜ê¸°</translation> + <translation>ì§€ê°‘ì„ ë‹¤ë¥¸ìž¥ì†Œì— ë°±ì—…</translation> </message> <message> <location line="+2"/> <source>Change the passphrase used for wallet encryption</source> - <translation>지갑 ì•”í˜¸í™”ì— ì‚¬ìš©ë˜ëŠ” íŒ¨ìŠ¤í”„ë ˆì´ì¦ˆë¥¼ 변경합니다</translation> + <translation>지갑 ì•”í˜¸í™”ì— ì‚¬ìš©ë˜ëŠ” 암호를 변경합니다</translation> </message> <message> <location line="+6"/> <source>&Debug window</source> - <translation>디버그 ì°½(&D)</translation> + <translation>디버그 ì°½&</translation> </message> <message> <location line="+1"/> @@ -460,7 +466,7 @@ MIT/X11 프로그램 ë¼ì´ì„ ìŠ¤ì— ë”°ë¼ ë°°í¬í•©ë‹ˆë‹¤. COPYING ë˜ëŠ” http <message> <location line="-4"/> <source>&Verify message...</source> - <translation>메시지 ê²€ì¦(&V)...</translation> + <translation>메시지 확ì¸&...</translation> </message> <message> <location line="+430"/> @@ -537,18 +543,18 @@ MIT/X11 프로그램 ë¼ì´ì„ ìŠ¤ì— ë”°ë¼ ë°°í¬í•©ë‹ˆë‹¤. COPYING ë˜ëŠ” http <message> <location line="-401"/> <source>Bitcoin Core</source> - <translation type="unfinished"/> + <translation>비트코ì¸ì½”ì–´</translation> </message> <message> <location line="+163"/> <source>Request payments (generates QR codes and bitcoin: URIs)</source> - <translation type="unfinished"/> + <translation>지불 ìš”ì²í•˜ê¸° (QR코드와 비트코ì¸ì´ ìƒì„±ë©ë‹ˆë‹¤: URIs)</translation> </message> <message> <location line="+29"/> <location line="+2"/> <source>&About Bitcoin Core</source> - <translation type="unfinished"/> + <translation>&ë¹„íŠ¸ì½”ì¸ ì½”ì–´ 소개</translation> </message> <message> <location line="+35"/> @@ -563,12 +569,12 @@ MIT/X11 프로그램 ë¼ì´ì„ ìŠ¤ì— ë”°ë¼ ë°°í¬í•©ë‹ˆë‹¤. COPYING ë˜ëŠ” http <message> <location line="+3"/> <source>Open a bitcoin: URI or payment request</source> - <translation type="unfinished"/> + <translation>비트코ì¸: URI ë˜ëŠ” ì§€ë¶ˆìš”ì² ì—´ê¸°</translation> </message> <message> <location line="+2"/> <source>&Command-line options</source> - <translation type="unfinished"/> + <translation>ëª…ë ¹ì–´-ë¼ì¸ 옵션</translation> </message> <message> <location line="+1"/> @@ -589,7 +595,7 @@ MIT/X11 프로그램 ë¼ì´ì„ ìŠ¤ì— ë”°ë¼ ë°°í¬í•©ë‹ˆë‹¤. COPYING ë˜ëŠ” http <message> <location line="+22"/> <source>No block source available...</source> - <translation type="unfinished"/> + <translation>사용 가능한 ë¸”ë½ ì†ŒìŠ¤ê°€ 없습니다...</translation> </message> <message> <location line="+12"/> @@ -599,22 +605,32 @@ MIT/X11 프로그램 ë¼ì´ì„ ìŠ¤ì— ë”°ë¼ ë°°í¬í•©ë‹ˆë‹¤. COPYING ë˜ëŠ” http <message> <location line="+4"/> <source>Processed %1 blocks of transaction history.</source> - <translation type="unfinished"/> + <translation>%1 블ë½ì˜ 거래 기ë¡ë“¤ì´ 처리ë¨.</translation> </message> <message numerus="yes"> <location line="+23"/> <source>%n hour(s)</source> - <translation type="unfinished"><numerusform></numerusform></translation> + <translation><numerusform>시간</numerusform></translation> </message> <message numerus="yes"> <location line="+4"/> <source>%n day(s)</source> - <translation type="unfinished"><numerusform></numerusform></translation> + <translation><numerusform>ì¼</numerusform></translation> </message> <message numerus="yes"> <location line="+4"/> <source>%n week(s)</source> - <translation type="unfinished"><numerusform></numerusform></translation> + <translation><numerusform>주</numerusform></translation> + </message> + <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation>%1 ê·¸ë¦¬ê³ %2</translation> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation><numerusform>%n ë…„</numerusform></translation> </message> <message> <location line="+4"/> @@ -624,12 +640,12 @@ MIT/X11 프로그램 ë¼ì´ì„ ìŠ¤ì— ë”°ë¼ ë°°í¬í•©ë‹ˆë‹¤. COPYING ë˜ëŠ” http <message> <location line="+21"/> <source>Last received block was generated %1 ago.</source> - <translation type="unfinished"/> + <translation>ìµœê·¼ì— ë°›ì€ ë¸”ë¡ì€ %1 ì „ì— ìƒì„±ë˜ì—ˆìŠµë‹ˆë‹¤.</translation> </message> <message> <location line="+2"/> <source>Transactions after this will not yet be visible.</source> - <translation type="unfinished"/> + <translation>ì´ê²ƒ í›„ì˜ ê±°ëž˜ë“¤ì€ ì•„ì§ ë³´ì´ì§€ ì•Šì„ ê²ƒìž…ë‹ˆë‹¤.</translation> </message> <message> <location line="+27"/> @@ -664,7 +680,7 @@ MIT/X11 프로그램 ë¼ì´ì„ ìŠ¤ì— ë”°ë¼ ë°°í¬í•©ë‹ˆë‹¤. COPYING ë˜ëŠ” http <message> <location line="+0"/> <source>Incoming transaction</source> - <translation>ë„착하는 거래</translation> + <translation>거래 들어오는 중</translation> </message> <message> <location line="+1"/> @@ -690,7 +706,7 @@ Address: %4 <translation>ì§€ê°‘ì´ ì•”í˜¸í™” ë˜ì—ˆê³ 현재 ìž ê²¨ì ¸ 있습니다</translation> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+435"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>치명ì ì¸ ì˜¤ë¥˜ê°€ 있습니다. 비트코ì¸ì„ ë”ì´ìƒ ì•ˆì „í•˜ê²Œ ì§„í–‰í• ìˆ˜ 없어 ë¹ ì ¸ë‚˜ê°‘ë‹ˆë‹¤.</translation> </message> @@ -708,32 +724,32 @@ Address: %4 <message> <location filename="../forms/coincontroldialog.ui" line="+14"/> <source>Coin Control Address Selection</source> - <translation type="unfinished"/> + <translation>ì½”ì¸ì»¨íŠ¸ë¡¤ 주소 ì„ íƒ</translation> </message> <message> <location line="+34"/> <source>Quantity:</source> - <translation type="unfinished"/> + <translation>수량:</translation> </message> <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>거래량</translation> </message> <message> <location line="+29"/> <source>Priority:</source> - <translation type="unfinished"/> + <translation>ìš°ì„ ë„:</translation> </message> <message> <location line="+45"/> <source>Fee:</source> - <translation type="unfinished"/> + <translation>수수료:</translation> </message> <message> <location line="+32"/> @@ -743,7 +759,7 @@ Address: %4 <message> <location line="+48"/> <source>After Fee:</source> - <translation type="unfinished"/> + <translation>수수료 ì´í›„:</translation> </message> <message> <location line="+32"/> @@ -751,22 +767,22 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation type="unfinished"/> </message> <message> <location line="+13"/> <source>Tree mode</source> - <translation type="unfinished"/> + <translation>트리 모드</translation> </message> <message> <location line="+16"/> <source>List mode</source> - <translation type="unfinished"/> + <translation>리스트 모드</translation> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation>거래량</translation> </message> @@ -783,7 +799,7 @@ Address: %4 <message> <location line="+5"/> <source>Confirmations</source> - <translation type="unfinished"/> + <translation>확ì¸</translation> </message> <message> <location line="+3"/> @@ -793,7 +809,7 @@ Address: %4 <message> <location line="+5"/> <source>Priority</source> - <translation type="unfinished"/> + <translation>ìš°ì„ ë„</translation> </message> <message> <location filename="../coincontroldialog.cpp" line="+42"/> @@ -829,27 +845,27 @@ Address: %4 <message> <location line="+22"/> <source>Copy quantity</source> - <translation type="unfinished"/> + <translation>수량 복사</translation> </message> <message> <location line="+2"/> <source>Copy fee</source> - <translation type="unfinished"/> + <translation>수수료 복사</translation> </message> <message> <location line="+1"/> <source>Copy after fee</source> - <translation type="unfinished"/> + <translation>수수료 ì´í›„ 복사</translation> </message> <message> <location line="+1"/> <source>Copy bytes</source> - <translation type="unfinished"/> + <translation>bytes를 복사</translation> </message> <message> <location line="+1"/> <source>Copy priority</source> - <translation type="unfinished"/> + <translation>ìš°ì„ ë„ ë³µì‚¬</translation> </message> <message> <location line="+1"/> @@ -864,7 +880,7 @@ Address: %4 <message> <location line="+323"/> <source>highest</source> - <translation type="unfinished"/> + <translation>최ìƒ</translation> </message> <message> <location line="+1"/> @@ -874,27 +890,27 @@ Address: %4 <message> <location line="+1"/> <source>high</source> - <translation type="unfinished"/> + <translation>ìƒ</translation> </message> <message> <location line="+1"/> <source>medium-high</source> - <translation type="unfinished"/> + <translation>중ìƒ</translation> </message> <message> <location line="+1"/> <source>medium</source> - <translation type="unfinished"/> + <translation>중</translation> </message> <message> <location line="+4"/> <source>low-medium</source> - <translation type="unfinished"/> + <translation>중하</translation> </message> <message> <location line="+1"/> <source>low</source> - <translation type="unfinished"/> + <translation>하</translation> </message> <message> <location line="+1"/> @@ -909,27 +925,27 @@ Address: %4 <message> <location line="+11"/> <source>(%1 locked)</source> - <translation type="unfinished"/> + <translation>(%1 ìž ê¸ˆ)</translation> </message> <message> <location line="+31"/> <source>none</source> - <translation type="unfinished"/> + <translation>ì—†ìŒ</translation> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation type="unfinished"/> </message> <message> <location line="+0"/> <source>yes</source> - <translation type="unfinished"/> + <translation>예</translation> </message> <message> <location line="+0"/> <source>no</source> - <translation type="unfinished"/> + <translation>아니요</translation> </message> <message> <location line="+10"/> @@ -987,7 +1003,7 @@ Address: %4 <message> <location line="-9"/> <source>change from %1 (%2)</source> - <translation type="unfinished"/> + <translation>~로부터 변경 %1 (%2)</translation> </message> <message> <location line="+1"/> @@ -1068,12 +1084,12 @@ Address: %4 <message> <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"/> <source>name</source> - <translation type="unfinished"/> + <translation>ì´ë¦„</translation> </message> <message> <location line="+2"/> @@ -1083,12 +1099,12 @@ Address: %4 <message> <location line="+3"/> <source>Path already exists, and is not a directory.</source> - <translation type="unfinished"/> + <translation>경로가 ì´ë¯¸ 존재합니다. ê·¸ë¦¬ê³ ê·¸ê²ƒì€ í´ë”ê°€ 아닙니다.</translation> </message> <message> <location line="+7"/> <source>Cannot create data directory here.</source> - <translation type="unfinished"/> + <translation>ë°ì´í„° í´ë”를 여기 ìƒì„±í• 수 없습니다.</translation> </message> </context> <context> @@ -1096,12 +1112,12 @@ Address: %4 <message> <location filename="../forms/helpmessagedialog.ui" line="+19"/> <source>Bitcoin Core - Command-line options</source> - <translation type="unfinished"/> + <translation>ë¹„íŠ¸ì½”ì¸ ì½”ì–´ - ëª…ë ¹ì–´-ë¼ì¸ 옵션</translation> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> - <translation type="unfinished"/> + <translation>비트코ì¸ì½”ì–´</translation> </message> <message> <location line="+0"/> @@ -1141,7 +1157,7 @@ Address: %4 <message> <location line="+1"/> <source>Choose data directory on startup (default: 0)</source> - <translation type="unfinished"/> + <translation>파ì¼ëª©ë¡ì„ ì„ íƒí•˜ì—¬ 시작하시오(기본값: 0)</translation> </message> </context> <context> @@ -1149,12 +1165,12 @@ Address: %4 <message> <location filename="../forms/intro.ui" line="+14"/> <source>Welcome</source> - <translation type="unfinished"/> + <translation>환ì˜í•©ë‹ˆë‹¤</translation> </message> <message> <location line="+9"/> <source>Welcome to Bitcoin Core.</source> - <translation type="unfinished"/> + <translation>ë¹„íŠ¸ì½”ì¸ ì½”ì–´ì— ì˜¤ì‹ ê²ƒì„ í™˜ì˜í•©ë‹ˆ.</translation> </message> <message> <location line="+26"/> @@ -1169,12 +1185,12 @@ Address: %4 <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="+85"/> @@ -1194,12 +1210,12 @@ Address: %4 <message> <location line="+9"/> <source>GB of free space available</source> - <translation type="unfinished"/> + <translation>GBê°€ 사용가능</translation> </message> <message> <location line="+3"/> <source>(of %1GB needed)</source> - <translation type="unfinished"/> + <translation>(%1GBê°€ í•„ìš”)</translation> </message> </context> <context> @@ -1207,27 +1223,27 @@ Address: %4 <message> <location filename="../forms/openuridialog.ui" line="+14"/> <source>Open URI</source> - <translation type="unfinished"/> + <translation>URI 열기</translation> </message> <message> <location line="+6"/> <source>Open payment request from URI or file</source> - <translation type="unfinished"/> + <translation>지급 ìš”ì² URI ë˜ëŠ” íŒŒì¼ ì—´ê¸°</translation> </message> <message> <location line="+9"/> <source>URI:</source> - <translation type="unfinished"/> + <translation>URI:</translation> </message> <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> @@ -1243,9 +1259,9 @@ Address: %4 <translation>ë©”ì¸(&M)</translation> </message> <message> - <location line="+6"/> + <location line="+122"/> <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>ë‹¹ì‹ ì˜ ê±°ëž˜ê°€ ë”ìš± ë¹ ë¥´ê²Œ 처리ë 수 있ë„ë¡ ì„ íƒì 으로 kBd당 거래 수수료를 ì§€ì •í•©ë‹ˆë‹¤. ì°¸ê³ ë¡œ ëŒ€ë¶€ë¶„ì˜ ê±°ëž˜ë“¤ì€ 1kB입니다.</translation> </message> <message> <location line="+15"/> @@ -1253,7 +1269,7 @@ Address: %4 <translation>송금 수수료(&F)</translation> </message> <message> - <location line="+31"/> + <location line="-131"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation>시스템 로그ì¸í›„ì— ë¹„íŠ¸ì½”ì¸ì„ ìžë™ìœ¼ë¡œ 시작합니다.</translation> </message> @@ -1265,17 +1281,12 @@ Address: %4 <message> <location line="+9"/> <source>Size of &database cache</source> - <translation type="unfinished"/> + <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"/> + <location line="+16"/> <source>MB</source> - <translation type="unfinished"/> + <translation>메가바ì´íŠ¸</translation> </message> <message> <location line="+27"/> @@ -1288,19 +1299,24 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+58"/> + <location line="+107"/> + <source>&Spend unconfirmed change (experts only)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+37"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation type="unfinished"/> </message> <message> <location line="+3"/> <source>&Connect through SOCKS proxy (default proxy):</source> - <translation type="unfinished"/> + <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 type="unfinished"/> + <translation>프ë¡ì‹œ ì•„ì´í”¼ 주소(예. IPv4:127.0.0.1 / IPv6: ::1)</translation> </message> <message> <location line="+224"/> @@ -1323,7 +1339,17 @@ Address: %4 <translation>네트워í¬(&N)</translation> </message> <message> - <location line="+6"/> + <location line="-86"/> + <source>W&allet</source> + <translation>지갑</translation> + </message> + <message> + <location line="+52"/> + <source>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.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+40"/> <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> @@ -1438,19 +1464,19 @@ Address: %4 <translation>취소(&C)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+70"/> <source>default</source> <translation>기본값</translation> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> - <translation type="unfinished"/> + <translation>ì—†ìŒ</translation> </message> <message> - <location line="+75"/> + <location line="+78"/> <source>Confirm options reset</source> - <translation type="unfinished"/> + <translation>옵션 초기화를 확ì¸</translation> </message> <message> <location line="+1"/> @@ -1461,7 +1487,7 @@ Address: %4 <message> <location line="-29"/> <source>Client will be shutdown, do you want to proceed?</source> - <translation type="unfinished"/> + <translation>í´ë¼ì´ì–¸íŠ¸ê°€ 종료ë©ë‹ˆë‹¤, ê³„ì† ì§„í–‰í•˜ì‹œê² ìŠµë‹ˆê¹Œ?</translation> </message> <message> <location line="+33"/> @@ -1488,49 +1514,49 @@ Address: %4 <translation>표시한 ì •ë³´ê°€ ì˜¤ëž˜ëœ ê²ƒ 같습니다. ë¹„íŠ¸ì½”ì¸ ë„¤íŠ¸ì›Œí¬ì— ì—°ê²°í•˜ê³ ë‚œ 다ìŒì— ì§€ê°‘ì„ ìžë™ìœ¼ë¡œ ë™ê¸°í™” 하지만, ì•„ì§ ê³¼ì •ì´ ë나지는 않았습니다.</translation> </message> <message> - <location line="-155"/> - <source>Unconfirmed:</source> - <translation>미확ì¸:</translation> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation>지갑</translation> </message> <message> <location line="+51"/> - <source>Confirmed:</source> - <translation type="unfinished"/> + <source>Available:</source> + <translation>ìœ ìš©í•œ</translation> </message> <message> <location line="+16"/> <source>Your current spendable balance</source> - <translation type="unfinished"/> + <translation>ë‹¹ì‹ ì˜ í˜„ìž¬ 사용 가능한 잔액</translation> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation>ë¯¸ì •</translation> + </message> + <message> + <location line="+16"/> <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"/> <source>Immature:</source> - <translation type="unfinished"/> + <translation>ì•„ì§ ì‚¬ìš© 불가능:</translation> </message> <message> <location line="+13"/> <source>Mined balance that has not yet matured</source> - <translation type="unfinished"/> + <translation>ì•„ì§ ì‚¬ìš© 가능하지 ì•Šì€ ì±„êµ´ëœ ìž”ì•¡</translation> </message> <message> <location line="+16"/> <source>Total:</source> - <translation type="unfinished"/> + <translation>ì´ì•¡:</translation> </message> <message> <location line="+16"/> <source>Your current total balance</source> - <translation type="unfinished"/> + <translation>ë‹¹ì‹ ì˜ í˜„ìž¬ ì´ì•¡</translation> </message> <message> <location line="+71"/> @@ -1570,17 +1596,17 @@ Address: %4 <location line="+18"/> <location line="+16"/> <source>Payment request error</source> - <translation type="unfinished"/> + <translation>지불 ìš”ì² ì• ëŸ¬</translation> </message> <message> <location line="-353"/> <source>Cannot start bitcoin: click-to-pay handler</source> - <translation type="unfinished"/> + <translation>비트코ì¸ì„ ì‹œìž‘í• ìˆ˜ 없습니다: ì§€ê¸‰ì œì–´ê¸°ë¥¼ í´ë¦í•˜ì‹œì˜¤</translation> </message> <message> <location line="+58"/> <source>Net manager warning</source> - <translation type="unfinished"/> + <translation>ë„¤íŠ¸ì›Œí¬ ê´€ë¦¬ì¸ ê²½ê³ </translation> </message> <message> <location line="+1"/> @@ -1610,12 +1636,12 @@ Address: %4 <message> <location line="+59"/> <source>Refund from %1</source> - <translation type="unfinished"/> + <translation>%1 ìœ¼ë¡œë¶€í„°ì˜ í™˜ë¶ˆ</translation> </message> <message> <location line="+43"/> <source>Error communicating with %1: %2</source> - <translation type="unfinished"/> + <translation>%1ê³¼ ì†Œí†µí•˜ëŠ”ë° ì• ëŸ¬: %2</translation> </message> <message> <location line="+24"/> @@ -1625,17 +1651,17 @@ Address: %4 <message> <location line="+11"/> <source>Bad response from server %1</source> - <translation type="unfinished"/> + <translation>서버로 부터 ë°˜ì‘ì´ ì—†ìŠµë‹ˆë‹¤ %1</translation> </message> <message> <location line="+33"/> <source>Payment acknowledged</source> - <translation type="unfinished"/> + <translation>ì§€ë¶ˆì´ ìŠ¹ì¸ë¨</translation> </message> <message> <location line="-11"/> <source>Network request error</source> - <translation type="unfinished"/> + <translation>ë„¤íŠ¸ì›Œí¬ ìš”ì² ì• ëŸ¬</translation> </message> </context> <context> @@ -1649,13 +1675,18 @@ Address: %4 <message> <location line="+1"/> <source>Error: Specified data directory "%1" does not exist.</source> - <translation type="unfinished"/> + <translation>ì• ëŸ¬: ì§€ì •í•œ ë°ì´í„° í´ë” "%1"ì€ ì¡´ìž¬í•˜ì§€ 않습니다.</translation> </message> <message> <location line="-12"/> <source>Error: Invalid combination of -regtest and -testnet.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../guiutil.cpp" line="+82"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>ë¹„íŠ¸ì½”ì¸ ì£¼ì†Œë¥¼ ìž…ë ¥í•˜ê¸° (예 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> </context> <context> <name>QRImageWidget</name> @@ -1677,7 +1708,7 @@ Address: %4 <message> <location line="+0"/> <source>PNG Image (*.png)</source> - <translation type="unfinished"/> + <translation>PNG ì´ë¯¸ì§€(*.png)</translation> </message> </context> <context> @@ -1710,22 +1741,22 @@ Address: %4 <message> <location line="-45"/> <source>&Information</source> - <translation>ì •ë³´(&I)</translation> + <translation>ì •ë³´&</translation> </message> <message> <location line="-10"/> <source>Debug window</source> - <translation type="unfinished"/> + <translation>디버그 ì°½</translation> </message> <message> <location line="+25"/> <source>General</source> - <translation type="unfinished"/> + <translation>ì¼ë°˜</translation> </message> <message> <location line="+53"/> <source>Using OpenSSL version</source> - <translation type="unfinished"/> + <translation>오픈SSL ë²„ì „ì„ ì‚¬ìš©í•©ë‹ˆë‹¤</translation> </message> <message> <location line="+49"/> @@ -1740,7 +1771,7 @@ Address: %4 <message> <location line="+7"/> <source>Name</source> - <translation type="unfinished"/> + <translation>ì´ë¦„</translation> </message> <message> <location line="+23"/> @@ -1780,7 +1811,7 @@ Address: %4 <message> <location line="+72"/> <source>&Network Traffic</source> - <translation type="unfinished"/> + <translation>&ë„¤íŠ¸ì›Œí¬ íŠ¸ëž˜í”½</translation> </message> <message> <location line="+52"/> @@ -1790,7 +1821,7 @@ Address: %4 <message> <location line="+13"/> <source>Totals</source> - <translation type="unfinished"/> + <translation>ì´ì•¡</translation> </message> <message> <location line="+64"/> @@ -1815,7 +1846,7 @@ Address: %4 <message> <location line="+7"/> <source>Open the Bitcoin debug log file from the current data directory. This can take a few seconds for large log files.</source> - <translation type="unfinished"/> + <translation>ë¹„íŠ¸ì½”ì¸ ë””ë²„ê·¸ 로그파ì¼ì„ 현재 ë°ì´í„° í´ë”ì—ì„œ ì—¬ì‹ì‹œìš”. ìš©ëŸ‰ì´ í° ë¡œê·¸ 파ì¼ë“¤ì€ 몇 초가 걸릴 수 있습니다.</translation> </message> <message> <location line="+76"/> @@ -1825,7 +1856,7 @@ Address: %4 <message> <location filename="../rpcconsole.cpp" line="-30"/> <source>Welcome to the Bitcoin RPC console.</source> - <translation>ë¹„íŠ¸ì½”ì¸ RPC ì½˜ì†”ì— ìž˜ 들어오셨습니다.</translation> + <translation>ë¹„íŠ¸ì½”ì¸ RPC ì½˜ì†”ì— ì˜¤ì‹ ê±¸ 환ì˜í•©ë‹ˆë‹¤</translation> </message> <message> <location line="+1"/> @@ -1840,58 +1871,58 @@ Address: %4 <message> <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 기가바ì´íŠ¸</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="+83"/> + <location filename="../forms/receivecoinsdialog.ui" line="+107"/> <source>&Amount:</source> - <translation type="unfinished"/> + <translation>&거래량:</translation> </message> <message> - <location line="-13"/> + <location line="-16"/> <source>&Label:</source> <translation>í‘œ:</translation> </message> <message> - <location line="-34"/> + <location line="-37"/> <source>&Message:</source> - <translation type="unfinished"/> + <translation>&메시지:</translation> </message> <message> - <location line="-17"/> + <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"/> </message> @@ -1901,27 +1932,30 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+27"/> - <source>An optional 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"/> </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> + <location line="-7"/> + <location line="+21"/> + <source>An optional label to associate with the new receiving address.</source> <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="-7"/> <source>Use this form to request payments. All fields are <b>optional</b>.</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <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"/> </message> <message> - <location line="+17"/> + <location line="+32"/> <source>Clear all fields of the form.</source> <translation>ì–‘ì‹ì˜ ëª¨ë“ í•„ë“œë¥¼ 지ì›ë‹ˆë‹¤</translation> </message> @@ -1931,34 +1965,49 @@ Address: %4 <translation>지우기</translation> </message> <message> - <location line="+36"/> - <source>&Request payment</source> - <translation>지불 ìš”ì²(&R)</translation> + <location line="+78"/> + <source>Requested payments history</source> + <translation>ì§€ì¶œê¸°ë¡ í™•ì¸</translation> </message> <message> - <location line="+47"/> - <source>Requested payments</source> - <translation type="unfinished"/> + <location line="-98"/> + <source>&Request payment</source> + <translation>지불 ìš”ì²(&R)</translation> </message> <message> - <location line="+16"/> + <location line="+120"/> <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"/> + <translation>보기</translation> </message> <message> <location line="+11"/> <source>Remove the selected entries from the list</source> - <translation type="unfinished"/> + <translation>목ë¡ì—ì„œ ì‚ì œí• í•ëª©ì„ ì„ íƒí•˜ì‹œì˜¤</translation> </message> <message> <location line="+3"/> <source>Remove</source> - <translation type="unfinished"/> + <translation>ì‚ì œ</translation> + </message> + <message> + <location filename="../receivecoinsdialog.cpp" line="+38"/> + <source>Copy label</source> + <translation>í‘œ 복사하기</translation> + </message> + <message> + <location line="+1"/> + <source>Copy message</source> + <translation>메시지 복사</translation> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation>거래량 복사</translation> </message> </context> <context> @@ -2059,14 +2108,19 @@ Address: %4 <message> <location line="+9"/> <source>(no message)</source> - <translation type="unfinished"/> + <translation>(메세지가 없습니다)</translation> + </message> + <message> + <location line="+8"/> + <source>(no amount)</source> + <translation>(거래량 ì—†ìŒ)</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>ì½”ì¸ë“¤ 보내기</translation> @@ -2074,7 +2128,7 @@ Address: %4 <message> <location line="+76"/> <source>Coin Control Features</source> - <translation type="unfinished"/> + <translation>ì½”ì¸ ì»¨íŠ¸ë¡¤ 기능들</translation> </message> <message> <location line="+20"/> @@ -2084,37 +2138,37 @@ Address: %4 <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"/> <source>Quantity:</source> - <translation type="unfinished"/> + <translation>수량:</translation> </message> <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>거래량:</translation> </message> <message> <location line="+32"/> <source>Priority:</source> - <translation type="unfinished"/> + <translation>ìš°ì„ ë„:</translation> </message> <message> <location line="+48"/> <source>Fee:</source> - <translation type="unfinished"/> + <translation>수수료:</translation> </message> <message> <location line="+32"/> @@ -2124,7 +2178,7 @@ Address: %4 <message> <location line="+48"/> <source>After Fee:</source> - <translation type="unfinished"/> + <translation>수수료 ì´í›„:</translation> </message> <message> <location line="+32"/> @@ -2139,20 +2193,20 @@ Address: %4 <message> <location line="+3"/> <source>Custom change address</source> - <translation type="unfinished"/> + <translation>주소변경</translation> </message> <message> - <location line="+115"/> + <location line="+164"/> <source>Send to multiple recipients at once</source> <translation>ë‹¤ìˆ˜ì˜ ìˆ˜ë ¹ì¸ë“¤ì—게 í•œë²ˆì— ë³´ë‚´ê¸°</translation> </message> <message> <location line="+3"/> <source>Add &Recipient</source> - <translation type="unfinished"/> + <translation>ìˆ˜ë ¹ì¸ ì¶”ê°€í•˜ê¸°</translation> </message> <message> - <location line="+20"/> + <location line="-23"/> <source>Clear all fields of the form.</source> <translation>ì–‘ì‹ì˜ ëª¨ë“ í•„ë“œë¥¼ 지ì›ë‹ˆë‹¤</translation> </message> @@ -2162,14 +2216,14 @@ Address: %4 <translation>ëª¨ë‘ ì§€ìš°ê¸°(&A)</translation> </message> <message> - <location line="+22"/> + <location line="+52"/> <source>Balance:</source> <translation>잔액:</translation> </message> <message> - <location line="+41"/> + <location line="-78"/> <source>Confirm the send action</source> - <translation>보내는 행위 확ì¸</translation> + <translation>ì „ì†¡ 기능 확ì¸</translation> </message> <message> <location line="+3"/> @@ -2177,7 +2231,7 @@ Address: %4 <translation>보내기(&E)</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-228"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation>ì½”ì¸ ì „ì†¡ì„ í™•ì¸</translation> </message> @@ -2190,14 +2244,9 @@ Address: %4 <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"/> + <location line="-121"/> <source>Copy quantity</source> - <translation type="unfinished"/> + <translation>수량 복사</translation> </message> <message> <location line="+1"/> @@ -2207,22 +2256,22 @@ Address: %4 <message> <location line="+1"/> <source>Copy fee</source> - <translation type="unfinished"/> + <translation>수수료 복사</translation> </message> <message> <location line="+1"/> <source>Copy after fee</source> - <translation type="unfinished"/> + <translation>수수료 ì´í›„ 복사</translation> </message> <message> <location line="+1"/> <source>Copy bytes</source> - <translation type="unfinished"/> + <translation>bytes 복사</translation> </message> <message> <location line="+1"/> <source>Copy priority</source> - <translation type="unfinished"/> + <translation>ìš°ì„ ë„ ë³µì‚¬</translation> </message> <message> <location line="+1"/> @@ -2237,17 +2286,17 @@ 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"/> + <location line="+203"/> <source>The recipient address is not valid, please recheck.</source> - <translation type="unfinished"/> + <translation>ìˆ˜ë ¹ì¸ ì£¼ì†Œê°€ ì •í™•í•˜ì§€ 않습니다. ìž¬í™•ì¸ ë°”ëžë‹ˆë‹¤</translation> </message> <message> <location line="+3"/> @@ -2272,7 +2321,7 @@ Address: %4 <message> <location line="+3"/> <source>Transaction creation failed!</source> - <translation type="unfinished"/> + <translation>거래를 ìƒì„±í•˜ëŠ” ê²ƒì„ ì‹¤íŒ¨í•˜ì˜€ìŠµë‹ˆë‹¤</translation> </message> <message> <location line="+4"/> @@ -2280,39 +2329,39 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Warning: Invalid Bitcoin address</source> - <translation type="unfinished"/> + <translation>ê²½ê³ : ìž˜ëª»ëœ ë¹„íŠ¸ì½”ì¸ì£¼ì†Œìž…니다</translation> </message> <message> - <location line="+21"/> + <location line="+20"/> <source>(no label)</source> <translation>(í‘œ 없슴)</translation> </message> <message> <location line="-11"/> <source>Warning: Unknown change address</source> - <translation type="unfinished"/> + <translation>ê²½ê³ : ì•Œë ¤ì§€ì§€ ì•Šì€ ì£¼ì†Œë³€ê²½ìž…ë‹ˆë‹¤</translation> </message> <message> - <location line="-366"/> + <location line="-367"/> <source>Are you sure you want to send?</source> - <translation type="unfinished"/> + <translation>ì •ë§ë¡œ ë³´ë‚´ì‹œê² ìŠµë‹ˆê¹Œ?</translation> </message> <message> <location line="+9"/> <source>added as transaction fee</source> - <translation type="unfinished"/> + <translation>거래 수수료로 추가ë¨</translation> </message> <message> - <location line="+170"/> + <location line="+171"/> <source>Payment request expired</source> - <translation type="unfinished"/> + <translation>지불 ìš”ì² ë§Œë£Œ</translation> </message> <message> <location line="+8"/> <source>Invalid payment address %1</source> - <translation type="unfinished"/> + <translation>ìž˜ëª»ëœ ì§€ë¶ˆ 주소입니다 %1</translation> </message> </context> <context> @@ -2352,7 +2401,7 @@ Address: %4 <message> <location line="-40"/> <source>This is a normal payment.</source> - <translation type="unfinished"/> + <translation>í‰ê· 지급입니다</translation> </message> <message> <location line="+50"/> @@ -2374,22 +2423,17 @@ Address: %4 <location line="+524"/> <location line="+536"/> <source>Remove this entry</source> - <translation type="unfinished"/> + <translation>í•ëª©ì„ 지우시오</translation> </message> <message> <location line="-1008"/> <source>Message:</source> - <translation type="unfinished"/> + <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"/> + <location line="+968"/> <source>This is a verified payment request.</source> - <translation type="unfinished"/> + <translation>지급 확ì¸ìš”ì²ìž…니다.</translation> </message> <message> <location line="-991"/> @@ -2397,11 +2441,16 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+459"/> - <source>This is an unverified payment request.</source> + <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"/> </message> <message> + <location line="+426"/> + <source>This is an unverified payment request.</source> + <translation>ì§€ê¸‰ìš”ì² ë¯¸í™•ì¸ìž…니다</translation> + </message> + <message> <location line="+18"/> <location line="+532"/> <source>Pay To:</source> @@ -2411,12 +2460,7 @@ Address: %4 <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>ë¹„íŠ¸ì½”ì¸ ì£¼ì†Œë¥¼ ìž…ë ¥í•˜ê¸° (예 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + <translation>메모:</translation> </message> </context> <context> @@ -2424,12 +2468,12 @@ Address: %4 <message> <location filename="../utilitydialog.cpp" line="+48"/> <source>Bitcoin Core is shutting down...</source> - <translation type="unfinished"/> + <translation>비트코ì¸ì½”ì–´ê°€ ë‹«ì•„ì§€ê³ ìžˆìŠµë‹ˆë‹¤</translation> </message> <message> <location line="+1"/> <source>Do not shut down the computer until this window disappears.</source> - <translation type="unfinished"/> + <translation>ì°½ì´ ì‚¬ë¼ì§€ê¸° ì „ê¹Œì§€ 컴퓨터를 ë„지마시오.</translation> </message> </context> <context> @@ -2437,7 +2481,7 @@ Address: %4 <message> <location filename="../forms/signverifymessagedialog.ui" line="+14"/> <source>Signatures - Sign / Verify a Message</source> - <translation type="unfinished"/> + <translation>서명 - ì‹¸ì¸ / 메시지 확ì¸</translation> </message> <message> <location line="+10"/> @@ -2455,19 +2499,19 @@ Address: %4 <translation>메시지를 ì„œëª…í• ì£¼ì†Œ (예: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location line="+10"/> - <location line="+213"/> + <location line="+7"/> + <location line="+210"/> <source>Choose previously used address</source> <translation>ì´ì „ì— ì‚¬ìš©í•œ 주소를 ì„ íƒí•˜ì‹ì‹œì˜¤</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>í´ë¦½ë³´ë“œë¡œ 부터 주소를 붙ì´ì„¸ìš”</translation> </message> @@ -2484,7 +2528,7 @@ Address: %4 <message> <location line="+7"/> <source>Signature</source> - <translation type="unfinished"/> + <translation>서명</translation> </message> <message> <location line="+27"/> @@ -2508,12 +2552,12 @@ Address: %4 </message> <message> <location line="+3"/> - <location line="+146"/> + <location line="+143"/> <source>Clear &All</source> <translation>ëª¨ë‘ ì§€ìš°ê¸°(&A)</translation> </message> <message> - <location line="-87"/> + <location line="-84"/> <source>&Verify Message</source> <translation>메시지 ê²€ì¦(&V)</translation> </message> @@ -2528,9 +2572,9 @@ Address: %4 <translation>서명한 ë©”ì‹œì§€ì˜ ì£¼ì†Œìž…ë‹ˆë‹¤ (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 type="unfinished"/> + <translation>ì •í™•í•œ 비트코ì¸ì£¼ì†Œê°€ ìž…ë ¥ë¬ëŠ”지 메시지를 확ì¸í•˜ì‹œì˜¤</translation> </message> <message> <location line="+3"/> @@ -2543,43 +2587,37 @@ Address: %4 <translation>ëª¨ë“ ê²€ì¦ ë©”ì‹œì§€ í•„ë“œ ìž¬ì„¤ì •</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>ë¹„íŠ¸ì½”ì¸ ì£¼ì†Œë¥¼ ìž…ë ¥í•˜ê¸° (예 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location line="-2"/> + <location line="-1"/> <source>Click "Sign Message" to generate signature</source> <translation>ì„œëª…ì„ ë§Œë“¤ë ¤ë©´ "메시지 서명"ì„ ëˆ„ë¥´ì‹ì‹œì˜¤</translation> </message> <message> - <location line="+3"/> - <source>Enter Bitcoin signature</source> - <translation>ë¹„íŠ¸ì½”ì¸ ì„œëª…ì„ ìž…ë ¥í•˜ì‹ì‹œì˜¤</translation> - </message> - <message> <location line="+84"/> - <location line="+81"/> + <location line="+80"/> <source>The entered address is invalid.</source> <translation>ìž…ë ¥í•œ 주소가 잘못ë˜ì—ˆìŠµë‹ˆë‹¤.</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>주소를 확ì¸í•˜ê³ 다시 ì‹œë„하ì‹ì‹œì˜¤.</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>ìž…ë ¥í•œ 주소는 키ì—ì„œ 참조하지 않습니다.</translation> </message> <message> - <location line="-73"/> + <location line="-72"/> <source>Wallet unlock was cancelled.</source> <translation>지갑 ìž ê¸ˆ í•´ì œë¥¼ 취소했습니다.</translation> </message> @@ -2599,7 +2637,7 @@ Address: %4 <translation>메시지를 서명했습니다.</translation> </message> <message> - <location line="+59"/> + <location line="+58"/> <source>The signature could not be decoded.</source> <translation>ì„œëª…ì„ í•´ë…í• ìˆ˜ 없습니다.</translation> </message> @@ -2630,12 +2668,12 @@ Address: %4 <message> <location filename="../splashscreen.cpp" line="+28"/> <source>Bitcoin Core</source> - <translation type="unfinished"/> + <translation>비트코ì¸ì½”ì–´</translation> </message> <message> <location line="+2"/> <source>The Bitcoin Core developers</source> - <translation type="unfinished"/> + <translation>비트코ì¸ì½”ì–´ 개발ìžë“¤</translation> </message> <message> <location line="+1"/> @@ -2660,8 +2698,13 @@ Address: %4 </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation>충ëŒ</translation> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> - <translation type="unfinished"/> + <translation>%1/오프ë¼ì¸</translation> </message> <message> <location line="+2"/> @@ -2691,36 +2734,36 @@ Address: %4 <message> <location line="+7"/> <source>Source</source> - <translation type="unfinished"/> + <translation>소스</translation> </message> <message> <location line="+0"/> <source>Generated</source> - <translation type="unfinished"/> + <translation>ìƒì„±í•˜ë‹¤</translation> </message> <message> <location line="+5"/> <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"/> <source>label</source> - <translation type="unfinished"/> + <translation>ë¼ë²¨</translation> </message> <message> <location line="+37"/> @@ -2729,7 +2772,7 @@ Address: %4 <location line="+17"/> <location line="+53"/> <source>Credit</source> - <translation type="unfinished"/> + <translation>예금</translation> </message> <message numerus="yes"> <location line="-125"/> @@ -2739,7 +2782,7 @@ Address: %4 <message> <location line="+2"/> <source>not accepted</source> - <translation type="unfinished"/> + <translation>허용ë˜ì§€ 않는다</translation> </message> <message> <location line="+44"/> @@ -2747,7 +2790,7 @@ Address: %4 <location line="+15"/> <location line="+53"/> <source>Debit</source> - <translation type="unfinished"/> + <translation>차변</translation> </message> <message> <location line="-62"/> @@ -2778,7 +2821,7 @@ Address: %4 <message> <location line="+18"/> <source>Merchant</source> - <translation type="unfinished"/> + <translation>ìƒì¸</translation> </message> <message> <location line="+7"/> @@ -2821,12 +2864,12 @@ Address: %4 <translation>. ì•„ì§ ì„±ê³µì 으로 통보하지 ì•ŠìŒ</translation> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation>알수없ìŒ</translation> </message> @@ -2867,12 +2910,12 @@ Address: %4 <translation>수량</translation> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform></translation> </message> @@ -2882,25 +2925,14 @@ Address: %4 <translation>%1 까지 열림</translation> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> - <translation>오프ë¼ì¸(%1 확ì¸ë¨)</translation> - </message> - <message> - <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation>미확ì¸(%2 중 %1 확ì¸ë¨)</translation> - </message> - <message> - <location line="-22"/> - <location line="+25"/> + <location line="+12"/> <source>Confirmed (%1 confirmations)</source> <translation>확ì¸ë¨(%1 확ì¸ë¨)</translation> </message> <message> - <location line="-22"/> + <location line="+9"/> <source>This block was not received by any other nodes and will probably not be accepted!</source> - <translation>ì´ ë¸”ëŸì€ 다른 노드로부터 받지 않았ìŒ. 허용ë˜ì§€ ì•Šì„ ê²ƒìž„.</translation> + <translation>ì´ ë¸”ëŸì€ 다른 노드로부터 받지 ì•Šì•„ 허용ë˜ì§€ ì•Šì„ ê²ƒìž„.</translation> </message> <message> <location line="+3"/> @@ -2908,7 +2940,27 @@ Address: %4 <translation>ìƒì„±ë˜ì—ˆìœ¼ë‚˜ ê±°ì ˆë¨</translation> </message> <message> - <location line="+62"/> + <location line="-21"/> + <source>Offline</source> + <translation>오프ë¼ì¸</translation> + </message> + <message> + <location line="+3"/> + <source>Unconfirmed</source> + <translation>미확ì¸</translation> + </message> + <message> + <location line="+3"/> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Conflicted</source> + <translation>충ëŒ</translation> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation>다ìŒê³¼ 함께 ë°›ìŒ : </translation> </message> @@ -2938,7 +2990,7 @@ Address: %4 <translation>(ì—†ìŒ)</translation> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation>거래ìƒí™©. 마우스를 올리면 승ì¸íšŸìˆ˜ê°€ 표시ë©ë‹ˆë‹¤.</translation> </message> @@ -2955,7 +3007,7 @@ Address: %4 <message> <location line="+2"/> <source>Destination address of transaction.</source> - <translation>거래 ìƒëŒ€ë°©ì˜ 주소.</translation> + <translation>거래가 ë„ë‹¬í• ì£¼ì†Œ</translation> </message> <message> <location line="+2"/> @@ -3029,7 +3081,7 @@ Address: %4 <message> <location line="+6"/> <source>Enter address or label to search</source> - <translation>검색하기 위한 주소 ë˜ëŠ” ë¼ë²¨ì„ ìž…ë ¥</translation> + <translation>검색하기 위한 주소 ë˜ëŠ” í‘œ ìž…ë ¥</translation> </message> <message> <location line="+6"/> @@ -3044,7 +3096,7 @@ Address: %4 <message> <location line="+1"/> <source>Copy label</source> - <translation>ë¼ë²¨ 복사하기</translation> + <translation>í‘œ 복사하기</translation> </message> <message> <location line="+1"/> @@ -3059,7 +3111,7 @@ Address: %4 <message> <location line="+1"/> <source>Edit label</source> - <translation>ë¼ë²¨ ìˆ˜ì •í•˜ê¸°</translation> + <translation>í‘œ ìˆ˜ì •í•˜ê¸°</translation> </message> <message> <location line="+1"/> @@ -3069,27 +3121,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"/> @@ -3147,7 +3199,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> @@ -3168,7 +3220,7 @@ Address: %4 <message> <location line="+1"/> <source>Export the data in the current tab to a file</source> - <translation type="unfinished"/> + <translation>현재 íƒì— 있는 ë°ì´í„°ë¥¼ 파ì¼ë¡œ 내보내기</translation> </message> <message> <location line="+181"/> @@ -3193,7 +3245,7 @@ Address: %4 <message> <location line="+4"/> <source>The wallet data was successfully saved to %1.</source> - <translation type="unfinished"/> + <translation>지갑 ì •ë³´ê°€ %1ì— ì„±ê³µì 으로 ì €ìž¥ë˜ì—ˆìŠµë‹ˆë‹¤</translation> </message> <message> <location line="+0"/> @@ -3204,12 +3256,12 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+223"/> <source>Usage:</source> <translation>사용법:</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>List commands</source> <translation>커맨드 목ë¡</translation> </message> @@ -3226,12 +3278,12 @@ Address: %4 <message> <location line="+22"/> <source>Specify configuration file (default: bitcoin.conf)</source> - <translation>ì„¤ì •íŒŒì¼ ì§€ì • (기본: bitcoin.conf)</translation> + <translation>ì„¤ì •íŒŒì¼ ì§€ì • (기본값: bitcoin.conf)</translation> </message> <message> <location line="+3"/> <source>Specify pid file (default: bitcoind.pid)</source> - <translation>pid íŒŒì¼ ì§€ì • (기본: bitcoind.pid)</translation> + <translation>pid íŒŒì¼ ì§€ì • (기본값: bitcoind.pid)</translation> </message> <message> <location line="-1"/> @@ -3241,17 +3293,17 @@ Address: %4 <message> <location line="-9"/> <source>Set database cache size in megabytes (default: 25)</source> - <translation>ë°ì´í„°ë² ì´ìŠ¤ ìºì‹œ í¬ê¸°ë¥¼ 메가바ì´íŠ¸ë¡œ ì§€ì •(ë‚´ì •ê°’:25)</translation> + <translation>ë°ì´í„°ë² ì´ìŠ¤ ìºì‹œ í¬ê¸°ë¥¼ 메가바ì´íŠ¸ë¡œ ì§€ì •(기본값:25)</translation> </message> <message> <location line="-26"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> - <translation type="unfinished"/> + <translation><port>ë¡œ ì—°ê²°ì„ í—ˆìš©í•œë‹¤ (기본값: 8333 ë˜ëŠ” 테스트넷: 18333)</translation> </message> <message> <location line="+5"/> <source>Maintain at most <n> connections to peers (default: 125)</source> - <translation type="unfinished"/> + <translation>가장 잘 ì—°ê²°ë˜ëŠ” 사용ìžë¥¼ ìœ ì§€í•©ë‹ˆë‹¤(기본값: 125)</translation> </message> <message> <location line="-51"/> @@ -3264,14 +3316,14 @@ Address: %4 <translation>ê³µì¸ ì£¼ì†Œë¥¼ ì§€ì •í•˜ì‹ì‹œì˜¤</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> - <translation type="unfinished"/> + <translation>ì´ìƒí–‰ë™ ë„¤íŠ¸ì›Œí¬ ì°¸ì—¬ìžì˜ ì—°ê²°ì„ ì°¨ë‹¨ì‹œí‚¤ê¸° 위한 한계치 (기본값: 100)</translation> </message> <message> - <location line="-148"/> + <location line="-150"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> - <translation type="unfinished"/> + <translation>ì´ìƒí–‰ë™ì„ 하는 ë„¤íŠ¸ì›Œí¬ ì°¸ì—¬ìžë“¤ì„ 다시 ì—°ê²°ì‹œí‚¤ëŠ”ë° ê±¸ë¦¬ëŠ” 시간 (기본값: 86400ì´ˆ)</translation> </message> <message> <location line="-36"/> @@ -3289,19 +3341,19 @@ Address: %4 <translation>ëª…ë ¹ì¤„ê³¼ JSON-RPC ëª…ë ¹ 수ë½</translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Run in the background as a daemon and accept commands</source> <translation>ë°ëª¬ìœ¼ë¡œ 백그ë¼ìš´ë“œì—ì„œ ì‹¤í–‰í•˜ê³ ëª…ë ¹ì„ í—ˆìš©</translation> </message> <message> - <location line="+39"/> + <location line="+40"/> <source>Use the test network</source> <translation>테스트 ë„¤íŠ¸ì›Œí¬ ì‚¬ìš©</translation> </message> <message> - <location line="-118"/> + <location line="-120"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation type="unfinished"/> + <translation>외부 ì ‘ì†ì„ 승ì¸í•©ë‹ˆë‹¤</translation> </message> <message> <location line="-95"/> @@ -3371,7 +3423,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+5"/> <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source> - <translation type="unfinished"/> + <translation>Tor 서비스를 ì´ìš©í•˜ì—¬ 네트워í¬ì— 참여하기 위해서 SOCKS5 프ë¡ì‹œë¥¼ ë”°ë¡œ 사용함 (기본값: -proxy)</translation> </message> <message> <location line="+3"/> @@ -3391,7 +3443,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <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>ê²½ê³ : 현재 ë¹„íŠ¸ì½”ì¸ ë²„ì „ì´ ë‹¤ë¥¸ ë„¤íŠ¸ì›Œí¬ ì°¸ì—¬ìžë“¤ê³¼ ë™ì¼í•˜ì§€ 않는 것 같습니다. ë‹¹ì‹ ë˜ëŠ” 다른 참여ìžë“¤ì´ ë™ì¼í•œ ë¹„íŠ¸ì½”ì¸ ë²„ì „ìœ¼ë¡œ ì—…ê·¸ë ˆì´ë“œ í• í•„ìš”ê°€ 있습니다.</translation> </message> <message> <location line="+3"/> @@ -3411,12 +3463,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+6"/> <source>Attempt to recover private keys from a corrupt wallet.dat</source> - <translation type="unfinished"/> + <translation>ì†ìƒëœ wallet.datì—ì„œ ê°œì¸í‚¤ ë³µì›ì„ ì‹œë„합니다</translation> </message> <message> <location line="+1"/> <source>Bitcoin Core Daemon</source> - <translation type="unfinished"/> + <translation>ë¹„íŠ¸ì½”ì¸ ì½”ì–´ ë°ëª¬</translation> </message> <message> <location line="+1"/> @@ -3430,13 +3482,18 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation>ê±°ëž˜ë‚´ì— ì‚ì œ(진단ë„구; 재스캔 í¬í•¨)</translation> + </message> + <message> + <location line="+1"/> <source>Connect only to the specified node(s)</source> - <translation type="unfinished"/> + <translation>ì§€ì •ëœ ë…¸ë“œì—만 연결하기</translation> </message> <message> <location line="+1"/> <source>Connect through SOCKS proxy</source> - <translation type="unfinished"/> + <translation>SOCKS 프ë¡ì‹œë¥¼ 통해 ì—°ê²°</translation> </message> <message> <location line="+1"/> @@ -3446,7 +3503,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+2"/> <source>Corrupted block database detected</source> - <translation type="unfinished"/> + <translation>ì†ìƒëœ ë¸”ë¡ ë°ì´í„°ë² ì´ìŠ¤ê°€ ê°ì§€ë˜ì—ˆìŠµë‹ˆë‹¤</translation> </message> <message> <location line="+1"/> @@ -3461,7 +3518,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+1"/> <source>Do you want to rebuild the block database now?</source> - <translation type="unfinished"/> + <translation>ë¸”ë½ ë°ì´í„°ë² ì´ìŠ¤ë¥¼ 다시 ìƒì„±í•˜ì‹œê² 습니까?</translation> </message> <message> <location line="+2"/> @@ -3476,7 +3533,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+1"/> <source>Error loading block database</source> - <translation type="unfinished"/> + <translation>ë¸”ë¡ ë°ì´í„°ë² ì´ìŠ¤ë¥¼ ë¶ˆëŸ¬ì˜¤ëŠ”ë° ì˜¤ë¥˜</translation> </message> <message> <location line="+4"/> @@ -3491,7 +3548,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+1"/> <source>Error: Wallet locked, unable to create transaction!</source> - <translation type="unfinished"/> + <translation>오류: ì§€ê°‘ì´ ìž ê¸ˆìƒíƒœì—¬ì„œ 거래를 ìƒì„±í• 수 없습니다!</translation> </message> <message> <location line="+1"/> @@ -3561,12 +3618,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+1"/> <source>Find peers using DNS lookup (default: 1 unless -connect)</source> - <translation type="unfinished"/> + <translation>DNS 찾기를 ì´ìš©í•˜ì—¬ 사용ìžë¥¼ 찾으시오(기본값: 1 ì—°ê²° ë˜ë©´)</translation> </message> <message> <location line="+1"/> <source>Generate coins (default: 0)</source> - <translation type="unfinished"/> + <translation>ì½”ì¸ ìƒì„±(기본값: 0)</translation> </message> <message> <location line="+2"/> @@ -3606,7 +3663,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+1"/> <source>RPC client options:</source> - <translation type="unfinished"/> + <translation>RPC í´ë¼ì´ì–¸íŠ¸ 옵션</translation> </message> <message> <location line="+1"/> @@ -3616,7 +3673,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+5"/> <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source> - <translation type="unfinished"/> + <translation>-proxy를 위한 SOCKS ë²„ì „ì„ ì„ íƒí•˜ì„¸ìš” (4 ë˜ëŠ” 5, 기본: 5)</translation> </message> <message> <location line="+1"/> @@ -3626,7 +3683,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+7"/> <source>Set maximum block size in bytes (default: %d)</source> - <translation type="unfinished"/> + <translation>최대 ë¸”ë½ í¬ê¸°ë¥¼ Bytesë¡œ ì§€ì •í•˜ì„¸ìš” (기본: %d)</translation> </message> <message> <location line="+2"/> @@ -3636,10 +3693,15 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+7"/> <source>Specify wallet file (within data directory)</source> - <translation type="unfinished"/> + <translation>ë°ì´í„° í´ë” ì•ˆì— ì§€ê°‘ 파ì¼ì„ ì„ íƒí•˜ì„¸ìš”.</translation> </message> <message> <location line="+2"/> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Start Bitcoin server</source> <translation>ë¹„íŠ¸ì½”ì¸ ì„œë²„ 시작</translation> </message> @@ -3666,7 +3728,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+1"/> <source>Wait for RPC server to start</source> - <translation type="unfinished"/> + <translation>RPC서버가 시작ë˜ê¸¸ 기다리ì‹ì‹œìš”</translation> </message> <message> <location line="+1"/> @@ -3676,7 +3738,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+2"/> <source>Wallet options:</source> - <translation type="unfinished"/> + <translation>지갑 옵션:</translation> </message> <message> <location line="+2"/> @@ -3689,12 +3751,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-79"/> + <location line="-80"/> <source>Imports blocks from external blk000??.dat file</source> <translation>외부 blk000??.dat 파ì¼ì—ì„œ ë¸”ë¡ ê°€ì ¸ì˜¤ê¸°</translation> </message> <message> - <location line="-105"/> + <location line="-106"/> <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> @@ -3714,7 +3776,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+89"/> + <location line="+90"/> <source>Information</source> <translation>ì •ë³´</translation> </message> @@ -3731,7 +3793,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+8"/> <source>Maintain a full transaction index (default: 0)</source> - <translation type="unfinished"/> + <translation>ì „ì²´ 거래 지수를 ìœ ì§€í•©ë‹ˆë‹¤(기본값: 0)</translation> </message> <message> <location line="+2"/> @@ -3776,7 +3838,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+1"/> <source>Signing transaction failed</source> - <translation type="unfinished"/> + <translation>거래를 ì„œëª…í•˜ëŠ”ê²ƒì„ ì‹¤íŒ¨í•˜ì˜€ìŠµë‹ˆë‹¤.</translation> </message> <message> <location line="+2"/> @@ -3784,19 +3846,19 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>밀리초 단위로 ì—°ê²° ì œí•œì‹œê°„ì„ ì„¤ì •í•˜ì‹ì‹œì˜¤(기본값: 5000)</translation> </message> <message> - <location line="+6"/> + <location line="+7"/> <source>System error: </source> <translation>시스템 오류:</translation> </message> <message> <location line="+5"/> <source>Transaction amount too small</source> - <translation type="unfinished"/> + <translation>ê±°ëž˜ëŸ‰ì´ ë„ˆë¬´ ì 습니다</translation> </message> <message> <location line="+1"/> <source>Transaction amounts must be positive</source> - <translation type="unfinished"/> + <translation>ê±°ëž˜ëŸ‰ì€ ë°˜ë“œì‹œ ì •ìˆ˜ì—¬ì•¼í•©ë‹ˆë‹¤.</translation> </message> <message> <location line="+1"/> @@ -3830,41 +3892,46 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation>ì§€ê°‘ì˜ ëª¨ë“ ê±°ëž˜ë‚´ì— ê±´ë„ˆë›°ê¸°...</translation> + </message> + <message> + <location line="+1"/> <source>version</source> <translation>ë²„ì „</translation> </message> <message> <location line="+1"/> <source>wallet.dat corrupt, salvage failed</source> - <translation type="unfinished"/> + <translation>wallet.dat 파ì¼ì´ ì†ìƒë˜ì—ˆê³ 복구가 실패하였습니다.</translation> </message> <message> - <location line="-58"/> + <location line="-60"/> <source>Password for JSON-RPC connections</source> <translation>JSON-RPC ì—°ê²°ì— ì‚¬ìš©í• ì•”í˜¸</translation> </message> <message> - <location line="-70"/> + <location line="-71"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>ì§€ì •í•œ IP ì£¼ì†Œì˜ JSON-RPC ì—°ê²° 허용</translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> - <translation>실행 ì¤‘ì¸ ë…¸ë“œë¡œ ëª…ë ¹ ì „ì†¡ <ip> (기본: 127.0.0.1)</translation> + <translation>실행 ì¤‘ì¸ ë…¸ë“œë¡œ ëª…ë ¹ ì „ì†¡ <ip> (기본값: 127.0.0.1)</translation> </message> <message> - <location line="-132"/> + <location line="-133"/> <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="+161"/> + <location line="+163"/> <source>Upgrade wallet to latest format</source> <translation>ì§€ê°‘ì„ ìµœê·¼ 형ì‹ìœ¼ë¡œ ê°œì„ í•˜ì‹œì˜¤</translation> </message> <message> - <location line="-24"/> + <location line="-25"/> <source>Set key pool size to <n> (default: 100)</source> <translation>키 í’€ í¬ê¸° ì„¤ì • <n>(기본값: 100)</translation> </message> @@ -3874,12 +3941,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>누ë½ëœ 지갑 ì†¡ê¸ˆì— ëŒ€í•œ ë¸”ë¡ ì²´ì¸ ë‹¤ì‹œ 검색</translation> </message> <message> - <location line="+38"/> + <location line="+39"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>JSON-RPC ì—°ê²°ì— OpenSSL(https) 사용</translation> </message> <message> - <location line="-30"/> + <location line="-31"/> <source>Server certificate file (default: server.cert)</source> <translation>서버 ì¸ì¦ íŒŒì¼ (기본값: server.cert)</translation> </message> @@ -3889,9 +3956,9 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>서버 ê°œì¸ í‚¤(기본값: server.pem)</translation> </message> <message> - <location line="+16"/> + <location line="+17"/> <source>This help message</source> - <translation>ì´ ë„ì›€ë§ ë©”ì‹œì§€ìž…ë‹ˆë‹¤</translation> + <translation>ë„ì›€ë§ ë©”ì‹œì§€ìž…ë‹ˆë‹¤</translation> </message> <message> <location line="+7"/> @@ -3899,34 +3966,34 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>ì´ ì»´í“¨í„°ì˜ %sì— ë°”ì¸ë”©í• 수 없습니다 (ë°”ì¸ë”© ê³¼ì •ì— %d 오류 ë°œìƒ, %s)</translation> </message> <message> - <location line="-107"/> + <location line="-109"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>-addnode, -seednode, -connect ì˜µì…˜ì— ëŒ€í•´ DNS íƒìƒ‰ 허용</translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <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"/> + <location line="+99"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> - <translation>ì§€ê°‘ì„ ìƒˆë¡œ ì¨ì•¼ 합니다.: 완성하기위하여 비트코ì¸ì„ 다시 시작하ì‹ì‹œì˜¤.</translation> + <translation>ì§€ê°‘ì„ ìƒˆë¡œ ì¨ì•¼ 합니다.: 완성하기 위하여 비트코ì¸ì„ 다시 시작하ì‹ì‹œì˜¤.</translation> </message> <message> - <location line="-100"/> + <location line="-101"/> <source>Error loading wallet.dat</source> - <translation>wallet.dat 로딩 ì—러</translation> + <translation>wallet.dat 불러오기 ì—러</translation> </message> <message> <location line="+31"/> @@ -3934,7 +4001,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>ìž˜ëª»ëœ -proxy 주소입니다: '%s'</translation> </message> <message> - <location line="+56"/> + <location line="+57"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>-onlynetì— ì§€ì •í•œ 네트워í¬ë¥¼ ì•Œ 수 없습니다: '%s'</translation> </message> @@ -3944,7 +4011,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>ìš”ì²í•œ -socks 프ë¡ížˆ ë²„ì „ì„ ì•Œ 수 없습니다: %i</translation> </message> <message> - <location line="-101"/> + <location line="-103"/> <source>Cannot resolve -bind address: '%s'</source> <translation>-bind 주소를 확ì¸í• 수 없습니다: '%s'</translation> </message> @@ -3954,7 +4021,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>-externalip 주소를 확ì¸í• 수 없습니다: '%s'</translation> </message> <message> - <location line="+48"/> + <location line="+49"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>-paytxfee=<amount>ì— ëŒ€í•œ ì–‘ì´ ìž˜ëª»ë˜ì—ˆìŠµë‹ˆë‹¤: '%s'</translation> </message> @@ -3974,7 +4041,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>ë¸”ëŸ ì¸ë±ìŠ¤ë¥¼ 불러오는 중...</translation> </message> <message> - <location line="-62"/> + <location line="-63"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"/> </message> @@ -3984,12 +4051,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>ì´ ì»´í“¨í„°ì˜ %sì— ë°”ì¸ë”© í• ìˆ˜ 없습니다. ì•„ë§ˆë„ ë¹„íŠ¸ì½”ì¸ì´ ì‹¤í–‰ì¤‘ì¸ ê²ƒ 같습니다.</translation> </message> <message> - <location line="+95"/> + <location line="+96"/> <source>Loading wallet...</source> <translation>ì§€ê°‘ì„ ë¶ˆëŸ¬ì˜¤ëŠ” 중...</translation> </message> <message> - <location line="-56"/> + <location line="-57"/> <source>Cannot downgrade wallet</source> <translation>ì§€ê°‘ì„ ë‹¤ìš´ê·¸ë ˆì´ë“œ í• ìˆ˜ 없습니다</translation> </message> @@ -3999,7 +4066,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>기본 ê³„ì¢Œì— ê¸°ë¡í• 수 없습니다</translation> </message> <message> - <location line="+67"/> + <location line="+68"/> <source>Rescanning...</source> <translation>재검색 중...</translation> </message> @@ -4009,17 +4076,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>로딩 완료</translation> </message> <message> - <location line="+85"/> + <location line="+86"/> <source>To use the %s option</source> <translation>%s ì˜µì…˜ì„ ì‚¬ìš©í•˜ë ¤ë©´</translation> </message> <message> - <location line="-77"/> + <location line="-78"/> <source>Error</source> <translation>오류</translation> </message> <message> - <location line="-35"/> + <location line="-36"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> @@ -4028,4 +4095,4 @@ If the file does not exist, create it with owner-readable-only file permissions. 파ì¼ì´ 없으면 ì†Œìœ ìž ì½ê¸° ì „ìš© íŒŒì¼ ê¶Œí•œìœ¼ë¡œ 만들어야 합니다.</translation> </message> </context> -</TS>
\ No newline at end of file +</TS> diff --git a/src/qt/locale/bitcoin_la.ts b/src/qt/locale/bitcoin_la.ts index ae65eb1c66..c4d946e199 100644 --- a/src/qt/locale/bitcoin_la.ts +++ b/src/qt/locale/bitcoin_la.ts @@ -35,6 +35,12 @@ Hoc productum continet programmata composita ab OpenSSL Project pro utendo in Op <source>The Bitcoin Core developers</source> <translation type="unfinished"/> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source> (%1-bit)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>AddressBookPage</name> @@ -616,6 +622,16 @@ Hoc productum continet programmata composita ab OpenSSL Project pro utendo in Op <translation><numerusform>%n hebdomas</numerusform><numerusform>%n hebdomades</numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation>%1 post</translation> @@ -689,7 +705,7 @@ Inscriptio: %4 <translation>Cassidile <b>cifratum</b> est et iam nunc <b>seratum</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+435"/> <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> @@ -750,7 +766,7 @@ Inscriptio: %4 <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation type="unfinished"/> </message> @@ -765,7 +781,7 @@ Inscriptio: %4 <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation>Quantitas</translation> </message> @@ -916,7 +932,7 @@ Inscriptio: %4 <translation type="unfinished"/> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation type="unfinished"/> </message> @@ -1098,7 +1114,7 @@ Inscriptio: %4 <translation type="unfinished"/> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation>Bitcoin Nucleus</translation> </message> @@ -1242,7 +1258,7 @@ Inscriptio: %4 <translation>&Princeps</translation> </message> <message> - <location line="+6"/> + <location line="+122"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation>Optionalis merces transactionum singulis kB quae adiuvat curare tuas transactiones processas esse celeriter. Plurimi transactiones 1kB sunt.</translation> </message> @@ -1252,7 +1268,7 @@ Inscriptio: %4 <translation>Solve &mercedem transactionis</translation> </message> <message> - <location line="+31"/> + <location line="-131"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation>Pelle Bitcoin per se postquam in systema inire.</translation> </message> @@ -1267,12 +1283,7 @@ Inscriptio: %4 <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"/> + <location line="+16"/> <source>MB</source> <translation type="unfinished"/> </message> @@ -1287,7 +1298,12 @@ Inscriptio: %4 <translation>Constitue numerum filorum verificationis scriptorum (Maximum 16, 0 = auto, <0 = tot corda libera erunt, praedefinitum: 0)</translation> </message> <message> - <location line="+58"/> + <location line="+107"/> + <source>&Spend unconfirmed change (experts only)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+37"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation type="unfinished"/> </message> @@ -1322,7 +1338,17 @@ Inscriptio: %4 <translation>&Rete</translation> </message> <message> - <location line="+6"/> + <location line="-86"/> + <source>W&allet</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+52"/> + <source>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.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+40"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>Aperi per se portam clientis Bitcoin in itineratore. Hoc tantum effectivum est si itineratrum tuum supportat UPnP et id activum est.</translation> </message> @@ -1437,17 +1463,17 @@ Inscriptio: %4 <translation>&Cancella</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+70"/> <source>default</source> <translation>praedefinitum</translation> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation type="unfinished"/> </message> <message> - <location line="+75"/> + <location line="+78"/> <source>Confirm options reset</source> <translation>Confirma optionum reconstituere</translation> </message> @@ -1487,18 +1513,13 @@ Inscriptio: %4 <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="-155"/> - <source>Unconfirmed:</source> - <translation>Non confirmata:</translation> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation>Cassidile</translation> </message> <message> <location line="+51"/> - <source>Confirmed:</source> + <source>Available:</source> <translation type="unfinished"/> </message> <message> @@ -1507,7 +1528,12 @@ Inscriptio: %4 <translation type="unfinished"/> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation type="unfinished"/> </message> @@ -1655,6 +1681,11 @@ Inscriptio: %4 <source>Error: Invalid combination of -regtest and -testnet.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../guiutil.cpp" line="+82"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>Insere inscriptionem Bitcoin (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> </context> <context> <name>QRImageWidget</name> @@ -1875,22 +1906,22 @@ Inscriptio: %4 <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+83"/> + <location filename="../forms/receivecoinsdialog.ui" line="+107"/> <source>&Amount:</source> <translation type="unfinished"/> </message> <message> - <location line="-13"/> + <location line="-16"/> <source>&Label:</source> <translation>&Titulus:</translation> </message> <message> - <location line="-34"/> + <location line="-37"/> <source>&Message:</source> <translation type="unfinished"/> </message> <message> - <location line="-17"/> + <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"/> </message> @@ -1900,27 +1931,30 @@ Inscriptio: %4 <translation type="unfinished"/> </message> <message> - <location line="+27"/> - <source>An optional 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"/> </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> + <location line="-7"/> + <location line="+21"/> + <source>An optional label to associate with the new receiving address.</source> <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="-7"/> <source>Use this form to request payments. All fields are <b>optional</b>.</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <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"/> </message> <message> - <location line="+17"/> + <location line="+32"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -1930,17 +1964,17 @@ Inscriptio: %4 <translation type="unfinished"/> </message> <message> - <location line="+36"/> - <source>&Request payment</source> + <location line="+78"/> + <source>Requested payments history</source> <translation type="unfinished"/> </message> <message> - <location line="+47"/> - <source>Requested payments</source> + <location line="-98"/> + <source>&Request payment</source> <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+120"/> <source>Show the selected request (does the same as double clicking an entry)</source> <translation type="unfinished"/> </message> @@ -1959,6 +1993,21 @@ Inscriptio: %4 <source>Remove</source> <translation type="unfinished"/> </message> + <message> + <location filename="../receivecoinsdialog.cpp" line="+38"/> + <source>Copy label</source> + <translation>Copia titulum</translation> + </message> + <message> + <location line="+1"/> + <source>Copy message</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation>Copia quantitatem</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -2060,12 +2109,17 @@ Inscriptio: %4 <source>(no message)</source> <translation type="unfinished"/> </message> + <message> + <location line="+8"/> + <source>(no amount)</source> + <translation type="unfinished"/> + </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>Mitte Nummos</translation> @@ -2141,7 +2195,7 @@ Inscriptio: %4 <translation type="unfinished"/> </message> <message> - <location line="+115"/> + <location line="+164"/> <source>Send to multiple recipients at once</source> <translation>Mitte pluribus accipientibus simul</translation> </message> @@ -2151,7 +2205,7 @@ Inscriptio: %4 <translation>Adde &Accipientem</translation> </message> <message> - <location line="+20"/> + <location line="-23"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -2161,12 +2215,12 @@ Inscriptio: %4 <translation>Vacuefac &Omnia</translation> </message> <message> - <location line="+22"/> + <location line="+52"/> <source>Balance:</source> <translation>Pendendum:</translation> </message> <message> - <location line="+41"/> + <location line="-78"/> <source>Confirm the send action</source> <translation>Confirma actionem mittendi</translation> </message> @@ -2176,7 +2230,7 @@ Inscriptio: %4 <translation>&Mitte</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-228"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation>Confirma mittendum nummorum</translation> </message> @@ -2189,12 +2243,7 @@ Inscriptio: %4 <translation type="unfinished"/> </message> <message> - <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"/> + <location line="-121"/> <source>Copy quantity</source> <translation type="unfinished"/> </message> @@ -2244,7 +2293,7 @@ Inscriptio: %4 <translation type="unfinished"/> </message> <message> - <location line="+202"/> + <location line="+203"/> <source>The recipient address is not valid, please recheck.</source> <translation>Inscriptio accipientis non est valida, sodes reproba.</translation> </message> @@ -2279,12 +2328,12 @@ Inscriptio: %4 <translation type="unfinished"/> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Warning: Invalid Bitcoin address</source> <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+20"/> <source>(no label)</source> <translation>(nullus titulus)</translation> </message> @@ -2294,7 +2343,7 @@ Inscriptio: %4 <translation type="unfinished"/> </message> <message> - <location line="-366"/> + <location line="-367"/> <source>Are you sure you want to send?</source> <translation type="unfinished"/> </message> @@ -2304,7 +2353,7 @@ Inscriptio: %4 <translation type="unfinished"/> </message> <message> - <location line="+170"/> + <location line="+171"/> <source>Payment request expired</source> <translation type="unfinished"/> </message> @@ -2381,12 +2430,7 @@ Inscriptio: %4 <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"/> + <location line="+968"/> <source>This is a verified payment request.</source> <translation type="unfinished"/> </message> @@ -2396,7 +2440,12 @@ Inscriptio: %4 <translation type="unfinished"/> </message> <message> - <location line="+459"/> + <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"/> + </message> + <message> + <location line="+426"/> <source>This is an unverified payment request.</source> <translation type="unfinished"/> </message> @@ -2412,11 +2461,6 @@ Inscriptio: %4 <source>Memo:</source> <translation type="unfinished"/> </message> - <message> - <location filename="../sendcoinsentry.cpp" line="+1"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Insero inscriptionem Bitcoin (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> </context> <context> <name>ShutdownWindow</name> @@ -2454,19 +2498,19 @@ Inscriptio: %4 <translation>Inscriptio qua signare nuntium (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"/> </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>Glutina inscriptionem ex latibulo</translation> </message> @@ -2507,12 +2551,12 @@ Inscriptio: %4 </message> <message> <location line="+3"/> - <location line="+146"/> + <location line="+143"/> <source>Clear &All</source> <translation>Vacuefac &Omnia</translation> </message> <message> - <location line="-87"/> + <location line="-84"/> <source>&Verify Message</source> <translation>&Verifica Nuntium</translation> </message> @@ -2527,7 +2571,7 @@ Inscriptio: %4 <translation>Inscriptio qua nuntius signatus est (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>Verifica nuntium ut cures signatum esse cum specifica inscriptione Bitcoin</translation> </message> @@ -2542,43 +2586,37 @@ Inscriptio: %4 <translation>Reconstitue omnes campos verificandi nuntii</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>Insere inscriptionem Bitcoin (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location line="-2"/> + <location line="-1"/> <source>Click "Sign Message" to generate signature</source> <translation>Clicca "Signa Nuntium" ut signatio generetur</translation> </message> <message> - <location line="+3"/> - <source>Enter Bitcoin signature</source> - <translation>Insere signationem Bitcoin</translation> - </message> - <message> <location line="+84"/> - <location line="+81"/> + <location line="+80"/> <source>The entered address is invalid.</source> <translation>Inscriptio inserta non valida est.</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>Sodes inscriptionem proba et rursus conare.</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>Inserta inscriptio clavem non refert.</translation> </message> <message> - <location line="-73"/> + <location line="-72"/> <source>Wallet unlock was cancelled.</source> <translation>Cassidilis reserare cancellatum est.</translation> </message> @@ -2598,7 +2636,7 @@ Inscriptio: %4 <translation>Nuntius signatus.</translation> </message> <message> - <location line="+59"/> + <location line="+58"/> <source>The signature could not be decoded.</source> <translation>Signatio decodificari non potuit.</translation> </message> @@ -2659,6 +2697,11 @@ Inscriptio: %4 </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation>%1/non conecto</translation> </message> @@ -2820,12 +2863,12 @@ Inscriptio: %4 <translation>, nondum prospere disseminatum est</translation> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform><numerusform>Aperi pro %n pluribus frustis</numerusform></translation> </message> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation>ignotum</translation> </message> @@ -2866,12 +2909,12 @@ Inscriptio: %4 <translation>Quantitas</translation> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <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> @@ -2881,23 +2924,12 @@ Inscriptio: %4 <translation>Apertum donec %1</translation> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> - <translation>Non conectum (%1 confirmationes)</translation> - </message> - <message> - <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation>Non confirmatum (%1 de %2 confirmationibus)</translation> - </message> - <message> - <location line="-22"/> - <location line="+25"/> + <location line="+12"/> <source>Confirmed (%1 confirmations)</source> <translation>Confirmatum (%1 confirmationes)</translation> </message> <message> - <location line="-22"/> + <location line="+9"/> <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> @@ -2907,7 +2939,27 @@ Inscriptio: %4 <translation>Generatum sed non acceptum</translation> </message> <message> - <location line="+62"/> + <location line="-21"/> + <source>Offline</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Unconfirmed</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation>Acceptum cum</translation> </message> @@ -2937,7 +2989,7 @@ Inscriptio: %4 <translation>(n/a)</translation> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation>Status transactionis. Supervola cum mure ut monstretur numerus confirmationum.</translation> </message> @@ -3203,12 +3255,12 @@ Inscriptio: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+223"/> <source>Usage:</source> <translation>Usus:</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>List commands</source> <translation>Enumera mandata</translation> </message> @@ -3263,12 +3315,12 @@ Inscriptio: %4 <translation>Specifica tuam propriam publicam inscriptionem</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation>Limen pro disconectendo paria improba (praedefinitum: 100)</translation> </message> <message> - <location line="-148"/> + <location line="-150"/> <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> @@ -3288,17 +3340,17 @@ Inscriptio: %4 <translation>Accipe terminalis et JSON-RPC mandata.</translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <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="+39"/> + <location line="+40"/> <source>Use the test network</source> <translation>Utere rete experimentale</translation> </message> <message> - <location line="-118"/> + <location line="-120"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>Accipe conexiones externas (praedefinitum: 1 nisi -proxy neque -connect)</translation> </message> @@ -3439,6 +3491,11 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" a </message> <message> <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation>Conecte sole ad nodos specificatos (vel nodum specificatum)</translation> </message> @@ -3649,6 +3706,11 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" a </message> <message> <location line="+2"/> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Start Bitcoin server</source> <translation type="unfinished"/> </message> @@ -3698,12 +3760,12 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" a <translation type="unfinished"/> </message> <message> - <location line="-79"/> + <location line="-80"/> <source>Imports blocks from external blk000??.dat file</source> <translation>Importat frusta ab externa plica blk000??.dat</translation> </message> <message> - <location line="-105"/> + <location line="-106"/> <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> @@ -3723,7 +3785,7 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" a <translation>Constitue numerum filorum verificationis scriptorum (Maximum 16, 0 = auto, <0 = tot corda libera erunt, praedefinitum: 0)</translation> </message> <message> - <location line="+89"/> + <location line="+90"/> <source>Information</source> <translation>Informatio</translation> </message> @@ -3793,7 +3855,7 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" a <translation>Specifica tempumfati conexionis in millisecundis (praedefinitum: 5000)</translation> </message> <message> - <location line="+6"/> + <location line="+7"/> <source>System error: </source> <translation>Systematis error:</translation> </message> @@ -3839,6 +3901,11 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" a </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>version</source> <translation>versio</translation> </message> @@ -3848,32 +3915,32 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" a <translation>wallet.dat corrupta, salvare abortum est</translation> </message> <message> - <location line="-58"/> + <location line="-60"/> <source>Password for JSON-RPC connections</source> <translation>Tessera pro conexionibus JSON-RPC</translation> </message> <message> - <location line="-70"/> + <location line="-71"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Permitte conexionibus JSON-RPC ex inscriptione specificata</translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>Mitte mandata nodo operanti in <ip> (praedefinitum: 127.0.0.1)</translation> </message> <message> - <location line="-132"/> + <location line="-133"/> <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="+161"/> + <location line="+163"/> <source>Upgrade wallet to latest format</source> <translation>Progredere cassidile ad formam recentissimam</translation> </message> <message> - <location line="-24"/> + <location line="-25"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Constitue magnitudinem stagni clavium ad <n> (praedefinitum: 100)</translation> </message> @@ -3883,12 +3950,12 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" a <translation>Iterum perlege catenam frustorum propter absentes cassidilis transactiones</translation> </message> <message> - <location line="+38"/> + <location line="+39"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Utere OpenSSL (https) pro conexionibus JSON-RPC</translation> </message> <message> - <location line="-30"/> + <location line="-31"/> <source>Server certificate file (default: server.cert)</source> <translation>Plica certificationis daemonis moderantis (praedefinitum: server.cert)</translation> </message> @@ -3898,7 +3965,7 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" a <translation>Clavis privata daemonis moderans (praedefinitum: server.pem)</translation> </message> <message> - <location line="+16"/> + <location line="+17"/> <source>This help message</source> <translation>Hic nuntius auxilii</translation> </message> @@ -3908,12 +3975,12 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" a <translation>Non posse conglutinare ad %s in hoc computatro (conglutinare redidit errorem %d, %s)</translation> </message> <message> - <location line="-107"/> + <location line="-109"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>Permitte quaerenda DNS pro -addnode, -seednode, et -connect</translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Loading addresses...</source> <translation>Legens inscriptiones...</translation> </message> @@ -3928,12 +3995,12 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" a <translation>Error legendi wallet.dat: Cassidili necesse est recentior versio Bitcoin</translation> </message> <message> - <location line="+98"/> + <location line="+99"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>Cassidili necesse erat rescribi: Repelle Bitcoin ut compleas</translation> </message> <message> - <location line="-100"/> + <location line="-101"/> <source>Error loading wallet.dat</source> <translation>Error legendi wallet.dat</translation> </message> @@ -3943,7 +4010,7 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" a <translation>Inscriptio -proxy non valida: '%s'</translation> </message> <message> - <location line="+56"/> + <location line="+57"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Ignotum rete specificatum in -onlynet: '%s'</translation> </message> @@ -3953,7 +4020,7 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" a <translation>Ignota -socks vicarii versio postulata: %i</translation> </message> <message> - <location line="-101"/> + <location line="-103"/> <source>Cannot resolve -bind address: '%s'</source> <translation>Non posse resolvere -bind inscriptonem: '%s'</translation> </message> @@ -3963,7 +4030,7 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" a <translation>Non posse resolvere -externalip inscriptionem: '%s'</translation> </message> <message> - <location line="+48"/> + <location line="+49"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>Quantitas non valida pro -paytxfee=<quantitas>: '%s'</translation> </message> @@ -3983,7 +4050,7 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" a <translation>Legens indicem frustorum...</translation> </message> <message> - <location line="-62"/> + <location line="-63"/> <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> @@ -3993,12 +4060,12 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" a <translation>Non posse conglutinare ad %s in hoc cumputatro. Bitcoin probabiliter iam operatur.</translation> </message> <message> - <location line="+95"/> + <location line="+96"/> <source>Loading wallet...</source> <translation>Legens cassidile...</translation> </message> <message> - <location line="-56"/> + <location line="-57"/> <source>Cannot downgrade wallet</source> <translation>Non posse cassidile regredi</translation> </message> @@ -4008,7 +4075,7 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" a <translation>Non posse scribere praedefinitam inscriptionem</translation> </message> <message> - <location line="+67"/> + <location line="+68"/> <source>Rescanning...</source> <translation>Iterum perlegens...</translation> </message> @@ -4018,17 +4085,17 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" a <translation>Completo lengendi</translation> </message> <message> - <location line="+85"/> + <location line="+86"/> <source>To use the %s option</source> <translation>Ut utaris optione %s</translation> </message> <message> - <location line="-77"/> + <location line="-78"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location line="-35"/> + <location line="-36"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_lt.ts b/src/qt/locale/bitcoin_lt.ts index 4f818d1e96..05827bf82d 100644 --- a/src/qt/locale/bitcoin_lt.ts +++ b/src/qt/locale/bitcoin_lt.ts @@ -35,6 +35,12 @@ Platinama pagal MIT/X11 licencijÄ…, kuriÄ… rasite faile COPYING arba http://www. <source>The Bitcoin Core developers</source> <translation type="unfinished"/> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source> (%1-bit)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>AddressBookPage</name> @@ -616,6 +622,16 @@ Platinama pagal MIT/X11 licencijÄ…, kuriÄ… rasite faile COPYING arba http://www. <translation><numerusform>%n savaitÄ—</numerusform><numerusform>%n savaitÄ—s</numerusform><numerusform>%n savaiÄių</numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation type="unfinished"/> @@ -688,7 +704,7 @@ Adresas: %4</translation> <translation>PiniginÄ— <b>užšifruota</b> ir Å¡iuo metu <b>užrakinta</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+435"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -749,7 +765,7 @@ Adresas: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation type="unfinished"/> </message> @@ -764,7 +780,7 @@ Adresas: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation>Suma</translation> </message> @@ -915,7 +931,7 @@ Adresas: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation type="unfinished"/> </message> @@ -1097,7 +1113,7 @@ Adresas: %4</translation> <translation type="unfinished"/> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation>Bitcoin branduolys</translation> </message> @@ -1241,7 +1257,7 @@ Adresas: %4</translation> <translation>&PagrindinÄ—s</translation> </message> <message> - <location line="+6"/> + <location line="+122"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation type="unfinished"/> </message> @@ -1251,7 +1267,7 @@ Adresas: %4</translation> <translation>&MokÄ—ti sandorio mokestį</translation> </message> <message> - <location line="+31"/> + <location line="-131"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation>AutomatiÅ¡kai paleisti Bitkoin programÄ… įjungus sistemÄ….</translation> </message> @@ -1266,12 +1282,7 @@ Adresas: %4</translation> <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"/> + <location line="+16"/> <source>MB</source> <translation type="unfinished"/> </message> @@ -1286,7 +1297,12 @@ Adresas: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+58"/> + <location line="+107"/> + <source>&Spend unconfirmed change (experts only)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+37"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation type="unfinished"/> </message> @@ -1321,7 +1337,17 @@ Adresas: %4</translation> <translation>&Tinklas</translation> </message> <message> - <location line="+6"/> + <location line="-86"/> + <source>W&allet</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+52"/> + <source>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.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+40"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>AutomatiÅ¡kai atidaryti Bitcoin kliento prievadÄ… marÅ¡rutizatoriuje. Tai veikia tik tada, kai jÅ«sų marÅ¡rutizatorius palaiko UPnP ir ji įjungta.</translation> </message> @@ -1436,17 +1462,17 @@ Adresas: %4</translation> <translation>&AtÅ¡aukti</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+70"/> <source>default</source> <translation>numatyta</translation> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation type="unfinished"/> </message> <message> - <location line="+75"/> + <location line="+78"/> <source>Confirm options reset</source> <translation type="unfinished"/> </message> @@ -1486,19 +1512,14 @@ Adresas: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="-155"/> - <source>Unconfirmed:</source> - <translation>Nepatvirtinti:</translation> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation>PiniginÄ—</translation> </message> <message> <location line="+51"/> - <source>Confirmed:</source> - <translation>Patvirtinta:</translation> + <source>Available:</source> + <translation type="unfinished"/> </message> <message> <location line="+16"/> @@ -1506,7 +1527,12 @@ Adresas: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation type="unfinished"/> </message> @@ -1654,6 +1680,11 @@ Adresas: %4</translation> <source>Error: Invalid combination of -regtest and -testnet.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../guiutil.cpp" line="+82"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>Ä®veskite bitkoinų adresÄ… (pvz. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> </context> <context> <name>QRImageWidget</name> @@ -1874,22 +1905,22 @@ Adresas: %4</translation> <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+83"/> + <location filename="../forms/receivecoinsdialog.ui" line="+107"/> <source>&Amount:</source> <translation type="unfinished"/> </message> <message> - <location line="-13"/> + <location line="-16"/> <source>&Label:</source> <translation>Ž&ymÄ—:</translation> </message> <message> - <location line="-34"/> + <location line="-37"/> <source>&Message:</source> <translation type="unfinished"/> </message> <message> - <location line="-17"/> + <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"/> </message> @@ -1899,27 +1930,30 @@ Adresas: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+27"/> - <source>An optional 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"/> </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> + <location line="-7"/> + <location line="+21"/> + <source>An optional label to associate with the new receiving address.</source> <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="-7"/> <source>Use this form to request payments. All fields are <b>optional</b>.</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <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"/> </message> <message> - <location line="+17"/> + <location line="+32"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -1929,17 +1963,17 @@ Adresas: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+36"/> - <source>&Request payment</source> + <location line="+78"/> + <source>Requested payments history</source> <translation type="unfinished"/> </message> <message> - <location line="+47"/> - <source>Requested payments</source> + <location line="-98"/> + <source>&Request payment</source> <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+120"/> <source>Show the selected request (does the same as double clicking an entry)</source> <translation type="unfinished"/> </message> @@ -1958,6 +1992,21 @@ Adresas: %4</translation> <source>Remove</source> <translation type="unfinished"/> </message> + <message> + <location filename="../receivecoinsdialog.cpp" line="+38"/> + <source>Copy label</source> + <translation>Kopijuoti žymÄ™</translation> + </message> + <message> + <location line="+1"/> + <source>Copy message</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation>Kopijuoti sumÄ…</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -2059,12 +2108,17 @@ Adresas: %4</translation> <source>(no message)</source> <translation type="unfinished"/> </message> + <message> + <location line="+8"/> + <source>(no amount)</source> + <translation type="unfinished"/> + </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>Siųsti monetas</translation> @@ -2140,7 +2194,7 @@ Adresas: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+115"/> + <location line="+164"/> <source>Send to multiple recipients at once</source> <translation>Siųsti keliems gavÄ—jams vienu metu</translation> </message> @@ -2150,7 +2204,7 @@ Adresas: %4</translation> <translation>&A PridÄ—ti gavÄ—jÄ…</translation> </message> <message> - <location line="+20"/> + <location line="-23"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -2160,12 +2214,12 @@ Adresas: %4</translation> <translation>IÅ¡valyti &viskÄ…</translation> </message> <message> - <location line="+22"/> + <location line="+52"/> <source>Balance:</source> <translation>Balansas:</translation> </message> <message> - <location line="+41"/> + <location line="-78"/> <source>Confirm the send action</source> <translation>Patvirtinti siuntimo veiksmÄ…</translation> </message> @@ -2175,7 +2229,7 @@ Adresas: %4</translation> <translation>&Siųsti</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-228"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation>Patvirtinti monetų siuntimÄ…</translation> </message> @@ -2188,12 +2242,7 @@ Adresas: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="-136"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Ä®veskite bitkoinų adresÄ… (pvz. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> - <message> - <location line="+15"/> + <location line="-121"/> <source>Copy quantity</source> <translation type="unfinished"/> </message> @@ -2243,7 +2292,7 @@ Adresas: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+202"/> + <location line="+203"/> <source>The recipient address is not valid, please recheck.</source> <translation>Negaliojantis gavÄ—jo adresas. Patikrinkite.</translation> </message> @@ -2278,12 +2327,12 @@ Adresas: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Warning: Invalid Bitcoin address</source> <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+20"/> <source>(no label)</source> <translation>(nÄ—ra žymÄ—s)</translation> </message> @@ -2293,7 +2342,7 @@ Adresas: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="-366"/> + <location line="-367"/> <source>Are you sure you want to send?</source> <translation type="unfinished"/> </message> @@ -2303,7 +2352,7 @@ Adresas: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+170"/> + <location line="+171"/> <source>Payment request expired</source> <translation type="unfinished"/> </message> @@ -2380,12 +2429,7 @@ Adresas: %4</translation> <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"/> + <location line="+968"/> <source>This is a verified payment request.</source> <translation type="unfinished"/> </message> @@ -2395,7 +2439,12 @@ Adresas: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+459"/> + <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"/> + </message> + <message> + <location line="+426"/> <source>This is an unverified payment request.</source> <translation type="unfinished"/> </message> @@ -2411,11 +2460,6 @@ Adresas: %4</translation> <source>Memo:</source> <translation type="unfinished"/> </message> - <message> - <location filename="../sendcoinsentry.cpp" line="+1"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Ä®veskite bitkoinų adresÄ… (pvz. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> </context> <context> <name>ShutdownWindow</name> @@ -2453,19 +2497,19 @@ Adresas: %4</translation> <translation>Ä®veskite bitkoinų adresÄ… (pvz. 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"/> </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>Ä®vesti adresÄ… iÅ¡ mainų atminties</translation> </message> @@ -2506,12 +2550,12 @@ Adresas: %4</translation> </message> <message> <location line="+3"/> - <location line="+146"/> + <location line="+143"/> <source>Clear &All</source> <translation>IÅ¡valyti &viskÄ…</translation> </message> <message> - <location line="-87"/> + <location line="-84"/> <source>&Verify Message</source> <translation>&Patikrinti žinutÄ™</translation> </message> @@ -2526,7 +2570,7 @@ Adresas: %4</translation> <translation>Ä®veskite bitkoinų adresÄ… (pvz. 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>Patikrinkite žinutÄ™, jog įsitikintumÄ—te, kad jÄ… pasiraÅ¡Ä— nurodytas Bitcoin adresas</translation> </message> @@ -2541,43 +2585,37 @@ Adresas: %4</translation> <translation type="unfinished"/> </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>Ä®veskite bitkoinų adresÄ… (pvz. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location line="-2"/> + <location line="-1"/> <source>Click "Sign Message" to generate signature</source> <translation>SpragtelÄ—kite "Registruotis žinutÄ™" tam, kad gauti paraÅ¡Ä…</translation> </message> <message> - <location line="+3"/> - <source>Enter Bitcoin signature</source> - <translation>Ä®veskite Bitcoin paraÅ¡Ä…</translation> - </message> - <message> <location line="+84"/> - <location line="+81"/> + <location line="+80"/> <source>The entered address is invalid.</source> <translation>Ä®vestas adresas negalioja.</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>PraÅ¡om patikrinti adresÄ… ir bandyti iÅ¡ naujo.</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 type="unfinished"/> </message> <message> - <location line="-73"/> + <location line="-72"/> <source>Wallet unlock was cancelled.</source> <translation>PiniginÄ—s atrakinimas atÅ¡auktas.</translation> </message> @@ -2597,7 +2635,7 @@ Adresas: %4</translation> <translation>ŽinutÄ— pasiraÅ¡yta.</translation> </message> <message> - <location line="+59"/> + <location line="+58"/> <source>The signature could not be decoded.</source> <translation>Nepavyko iÅ¡koduoti paraÅ¡o.</translation> </message> @@ -2658,6 +2696,11 @@ Adresas: %4</translation> </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation>%1/neprisijungÄ™s</translation> </message> @@ -2819,12 +2862,12 @@ Adresas: %4</translation> <translation>, transliavimas dar nebuvo sÄ—kmingas</translation> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation>nežinomas</translation> </message> @@ -2865,12 +2908,12 @@ Adresas: %4</translation> <translation>Suma</translation> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> @@ -2880,23 +2923,12 @@ Adresas: %4</translation> <translation>Atidaryta iki %1</translation> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> - <translation>Atjungta (%1 patvirtinimai)</translation> - </message> - <message> - <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation>Nepatvirtintos (%1 iÅ¡ %2 patvirtinimų)</translation> - </message> - <message> - <location line="-22"/> - <location line="+25"/> + <location line="+12"/> <source>Confirmed (%1 confirmations)</source> <translation>Patvirtinta (%1 patvirtinimai)</translation> </message> <message> - <location line="-22"/> + <location line="+9"/> <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> @@ -2906,7 +2938,27 @@ Adresas: %4</translation> <translation>IÅ¡gauta bet nepriimta</translation> </message> <message> - <location line="+62"/> + <location line="-21"/> + <source>Offline</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Unconfirmed</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation>Gauta su</translation> </message> @@ -2936,7 +2988,7 @@ Adresas: %4</translation> <translation>nepasiekiama</translation> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation>Sandorio bÅ«klÄ—. Užvedus pelÄ—s žymeklį ant Å¡ios srities matysite patvirtinimų skaiÄių.</translation> </message> @@ -3202,12 +3254,12 @@ Adresas: %4</translation> <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+223"/> <source>Usage:</source> <translation>Naudojimas:</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>List commands</source> <translation>Komandų sÄ…raÅ¡as</translation> </message> @@ -3262,12 +3314,12 @@ Adresas: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+6"/> <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="-148"/> + <location line="-150"/> <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> @@ -3287,17 +3339,17 @@ Adresas: %4</translation> <translation>Priimti komandinÄ™ eilutÄ™ ir JSON-RPC komandas</translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <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="+39"/> + <location line="+40"/> <source>Use the test network</source> <translation>Naudoti testavimo tinklÄ…</translation> </message> <message> - <location line="-118"/> + <location line="-120"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> @@ -3428,6 +3480,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation>Prisijungti tik prie nurodyto mazgo</translation> </message> @@ -3638,6 +3695,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Start Bitcoin server</source> <translation>Paleisti Bitcoin serverį</translation> </message> @@ -3687,12 +3749,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-79"/> + <location line="-80"/> <source>Imports blocks from external blk000??.dat file</source> <translation type="unfinished"/> </message> <message> - <location line="-105"/> + <location line="-106"/> <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> @@ -3712,7 +3774,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+89"/> + <location line="+90"/> <source>Information</source> <translation>Informacija</translation> </message> @@ -3782,7 +3844,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Nustatyti sujungimo trukmÄ™ milisekundÄ—mis (pagal nutylÄ—jimÄ…: 5000)</translation> </message> <message> - <location line="+6"/> + <location line="+7"/> <source>System error: </source> <translation>Sistemos klaida:</translation> </message> @@ -3828,6 +3890,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>version</source> <translation>versija</translation> </message> @@ -3837,32 +3904,32 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-58"/> + <location line="-60"/> <source>Password for JSON-RPC connections</source> <translation>Slaptažodis JSON-RPC sujungimams</translation> </message> <message> - <location line="-70"/> + <location line="-71"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Leisti JSON-RPC tik iÅ¡ nurodytų IP adresų</translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>Siųsti komandÄ… mazgui dirbanÄiam <ip> (pagal nutylÄ—jimÄ…: 127.0.0.1)</translation> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+161"/> + <location line="+163"/> <source>Upgrade wallet to latest format</source> <translation>Atnaujinti piniginÄ™ į naujausiÄ… formatÄ…</translation> </message> <message> - <location line="-24"/> + <location line="-25"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Nustatyti rakto apimties dydį <n> (pagal nutylÄ—jimÄ…: 100)</translation> </message> @@ -3872,12 +3939,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>IeÅ¡koti prarastų piniginÄ—s sandorių blokų grandinÄ—je</translation> </message> <message> - <location line="+38"/> + <location line="+39"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Naudoti OpenSSL (https) jungimuisi JSON-RPC </translation> </message> <message> - <location line="-30"/> + <location line="-31"/> <source>Server certificate file (default: server.cert)</source> <translation>Serverio sertifikato failas (pagal nutylÄ—jimÄ…: server.cert)</translation> </message> @@ -3887,7 +3954,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Serverio privatus raktas (pagal nutylÄ—jimÄ…: server.pem)</translation> </message> <message> - <location line="+16"/> + <location line="+17"/> <source>This help message</source> <translation>Pagelbos žinutÄ—</translation> </message> @@ -3897,12 +3964,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Nepavyko susieti Å¡iame kompiuteryje prievado %s (bind returned error %d, %s)</translation> </message> <message> - <location line="-107"/> + <location line="-109"/> <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="+60"/> + <location line="+61"/> <source>Loading addresses...</source> <translation>Užkraunami adresai...</translation> </message> @@ -3917,12 +3984,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation> wallet.dat pakrovimo klaida, wallet.dat reikalauja naujasnÄ—s Bitcoin versijos</translation> </message> <message> - <location line="+98"/> + <location line="+99"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>PiniginÄ— turi bÅ«ti prraÅ¡yta: įvykdymui perkraukite Bitcoin</translation> </message> <message> - <location line="-100"/> + <location line="-101"/> <source>Error loading wallet.dat</source> <translation> wallet.dat pakrovimo klaida</translation> </message> @@ -3932,7 +3999,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Neteisingas proxy adresas: '%s'</translation> </message> <message> - <location line="+56"/> + <location line="+57"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation type="unfinished"/> </message> @@ -3942,7 +4009,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-101"/> + <location line="-103"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -3952,7 +4019,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+48"/> + <location line="+49"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>Neteisinga suma -paytxfee=<amount>: '%s'</translation> </message> @@ -3972,7 +4039,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Ä®keliamas blokų indeksas...</translation> </message> <message> - <location line="-62"/> + <location line="-63"/> <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> @@ -3982,12 +4049,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Nepavyko susieti Å¡iame kompiuteryje prievado %s. Bitcoin tikriausiai jau veikia.</translation> </message> <message> - <location line="+95"/> + <location line="+96"/> <source>Loading wallet...</source> <translation>Užkraunama piniginÄ—...</translation> </message> <message> - <location line="-56"/> + <location line="-57"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> @@ -3997,7 +4064,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+67"/> + <location line="+68"/> <source>Rescanning...</source> <translation>PeržiÅ«ra</translation> </message> @@ -4007,17 +4074,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Ä®kÄ—limas baigtas</translation> </message> <message> - <location line="+85"/> + <location line="+86"/> <source>To use the %s option</source> <translation type="unfinished"/> </message> <message> - <location line="-77"/> + <location line="-78"/> <source>Error</source> <translation>Klaida</translation> </message> <message> - <location line="-35"/> + <location line="-36"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_lv_LV.ts b/src/qt/locale/bitcoin_lv_LV.ts index 48ac158b1e..6a0ac94adb 100644 --- a/src/qt/locale/bitcoin_lv_LV.ts +++ b/src/qt/locale/bitcoin_lv_LV.ts @@ -31,6 +31,12 @@ This product includes software developed by the OpenSSL Project for use in the O <source>The Bitcoin Core developers</source> <translation type="unfinished"/> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source> (%1-bit)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>AddressBookPage</name> @@ -612,6 +618,16 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation type="unfinished"/> @@ -685,7 +701,7 @@ Adrese: %4 <translation>Maciņš ir <b>Å¡ifrÄ“ts</b> un paÅ¡laik <b>slÄ“gts</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+435"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -746,7 +762,7 @@ Adrese: %4 <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation type="unfinished"/> </message> @@ -761,7 +777,7 @@ Adrese: %4 <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation>Daudzums</translation> </message> @@ -912,7 +928,7 @@ Adrese: %4 <translation type="unfinished"/> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation type="unfinished"/> </message> @@ -1094,7 +1110,7 @@ Adrese: %4 <translation type="unfinished"/> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation type="unfinished"/> </message> @@ -1238,7 +1254,7 @@ Adrese: %4 <translation>&Galvenais</translation> </message> <message> - <location line="+6"/> + <location line="+122"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation type="unfinished"/> </message> @@ -1248,7 +1264,7 @@ Adrese: %4 <translation>&MaksÄt par transakciju</translation> </message> <message> - <location line="+31"/> + <location line="-131"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation>AutomÄtiski sÄkt Bitcoin pÄ“c pieteikÅ¡anÄs sistÄ“mÄ.</translation> </message> @@ -1263,12 +1279,7 @@ Adrese: %4 <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"/> + <location line="+16"/> <source>MB</source> <translation type="unfinished"/> </message> @@ -1283,7 +1294,12 @@ Adrese: %4 <translation type="unfinished"/> </message> <message> - <location line="+58"/> + <location line="+107"/> + <source>&Spend unconfirmed change (experts only)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+37"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation type="unfinished"/> </message> @@ -1318,7 +1334,17 @@ Adrese: %4 <translation>&TÄ«kls</translation> </message> <message> - <location line="+6"/> + <location line="-86"/> + <source>W&allet</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+52"/> + <source>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.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+40"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>Uz rÅ«tera automÄtiski atvÄ“rt Bitcoin klienta portu. Tas strÄdÄ tikai tad, ja rÅ«teris atbalsta UPnP un tas ir ieslÄ“gts.</translation> </message> @@ -1433,17 +1459,17 @@ Adrese: %4 <translation>&Atcelt</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+70"/> <source>default</source> <translation>pÄ“c noklusÄ“Å¡anas</translation> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation type="unfinished"/> </message> <message> - <location line="+75"/> + <location line="+78"/> <source>Confirm options reset</source> <translation type="unfinished"/> </message> @@ -1483,18 +1509,13 @@ Adrese: %4 <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="-155"/> - <source>Unconfirmed:</source> - <translation>NeapstiprinÄtas:</translation> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation>Maciņš</translation> </message> <message> <location line="+51"/> - <source>Confirmed:</source> + <source>Available:</source> <translation type="unfinished"/> </message> <message> @@ -1503,14 +1524,19 @@ Adrese: %4 <translation type="unfinished"/> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> <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="+16"/> <source>Immature:</source> - <translation type="unfinished"/> + <translation>NenobrieduÅ¡u:</translation> </message> <message> <location line="+13"/> @@ -1651,6 +1677,11 @@ Adrese: %4 <source>Error: Invalid combination of -regtest and -testnet.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../guiutil.cpp" line="+82"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>Ierakstiet Bitcoin adresi (piem. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> </context> <context> <name>QRImageWidget</name> @@ -1871,22 +1902,22 @@ Adrese: %4 <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+83"/> + <location filename="../forms/receivecoinsdialog.ui" line="+107"/> <source>&Amount:</source> <translation type="unfinished"/> </message> <message> - <location line="-13"/> + <location line="-16"/> <source>&Label:</source> <translation>&Nosaukums:</translation> </message> <message> - <location line="-34"/> + <location line="-37"/> <source>&Message:</source> <translation type="unfinished"/> </message> <message> - <location line="-17"/> + <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"/> </message> @@ -1896,27 +1927,30 @@ Adrese: %4 <translation type="unfinished"/> </message> <message> - <location line="+27"/> - <source>An optional 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"/> </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> + <location line="-7"/> + <location line="+21"/> + <source>An optional label to associate with the new receiving address.</source> <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="-7"/> <source>Use this form to request payments. All fields are <b>optional</b>.</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <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"/> </message> <message> - <location line="+17"/> + <location line="+32"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -1926,17 +1960,17 @@ Adrese: %4 <translation type="unfinished"/> </message> <message> - <location line="+36"/> - <source>&Request payment</source> + <location line="+78"/> + <source>Requested payments history</source> <translation type="unfinished"/> </message> <message> - <location line="+47"/> - <source>Requested payments</source> + <location line="-98"/> + <source>&Request payment</source> <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+120"/> <source>Show the selected request (does the same as double clicking an entry)</source> <translation type="unfinished"/> </message> @@ -1955,6 +1989,21 @@ Adrese: %4 <source>Remove</source> <translation type="unfinished"/> </message> + <message> + <location filename="../receivecoinsdialog.cpp" line="+38"/> + <source>Copy label</source> + <translation>KopÄ“t nosaukumu</translation> + </message> + <message> + <location line="+1"/> + <source>Copy message</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation>KopÄ“t daudzumu</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -2056,12 +2105,17 @@ Adrese: %4 <source>(no message)</source> <translation type="unfinished"/> </message> + <message> + <location line="+8"/> + <source>(no amount)</source> + <translation type="unfinished"/> + </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>SÅ«tÄ«t bitkoinus</translation> @@ -2137,7 +2191,7 @@ Adrese: %4 <translation type="unfinished"/> </message> <message> - <location line="+115"/> + <location line="+164"/> <source>Send to multiple recipients at once</source> <translation>SÅ«tÄ«t vairÄkiem saņēmÄ“jiem uzreiz</translation> </message> @@ -2147,7 +2201,7 @@ Adrese: %4 <translation type="unfinished"/> </message> <message> - <location line="+20"/> + <location line="-23"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -2157,12 +2211,12 @@ Adrese: %4 <translation>&NotÄ«rÄ«t visu</translation> </message> <message> - <location line="+22"/> + <location line="+52"/> <source>Balance:</source> <translation>Bilance:</translation> </message> <message> - <location line="+41"/> + <location line="-78"/> <source>Confirm the send action</source> <translation>ApstiprinÄt nosÅ«tÄ«Å¡anu</translation> </message> @@ -2172,7 +2226,7 @@ Adrese: %4 <translation type="unfinished"/> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-228"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation>ApstiprinÄt bitkoinu sÅ«tÄ«Å¡anu</translation> </message> @@ -2185,12 +2239,7 @@ Adrese: %4 <translation type="unfinished"/> </message> <message> - <location line="-136"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Ierakstiet Bitcoin adresi (piem. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> - <message> - <location line="+15"/> + <location line="-121"/> <source>Copy quantity</source> <translation type="unfinished"/> </message> @@ -2240,7 +2289,7 @@ Adrese: %4 <translation type="unfinished"/> </message> <message> - <location line="+202"/> + <location line="+203"/> <source>The recipient address is not valid, please recheck.</source> <translation type="unfinished"/> </message> @@ -2275,12 +2324,12 @@ Adrese: %4 <translation type="unfinished"/> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Warning: Invalid Bitcoin address</source> <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+20"/> <source>(no label)</source> <translation>(bez nosaukuma)</translation> </message> @@ -2290,7 +2339,7 @@ Adrese: %4 <translation type="unfinished"/> </message> <message> - <location line="-366"/> + <location line="-367"/> <source>Are you sure you want to send?</source> <translation type="unfinished"/> </message> @@ -2300,7 +2349,7 @@ Adrese: %4 <translation type="unfinished"/> </message> <message> - <location line="+170"/> + <location line="+171"/> <source>Payment request expired</source> <translation type="unfinished"/> </message> @@ -2377,12 +2426,7 @@ Adrese: %4 <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"/> + <location line="+968"/> <source>This is a verified payment request.</source> <translation type="unfinished"/> </message> @@ -2392,7 +2436,12 @@ Adrese: %4 <translation type="unfinished"/> </message> <message> - <location line="+459"/> + <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"/> + </message> + <message> + <location line="+426"/> <source>This is an unverified payment request.</source> <translation type="unfinished"/> </message> @@ -2408,11 +2457,6 @@ Adrese: %4 <source>Memo:</source> <translation type="unfinished"/> </message> - <message> - <location filename="../sendcoinsentry.cpp" line="+1"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Ierakstiet Bitcoin adresi (piem. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> </context> <context> <name>ShutdownWindow</name> @@ -2450,19 +2494,19 @@ Adrese: %4 <translation type="unfinished"/> </message> <message> - <location line="+10"/> - <location line="+213"/> + <location line="+7"/> + <location line="+210"/> <source>Choose previously used address</source> <translation type="unfinished"/> </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>ielÄ«mÄ“t adresi no starpliktuves</translation> </message> @@ -2503,12 +2547,12 @@ Adrese: %4 </message> <message> <location line="+3"/> - <location line="+146"/> + <location line="+143"/> <source>Clear &All</source> <translation>&NotÄ«rÄ«t visu</translation> </message> <message> - <location line="-87"/> + <location line="-84"/> <source>&Verify Message</source> <translation type="unfinished"/> </message> @@ -2523,7 +2567,7 @@ Adrese: %4 <translation type="unfinished"/> </message> <message> - <location line="+40"/> + <location line="+37"/> <source>Verify the message to ensure it was signed with the specified Bitcoin address</source> <translation type="unfinished"/> </message> @@ -2538,43 +2582,37 @@ Adrese: %4 <translation type="unfinished"/> </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>Ierakstiet Bitcoin adresi (piem. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location line="-2"/> + <location line="-1"/> <source>Click "Sign Message" to generate signature</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Enter Bitcoin signature</source> - <translation type="unfinished"/> - </message> - <message> <location line="+84"/> - <location line="+81"/> + <location line="+80"/> <source>The entered address is invalid.</source> <translation type="unfinished"/> </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 type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location line="-73"/> + <location line="-72"/> <source>Wallet unlock was cancelled.</source> <translation type="unfinished"/> </message> @@ -2594,7 +2632,7 @@ Adrese: %4 <translation type="unfinished"/> </message> <message> - <location line="+59"/> + <location line="+58"/> <source>The signature could not be decoded.</source> <translation type="unfinished"/> </message> @@ -2655,6 +2693,11 @@ Adrese: %4 </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation type="unfinished"/> </message> @@ -2816,12 +2859,12 @@ Adrese: %4 <translation>, vÄ“l nav veiksmÄ«gi izziņots</translation> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation>nav zinÄms</translation> </message> @@ -2862,12 +2905,12 @@ Adrese: %4 <translation>Daudzums</translation> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> @@ -2877,23 +2920,12 @@ Adrese: %4 <translation>AtvÄ“rts lÄ«dz %1</translation> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> - <translation>Nav pieslÄ“gts (%1 apstiprinÄjumu)</translation> - </message> - <message> - <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation>Nav apstiprinÄts (%1 no %2 apstiprinÄjumu)</translation> - </message> - <message> - <location line="-22"/> - <location line="+25"/> + <location line="+12"/> <source>Confirmed (%1 confirmations)</source> <translation>ApstiprinÄts (%1 apstiprinÄjumu)</translation> </message> <message> - <location line="-22"/> + <location line="+9"/> <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> @@ -2903,7 +2935,27 @@ Adrese: %4 <translation>Ä¢enerÄ“ts, taÄu nav akceptÄ“ts</translation> </message> <message> - <location line="+62"/> + <location line="-21"/> + <source>Offline</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Unconfirmed</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation>Saņemts ar</translation> </message> @@ -2933,7 +2985,7 @@ Adrese: %4 <translation>(nav pieejams)</translation> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation>Transakcijas statuss. Turiet peli virs Å¡Ä« lauka, lai redzÄ“tu apstiprinÄjumu skaitu.</translation> </message> @@ -3134,7 +3186,7 @@ Adrese: %4 <message> <location line="+8"/> <source>to</source> - <translation type="unfinished"/> + <translation>uz</translation> </message> </context> <context> @@ -3199,12 +3251,12 @@ Adrese: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+223"/> <source>Usage:</source> <translation>Lietojums:</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>List commands</source> <translation>Komandu saraksts</translation> </message> @@ -3259,12 +3311,12 @@ Adrese: %4 <translation>NorÄdiet savu publisko adresi</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <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="-148"/> + <location line="-150"/> <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> @@ -3284,17 +3336,17 @@ Adrese: %4 <translation>Pieņemt komandrindas un JSON-RPC komandas</translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <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="+39"/> + <location line="+40"/> <source>Use the test network</source> <translation>Izmantot testa tÄ«klu</translation> </message> <message> - <location line="-118"/> + <location line="-120"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> @@ -3425,6 +3477,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation type="unfinished"/> </message> @@ -3635,6 +3692,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Start Bitcoin server</source> <translation type="unfinished"/> </message> @@ -3684,12 +3746,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-79"/> + <location line="-80"/> <source>Imports blocks from external blk000??.dat file</source> <translation type="unfinished"/> </message> <message> - <location line="-105"/> + <location line="-106"/> <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> @@ -3709,7 +3771,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+89"/> + <location line="+90"/> <source>Information</source> <translation type="unfinished"/> </message> @@ -3779,7 +3841,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+7"/> <source>System error: </source> <translation type="unfinished"/> </message> @@ -3825,6 +3887,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>version</source> <translation>versija</translation> </message> @@ -3834,32 +3901,32 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-58"/> + <location line="-60"/> <source>Password for JSON-RPC connections</source> <translation>JSON-RPC savienojumu parole</translation> </message> <message> - <location line="-70"/> + <location line="-71"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Atļaut JSON-RPC savienojumus no norÄdÄ«tÄs IP adreses</translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>NosÅ«tÄ«t komandas mezglam, kas darbojas adresÄ“ <ip> (pÄ“c noklusÄ“Å¡anas: 127.0.0.1)</translation> </message> <message> - <location line="-132"/> + <location line="-133"/> <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="+161"/> + <location line="+163"/> <source>Upgrade wallet to latest format</source> <translation>Atjaunot maciņa formÄtu uz jaunÄko</translation> </message> <message> - <location line="-24"/> + <location line="-25"/> <source>Set key pool size to <n> (default: 100)</source> <translation>UzstÄdÄ«t atslÄ“gu bufera izmÄ“ru uz <n> (pÄ“c noklusÄ“Å¡anas: 100)</translation> </message> @@ -3869,12 +3936,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>AtkÄrtoti skanÄ“t bloku virkni, meklÄ“jot trÅ«kstoÅ¡Äs maciņa transakcijas</translation> </message> <message> - <location line="+38"/> + <location line="+39"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>JSON-RPC savienojumiem izmantot OpenSSL (https)</translation> </message> <message> - <location line="-30"/> + <location line="-31"/> <source>Server certificate file (default: server.cert)</source> <translation>Servera sertifikÄta fails (pÄ“c noklusÄ“Å¡anas: server.cert)</translation> </message> @@ -3884,7 +3951,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Servera privÄtÄ atslÄ“ga (pÄ“c noklusÄ“Å¡anas: server.pem)</translation> </message> <message> - <location line="+16"/> + <location line="+17"/> <source>This help message</source> <translation>Å is palÄ«dzÄ«bas paziņojums</translation> </message> @@ -3894,12 +3961,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Nevar pievienoties pie %s Å¡ajÄ datorÄ (pievienoÅ¡anÄs atgrieza kļūdu %d, %s)</translation> </message> <message> - <location line="-107"/> + <location line="-109"/> <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="+60"/> + <location line="+61"/> <source>Loading addresses...</source> <translation>IelÄdÄ“ adreses...</translation> </message> @@ -3914,12 +3981,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Nevar ielÄdÄ“t wallet.dat: maciņa atvÄ“rÅ¡anai nepiecieÅ¡ama jaunÄka Bitcoin versija</translation> </message> <message> - <location line="+98"/> + <location line="+99"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>Bija nepiecieÅ¡ams pÄrstartÄ“t maciņu: pabeigÅ¡anai pÄrstartÄ“jiet Bitcoin</translation> </message> <message> - <location line="-100"/> + <location line="-101"/> <source>Error loading wallet.dat</source> <translation>Kļūda ielÄdÄ“jot wallet.dat</translation> </message> @@ -3929,7 +3996,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>NederÄ«ga -proxy adrese: '%s'</translation> </message> <message> - <location line="+56"/> + <location line="+57"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>-onlynet komandÄ norÄdÄ«ts nepazÄ«stams tÄ«kls: '%s'</translation> </message> @@ -3939,7 +4006,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>PieprasÄ«ta nezinÄma -socks proxy versija: %i</translation> </message> <message> - <location line="-101"/> + <location line="-103"/> <source>Cannot resolve -bind address: '%s'</source> <translation>Nevar uzmeklÄ“t -bind adresi: '%s'</translation> </message> @@ -3949,7 +4016,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Nevar atrisinÄt -externalip adresi: '%s'</translation> </message> <message> - <location line="+48"/> + <location line="+49"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>NederÄ«gs daudzums priekÅ¡ -paytxfree=<amount>: '%s'</translation> </message> @@ -3969,7 +4036,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>IelÄdÄ“ bloku indeksu...</translation> </message> <message> - <location line="-62"/> + <location line="-63"/> <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> @@ -3979,12 +4046,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Nevar pievienoties %s uz Å¡Ä« datora. Bitcoin droÅ¡i vien jau darbojas.</translation> </message> <message> - <location line="+95"/> + <location line="+96"/> <source>Loading wallet...</source> <translation>IelÄdÄ“ maciņu...</translation> </message> <message> - <location line="-56"/> + <location line="-57"/> <source>Cannot downgrade wallet</source> <translation>Nevar maciņa formÄtu padarÄ«t vecÄku</translation> </message> @@ -3994,7 +4061,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Nevar ierakstÄ«t adresi pÄ“c noklusÄ“Å¡anas</translation> </message> <message> - <location line="+67"/> + <location line="+68"/> <source>Rescanning...</source> <translation>SkanÄ“ju no jauna...</translation> </message> @@ -4004,17 +4071,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>IelÄde pabeigta</translation> </message> <message> - <location line="+85"/> + <location line="+86"/> <source>To use the %s option</source> <translation>Izmantot opciju %s</translation> </message> <message> - <location line="-77"/> + <location line="-78"/> <source>Error</source> <translation>Kļūda</translation> </message> <message> - <location line="-35"/> + <location line="-36"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_ms_MY.ts b/src/qt/locale/bitcoin_ms_MY.ts index 8df9ea2a3d..cf915512bb 100644 --- a/src/qt/locale/bitcoin_ms_MY.ts +++ b/src/qt/locale/bitcoin_ms_MY.ts @@ -31,6 +31,12 @@ This product includes software developed by the OpenSSL Project for use in the O <source>The Bitcoin Core developers</source> <translation type="unfinished"/> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source> (%1-bit)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>AddressBookPage</name> @@ -612,6 +618,16 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation type="unfinished"><numerusform></numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation type="unfinished"/> @@ -681,7 +697,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+435"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -742,7 +758,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation type="unfinished"/> </message> @@ -757,7 +773,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation type="unfinished"/> </message> @@ -908,7 +924,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation type="unfinished"/> </message> @@ -1090,7 +1106,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation type="unfinished"/> </message> @@ -1234,7 +1250,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+122"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation type="unfinished"/> </message> @@ -1244,7 +1260,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="-131"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation type="unfinished"/> </message> @@ -1259,12 +1275,7 @@ Address: %4 <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"/> + <location line="+16"/> <source>MB</source> <translation type="unfinished"/> </message> @@ -1279,7 +1290,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+58"/> + <location line="+107"/> + <source>&Spend unconfirmed change (experts only)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+37"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation type="unfinished"/> </message> @@ -1314,7 +1330,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="-86"/> + <source>W&allet</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+52"/> + <source>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.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+40"/> <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> @@ -1429,17 +1455,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+70"/> <source>default</source> <translation type="unfinished"/> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation type="unfinished"/> </message> <message> - <location line="+75"/> + <location line="+78"/> <source>Confirm options reset</source> <translation type="unfinished"/> </message> @@ -1479,18 +1505,13 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-155"/> - <source>Unconfirmed:</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation type="unfinished"/> </message> <message> <location line="+51"/> - <source>Confirmed:</source> + <source>Available:</source> <translation type="unfinished"/> </message> <message> @@ -1499,7 +1520,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation type="unfinished"/> </message> @@ -1647,6 +1673,11 @@ Address: %4 <source>Error: Invalid combination of -regtest and -testnet.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../guiutil.cpp" line="+82"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>QRImageWidget</name> @@ -1867,22 +1898,22 @@ Address: %4 <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+83"/> + <location filename="../forms/receivecoinsdialog.ui" line="+107"/> <source>&Amount:</source> <translation type="unfinished"/> </message> <message> - <location line="-13"/> + <location line="-16"/> <source>&Label:</source> <translation type="unfinished"/> </message> <message> - <location line="-34"/> + <location line="-37"/> <source>&Message:</source> <translation type="unfinished"/> </message> <message> - <location line="-17"/> + <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"/> </message> @@ -1892,27 +1923,30 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+27"/> - <source>An optional 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"/> </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> + <location line="-7"/> + <location line="+21"/> + <source>An optional label to associate with the new receiving address.</source> <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="-7"/> <source>Use this form to request payments. All fields are <b>optional</b>.</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <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"/> </message> <message> - <location line="+17"/> + <location line="+32"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -1922,17 +1956,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+36"/> - <source>&Request payment</source> + <location line="+78"/> + <source>Requested payments history</source> <translation type="unfinished"/> </message> <message> - <location line="+47"/> - <source>Requested payments</source> + <location line="-98"/> + <source>&Request payment</source> <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+120"/> <source>Show the selected request (does the same as double clicking an entry)</source> <translation type="unfinished"/> </message> @@ -1951,6 +1985,21 @@ Address: %4 <source>Remove</source> <translation type="unfinished"/> </message> + <message> + <location filename="../receivecoinsdialog.cpp" line="+38"/> + <source>Copy label</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy message</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation type="unfinished"/> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -2052,12 +2101,17 @@ Address: %4 <source>(no message)</source> <translation type="unfinished"/> </message> + <message> + <location line="+8"/> + <source>(no amount)</source> + <translation type="unfinished"/> + </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 type="unfinished"/> @@ -2133,7 +2187,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+115"/> + <location line="+164"/> <source>Send to multiple recipients at once</source> <translation type="unfinished"/> </message> @@ -2143,7 +2197,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+20"/> + <location line="-23"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -2153,12 +2207,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+22"/> + <location line="+52"/> <source>Balance:</source> <translation>Baki</translation> </message> <message> - <location line="+41"/> + <location line="-78"/> <source>Confirm the send action</source> <translation type="unfinished"/> </message> @@ -2168,7 +2222,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-228"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation type="unfinished"/> </message> @@ -2181,12 +2235,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-136"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+15"/> + <location line="-121"/> <source>Copy quantity</source> <translation type="unfinished"/> </message> @@ -2236,7 +2285,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+202"/> + <location line="+203"/> <source>The recipient address is not valid, please recheck.</source> <translation type="unfinished"/> </message> @@ -2271,12 +2320,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Warning: Invalid Bitcoin address</source> <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+20"/> <source>(no label)</source> <translation type="unfinished"/> </message> @@ -2286,7 +2335,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-366"/> + <location line="-367"/> <source>Are you sure you want to send?</source> <translation type="unfinished"/> </message> @@ -2296,7 +2345,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+170"/> + <location line="+171"/> <source>Payment request expired</source> <translation type="unfinished"/> </message> @@ -2373,12 +2422,7 @@ Address: %4 <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"/> + <location line="+968"/> <source>This is a verified payment request.</source> <translation type="unfinished"/> </message> @@ -2388,7 +2432,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+459"/> + <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"/> + </message> + <message> + <location line="+426"/> <source>This is an unverified payment request.</source> <translation type="unfinished"/> </message> @@ -2404,11 +2453,6 @@ Address: %4 <source>Memo:</source> <translation type="unfinished"/> </message> - <message> - <location filename="../sendcoinsentry.cpp" line="+1"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"/> - </message> </context> <context> <name>ShutdownWindow</name> @@ -2446,19 +2490,19 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+10"/> - <location line="+213"/> + <location line="+7"/> + <location line="+210"/> <source>Choose previously used address</source> <translation type="unfinished"/> </message> <message> - <location line="-203"/> - <location line="+213"/> + <location line="-200"/> + <location line="+210"/> <source>Alt+A</source> <translation type="unfinished"/> </message> <message> - <location line="-203"/> + <location line="-200"/> <source>Paste address from clipboard</source> <translation type="unfinished"/> </message> @@ -2499,12 +2543,12 @@ Address: %4 </message> <message> <location line="+3"/> - <location line="+146"/> + <location line="+143"/> <source>Clear &All</source> <translation type="unfinished"/> </message> <message> - <location line="-87"/> + <location line="-84"/> <source>&Verify Message</source> <translation type="unfinished"/> </message> @@ -2519,7 +2563,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+40"/> + <location line="+37"/> <source>Verify the message to ensure it was signed with the specified Bitcoin address</source> <translation type="unfinished"/> </message> @@ -2534,43 +2578,37 @@ Address: %4 <translation type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location line="-2"/> + <location line="-1"/> <source>Click "Sign Message" to generate signature</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Enter Bitcoin signature</source> - <translation type="unfinished"/> - </message> - <message> <location line="+84"/> - <location line="+81"/> + <location line="+80"/> <source>The entered address is invalid.</source> <translation type="unfinished"/> </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 type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location line="-73"/> + <location line="-72"/> <source>Wallet unlock was cancelled.</source> <translation type="unfinished"/> </message> @@ -2590,7 +2628,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+59"/> + <location line="+58"/> <source>The signature could not be decoded.</source> <translation type="unfinished"/> </message> @@ -2651,6 +2689,11 @@ Address: %4 </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation type="unfinished"/> </message> @@ -2812,12 +2855,12 @@ Address: %4 <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation type="unfinished"/> </message> @@ -2858,12 +2901,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform></translation> </message> @@ -2873,33 +2916,42 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> + <location line="+12"/> + <source>Confirmed (%1 confirmations)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+9"/> + <source>This block was not received by any other nodes and will probably not be accepted!</source> <translation type="unfinished"/> </message> <message> <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> + <source>Generated but not accepted</source> <translation type="unfinished"/> </message> <message> - <location line="-22"/> - <location line="+25"/> - <source>Confirmed (%1 confirmations)</source> + <location line="-21"/> + <source>Offline</source> <translation type="unfinished"/> </message> <message> - <location line="-22"/> - <source>This block was not received by any other nodes and will probably not be accepted!</source> + <location line="+3"/> + <source>Unconfirmed</source> <translation type="unfinished"/> </message> <message> <location line="+3"/> - <source>Generated but not accepted</source> + <source>Confirming (%1 of %2 recommended confirmations)</source> <translation type="unfinished"/> </message> <message> - <location line="+62"/> + <location line="+6"/> + <source>Conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation type="unfinished"/> </message> @@ -2929,7 +2981,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation type="unfinished"/> </message> @@ -3195,12 +3247,12 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+223"/> <source>Usage:</source> <translation type="unfinished"/> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>List commands</source> <translation type="unfinished"/> </message> @@ -3255,12 +3307,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation type="unfinished"/> </message> <message> - <location line="-148"/> + <location line="-150"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"/> </message> @@ -3280,17 +3332,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Run in the background as a daemon and accept commands</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <location line="+40"/> <source>Use the test network</source> <translation type="unfinished"/> </message> <message> - <location line="-118"/> + <location line="-120"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> @@ -3421,6 +3473,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation type="unfinished"/> </message> @@ -3631,6 +3688,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Start Bitcoin server</source> <translation type="unfinished"/> </message> @@ -3680,12 +3742,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-79"/> + <location line="-80"/> <source>Imports blocks from external blk000??.dat file</source> <translation type="unfinished"/> </message> <message> - <location line="-105"/> + <location line="-106"/> <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> @@ -3705,7 +3767,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+89"/> + <location line="+90"/> <source>Information</source> <translation type="unfinished"/> </message> @@ -3775,7 +3837,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+7"/> <source>System error: </source> <translation type="unfinished"/> </message> @@ -3821,6 +3883,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>version</source> <translation type="unfinished"/> </message> @@ -3830,32 +3897,32 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-58"/> + <location line="-60"/> <source>Password for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-70"/> + <location line="-71"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation type="unfinished"/> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+161"/> + <location line="+163"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"/> </message> <message> - <location line="-24"/> + <location line="-25"/> <source>Set key pool size to <n> (default: 100)</source> <translation type="unfinished"/> </message> @@ -3865,12 +3932,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+38"/> + <location line="+39"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-30"/> + <location line="-31"/> <source>Server certificate file (default: server.cert)</source> <translation type="unfinished"/> </message> @@ -3880,7 +3947,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+17"/> <source>This help message</source> <translation type="unfinished"/> </message> @@ -3890,12 +3957,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-107"/> + <location line="-109"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation type="unfinished"/> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Loading addresses...</source> <translation type="unfinished"/> </message> @@ -3910,12 +3977,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+98"/> + <location line="+99"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation type="unfinished"/> </message> <message> - <location line="-100"/> + <location line="-101"/> <source>Error loading wallet.dat</source> <translation type="unfinished"/> </message> @@ -3925,7 +3992,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+56"/> + <location line="+57"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation type="unfinished"/> </message> @@ -3935,7 +4002,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-101"/> + <location line="-103"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -3945,7 +4012,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+48"/> + <location line="+49"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation type="unfinished"/> </message> @@ -3965,7 +4032,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-62"/> + <location line="-63"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"/> </message> @@ -3975,12 +4042,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+95"/> + <location line="+96"/> <source>Loading wallet...</source> <translation type="unfinished"/> </message> <message> - <location line="-56"/> + <location line="-57"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> @@ -3990,7 +4057,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+67"/> + <location line="+68"/> <source>Rescanning...</source> <translation type="unfinished"/> </message> @@ -4000,17 +4067,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+85"/> + <location line="+86"/> <source>To use the %s option</source> <translation type="unfinished"/> </message> <message> - <location line="-77"/> + <location line="-78"/> <source>Error</source> <translation type="unfinished"/> </message> <message> - <location line="-35"/> + <location line="-36"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_nb.ts b/src/qt/locale/bitcoin_nb.ts index 8f196a66c3..6c2095deea 100644 --- a/src/qt/locale/bitcoin_nb.ts +++ b/src/qt/locale/bitcoin_nb.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="nb" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="nb" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -24,7 +24,7 @@ Dette er eksperimentell programvare. Distribuert under MIT/X11 programvarelisensen, se medfølgende fil COPYING eller http://www.opensource.org/licenses/mit-license.php. -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> +Dette produktet inneholder programvare utviklet av OpenSSL Project for bruk i OpenSSL Toolkit (http://www.openssl.org/), kryptografisk programvare skrevet av Eric Young (eay@cryptsoft.com) og UPnP programvare skrevet av Thomas Bernard.</translation> </message> <message> <location filename="../utilitydialog.cpp" line="+29"/> @@ -36,6 +36,12 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <source>The Bitcoin Core developers</source> <translation>Bitcoin Core utviklerne</translation> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source> (%1-bit)</source> + <translation>(%1-bit)</translation> + </message> </context> <context> <name>AddressBookPage</name> @@ -65,7 +71,7 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <translation>&Kopier</translation> </message> <message> - <location line="+52"/> + <location line="+58"/> <source>C&lose</source> <translation>&Lukk</translation> </message> @@ -75,7 +81,7 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <translation>&Kopier Adresse</translation> </message> <message> - <location filename="../forms/addressbookpage.ui" line="-41"/> + <location filename="../forms/addressbookpage.ui" line="-47"/> <source>Delete the currently selected address from the list</source> <translation>Slett den valgte adressen fra listen.</translation> </message> @@ -87,7 +93,7 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <message> <location line="+3"/> <source>&Export</source> - <translation>&Eksporter...</translation> + <translation>&Eksporter</translation> </message> <message> <location line="-27"/> @@ -122,12 +128,12 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <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>Dette er dine Bitcoin adresser for Ã¥ sende betalinger. Alltid sjekk mengden og mottaker adresse før sending av mynter.</translation> + <translation>Dette er dine Bitcoin-adresser for Ã¥ sende betalinger. Alltid sjekk beløp og mottakeradresse før sending av mynter.</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>Dette er dine Bitcoin adresser for Ã¥ sende betalinger. Det er anbefalt Ã¥ bruk en ny mottaksadresse for hver transaksjon.</translation> + <translation>Dette er dine Bitcoin-adresser for Ã¥ sende betalinger. Det er anbefalt Ã¥ bruk en ny mottaksadresse for hver transaksjon.</translation> </message> <message> <location line="+7"/> @@ -157,7 +163,7 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <message> <location line="+1"/> <source>There was an error trying to save the address list to %1.</source> - <translation type="unfinished"/> + <translation>En feil oppstod ved lagring av adresselisten til %1.</translation> </message> </context> <context> @@ -258,13 +264,13 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <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>VIKTIG: Tidligere sikkerhetskopier av din lommebok-fil, bør erstattes med den nylig genererte, krypterte filen, da de blir ugyldiggjort av sikkerhetshensyn sÃ¥ snart du begynner Ã¥ bruke den nye krypterte lommeboken.</translation> + <translation>VIKTIG: Tidligere sikkerhetskopier av din lommebokfil bør erstattes med den nylig genererte og krypterte filen, da de blir ugyldiggjort av sikkerhetshensyn sÃ¥ snart du begynner Ã¥ bruke den nye krypterte lommeboken.</translation> </message> <message> <location line="+100"/> <location line="+24"/> <source>Warning: The Caps Lock key is on!</source> - <translation>Advarsel: Caps Lock er pÃ¥ !</translation> + <translation>Advarsel: Caps Lock er pÃ¥!</translation> </message> <message> <location line="-130"/> @@ -322,7 +328,7 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+295"/> + <location filename="../bitcoingui.cpp" line="+294"/> <source>Sign &message...</source> <translation>Signer &melding...</translation> </message> @@ -337,12 +343,12 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <translation>&Oversikt</translation> </message> <message> - <location line="-137"/> + <location line="-136"/> <source>Node</source> - <translation type="unfinished"/> + <translation>Node</translation> </message> <message> - <location line="+138"/> + <location line="+137"/> <source>Show general overview of wallet</source> <translation>Vis generell oversikt over lommeboken</translation> </message> @@ -405,17 +411,17 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <message> <location line="+10"/> <source>&Sending addresses...</source> - <translation type="unfinished"/> + <translation>&Utsendingsadresser...</translation> </message> <message> <location line="+2"/> <source>&Receiving addresses...</source> - <translation type="unfinished"/> + <translation>&Mottaksadresser...</translation> </message> <message> <location line="+3"/> <source>Open &URI...</source> - <translation>Ã…pne %URI...</translation> + <translation>Ã…pne &URI...</translation> </message> <message> <location line="+325"/> @@ -425,7 +431,7 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <message> <location line="+3"/> <source>Reindexing blocks on disk...</source> - <translation>Re-indekserer blokker pÃ¥ disk...</translation> + <translation>Reindekserer blokker pÃ¥ harddisk...</translation> </message> <message> <location line="-405"/> @@ -440,7 +446,7 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <message> <location line="+12"/> <source>Backup wallet to another location</source> - <translation>Sikkerhetskopiér lommebok til annet sted</translation> + <translation>Sikkerhetskopier lommebok til annet sted</translation> </message> <message> <location line="+2"/> @@ -463,17 +469,17 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <translation>&Verifiser melding...</translation> </message> <message> - <location line="+430"/> + <location line="+440"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-643"/> + <location line="-652"/> <source>Wallet</source> <translation>Lommebok</translation> </message> <message> - <location line="+146"/> + <location line="+145"/> <source>&Send</source> <translation>&Send</translation> </message> @@ -486,7 +492,7 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <location line="+46"/> <location line="+2"/> <source>&Show / Hide</source> - <translation>&Gjem / vis</translation> + <translation>&Vis / Skjul</translation> </message> <message> <location line="+1"/> @@ -501,7 +507,7 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <message> <location line="+7"/> <source>Sign messages with your Bitcoin addresses to prove you own them</source> - <translation>Signér en melding for Ã¥ bevise at du eier denne adressen</translation> + <translation>Signer en melding med Bitcoin-adressene dine for Ã¥ bevise at du eier dem</translation> </message> <message> <location line="+2"/> @@ -529,20 +535,20 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <translation>Verktøylinje for faner</translation> </message> <message> - <location line="-284"/> - <location line="+376"/> + <location line="-283"/> + <location line="+375"/> <source>[testnet]</source> <translation>[testnett]</translation> </message> <message> - <location line="-401"/> + <location line="-400"/> <source>Bitcoin Core</source> - <translation>Bitcoin Kjerne</translation> + <translation>Bitcoin Core</translation> </message> <message> - <location line="+163"/> + <location line="+162"/> <source>Request payments (generates QR codes and bitcoin: URIs)</source> - <translation>Forespør betalinger (genererer QR koder og bitcoin: URIs)</translation> + <translation>Forespør betalinger (genererer QR-koder og bitcoin: URIer)</translation> </message> <message> <location line="+29"/> @@ -563,23 +569,23 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <message> <location line="+3"/> <source>Open a bitcoin: URI or payment request</source> - <translation>Ã…pne en bitcoin: URI eller betalingsetterspørring</translation> + <translation>Ã…pne en Bitcoin: URI eller betalingsetterspørring</translation> </message> <message> <location line="+2"/> <source>&Command-line options</source> - <translation type="unfinished"/> + <translation>&Kommandolinjevalg</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>Vis Bitcoin Core hjelpemeldingen for Ã¥ fÃ¥ en liste med mulige kommandolinjevalg</translation> </message> <message> <location line="+159"/> <location line="+5"/> <source>Bitcoin client</source> - <translation>Bitcoinklient</translation> + <translation>Bitcoin-klienten</translation> </message> <message numerus="yes"> <location line="+142"/> @@ -589,7 +595,7 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <message> <location line="+22"/> <source>No block source available...</source> - <translation>Ingen blokk-kilde tilgjengelig...</translation> + <translation>Ingen kilde for blokker tilgjengelig...</translation> </message> <message> <location line="+12"/> @@ -602,7 +608,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="+23"/> + <location line="+27"/> <source>%n hour(s)</source> <translation><numerusform>%n time</numerusform><numerusform>%n timer</numerusform></translation> </message> @@ -613,10 +619,21 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i </message> <message numerus="yes"> <location line="+4"/> + <location line="+6"/> <source>%n week(s)</source> <translation><numerusform>%n uke</numerusform><numerusform>%n uker</numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation>%1 og %2</translation> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation><numerusform>%n Ã¥r</numerusform><numerusform>%n Ã¥r</numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation>%1 bak</translation> @@ -647,12 +664,12 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <translation>Informasjon</translation> </message> <message> - <location line="-85"/> + <location line="-95"/> <source>Up to date</source> <translation>Ajour</translation> </message> <message> - <location line="+34"/> + <location line="+44"/> <source>Catching up...</source> <translation>Kommer ajour...</translation> </message> @@ -690,7 +707,7 @@ Adresse: %4 <translation>Lommeboken er <b>kryptert</b> og for tiden <b>lÃ¥st</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+441"/> <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> @@ -698,7 +715,7 @@ Adresse: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+119"/> + <location filename="../clientmodel.cpp" line="+128"/> <source>Network Alert</source> <translation>Nettverksvarsel</translation> </message> @@ -708,7 +725,7 @@ Adresse: %4 <message> <location filename="../forms/coincontroldialog.ui" line="+14"/> <source>Coin Control Address Selection</source> - <translation>Mynt Kontroll Adresse Valg</translation> + <translation>Myntkontroll Adresse Valg</translation> </message> <message> <location line="+34"/> @@ -743,30 +760,30 @@ Adresse: %4 <message> <location line="+48"/> <source>After Fee:</source> - <translation>Etter Avgift:</translation> + <translation>Etter Gebyr:</translation> </message> <message> <location line="+32"/> <source>Change:</source> - <translation>Endring:</translation> + <translation>Veksel:</translation> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> - <translation>Fjern alt valgt</translation> + <translation>velg (fjern) alt</translation> </message> <message> <location line="+13"/> <source>Tree mode</source> - <translation>Tre modus</translation> + <translation>Tremodus</translation> </message> <message> <location line="+16"/> <source>List mode</source> - <translation>Liste modus</translation> + <translation>Listemodus</translation> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation>Beløp</translation> </message> @@ -796,7 +813,7 @@ Adresse: %4 <translation>Prioritet</translation> </message> <message> - <location filename="../coincontroldialog.cpp" line="+42"/> + <location filename="../coincontroldialog.cpp" line="+41"/> <source>Copy address</source> <translation>Kopier adresse</translation> </message> @@ -809,7 +826,7 @@ Adresse: %4 <location line="+1"/> <location line="+26"/> <source>Copy amount</source> - <translation>Kopiér beløp</translation> + <translation>Kopier beløp</translation> </message> <message> <location line="-25"/> @@ -819,12 +836,12 @@ Adresse: %4 <message> <location line="+1"/> <source>Lock unspent</source> - <translation type="unfinished"/> + <translation>LÃ¥s ubrukte</translation> </message> <message> <location line="+1"/> <source>Unlock unspent</source> - <translation type="unfinished"/> + <translation>LÃ¥s opp ubrukte</translation> </message> <message> <location line="+22"/> @@ -834,35 +851,35 @@ Adresse: %4 <message> <location line="+2"/> <source>Copy fee</source> - <translation type="unfinished"/> + <translation>Kopier gebyr</translation> </message> <message> <location line="+1"/> <source>Copy after fee</source> - <translation type="unfinished"/> + <translation>Kopier fra gebyr</translation> </message> <message> <location line="+1"/> <source>Copy bytes</source> - <translation type="unfinished"/> + <translation>Kopier bytes</translation> </message> <message> <location line="+1"/> <source>Copy priority</source> - <translation type="unfinished"/> + <translation>Kopier prioritet</translation> </message> <message> <location line="+1"/> <source>Copy low output</source> - <translation type="unfinished"/> + <translation>Kopier svake utdata</translation> </message> <message> <location line="+1"/> <source>Copy change</source> - <translation type="unfinished"/> + <translation>Kopier veksel</translation> </message> <message> - <location line="+323"/> + <location line="+332"/> <source>highest</source> <translation>høyest</translation> </message> @@ -917,7 +934,7 @@ Adresse: %4 <translation>ingen</translation> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation>Støv</translation> </message> @@ -940,7 +957,7 @@ Adresse: %4 <location line="+1"/> <location line="+5"/> <source>This means a fee of at least %1 per kB is required.</source> - <translation>Dette betyr at en avgift pÃ¥ minst %1 per KB er pÃ¥krevd.</translation> + <translation>Dette betyr at et gebyr pÃ¥ minst %1 per KB er pÃ¥krevd.</translation> </message> <message> <location line="-4"/> @@ -955,23 +972,23 @@ Adresse: %4 <message> <location line="+1"/> <source>This label turns red, if the priority is smaller than "medium".</source> - <translation type="unfinished"/> + <translation>Denne merkelappen blir rød, hvis prioriteten er mindre enn "medium".</translation> </message> <message> <location line="+3"/> <source>This label turns red, if any recipient receives an amount smaller than %1.</source> - <translation>Denne merkelappen blir rød, hvis noen mottaker mottar en mengde pÃ¥ mindre enn %1.</translation> + <translation>Denne merkelappen blir rød, hvis en mottaker mottar en mengde pÃ¥ mindre enn %1.</translation> </message> <message> <location line="+1"/> <location line="+4"/> <source>This means a fee of at least %1 is required.</source> - <translation>Dette betyr at en avgift pÃ¥ minst %1 er pÃ¥krevd.</translation> + <translation>Dette betyr at et gebyr pÃ¥ minst %1 er pÃ¥krevd.</translation> </message> <message> <location line="-3"/> <source>Amounts below 0.546 times the minimum relay fee are shown as dust.</source> - <translation>Mengder under 0.546 ganger minimum relé avgiften er vist som støv.</translation> + <translation>Mengder under 0.546 ganger minimum relégebyr er vist som støv.</translation> </message> <message> <location line="+2"/> @@ -980,19 +997,19 @@ Adresse: %4 </message> <message> <location line="+43"/> - <location line="+66"/> + <location line="+63"/> <source>(no label)</source> <translation>(ingen merkelapp)</translation> </message> <message> <location line="-9"/> <source>change from %1 (%2)</source> - <translation>endring fra %1 (%2)</translation> + <translation>veksel fra %1 (%2)</translation> </message> <message> <location line="+1"/> <source>(change)</source> - <translation>(endring)</translation> + <translation>(veksel)</translation> </message> </context> <context> @@ -1068,7 +1085,7 @@ Adresse: %4 <message> <location filename="../intro.cpp" line="+65"/> <source>A new data directory will be created.</source> - <translation>En ny data mappe vil bli laget.</translation> + <translation>En ny datamappe vil bli laget.</translation> </message> <message> <location line="+22"/> @@ -1083,12 +1100,12 @@ Adresse: %4 <message> <location line="+3"/> <source>Path already exists, and is not a directory.</source> - <translation>Sti finnes allerede, og er ikke en mappe.</translation> + <translation>Snarvei finnes allerede, og er ikke en mappe.</translation> </message> <message> <location line="+7"/> <source>Cannot create data directory here.</source> - <translation>Kan ikke laget data mappe her.</translation> + <translation>Kan ikke lage datamappe her.</translation> </message> </context> <context> @@ -1096,12 +1113,12 @@ Adresse: %4 <message> <location filename="../forms/helpmessagedialog.ui" line="+19"/> <source>Bitcoin Core - Command-line options</source> - <translation type="unfinished"/> + <translation>Bitcoin Core - Kommandolinjevalg</translation> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> - <translation>Bitcoin Kjerne</translation> + <translation>Bitcoin Core</translation> </message> <message> <location line="+0"/> @@ -1131,8 +1148,7 @@ Adresse: %4 <message> <location line="+1"/> <source>Start minimized</source> - <translation>Start minimert -</translation> + <translation>Start minimert</translation> </message> <message> <location line="+1"/> @@ -1142,7 +1158,7 @@ Adresse: %4 <message> <location line="+1"/> <source>Choose data directory on startup (default: 0)</source> - <translation>Velg data mappe ved oppstart (standard: 0)</translation> + <translation>Velg datamappe ved oppstart (standard: 0)</translation> </message> </context> <context> @@ -1160,32 +1176,32 @@ Adresse: %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>Siden dette er første gang programmet starter, kan du velge hvor Bitcoin Core skal lagre sine data.</translation> + <translation>Siden dette er første gang programmet starter, kan du nÃ¥ velge hvor Bitcoin Core skal lagre sine data.</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>Bitcoin Core vil laste ned og lagre en kopi av Bitcoins blokk kjede. Minst %1GB av data vil bli lagret i denne mappen, og det vil vokse over tid. Lommeboken vil ogsÃ¥ bli lagret i denne mappen.</translation> + <translation>Bitcoin Core vil laste ned og lagre en kopi av Bitcoin sin blokkjede. Minst %1GB av data vil bli lagret i denne mappen, og det vil vokse over tid. Lommeboken vil ogsÃ¥ bli lagret i denne mappen.</translation> </message> <message> <location line="+10"/> <source>Use the default data directory</source> - <translation>Bruk standard data mappe</translation> + <translation>Bruk standard datamappe</translation> </message> <message> <location line="+7"/> <source>Use a custom data directory:</source> - <translation>Bruk en egendefinert data mappe:</translation> + <translation>Bruk en egendefinert datamappe:</translation> </message> <message> - <location filename="../intro.cpp" line="+85"/> + <location filename="../intro.cpp" line="+82"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> <location line="+1"/> <source>Error: Specified data directory "%1" can not be created.</source> - <translation>Feil: Spesifisert data mappe "%1" kan ikke opprettes.</translation> + <translation>Feil: Spesifisert datamappe "%1" kan ikke opprettes.</translation> </message> <message> <location line="+19"/> @@ -1195,7 +1211,7 @@ Adresse: %4 <message> <location line="+9"/> <source>GB of free space available</source> - <translation>GB av ledig lagringsplass</translation> + <translation>GB ledig lagringsplass</translation> </message> <message> <location line="+3"/> @@ -1208,7 +1224,7 @@ Adresse: %4 <message> <location filename="../forms/openuridialog.ui" line="+14"/> <source>Open URI</source> - <translation>Open URI</translation> + <translation>Ã…pne URI</translation> </message> <message> <location line="+6"/> @@ -1223,12 +1239,12 @@ Adresse: %4 <message> <location line="+11"/> <source>Select payment request file</source> - <translation>Velg betalingsetterspørring fil</translation> + <translation>Velg fil for betalingsetterspørring</translation> </message> <message> <location filename="../openuridialog.cpp" line="+47"/> <source>Select payment request file to open</source> - <translation>Velg betalingsetterspørrings fil Ã¥ Ã¥pne</translation> + <translation>Velg fil for betalingsetterspørring Ã¥ Ã¥pne</translation> </message> </context> <context> @@ -1244,17 +1260,17 @@ Adresse: %4 <translation>&Hoved</translation> </message> <message> - <location line="+6"/> + <location line="+122"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation>Valgfritt transaksjonsgebyr per kB som sikrer at dine transaksjoner blir raskt prosessert. De fleste transaksjoner er 1 kB.</translation> </message> <message> <location line="+15"/> <source>Pay transaction &fee</source> - <translation>Betal transaksjons&gebyr</translation> + <translation>Betal &transaksjonsgebyr</translation> </message> <message> - <location line="+31"/> + <location line="-131"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation>Start Bitcoin automatisk etter innlogging.</translation> </message> @@ -1266,47 +1282,42 @@ Adresse: %4 <message> <location line="+9"/> <source>Size of &database cache</source> - <translation type="unfinished"/> + <translation>Størrelse pÃ¥ &database hurtigbuffer</translation> </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"/> + <location line="+16"/> <source>MB</source> <translation>MB</translation> </message> <message> <location line="+27"/> <source>Number of script &verification threads</source> - <translation type="unfinished"/> + <translation>Antall script &verifikasjonstrÃ¥der</translation> </message> <message> <location line="+13"/> <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> - <translation type="unfinished"/> + <translation>Sett antall script verifikasjonstrÃ¥der (opp til 16, 0 = automatisk, <0 = la sÃ¥ mange kjerner være ledig, standardvalg: 0)</translation> </message> <message> - <location line="+58"/> + <location line="+153"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> - <translation type="unfinished"/> + <translation>Koble til Bitcoin-nettverket gjennom en SOCKS proxy.</translation> </message> <message> <location line="+3"/> <source>&Connect through SOCKS proxy (default proxy):</source> - <translation type="unfinished"/> + <translation>&Koble til gjennom SOCKS proxy (standardvalg proxy):</translation> </message> <message> <location line="+34"/> <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source> - <translation type="unfinished"/> + <translation>IP-adressen til proxyen (f.eks. IPv4: 127.0.0.1 / IPv6: ::1)</translation> </message> <message> - <location line="+224"/> + <location line="+214"/> <source>Active command-line options that override above options:</source> - <translation type="unfinished"/> + <translation>Aktive kommandolinjevalg som overstyrer valgene ovenfor:</translation> </message> <message> <location line="+43"/> @@ -1319,19 +1330,44 @@ Adresse: %4 <translation>&Tilbakestill Instillinger</translation> </message> <message> - <location line="-323"/> + <location line="-313"/> <source>&Network</source> <translation>&Nettverk</translation> </message> <message> - <location line="+6"/> + <location line="-95"/> + <source>W&allet</source> + <translation>L&ommebok</translation> + </message> + <message> + <location line="+65"/> + <source>Expert</source> + <translation>Ekspert</translation> + </message> + <message> + <location line="+9"/> + <source>Enable coin &control features</source> + <translation>Aktiver &myntkontroll funksjoner</translation> + </message> + <message> + <location line="+7"/> + <source>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.</source> + <translation>Hvis du sperrer for bruk av ubekreftet veksel, kan ikke vekselen fra transaksjonen bli brukt før transaksjonen har minimum en bekreftelse. Dette pÃ¥virker ogsÃ¥ hvordan balansen din blir beregnet.</translation> + </message> + <message> + <location line="+3"/> + <source>&Spend unconfirmed change</source> + <translation>&Bruk ubekreftet veksel</translation> + </message> + <message> + <location line="+17"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>Ã…pne automatisk Bitcoin klientporten pÃ¥ ruteren. Dette virker kun om din ruter støtter UPnP og dette er pÃ¥slÃ¥tt.</translation> </message> <message> <location line="+3"/> <source>Map port using &UPnP</source> - <translation>Sett opp port vha. &UPnP</translation> + <translation>Sett opp port ved hjelp av &UPnP</translation> </message> <message> <location line="+19"/> @@ -1419,17 +1455,12 @@ Adresse: %4 <translation>&Vis adresser i transaksjonslisten</translation> </message> <message> - <location line="+7"/> + <location line="-262"/> <source>Whether to show coin control features or not.</source> - <translation>Skal mynt kontroll funksjoner vises eller ikke.</translation> - </message> - <message> - <location line="+3"/> - <source>Display coin &control features (experts only)</source> - <translation>Vis mynt &kontroll funksjoner (kun for eksperter)</translation> + <translation>Skal myntkontroll funksjoner vises eller ikke.</translation> </message> <message> - <location line="+136"/> + <location line="+398"/> <source>&OK</source> <translation>&OK</translation> </message> @@ -1439,35 +1470,35 @@ Adresse: %4 <translation>&Avbryt</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+70"/> <source>default</source> <translation>standardverdi</translation> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation>ingen</translation> </message> <message> - <location line="+75"/> + <location line="+78"/> <source>Confirm options reset</source> - <translation>Bekreft innstillings tilbakestilling</translation> + <translation>Bekreft tilbakestilling av innstillinger</translation> </message> <message> <location line="+1"/> <location line="+29"/> <source>Client restart required to activate changes.</source> - <translation type="unfinished"/> + <translation>Omstart av klienten er nødvendig for Ã¥ aktivere endringene.</translation> </message> <message> <location line="-29"/> <source>Client will be shutdown, do you want to proceed?</source> - <translation type="unfinished"/> + <translation>Klienten vil bli lukket, vil du fortsette?</translation> </message> <message> <location line="+33"/> <source>This change would require a client restart.</source> - <translation type="unfinished"/> + <translation>Denne endringen krever omstart av klienten.</translation> </message> <message> <location line="+34"/> @@ -1489,19 +1520,14 @@ Adresse: %4 <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="-155"/> - <source>Unconfirmed:</source> - <translation>Ubekreftet</translation> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation>Lommebok</translation> </message> <message> <location line="+51"/> - <source>Confirmed:</source> - <translation>Bekreftet:</translation> + <source>Available:</source> + <translation>Tilgjengelig:</translation> </message> <message> <location line="+16"/> @@ -1509,7 +1535,12 @@ Adresse: %4 <translation>Din nÃ¥værende saldo</translation> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation>Under behandling:</translation> + </message> + <message> + <location line="+16"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation>Totalt antall ubekreftede transaksjoner som ikke teller med i saldo</translation> </message> @@ -1551,7 +1582,7 @@ Adresse: %4 <location filename="../paymentserver.cpp" line="+403"/> <location line="+13"/> <source>URI handling</source> - <translation>URI hÃ¥ndtering</translation> + <translation>URI-hÃ¥ndtering</translation> </message> <message> <location line="+1"/> @@ -1581,32 +1612,32 @@ Adresse: %4 <message> <location line="+58"/> <source>Net manager warning</source> - <translation type="unfinished"/> + <translation>Nettleder advarsel</translation> </message> <message> <location line="+1"/> <source>Your active proxy doesn't support SOCKS5, which is required for payment requests via proxy.</source> - <translation type="unfinished"/> + <translation>Din aktive proxy har ikke støtte for SOCKS5, som er pÃ¥krevd for betalingsforespørsler via proxy.</translation> </message> <message> <location line="+52"/> <source>Payment request fetch URL is invalid: %1</source> - <translation type="unfinished"/> + <translation>Hentelenke for betalingsforespørsel er ugyldig: %1</translation> </message> <message> <location line="+27"/> <source>Payment request file handling</source> - <translation type="unfinished"/> + <translation>FilhÃ¥ndtering for betalingsforespørsel</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 type="unfinished"/> + <translation>Fil for betalingsforespørsel kan ikke leses eller behandles! Dette kan skyldes en ugyldig fil for betalingsforespørsel.</translation> </message> <message> <location line="+73"/> <source>Unverified payment requests to custom payment scripts are unsupported.</source> - <translation type="unfinished"/> + <translation>Uverifiserte betalingsforespørsler til egentilpassede betalingscript er ikke støttet.</translation> </message> <message> <location line="+59"/> @@ -1616,12 +1647,12 @@ Adresse: %4 <message> <location line="+43"/> <source>Error communicating with %1: %2</source> - <translation>Feil ved Ã¥ kommunisere med %1: %2</translation> + <translation>Feil i kommunikasjonen med %1: %2</translation> </message> <message> <location line="+24"/> <source>Payment request can not be parsed or processed!</source> - <translation type="unfinished"/> + <translation>Betalingsforespørsler kan ikke analyseres eller behandles!</translation> </message> <message> <location line="+11"/> @@ -1642,28 +1673,33 @@ Adresse: %4 <context> <name>QObject</name> <message> - <location filename="../bitcoin.cpp" line="+71"/> - <location line="+11"/> + <location filename="../bitcoin.cpp" line="+63"/> + <location line="+14"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="+1"/> + <location line="-13"/> <source>Error: Specified data directory "%1" does not exist.</source> - <translation>Feil: Spesifisert data mappe "%1" finnes ikke.</translation> + <translation>Feil: Spesifisert datamappe "%1" finnes ikke.</translation> </message> <message> - <location line="-12"/> + <location line="+13"/> <source>Error: Invalid combination of -regtest and -testnet.</source> <translation>Feil: Ugyldig kombinasjon av -regtest og -testnet.</translation> </message> + <message> + <location filename="../guiutil.cpp" line="+82"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>Skriv inn en Bitcoin-adresse (f.eks. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> </context> <context> <name>QRImageWidget</name> <message> <location filename="../receiverequestdialog.cpp" line="+36"/> <source>&Save Image...</source> - <translation>&Lagre bilde...</translation> + <translation>&Lagre Bilde...</translation> </message> <message> <location line="+3"/> @@ -1673,12 +1709,12 @@ Adresse: %4 <message> <location line="+28"/> <source>Save QR Code</source> - <translation>Lagre QR Kode</translation> + <translation>Lagre QR-kode</translation> </message> <message> <location line="+0"/> <source>PNG Image (*.png)</source> - <translation>PNG Bilde (*.png)</translation> + <translation>PNG-bilde (*.png)</translation> </message> </context> <context> @@ -1699,7 +1735,7 @@ Adresse: %4 <location line="+36"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+359"/> + <location filename="../rpcconsole.cpp" line="+373"/> <source>N/A</source> <translation>-</translation> </message> @@ -1716,7 +1752,7 @@ Adresse: %4 <message> <location line="-10"/> <source>Debug window</source> - <translation>Debug vindu</translation> + <translation>Feilsøkingsvindu</translation> </message> <message> <location line="+25"/> @@ -1795,11 +1831,13 @@ Adresse: %4 </message> <message> <location line="+64"/> + <location filename="../rpcconsole.cpp" line="-10"/> <source>In:</source> <translation>Inn:</translation> </message> <message> <location line="+80"/> + <location filename="../rpcconsole.cpp" line="+1"/> <source>Out:</source> <translation>Ut:</translation> </message> @@ -1816,7 +1854,7 @@ Adresse: %4 <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>Ã…pne Bitcoin loggfil for feilsøk fra datamappen. Dette kan ta noen sekunder for store loggfiler.</translation> + <translation>Ã…pne Bitcoin sin loggfil for feilsøk fra den gjeldende datamappen. Dette kan ta noen sekunder for store loggfiler.</translation> </message> <message> <location line="+76"/> @@ -1824,9 +1862,9 @@ Adresse: %4 <translation>Tøm konsoll</translation> </message> <message> - <location filename="../rpcconsole.cpp" line="-30"/> + <location filename="../rpcconsole.cpp" line="-35"/> <source>Welcome to the Bitcoin RPC console.</source> - <translation>Velkommen til Bitcoin RPC konsoll.</translation> + <translation>Velkommen til Bitcoin sin RPC-konsoll.</translation> </message> <message> <location line="+1"/> @@ -1839,7 +1877,7 @@ Adresse: %4 <translation>Skriv <b>help</b> for en oversikt over kommandoer.</translation> </message> <message> - <location line="+122"/> + <location line="+136"/> <source>%1 B</source> <translation>%1 B</translation> </message> @@ -1877,24 +1915,24 @@ Adresse: %4 <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+83"/> + <location filename="../forms/receivecoinsdialog.ui" line="+107"/> <source>&Amount:</source> <translation>&Beløp:</translation> </message> <message> - <location line="-13"/> + <location line="-16"/> <source>&Label:</source> <translation>&Merkelapp:</translation> </message> <message> - <location line="-34"/> + <location line="-37"/> <source>&Message:</source> <translation>&Melding:</translation> </message> <message> - <location line="-17"/> + <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>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> + <translation>Gjenbruk en av de tidligere brukte mottaksadressene. Gjenbruk av adresser har sikkerhets- og personvernsutfordringer. Ikke bruk dette med unntak for Ã¥ gjennopprette en betalingsforespørsel som ble gjort tidligere.</translation> </message> <message> <location line="+3"/> @@ -1902,29 +1940,32 @@ Adresse: %4 <translation>Gj&enbruk en eksisterende mottaksadresse (ikke anbefalt)</translation> </message> <message> - <location line="+27"/> - <source>An optional label to associate with the new receiving address</source> - <translation type="unfinished"/> + <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>En valgfri melding Ã¥ tilknytte betalingsforespørselen, som vil bli vist nÃ¥r forespørselen er Ã¥pnet. Meldingen vil ikke bli sendt med betalingen over Bitcoin-nettverket.</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"/> + <location line="-7"/> + <location line="+21"/> + <source>An optional label to associate with the new receiving address.</source> + <translation>En valgfri merkelapp Ã¥ tilknytte den nye mottakeradressen.</translation> </message> <message> - <location line="+7"/> + <location line="-7"/> <source>Use this form to request payments. All fields are <b>optional</b>.</source> - <translation type="unfinished"/> + <translation>Bruk dette skjemaet til betalingsforespørsler. Alle felt er <b>valgfrie</b>.</translation> </message> <message> - <location line="+39"/> + <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>Et valgfritt beløp Ã¥ etterspørre. La stÃ¥ tomt eller null for ikke Ã¥ etterspørre et spesifikt beløp.</translation> </message> <message> - <location line="+17"/> + <location line="+32"/> <source>Clear all fields of the form.</source> - <translation>Fjern alle felter fra formen.</translation> + <translation>Fjern alle felter fra skjemaet.</translation> </message> <message> <location line="+3"/> @@ -1932,19 +1973,19 @@ Adresse: %4 <translation>Fjern</translation> </message> <message> - <location line="+36"/> - <source>&Request payment</source> - <translation>Ette&rspør betaling</translation> + <location line="+78"/> + <source>Requested payments history</source> + <translation>Etterspurt betalingshistorikk</translation> </message> <message> - <location line="+47"/> - <source>Requested payments</source> - <translation type="unfinished"/> + <location line="-98"/> + <source>&Request payment</source> + <translation>&Etterspør betaling</translation> </message> <message> - <location line="+16"/> + <location line="+120"/> <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> + <translation>Vis den valgte etterspørringen (gjør det samme som Ã¥ dobbelklikke pÃ¥ en oppføring)</translation> </message> <message> <location line="+3"/> @@ -1952,22 +1993,37 @@ Adresse: %4 <translation>Vis</translation> </message> <message> - <location line="+11"/> + <location line="+14"/> <source>Remove the selected entries from the list</source> - <translation>Fjern den valgte oppføringen fra listen</translation> + <translation>Fjern de valgte oppføringene fra listen</translation> </message> <message> <location line="+3"/> <source>Remove</source> <translation>Fjern</translation> </message> + <message> + <location filename="../receivecoinsdialog.cpp" line="+39"/> + <source>Copy label</source> + <translation>Kopier merkelapp</translation> + </message> + <message> + <location line="+1"/> + <source>Copy message</source> + <translation>Kopier melding</translation> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation>Kopier beløp</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> <message> <location filename="../forms/receiverequestdialog.ui" line="+29"/> <source>QR Code</source> - <translation>QR Kode</translation> + <translation>QR-kode</translation> </message> <message> <location line="+46"/> @@ -1982,7 +2038,7 @@ Adresse: %4 <message> <location line="+7"/> <source>&Save Image...</source> - <translation>&Lagre bilde...</translation> + <translation>&Lagre Bilde...</translation> </message> <message> <location filename="../receiverequestdialog.cpp" line="+56"/> @@ -2022,12 +2078,12 @@ Adresse: %4 <message> <location line="+10"/> <source>Resulting URI too long, try to reduce the text for label / message.</source> - <translation>Resulterende URI for lang, prøv Ã¥ redusere teksten for merkelapp / melding.</translation> + <translation>Resultat URI for lang, prøv Ã¥ redusere teksten for merkelapp / melding.</translation> </message> <message> <location line="+5"/> <source>Error encoding URI into QR Code.</source> - <translation>Feil ved koding av URI i QR kode.</translation> + <translation>Feil ved koding av URI til QR-kode.</translation> </message> </context> <context> @@ -2062,12 +2118,17 @@ Adresse: %4 <source>(no message)</source> <translation>(ingen melding)</translation> </message> + <message> + <location line="+8"/> + <source>(no amount)</source> + <translation>(intet beløp)</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 Bitcoins</translation> @@ -2075,7 +2136,7 @@ Adresse: %4 <message> <location line="+76"/> <source>Coin Control Features</source> - <translation>Mynt Kontroll Funksjoner</translation> + <translation>Myntkontroll Funksjoner</translation> </message> <message> <location line="+20"/> @@ -2115,47 +2176,47 @@ Adresse: %4 <message> <location line="+48"/> <source>Fee:</source> - <translation>Avgift:</translation> + <translation>Gebyr:</translation> </message> <message> <location line="+32"/> <source>Low Output:</source> - <translation>Lav Utdata:</translation> + <translation>Svak Utdata:</translation> </message> <message> <location line="+48"/> <source>After Fee:</source> - <translation>Etter Avgift:</translation> + <translation>Etter Gebyr:</translation> </message> <message> <location line="+32"/> <source>Change:</source> - <translation>Endring:</translation> + <translation>Veksel:</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"/> + <translation>Hvis dette er aktivert, men adressen for veksel er tom eller ugyldig, vil veksel bli sendt til en nylig generert adresse.</translation> </message> <message> <location line="+3"/> <source>Custom change address</source> - <translation type="unfinished"/> + <translation>Egendefinert adresse for veksel</translation> </message> <message> - <location line="+115"/> + <location line="+164"/> <source>Send to multiple recipients at once</source> - <translation>Send til flere enn én mottaker</translation> + <translation>Send til flere enn en mottaker</translation> </message> <message> <location line="+3"/> <source>Add &Recipient</source> - <translation>&Legg til Mottaker</translation> + <translation>Legg til &Mottaker</translation> </message> <message> - <location line="+20"/> + <location line="-23"/> <source>Clear all fields of the form.</source> - <translation>Fjern alle felter fra formen.</translation> + <translation>Fjern alle felter fra skjemaet.</translation> </message> <message> <location line="+3"/> @@ -2163,12 +2224,12 @@ Adresse: %4 <translation>Fjern &Alt</translation> </message> <message> - <location line="+22"/> + <location line="+58"/> <source>Balance:</source> <translation>Saldo:</translation> </message> <message> - <location line="+41"/> + <location line="-84"/> <source>Confirm the send action</source> <translation>Bekreft sending</translation> </message> @@ -2178,7 +2239,7 @@ Adresse: %4 <translation>S&end</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-228"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation>Bekreft sending av bitcoins</translation> </message> @@ -2191,54 +2252,49 @@ Adresse: %4 <translation>%1 til %2</translation> </message> <message> - <location line="-136"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Skriv inn en Bitcoin adresse (f.eks. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> - <message> - <location line="+15"/> + <location line="-121"/> <source>Copy quantity</source> <translation>Kopier mengde</translation> </message> <message> <location line="+1"/> <source>Copy amount</source> - <translation>Kopiér beløp</translation> + <translation>Kopier beløp</translation> </message> <message> <location line="+1"/> <source>Copy fee</source> - <translation type="unfinished"/> + <translation>Kopier gebyr</translation> </message> <message> <location line="+1"/> <source>Copy after fee</source> - <translation type="unfinished"/> + <translation>Kopier fra gebyr</translation> </message> <message> <location line="+1"/> <source>Copy bytes</source> - <translation type="unfinished"/> + <translation>Kopier bytes</translation> </message> <message> <location line="+1"/> <source>Copy priority</source> - <translation type="unfinished"/> + <translation>Kopier prioritet</translation> </message> <message> <location line="+1"/> <source>Copy low output</source> - <translation type="unfinished"/> + <translation>Kopier svake utdata</translation> </message> <message> <location line="+1"/> <source>Copy change</source> - <translation type="unfinished"/> + <translation>Kopier veksel</translation> </message> <message> <location line="+170"/> <source>Total Amount %1 (= %2)</source> - <translation>Total Mengde %1 (= %2)</translation> + <translation>Totalt Beløp %1 (= %2)</translation> </message> <message> <location line="+2"/> @@ -2246,14 +2302,14 @@ Adresse: %4 <translation>eller</translation> </message> <message> - <location line="+202"/> + <location line="+203"/> <source>The recipient address is not valid, please recheck.</source> <translation>Adresse for mottaker er ugyldig.</translation> </message> <message> <location line="+3"/> <source>The amount to pay must be larger than 0.</source> - <translation>Beløpen som skal betales mÃ¥ være over 0.</translation> + <translation>Beløpet som skal betales mÃ¥ være over 0.</translation> </message> <message> <location line="+3"/> @@ -2268,7 +2324,7 @@ Adresse: %4 <message> <location line="+3"/> <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation>Duplikate adresser funnet. Kan bare sende én gang til hver adresse per operasjon.</translation> + <translation>Doble antall adresser funnet. Kan bare sende en gang til hver adresse per operasjon.</translation> </message> <message> <location line="+3"/> @@ -2278,25 +2334,25 @@ Adresse: %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>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> + <translation>Transaksjonen ble avvist! Dette kan skje hvis noen av myntene i lommeboken allerede er brukt, som hvis du kopierte wallet.dat og mynter ble brukt i kopien uten Ã¥ bli markert som brukt her.</translation> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Warning: Invalid Bitcoin address</source> - <translation>Advarsel: Ugyldig Bitcoin adresse</translation> + <translation>Advarsel: Ugyldig Bitcoin-adresse</translation> </message> <message> - <location line="+21"/> + <location line="+20"/> <source>(no label)</source> <translation>(ingen merkelapp)</translation> </message> <message> <location line="-11"/> <source>Warning: Unknown change address</source> - <translation type="unfinished"/> + <translation>Advarsel: Ukjent adresse for veksel</translation> </message> <message> - <location line="-366"/> + <location line="-367"/> <source>Are you sure you want to send?</source> <translation>Er du sikker pÃ¥ at du vil sende?</translation> </message> @@ -2306,7 +2362,7 @@ Adresse: %4 <translation>lagt til som transaksjonsgebyr</translation> </message> <message> - <location line="+170"/> + <location line="+171"/> <source>Payment request expired</source> <translation>Betalingsforespørsel utgÃ¥tt</translation> </message> @@ -2383,12 +2439,7 @@ Adresse: %4 <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"/> + <location line="+968"/> <source>This is a verified payment request.</source> <translation>Dette er en verifisert betalingsetterspørring</translation> </message> @@ -2398,7 +2449,12 @@ Adresse: %4 <translation>Skriv inn en merkelapp for denne adressen for Ã¥ legge den til listen av brukte adresser</translation> </message> <message> - <location line="+459"/> + <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>En melding som var tilknyttet bitcoinen: URI vil bli lagret med transaksjonen for din oversikt. Denne meldingen vil ikke bli sendt over Bitcoin-nettverket.</translation> + </message> + <message> + <location line="+426"/> <source>This is an unverified payment request.</source> <translation>Dette er en uverifisert betalingsetterspørring</translation> </message> @@ -2412,12 +2468,7 @@ Adresse: %4 <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>Skriv inn en Bitcoin adresse (f.eks. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + <translation>Memo:</translation> </message> </context> <context> @@ -2425,12 +2476,12 @@ Adresse: %4 <message> <location filename="../utilitydialog.cpp" line="+48"/> <source>Bitcoin Core is shutting down...</source> - <translation type="unfinished"/> + <translation>Bitcoin Core lukker...</translation> </message> <message> <location line="+1"/> <source>Do not shut down the computer until this window disappears.</source> - <translation type="unfinished"/> + <translation>SlÃ¥ ikke av datamaskinen før dette vinduet forsvinner.</translation> </message> </context> <context> @@ -2438,17 +2489,17 @@ Adresse: %4 <message> <location filename="../forms/signverifymessagedialog.ui" line="+14"/> <source>Signatures - Sign / Verify a Message</source> - <translation>Signaturer - Signer / Verifiser en melding</translation> + <translation>Signaturer - Signer / Verifiser en Melding</translation> </message> <message> <location line="+10"/> <source>&Sign Message</source> - <translation>&Signér Melding</translation> + <translation>&Signer Melding</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>Du kan signere meldinger med dine adresser for Ã¥ bevise at du eier dem. Ikke signér vage meldinger da phishing-angrep kan prøve Ã¥ lure deg til Ã¥ signere din identitet over til andre. Signér kun fullt detaljerte utsagn som du er enig i.</translation> + <translation>Du kan signere meldinger med dine adresser for Ã¥ bevise at du eier dem. Ikke signer vage meldinger da phishing-angrep kan prøve Ã¥ lure deg til Ã¥ signere din identitet over til andre. Signer kun fullt detaljerte utsagn som du er enig i.</translation> </message> <message> <location line="+18"/> @@ -2456,19 +2507,19 @@ Adresse: %4 <translation>Adressen for signering av meldingen (f.eks. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location line="+10"/> - <location line="+213"/> + <location line="+7"/> + <location line="+210"/> <source>Choose previously used address</source> <translation>Velg tidligere brukt adresse</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>Lim inn adresse fra utklippstavlen</translation> </message> @@ -2500,7 +2551,7 @@ Adresse: %4 <message> <location line="+3"/> <source>Sign &Message</source> - <translation>Signér &Melding</translation> + <translation>Signer &Melding</translation> </message> <message> <location line="+14"/> @@ -2509,12 +2560,12 @@ Adresse: %4 </message> <message> <location line="+3"/> - <location line="+146"/> + <location line="+143"/> <source>Clear &All</source> <translation>Fjern &Alt</translation> </message> <message> - <location line="-87"/> + <location line="-84"/> <source>&Verify Message</source> <translation>&Verifiser Melding</translation> </message> @@ -2529,14 +2580,14 @@ Adresse: %4 <translation>Adressen meldingen var signert med (f.eks. 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>Verifiser meldingen for Ã¥ være sikker pÃ¥ at den ble signert av den angitte Bitcoin-adressen</translation> </message> <message> <location line="+3"/> <source>Verify &Message</source> - <translation>&Verifiser Melding</translation> + <translation>Verifiser &Melding</translation> </message> <message> <location line="+14"/> @@ -2544,43 +2595,37 @@ Adresse: %4 <translation>Tilbakestill alle felter for meldingsverifikasjon</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>Skriv inn en Bitcoin adresse (f.eks. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + <translation>Skriv inn en Bitcoin-adresse (f.eks. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location line="-2"/> + <location line="-1"/> <source>Click "Sign Message" to generate signature</source> <translation>Klikk "Signer Melding" for Ã¥ generere signatur</translation> </message> <message> - <location line="+3"/> - <source>Enter Bitcoin signature</source> - <translation>Angi Bitcoin signatur</translation> - </message> - <message> <location line="+84"/> - <location line="+81"/> + <location line="+80"/> <source>The entered address is invalid.</source> <translation>Angitt adresse er ugyldig.</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>Vennligst sjekk adressen og prøv igjen.</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>Angitt adresse refererer ikke til en nøkkel.</translation> </message> <message> - <location line="-73"/> + <location line="-72"/> <source>Wallet unlock was cancelled.</source> <translation>OpplÃ¥sing av lommebok ble avbrutt.</translation> </message> @@ -2600,7 +2645,7 @@ Adresse: %4 <translation>Melding signert.</translation> </message> <message> - <location line="+59"/> + <location line="+58"/> <source>The signature could not be decoded.</source> <translation>Signaturen kunne ikke dekodes.</translation> </message> @@ -2631,7 +2676,7 @@ Adresse: %4 <message> <location filename="../splashscreen.cpp" line="+28"/> <source>Bitcoin Core</source> - <translation>Bitcoin Kjerne</translation> + <translation>Bitcoin Core</translation> </message> <message> <location line="+2"/> @@ -2661,6 +2706,11 @@ Adresse: %4 </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation>konflikt</translation> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation>%1/frakoblet</translation> </message> @@ -2784,7 +2834,7 @@ Adresse: %4 <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 "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source> - <translation type="unfinished"/> + <translation>Genererte bitcoins mÃ¥ modnes %1 blokker før de kan brukes. Da du genererte denne blokken ble den kringkastet pÃ¥ nettverket for Ã¥ bli lagt til i kjeden av blokker. Hvis den ikke kommer med i kjeden vil den endre seg til "ikke akseptert" og pengene vil ikke kunne brukes. Dette vil noen ganger skje hvis en annen node genererer en blokk noen sekunder i tid fra din egen.</translation> </message> <message> <location line="+8"/> @@ -2819,15 +2869,15 @@ Adresse: %4 <message> <location line="-232"/> <source>, has not been successfully broadcast yet</source> - <translation>, har ikke blitt kringkastet uten problemer enda.</translation> + <translation>, har ikke blitt kringkastet med hell enda</translation> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <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> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation>ukjent</translation> </message> @@ -2868,12 +2918,12 @@ Adresse: %4 <translation>Beløp</translation> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> - <translation type="unfinished"/> + <translation>Umoden (%1 bekreftelser, vil være tilgjengelig etter %2)</translation> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <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> @@ -2883,23 +2933,12 @@ Adresse: %4 <translation>Ã…pen til %1</translation> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> - <translation>Frakoblet (%1 bekreftelser)</translation> - </message> - <message> - <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation>Ubekreftet (%1 av %2 bekreftelser)</translation> - </message> - <message> - <location line="-22"/> - <location line="+25"/> + <location line="+12"/> <source>Confirmed (%1 confirmations)</source> <translation>Bekreftet (%1 bekreftelser)</translation> </message> <message> - <location line="-22"/> + <location line="+9"/> <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> @@ -2909,7 +2948,27 @@ Adresse: %4 <translation>Generert men ikke akseptert</translation> </message> <message> - <location line="+62"/> + <location line="-21"/> + <source>Offline</source> + <translation>Frakoblet</translation> + </message> + <message> + <location line="+3"/> + <source>Unconfirmed</source> + <translation>Ubekreftet</translation> + </message> + <message> + <location line="+3"/> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation>Bekrefter (%1 av %2 anbefalte bekreftelser)</translation> + </message> + <message> + <location line="+6"/> + <source>Conflicted</source> + <translation>Konflikt</translation> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation>Mottatt med</translation> </message> @@ -2939,7 +2998,7 @@ Adresse: %4 <translation>-</translation> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation>Transaksjonsstatus. Hold muspekeren over dette feltet for Ã¥ se antall bekreftelser.</translation> </message> @@ -2956,7 +3015,7 @@ Adresse: %4 <message> <location line="+2"/> <source>Destination address of transaction.</source> - <translation>Mottaksadresse for transaksjonen</translation> + <translation>Mottaksadresse for transaksjonen.</translation> </message> <message> <location line="+2"/> @@ -3050,7 +3109,7 @@ Adresse: %4 <message> <location line="+1"/> <source>Copy amount</source> - <translation>Kopiér beløp</translation> + <translation>Kopier beløp</translation> </message> <message> <location line="+1"/> @@ -3068,7 +3127,7 @@ Adresse: %4 <translation>Vis transaksjonsdetaljer</translation> </message> <message> - <location line="+142"/> + <location line="+140"/> <source>Export Transaction History</source> <translation>Eksporter Transaksjonshistorikk</translation> </message> @@ -3164,7 +3223,7 @@ Adresse: %4 <message> <location filename="../walletview.cpp" line="+43"/> <source>&Export</source> - <translation>&Eksporter...</translation> + <translation>&Eksporter</translation> </message> <message> <location line="+1"/> @@ -3174,7 +3233,7 @@ Adresse: %4 <message> <location line="+181"/> <source>Backup Wallet</source> - <translation>Sikkerhetskopier lommebok</translation> + <translation>Sikkerhetskopier Lommebok</translation> </message> <message> <location line="+1"/> @@ -3184,7 +3243,7 @@ Adresse: %4 <message> <location line="+6"/> <source>Backup Failed</source> - <translation>Sikkerhetskopiering feilet</translation> + <translation>Sikkerhetskopiering Feilet</translation> </message> <message> <location line="+0"/> @@ -3199,18 +3258,18 @@ Adresse: %4 <message> <location line="+0"/> <source>Backup Successful</source> - <translation>Sikkerhetskopiering fullført</translation> + <translation>Sikkerhetskopiering Fullført</translation> </message> </context> <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+226"/> <source>Usage:</source> <translation>Bruk:</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>List commands</source> <translation>List opp kommandoer</translation> </message> @@ -3240,14 +3299,9 @@ Adresse: %4 <translation>Angi mappe for datafiler</translation> </message> <message> - <location line="-9"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation>Sett størrelse pÃ¥ mellomlager for database i megabytes (standardverdi: 25)</translation> - </message> - <message> - <location line="-26"/> + <location line="-35"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> - <translation>Lytt etter tilkoblinger pÃ¥ <port> (standardverdi: 8333 eller testnet: 18333)</translation> + <translation>Lytt etter tilkoblinger pÃ¥ <port> (standardverdi: 8333 eller testnett: 18333)</translation> </message> <message> <location line="+5"/> @@ -3265,47 +3319,47 @@ Adresse: %4 <translation>Angi din egen offentlige adresse</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <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="-148"/> + <location line="-151"/> <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="-36"/> + <location line="-38"/> <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> + <translation>En feil oppstod ved opprettelse av RPC-port %u for IPv4: %s</translation> </message> <message> - <location line="+34"/> + <location line="+36"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> - <translation>Lytt etter JSON-RPC tilkoblinger pÃ¥ <port> (standardverdi: 8332 or testnet: 18332)</translation> + <translation>Lytt etter JSON-RPC tilkoblinger pÃ¥ <port> (standardverdi: 8332 eller testnett: 18332)</translation> </message> <message> - <location line="+45"/> + <location line="+46"/> <source>Accept command line and JSON-RPC commands</source> <translation>Ta imot kommandolinje- og JSON-RPC-kommandoer</translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Run in the background as a daemon and accept commands</source> <translation>Kjør i bakgrunnen som daemon og ta imot kommandoer</translation> </message> <message> - <location line="+39"/> + <location line="+40"/> <source>Use the test network</source> <translation>Bruk testnettverket</translation> </message> <message> - <location line="-118"/> + <location line="-120"/> <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="-95"/> + <location line="-98"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -3326,7 +3380,7 @@ rpcpassord=%s Brukernavnet og passordet MÃ… IKKE være like. Om filen ikke eksisterer, opprett den nÃ¥ med eier-kun-les filrettigheter. Det er ogsÃ¥ anbefalt at Ã¥ sette varselsmelding slik du fÃ¥r melding om problemer. -For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@foo.com</translation> +For eksempel: varselmelding=echo %%s | mail -s "Bitcoin Varsel" admin@foo.com</translation> </message> <message> <location line="+12"/> @@ -3336,7 +3390,7 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <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>En feil oppstod under oppsettet av RPC port %u for IPv6, tilbakestilles til IPv4: %s</translation> + <translation>En feil oppstod under oppsettet av RPC-port %u for IPv6, tilbakestilles til IPv4: %s</translation> </message> <message> <location line="+3"/> @@ -3344,42 +3398,47 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <translation>Bind til angitt adresse. Bruk [vertsmaskin]:port notasjon for IPv6</translation> </message> <message> - <location line="+3"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> - <translation>Kan ikke skaffe lÃ¥s pÃ¥ denne datamappen %s. Bitcoin kjører sansynlig alerede.</translation> - </message> - <message> - <location line="+3"/> + <location line="+6"/> <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>GÃ¥ til modus for regresjonstesting, som bruker en spesiell blokkjede der blokker kan bli løst momentant. Dette er tenkt til verktøy for regresjonstesting og apputvikling.</translation> </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"/> + <translation>GÃ¥ til modus for regresjonstesting, som bruker en spesiell blokkjede der blokker kan bli løst momentant.</translation> </message> <message> <location line="+3"/> + <source>Error: Listening for incoming connections failed (listen returned error %d)</source> + <translation>Feil: Lytting etter innkommende tilkoblinger feilet (lytting returnerte feil %d)</translation> + </message> + <message> + <location line="+2"/> <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> + <translation>Feil: Transaksjonen ble avvist! Dette kan skje hvis noen av myntene i lommeboken allerede er blitt brukt, som om du brukte en kopi av wallet.dat og myntene ble brukt i kopien, men ikke markert som brukt her.</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>Feil: Denne transaksjonen trenger en gebyr pÃ¥ minst %s pÃ¥ grunn av beløpet, kompleksiteten, eller bruk av allerede mottatte penger.</translation> + <translation>Feil: Denne transaksjonen trenger en gebyr pÃ¥ minst %s pÃ¥ grunn av beløpet, kompleksiteten eller bruk av allerede mottatte penger!</translation> </message> <message> <location line="+6"/> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> - <translation>Kjør kommando nÃ¥r en lommeboktransaksjon endres (%s i cmd er erstattet med TxID)</translation> + <translation>Kjør kommando nÃ¥r en lommeboktransaksjon endres (%s i kommando er erstattet med TxID)</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>Dette er en forhÃ¥nds-sluppet test versjon - bruk pÃ¥ egen risiko - ikke for bruk av "Mining" (utvinning) eller markedsføring applikasjoner.</translation> + <translation>Dette er en forhÃ¥ndssluppet testversjon - bruk pÃ¥ egen risiko - ikke for bruk til blokkutvinning eller bedriftsapplikasjoner</translation> </message> <message> - <location line="+5"/> + <location line="+3"/> + <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source> + <translation>Ute av stand til Ã¥ binde til %s pÃ¥ denne datamaskinen. Bitcoin Core kjører sannsynligvis allerede.</translation> + </message> + <message> + <location line="+3"/> <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source> <translation>Bruk separate SOCKS5 proxyer for Ã¥ nÃ¥ noder via Tor skjulte tjenester (standardverdi: -proxy)</translation> </message> @@ -3396,22 +3455,22 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <message> <location line="+3"/> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> - <translation>Advarsel: Nettverket ser ikke ut til Ã¥ vær enig! Noen minere ser ut til Ã¥ ha problemer.</translation> + <translation>Advarsel: Nettverket ser ikke ut til Ã¥ være enig! Noen minere ser ut til Ã¥ ha problemer.</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>Advarsel: Vi ser ikke ut til Ã¥ være enige med vÃ¥re noder! Du mÃ¥ oppgradere, eller andre nodes mÃ¥ oppgradere.</translation> + <translation>Advarsel: Vi ser ikke ut til Ã¥ være enige med vÃ¥re noder! Du mÃ¥ oppgradere, eller andre noder mÃ¥ oppgradere.</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>Advarsel: Feil ved lesing av wallet.dat! Alle taster lest riktig, men transaksjon dataene eller adresse innlegg er kanskje manglende eller feil.</translation> + <translation>Advarsel: Feil ved lesing av wallet.dat! Alle nøkler lest riktig, men transaksjonsdataene eller oppføringer i adresseboken mangler kanskje eller er feil.</translation> </message> <message> <location line="+3"/> <source>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</source> - <translation type="unfinished"/> + <translation>Advarsel: wallet.dat korrupt, data reddet! Original wallet.dat lagret som wallet.{timestamp}.bak i %s; hvis din saldo eller dine transaksjoner ikke er korrekte bør du gjenopprette fra en backup.</translation> </message> <message> <location line="+9"/> @@ -3426,7 +3485,7 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <message> <location line="+1"/> <source>Bitcoin Core Daemon</source> - <translation type="unfinished"/> + <translation>Bitcoin Core Daemon</translation> </message> <message> <location line="+1"/> @@ -3440,6 +3499,11 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ </message> <message> <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation>Tøm listen over transaksjoner i lommeboken (diagnoseverktøy; impliserer -rescan)</translation> + </message> + <message> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation>Koble kun til angitt(e) node(r)</translation> </message> @@ -3466,7 +3530,7 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <message> <location line="+1"/> <source>Do not load the wallet and disable wallet RPC calls</source> - <translation type="unfinished"/> + <translation>Ikke last inn lommeboken og deaktiver RPC-kall</translation> </message> <message> <location line="+1"/> @@ -3481,7 +3545,7 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <message> <location line="+1"/> <source>Error initializing wallet database environment %s!</source> - <translation>Feil under oppstart av lommebokdatabasemiljø %s!</translation> + <translation>Feil under oppstart av lommeboken sitt databasemiljø %s!</translation> </message> <message> <location line="+1"/> @@ -3496,7 +3560,7 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <message> <location line="+2"/> <source>Error: Disk space is low!</source> - <translation>Feil: lite ledig lagringsplass!</translation> + <translation>Feil: Lite ledig lagringsplass!</translation> </message> <message> <location line="+1"/> @@ -3551,7 +3615,7 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <message> <location line="+1"/> <source>Failed to write to coin database</source> - <translation>Feil ved skriving av bitcoin database</translation> + <translation>Feil ved skriving til bitcoin sin database</translation> </message> <message> <location line="+1"/> @@ -3561,7 +3625,7 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <message> <location line="+1"/> <source>Failed to write undo data</source> - <translation>Feil ved skriving av angre-data</translation> + <translation>Feil ved skriving av angredata</translation> </message> <message> <location line="+1"/> @@ -3571,12 +3635,12 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <message> <location line="+1"/> <source>Find peers using DNS lookup (default: 1 unless -connect)</source> - <translation>Finn andre noder gjennom DNS-oppslag (standardverdi: 1 med mindre -connect er oppgit)</translation> + <translation>Finn andre noder gjennom DNS-oppslag (standardverdi: 1 med mindre -connect er oppgitt)</translation> </message> <message> <location line="+1"/> <source>Generate coins (default: 0)</source> - <translation>Generér bitcoins (standardverdi: 0)</translation> + <translation>Generer bitcoins (standardverdi: 0)</translation> </message> <message> <location line="+2"/> @@ -3591,12 +3655,12 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <message> <location line="+1"/> <source>If <category> is not supplied, output all debugging information.</source> - <translation type="unfinished"/> + <translation>Hvis <category> ikke er oppgitt, ta ut all informasjon om feilsøking.</translation> </message> <message> <location line="+2"/> <source>Incorrect or no genesis block found. Wrong datadir for network?</source> - <translation>Ugyldig eller ingen skaperblokk funnet. Feil datadir for nettverk?</translation> + <translation>Ugyldig eller ingen skaperblokk funnet. Feil datamappe for nettverk?</translation> </message> <message> <location line="+3"/> @@ -3611,57 +3675,67 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <message> <location line="+5"/> <source>Prepend debug output with timestamp (default: 1)</source> - <translation type="unfinished"/> + <translation>Sett inn tidsstempel i front av feilsøkingsdata (standardverdi: 1)</translation> </message> <message> <location line="+1"/> <source>RPC client options:</source> - <translation>RPC klient innstillinger:</translation> + <translation>Innstillinger for RPC-klient:</translation> </message> <message> <location line="+1"/> <source>Rebuild block chain index from current blk000??.dat files</source> - <translation>Gjenopprett blokkjedeindex fra blk000??.dat filer</translation> + <translation>Gjenopprett blokkjedeindeks fra blk000??.dat filer</translation> </message> <message> <location line="+5"/> <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source> - <translation>Velg versjon av SOCKS proxy (4 eller 5, standardverdi: 5)</translation> + <translation>Velg versjon av SOCKS -proxy (4 eller 5, standardverdi: 5)</translation> </message> <message> <location line="+1"/> <source>Send command to Bitcoin server</source> - <translation>Send kommando til Bitcoin tjener</translation> + <translation>Send kommando til Bitcoin-tjener</translation> </message> <message> - <location line="+7"/> + <location line="+5"/> + <source>Set database cache size in megabytes (%d to %d, default: %d)</source> + <translation>Sett databasen sin størrelse pÃ¥ hurtigbufferen i megabytes (%d til %d, standardverdi: %d)</translation> + </message> + <message> + <location line="+2"/> <source>Set maximum block size in bytes (default: %d)</source> <translation>Sett maks blokkstørrelse i bytes (standardverdi: %d)</translation> </message> <message> <location line="+2"/> <source>Set the number of threads to service RPC calls (default: 4)</source> - <translation>Sett nummer av trÃ¥der til betjening av RPC kall (standardverdi: 4)</translation> + <translation>Sett nummer av trÃ¥der til betjening av RPC-kall (standardverdi: 4)</translation> </message> <message> <location line="+7"/> <source>Specify wallet file (within data directory)</source> - <translation>Angi lommebok fil (inne i data mappe)</translation> + <translation>Angi lommebokfil (inne i datamappe)</translation> </message> <message> <location line="+2"/> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation>Bruk ubekreftet veksel ved sending av transaksjoner (standardverdi: 1)</translation> + </message> + <message> + <location line="+1"/> <source>Start Bitcoin server</source> - <translation>Start Bitcoin tjener</translation> + <translation>Start Bitcoin-tjener</translation> </message> <message> <location line="+3"/> <source>This is intended for regression testing tools and app development.</source> - <translation type="unfinished"/> + <translation>Dette er tiltenkt verktøy for regresjonstesting og apputvikling.</translation> </message> <message> <location line="+10"/> <source>Usage (deprecated, use bitcoin-cli):</source> - <translation type="unfinished"/> + <translation>Bruk (foreldet, bruk bitcoin-cli):</translation> </message> <message> <location line="+7"/> @@ -3676,22 +3750,22 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <message> <location line="+1"/> <source>Wait for RPC server to start</source> - <translation>Vent pÃ¥ start av RPV tjeneren</translation> + <translation>Vent pÃ¥ start av RPC-tjeneren</translation> </message> <message> <location line="+1"/> <source>Wallet %s resides outside data directory %s</source> - <translation>Lommebok %s befinner seg utenfor data mappe %s</translation> + <translation>Lommebok %s befinner seg utenfor datamappe %s</translation> </message> <message> <location line="+2"/> <source>Wallet options:</source> - <translation type="unfinished"/> + <translation>Valg for lommebok:</translation> </message> <message> <location line="+2"/> <source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source> - <translation type="unfinished"/> + <translation>Advarsel: Utløpt argument -debugnet ignorert, bruk -debug=net</translation> </message> <message> <location line="+2"/> @@ -3699,44 +3773,49 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <translation>Du mÃ¥ gjenoppbygge databasen med Ã¥ bruke -reindex for Ã¥ endre -txindex</translation> </message> <message> - <location line="-79"/> + <location line="-80"/> <source>Imports blocks from external blk000??.dat file</source> - <translation>Importerer blokker fra ekstern blk000?.dat fil</translation> + <translation>Importerer blokker fra ekstern fil blk000??.dat</translation> </message> <message> - <location line="-105"/> + <location line="-126"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source> + <translation>Ute av stand til Ã¥ lÃ¥se datamappen %s. Bitcoin Core kjører sannsynligvis allerede.</translation> + </message> + <message> + <location line="+19"/> <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"/> + <translation>Utfør kommando nÃ¥r et relevant varsel er mottatt eller vi ser en veldig lang gaffel (%s i kommando er erstattet med melding)</translation> </message> <message> <location line="+14"/> <source>Output debugging information (default: 0, supplying <category> is optional)</source> - <translation type="unfinished"/> + <translation>Ta ut feilsøkingsinformasjon (standardverdi: 0, bruk av <category> er valgfritt)</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>Sett maksimum størrelse for transaksjoner med høy prioritet / lavt gebyr, i bytes (standardverdi: %d)</translation> </message> <message> <location line="+2"/> <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> - <translation type="unfinished"/> + <translation>Sett antall script verifikasjonstrÃ¥der (opp til 16, 0 = automatisk, <0 = la sÃ¥ mange kjerner være ledig, standardvalg: 0)</translation> </message> <message> - <location line="+89"/> + <location line="+91"/> <source>Information</source> <translation>Informasjon</translation> </message> <message> <location line="+4"/> <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> - <translation>Ugyldig mengde for -minrelaytxfee=<amount>: '%s'</translation> + <translation>Ugyldig mengde for -minrelaytxfee=<beløp>: '%s'</translation> </message> <message> <location line="+1"/> <source>Invalid amount for -mintxfee=<amount>: '%s'</source> - <translation>Ugyldig mengde for -mintxfee=<amount>: '%s'</translation> + <translation>Ugyldig mengde for -mintxfee=<beløp>: '%s'</translation> </message> <message> <location line="+8"/> @@ -3756,7 +3835,7 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <message> <location line="+2"/> <source>Only accept block chain matching built-in checkpoints (default: 1)</source> - <translation type="unfinished"/> + <translation>Aksepter kun en blokkjede som passer med innebygde sjekkpunkter (standardvalg: 1)</translation> </message> <message> <location line="+1"/> @@ -3771,7 +3850,7 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <message> <location line="+4"/> <source>Send trace/debug info to console instead of debug.log file</source> - <translation>Send spor/debug informasjon til konsollet istedenfor debug.log filen</translation> + <translation>Send spor-/feilsøkingsinformasjon til konsollen istedenfor filen debug.log</translation> </message> <message> <location line="+6"/> @@ -3781,7 +3860,7 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <message> <location line="+2"/> <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> - <translation>Krymp debug.log filen nÃ¥r klienten starter (standardverdi: 1 hvis uten -debug)</translation> + <translation>Krymp filen debug.log nÃ¥r klienten starter (standardverdi: 1 hvis uten -debug)</translation> </message> <message> <location line="+1"/> @@ -3794,7 +3873,7 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <translation>Angi tidsavbrudd for forbindelse i millisekunder (standardverdi: 5000)</translation> </message> <message> - <location line="+6"/> + <location line="+7"/> <source>System error: </source> <translation>Systemfeil:</translation> </message> @@ -3806,7 +3885,7 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <message> <location line="+1"/> <source>Transaction amounts must be positive</source> - <translation>Transaksjonsmengden mÃ¥ være positiv</translation> + <translation>Transaksjonsbeløpet mÃ¥ være positivt</translation> </message> <message> <location line="+1"/> @@ -3840,6 +3919,11 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation>Zapper alle transaksjoner fra lommeboken...</translation> + </message> + <message> + <location line="+1"/> <source>version</source> <translation>versjon</translation> </message> @@ -3849,47 +3933,47 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <translation>wallet.dat korrupt, bergning feilet</translation> </message> <message> - <location line="-58"/> + <location line="-60"/> <source>Password for JSON-RPC connections</source> <translation>Passord for JSON-RPC forbindelser</translation> </message> <message> - <location line="-70"/> + <location line="-71"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Tillat JSON-RPC tilkoblinger fra angitt IP-adresse</translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>Send kommandoer til node pÃ¥ <ip> (standardverdi: 127.0.0.1)</translation> </message> <message> - <location line="-132"/> + <location line="-134"/> <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> + <translation>Utfør kommando nÃ¥r beste blokk endrer seg (%s i kommandoen erstattes med blokkens hash)</translation> </message> <message> - <location line="+161"/> + <location line="+164"/> <source>Upgrade wallet to latest format</source> - <translation>Oppgradér lommebok til nyeste format</translation> + <translation>Oppgrader lommebok til nyeste format</translation> </message> <message> - <location line="-24"/> + <location line="-25"/> <source>Set key pool size to <n> (default: 100)</source> - <translation>Angi størrelse pÃ¥ nøkkel-lager til <n> (standardverdi: 100)</translation> + <translation>Angi størrelsen pÃ¥ nøkkellageret til <n> (standardverdi: 100)</translation> </message> <message> <location line="-11"/> <source>Rescan the block chain for missing wallet transactions</source> - <translation>Se gjennom blokk-kjeden etter manglende lommeboktransaksjoner</translation> + <translation>Se gjennom blokkjeden etter manglende lommeboktransaksjoner</translation> </message> <message> - <location line="+38"/> + <location line="+39"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Bruk OpenSSL (https) for JSON-RPC forbindelser</translation> </message> <message> - <location line="-30"/> + <location line="-31"/> <source>Server certificate file (default: server.cert)</source> <translation>Servers sertifikat (standardverdi: server.cert)</translation> </message> @@ -3899,7 +3983,7 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <translation>Servers private nøkkel (standardverdi: server.pem)</translation> </message> <message> - <location line="+16"/> + <location line="+17"/> <source>This help message</source> <translation>Denne hjelpemeldingen</translation> </message> @@ -3909,12 +3993,12 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <translation>Kan ikke binde til %s pÃ¥ denne datamaskinen (bind returnerte feil %d, %s)</translation> </message> <message> - <location line="-107"/> + <location line="-109"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> - <translation>Tillat DNS oppslag for -addnode, -seednode og -connect</translation> + <translation>Tillat oppslag i DNS for -addnode, -seednode og -connect</translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Loading addresses...</source> <translation>Laster adresser...</translation> </message> @@ -3929,12 +4013,12 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <translation>Feil ved lasting av wallet.dat: Lommeboken krever en nyere versjon av Bitcoin</translation> </message> <message> - <location line="+98"/> + <location line="+99"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>Lommeboken mÃ¥tte skrives om: start Bitcoin pÃ¥ nytt for Ã¥ fullføre</translation> </message> <message> - <location line="-100"/> + <location line="-101"/> <source>Error loading wallet.dat</source> <translation>Feil ved lasting av wallet.dat</translation> </message> @@ -3944,17 +4028,17 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <translation>Ugyldig -proxy adresse: '%s'</translation> </message> <message> - <location line="+56"/> + <location line="+57"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Ukjent nettverk angitt i -onlynet '%s'</translation> </message> <message> <location line="-1"/> <source>Unknown -socks proxy version requested: %i</source> - <translation>Ukjent -socks proxy versjon angitt: %i</translation> + <translation>Ukjent -socks proxyversjon angitt: %i</translation> </message> <message> - <location line="-101"/> + <location line="-103"/> <source>Cannot resolve -bind address: '%s'</source> <translation>Kunne ikke slÃ¥ opp -bind adresse: '%s'</translation> </message> @@ -3964,7 +4048,7 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <translation>Kunne ikke slÃ¥ opp -externalip adresse: '%s'</translation> </message> <message> - <location line="+48"/> + <location line="+49"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>Ugyldig beløp for -paytxfee=<beløp>: '%s'</translation> </message> @@ -3984,22 +4068,17 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <translation>Laster blokkindeks...</translation> </message> <message> - <location line="-62"/> + <location line="-63"/> <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> <message> - <location line="-32"/> - <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source> - <translation>Kan ikke binde til %s pÃ¥ denne datamaskinen. Sannsynligvis kjører Bitcoin allerede.</translation> - </message> - <message> - <location line="+95"/> + <location line="+64"/> <source>Loading wallet...</source> <translation>Laster lommebok...</translation> </message> <message> - <location line="-56"/> + <location line="-57"/> <source>Cannot downgrade wallet</source> <translation>Kan ikke nedgradere lommebok</translation> </message> @@ -4009,7 +4088,7 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <translation>Kan ikke skrive standardadresse</translation> </message> <message> - <location line="+67"/> + <location line="+68"/> <source>Rescanning...</source> <translation>Leser gjennom...</translation> </message> @@ -4019,17 +4098,17 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <translation>Ferdig med lasting</translation> </message> <message> - <location line="+85"/> + <location line="+86"/> <source>To use the %s option</source> <translation>For Ã¥ bruke %s opsjonen</translation> </message> <message> - <location line="-77"/> + <location line="-78"/> <source>Error</source> <translation>Feil</translation> </message> <message> - <location line="-35"/> + <location line="-36"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_pam.ts b/src/qt/locale/bitcoin_pam.ts index 781b5c04a5..f971242412 100644 --- a/src/qt/locale/bitcoin_pam.ts +++ b/src/qt/locale/bitcoin_pam.ts @@ -34,6 +34,12 @@ Ing produktung ini atin yang makayabeng software a gewa dareng OpenSSL Project p <source>The Bitcoin Core developers</source> <translation type="unfinished"/> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source> (%1-bit)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>AddressBookPage</name> @@ -615,6 +621,16 @@ Ing produktung ini atin yang makayabeng software a gewa dareng OpenSSL Project p <translation><numerusform>%n dominggu</numerusform><numerusform>%n dominggu</numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation type="unfinished"/> @@ -688,7 +704,7 @@ Address: %4 <translation>Maka-<b>encrypt</b> ya ing wallet at kasalukuyan yang maka-<b>locked</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+435"/> <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> @@ -749,7 +765,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation type="unfinished"/> </message> @@ -764,7 +780,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation>Alaga</translation> </message> @@ -915,7 +931,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation type="unfinished"/> </message> @@ -1097,7 +1113,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation>Kapilubluban ning Bitcoin</translation> </message> @@ -1241,7 +1257,7 @@ Address: %4 <translation>&Pun</translation> </message> <message> - <location line="+6"/> + <location line="+122"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation type="unfinished"/> </message> @@ -1251,7 +1267,7 @@ Address: %4 <translation>Mamayad &bayad para king transaksion </translation> </message> <message> - <location line="+31"/> + <location line="-131"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation>Umpisan yang antimu ing Bitcoin kaibat mekapag-log in king sistema.</translation> </message> @@ -1266,12 +1282,7 @@ Address: %4 <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"/> + <location line="+16"/> <source>MB</source> <translation type="unfinished"/> </message> @@ -1286,7 +1297,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+58"/> + <location line="+107"/> + <source>&Spend unconfirmed change (experts only)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+37"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation type="unfinished"/> </message> @@ -1321,7 +1337,17 @@ Address: %4 <translation>&Network</translation> </message> <message> - <location line="+6"/> + <location line="-86"/> + <source>W&allet</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+52"/> + <source>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.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+40"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>Ibuklat yang antimanu ing Bitcoin client port king router. Gagana yamu ini istung ing router mu susuporta yang UPnP at magsilbi ya.</translation> </message> @@ -1436,17 +1462,17 @@ Address: %4 <translation>I-&Cancel</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+70"/> <source>default</source> <translation>default</translation> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation type="unfinished"/> </message> <message> - <location line="+75"/> + <location line="+78"/> <source>Confirm options reset</source> <translation type="unfinished"/> </message> @@ -1486,19 +1512,14 @@ Address: %4 <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="-155"/> - <source>Unconfirmed:</source> - <translation>Ali pa me-kumpirma:</translation> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation>Wallet</translation> </message> <message> <location line="+51"/> - <source>Confirmed:</source> - <translation>Me-kumpirma:</translation> + <source>Available:</source> + <translation type="unfinished"/> </message> <message> <location line="+16"/> @@ -1506,7 +1527,12 @@ Address: %4 <translation>Ing kekang kasalungsungan balanse a malyari mung gastusan</translation> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation>Ing kabuuan dareng transaksion a kasalungsungan ali pa me-kumpirma, at kasalungsungan ali pa mebilang kareng kekang balanseng malyari mung gastusan</translation> </message> @@ -1654,6 +1680,11 @@ Address: %4 <source>Error: Invalid combination of -regtest and -testnet.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../guiutil.cpp" line="+82"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>Magpalub kang Bitcoin address(e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> </context> <context> <name>QRImageWidget</name> @@ -1874,22 +1905,22 @@ Address: %4 <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+83"/> + <location filename="../forms/receivecoinsdialog.ui" line="+107"/> <source>&Amount:</source> <translation type="unfinished"/> </message> <message> - <location line="-13"/> + <location line="-16"/> <source>&Label:</source> <translation>&Label:</translation> </message> <message> - <location line="-34"/> + <location line="-37"/> <source>&Message:</source> <translation type="unfinished"/> </message> <message> - <location line="-17"/> + <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"/> </message> @@ -1899,27 +1930,30 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+27"/> - <source>An optional 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"/> </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> + <location line="-7"/> + <location line="+21"/> + <source>An optional label to associate with the new receiving address.</source> <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="-7"/> <source>Use this form to request payments. All fields are <b>optional</b>.</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <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"/> </message> <message> - <location line="+17"/> + <location line="+32"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -1929,17 +1963,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+36"/> - <source>&Request payment</source> + <location line="+78"/> + <source>Requested payments history</source> <translation type="unfinished"/> </message> <message> - <location line="+47"/> - <source>Requested payments</source> + <location line="-98"/> + <source>&Request payment</source> <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+120"/> <source>Show the selected request (does the same as double clicking an entry)</source> <translation type="unfinished"/> </message> @@ -1958,6 +1992,21 @@ Address: %4 <source>Remove</source> <translation type="unfinished"/> </message> + <message> + <location filename="../receivecoinsdialog.cpp" line="+38"/> + <source>Copy label</source> + <translation>Kopyan ing label</translation> + </message> + <message> + <location line="+1"/> + <source>Copy message</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation>Kopyan ing alaga</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -2059,12 +2108,17 @@ Address: %4 <source>(no message)</source> <translation type="unfinished"/> </message> + <message> + <location line="+8"/> + <source>(no amount)</source> + <translation type="unfinished"/> + </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>Magpadalang Barya</translation> @@ -2140,7 +2194,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+115"/> + <location line="+164"/> <source>Send to multiple recipients at once</source> <translation>Misanang magpadala kareng alialiuang tumanggap</translation> </message> @@ -2150,7 +2204,7 @@ Address: %4 <translation>Maglage &Tumanggap</translation> </message> <message> - <location line="+20"/> + <location line="-23"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -2160,12 +2214,12 @@ Address: %4 <translation>I-Clear &Eganagana</translation> </message> <message> - <location line="+22"/> + <location line="+52"/> <source>Balance:</source> <translation>Balanse:</translation> </message> <message> - <location line="+41"/> + <location line="-78"/> <source>Confirm the send action</source> <translation>Kumpirman ing aksion king pamagpadala</translation> </message> @@ -2175,7 +2229,7 @@ Address: %4 <translation>Ipadala</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-228"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation>Kumpirman ing pamagpadalang barya</translation> </message> @@ -2188,12 +2242,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-136"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Magpalub kang Bitcoin address(e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> - <message> - <location line="+15"/> + <location line="-121"/> <source>Copy quantity</source> <translation type="unfinished"/> </message> @@ -2243,7 +2292,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+202"/> + <location line="+203"/> <source>The recipient address is not valid, please recheck.</source> <translation>Ing address na ning tumanggap ali ya katanggap-tanggap, maliari pung pakilaue pasibayu.</translation> </message> @@ -2278,12 +2327,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Warning: Invalid Bitcoin address</source> <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+20"/> <source>(no label)</source> <translation>(alang label)</translation> </message> @@ -2293,7 +2342,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-366"/> + <location line="-367"/> <source>Are you sure you want to send?</source> <translation type="unfinished"/> </message> @@ -2303,7 +2352,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+170"/> + <location line="+171"/> <source>Payment request expired</source> <translation type="unfinished"/> </message> @@ -2380,12 +2429,7 @@ Address: %4 <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"/> + <location line="+968"/> <source>This is a verified payment request.</source> <translation type="unfinished"/> </message> @@ -2395,7 +2439,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+459"/> + <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"/> + </message> + <message> + <location line="+426"/> <source>This is an unverified payment request.</source> <translation type="unfinished"/> </message> @@ -2411,11 +2460,6 @@ Address: %4 <source>Memo:</source> <translation type="unfinished"/> </message> - <message> - <location filename="../sendcoinsentry.cpp" line="+1"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Magpalub kang Bitcoin address(e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> </context> <context> <name>ShutdownWindow</name> @@ -2453,19 +2497,19 @@ Address: %4 <translation>Ing address ban a -pirman ya ing mensayi kayabe ning (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"/> </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>Idikit ing address menibat clipboard</translation> </message> @@ -2506,12 +2550,12 @@ Address: %4 </message> <message> <location line="+3"/> - <location line="+146"/> + <location line="+143"/> <source>Clear &All</source> <translation>I-Clear &Eganagana</translation> </message> <message> - <location line="-87"/> + <location line="-84"/> <source>&Verify Message</source> <translation>&Beripikan ing Mensayi</translation> </message> @@ -2526,7 +2570,7 @@ Address: %4 <translation>Ing address na ning mensayi nung nokarin me pirma ya ini (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>Beripikan ing mensayi ban asiguradu a me pirma ya ini gamit ing mepiling Bitcoin address</translation> </message> @@ -2541,43 +2585,37 @@ Address: %4 <translation>Ibalik king dati reng ngan fields na ning pamag beripikang mensayi</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>Magpalub kang Bitcoin address(e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location line="-2"/> + <location line="-1"/> <source>Click "Sign Message" to generate signature</source> <translation>I-click ing "Pirman ing Mensayi" ban agawa ya ing metung a pirma</translation> </message> <message> - <location line="+3"/> - <source>Enter Bitcoin signature</source> - <translation>Ipalub ing pirma na ning Bitcoin</translation> - </message> - <message> <location line="+84"/> - <location line="+81"/> + <location line="+80"/> <source>The entered address is invalid.</source> <translation>Ing milub a address e ya katanggap-tanggap.</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>Maliaring pakilawe pasibayu ing address at pasibayuan ya iti.</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>Ing milub a address ali ya mag-refer king metung a key.</translation> </message> <message> - <location line="-73"/> + <location line="-72"/> <source>Wallet unlock was cancelled.</source> <translation>Me-kansela ya ing pamag-unlock king wallet.</translation> </message> @@ -2597,7 +2635,7 @@ Address: %4 <translation>Me-pirman ne ing mensayi.</translation> </message> <message> - <location line="+59"/> + <location line="+58"/> <source>The signature could not be decoded.</source> <translation>Ing pirma ali ya bisang ma-decode.</translation> </message> @@ -2658,6 +2696,11 @@ Address: %4 </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation>%1/offline</translation> </message> @@ -2819,12 +2862,12 @@ Address: %4 <translation>, eya matagumpeng mibalita</translation> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation>e miya balu</translation> </message> @@ -2865,12 +2908,12 @@ Address: %4 <translation>Alaga</translation> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> @@ -2880,23 +2923,12 @@ Address: %4 <translation>Makabuklat anggang %1</translation> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> - <translation>Offline(%1 kumpirmasion)</translation> - </message> - <message> - <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation>Ali pa me-kumpirma(%1 kareng %2 kumpirmasion)</translation> - </message> - <message> - <location line="-22"/> - <location line="+25"/> + <location line="+12"/> <source>Confirmed (%1 confirmations)</source> <translation>Me-kumpirma(%1 kumpirmasion)</translation> </message> <message> - <location line="-22"/> + <location line="+9"/> <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> @@ -2906,7 +2938,27 @@ Address: %4 <translation>Me-generate ya oneng ali ya metanggap</translation> </message> <message> - <location line="+62"/> + <location line="-21"/> + <source>Offline</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Unconfirmed</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation>Atanggap kayabe ning</translation> </message> @@ -2936,7 +2988,7 @@ Address: %4 <translation>(n/a)</translation> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation>Status ning Transaksion: Itapat me babo na ning field a ini ban ipakit dala reng bilang dareng me-kumpirma na</translation> </message> @@ -3202,12 +3254,12 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+223"/> <source>Usage:</source> <translation>Pamanggamit:</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>List commands</source> <translation>Listahan dareng commands</translation> </message> @@ -3262,12 +3314,12 @@ Address: %4 <translation>Sabyan me ing kekang pampublikong address</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation>Threshold for disconnecting misbehaving peers (default: 100)</translation> </message> <message> - <location line="-148"/> + <location line="-150"/> <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> @@ -3287,17 +3339,17 @@ Address: %4 <translation>Tumanggap command line at JSON-RPC commands</translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Run in the background as a daemon and accept commands</source> <translation>Gumana king gulut bilang daemon at tumanggap commands</translation> </message> <message> - <location line="+39"/> + <location line="+40"/> <source>Use the test network</source> <translation>Gamitan ing test network</translation> </message> <message> - <location line="-118"/> + <location line="-120"/> <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> @@ -3428,6 +3480,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation>Kumunekta mu king mepiling node(s)</translation> </message> @@ -3638,6 +3695,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Start Bitcoin server</source> <translation type="unfinished"/> </message> @@ -3687,12 +3749,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-79"/> + <location line="-80"/> <source>Imports blocks from external blk000??.dat file</source> <translation type="unfinished"/> </message> <message> - <location line="-105"/> + <location line="-106"/> <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> @@ -3712,7 +3774,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+89"/> + <location line="+90"/> <source>Information</source> <translation>&Impormasion</translation> </message> @@ -3782,7 +3844,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+7"/> <source>System error: </source> <translation>Kamalian ning sistema:</translation> </message> @@ -3828,6 +3890,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>version</source> <translation>bersion</translation> </message> @@ -3837,32 +3904,32 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-58"/> + <location line="-60"/> <source>Password for JSON-RPC connections</source> <translation>Password para king JSON-RPC koneksion</translation> </message> <message> - <location line="-70"/> + <location line="-71"/> <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="+80"/> + <location line="+81"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>Magpadalang command king node a gagana king <ip>(default: 127.0.0.1)</translation> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>I-execute ing command istung mialilan ya ing best block (%s in cmd is replaced by block hash)</translation> </message> <message> - <location line="+161"/> + <location line="+163"/> <source>Upgrade wallet to latest format</source> <translation>I-upgrade ing wallet king pekabayung porma</translation> </message> <message> - <location line="-24"/> + <location line="-25"/> <source>Set key pool size to <n> (default: 100)</source> <translation>I-set ing key pool size king <n>(default: 100)</translation> </message> @@ -3872,12 +3939,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>I-scan pasibayu ing block chain para kareng mauaualang transaksion</translation> </message> <message> - <location line="+38"/> + <location line="+39"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Gumamit OpenSSL(https) para king JSON-RPC koneksion</translation> </message> <message> - <location line="-30"/> + <location line="-31"/> <source>Server certificate file (default: server.cert)</source> <translation>Server certificate file (default: server.cert)</translation> </message> @@ -3887,7 +3954,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Server private key (default: server.pem)</translation> </message> <message> - <location line="+16"/> + <location line="+17"/> <source>This help message</source> <translation>Ining saup a mensayi</translation> </message> @@ -3897,12 +3964,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Ali ya magsilbing mag-bind keng %s kening kompyuter a ini (bind returned error %d, %s)</translation> </message> <message> - <location line="-107"/> + <location line="-109"/> <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="+60"/> + <location line="+61"/> <source>Loading addresses...</source> <translation>Lo-load da ne ing address...</translation> </message> @@ -3917,12 +3984,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Me-mali ya ing pamag-load na ning wallet.dat: Ing wallet mangailangan yang bayung bersion na ning Bitcoin</translation> </message> <message> - <location line="+98"/> + <location line="+99"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>Ing wallet mangailangan yang misulat pasibayu: Umpisan yang pasibayu ing Bitcoin ban ma-kumpleto ya</translation> </message> <message> - <location line="-100"/> + <location line="-101"/> <source>Error loading wallet.dat</source> <translation>Me-mali ya ing pamag-load king wallet.dat</translation> </message> @@ -3932,7 +3999,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Ali katanggap-tanggap a -proxy addresss: '%s'</translation> </message> <message> - <location line="+56"/> + <location line="+57"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>E kilalang network ing mepili king -onlynet: '%s'</translation> </message> @@ -3942,7 +4009,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>E kilalang -socks proxy version requested: %i</translation> </message> <message> - <location line="-101"/> + <location line="-103"/> <source>Cannot resolve -bind address: '%s'</source> <translation>Eya me-resolve ing -bind address: '%s'</translation> </message> @@ -3952,7 +4019,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Eya me-resolve ing -externalip address: '%s'</translation> </message> <message> - <location line="+48"/> + <location line="+49"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>Eya maliari ing alaga keng -paytxfee=<amount>: '%s'</translation> </message> @@ -3972,7 +4039,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Lo-load dane ing block index...</translation> </message> <message> - <location line="-62"/> + <location line="-63"/> <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> @@ -3982,12 +4049,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Eya megsilbing idikit king %s na ning kompyuter a ini. Mapaliaring mamandar ne ing Bitcoin.</translation> </message> <message> - <location line="+95"/> + <location line="+96"/> <source>Loading wallet...</source> <translation>Lo-load dane ing wallet...</translation> </message> <message> - <location line="-56"/> + <location line="-57"/> <source>Cannot downgrade wallet</source> <translation>Ali ya magsilbing i-downgrade ing wallet</translation> </message> @@ -3997,7 +4064,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Eya misulat ing default address</translation> </message> <message> - <location line="+67"/> + <location line="+68"/> <source>Rescanning...</source> <translation>I-scan deng pasibayu...</translation> </message> @@ -4007,17 +4074,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Yari ne ing pamag-load</translation> </message> <message> - <location line="+85"/> + <location line="+86"/> <source>To use the %s option</source> <translation>Para agamit ing %s a pimamilian</translation> </message> <message> - <location line="-77"/> + <location line="-78"/> <source>Error</source> <translation>Mali</translation> </message> <message> - <location line="-35"/> + <location line="-36"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_pl.ts b/src/qt/locale/bitcoin_pl.ts index 4ea954f5e1..3c80c594dd 100644 --- a/src/qt/locale/bitcoin_pl.ts +++ b/src/qt/locale/bitcoin_pl.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="pl" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="pl" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -36,6 +36,12 @@ This product includes software developed by the OpenSSL Project for use in the O <source>The Bitcoin Core developers</source> <translation>Deweloperzy Bitcoin Core</translation> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source> (%1-bit)</source> + <translation>(%1-bit)</translation> + </message> </context> <context> <name>AddressBookPage</name> @@ -65,7 +71,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Kopiuj</translation> </message> <message> - <location line="+52"/> + <location line="+58"/> <source>C&lose</source> <translation>Z&amknij</translation> </message> @@ -75,7 +81,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Kopiuj adres</translation> </message> <message> - <location filename="../forms/addressbookpage.ui" line="-41"/> + <location filename="../forms/addressbookpage.ui" line="-47"/> <source>Delete the currently selected address from the list</source> <translation>UsuÅ„ zaznaczony adres z listy</translation> </message> @@ -137,7 +143,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+1"/> <source>&Edit</source> - <translation>&Edytuj</translation> + <translation>&Modyfikuj</translation> </message> <message> <location line="+194"/> @@ -322,7 +328,7 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+295"/> + <location filename="../bitcoingui.cpp" line="+294"/> <source>Sign &message...</source> <translation>Podpisz wiado&mość...</translation> </message> @@ -337,12 +343,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>P&odsumowanie</translation> </message> <message> - <location line="-137"/> + <location line="-136"/> <source>Node</source> <translation type="unfinished"/> </message> <message> - <location line="+138"/> + <location line="+137"/> <source>Show general overview of wallet</source> <translation>Pokazuje ogólny zarys portfela</translation> </message> @@ -405,17 +411,17 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+10"/> <source>&Sending addresses...</source> - <translation type="unfinished"/> + <translation>Adres wysyÅ‚ania</translation> </message> <message> <location line="+2"/> <source>&Receiving addresses...</source> - <translation type="unfinished"/> + <translation>Adres odbiorczy</translation> </message> <message> <location line="+3"/> <source>Open &URI...</source> - <translation type="unfinished"/> + <translation>Otwórz URI...</translation> </message> <message> <location line="+325"/> @@ -463,17 +469,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Zweryfikuj wiadomość...</translation> </message> <message> - <location line="+430"/> + <location line="+440"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-643"/> + <location line="-652"/> <source>Wallet</source> <translation>Portfel</translation> </message> <message> - <location line="+146"/> + <location line="+145"/> <source>&Send</source> <translation>WyÅ›lij</translation> </message> @@ -529,18 +535,18 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Pasek zakÅ‚adek</translation> </message> <message> - <location line="-284"/> - <location line="+376"/> + <location line="-283"/> + <location line="+375"/> <source>[testnet]</source> <translation>[testnet]</translation> </message> <message> - <location line="-401"/> + <location line="-400"/> <source>Bitcoin Core</source> <translation>RdzeÅ„ BitCoin</translation> </message> <message> - <location line="+163"/> + <location line="+162"/> <source>Request payments (generates QR codes and bitcoin: URIs)</source> <translation>Żądaj pÅ‚atnoÅ›ci (generuje kod QR oraz bitcoin URI)</translation> </message> @@ -602,7 +608,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="+23"/> + <location line="+27"/> <source>%n hour(s)</source> <translation><numerusform>%n godzina</numerusform><numerusform>%n godzin</numerusform><numerusform>%n godzin</numerusform></translation> </message> @@ -613,13 +619,24 @@ This product includes software developed by the OpenSSL Project for use in the O </message> <message numerus="yes"> <location line="+4"/> + <location line="+6"/> <source>%n week(s)</source> <translation><numerusform>%n tydzieÅ„</numerusform><numerusform>%n tygodni</numerusform><numerusform>%n tygodni</numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation>%1 i %2</translation> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation><numerusform>%n rok</numerusform><numerusform>%n lata</numerusform><numerusform>%n lat</numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> - <translation>%1 do tyÅ‚u</translation> + <translation>%1 wstecz</translation> </message> <message> <location line="+21"/> @@ -647,12 +664,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Informacja</translation> </message> <message> - <location line="-85"/> + <location line="-95"/> <source>Up to date</source> <translation>Aktualny</translation> </message> <message> - <location line="+34"/> + <location line="+44"/> <source>Catching up...</source> <translation>Åapanie bloków...</translation> </message> @@ -690,7 +707,7 @@ Adres: %4 <translation>Portfel jest <b>zaszyfrowany</b> i obecnie <b>zablokowany</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+441"/> <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> @@ -698,7 +715,7 @@ Adres: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+119"/> + <location filename="../clientmodel.cpp" line="+128"/> <source>Network Alert</source> <translation>Sieć Alert</translation> </message> @@ -751,7 +768,7 @@ Adres: %4 <translation>Reszta:</translation> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation>Zaznacz/Odznacz wszystko</translation> </message> @@ -766,7 +783,7 @@ Adres: %4 <translation>Widok listy</translation> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation>Kwota</translation> </message> @@ -796,7 +813,7 @@ Adres: %4 <translation>Priorytet</translation> </message> <message> - <location filename="../coincontroldialog.cpp" line="+42"/> + <location filename="../coincontroldialog.cpp" line="+41"/> <source>Copy address</source> <translation>Kopiuj adres</translation> </message> @@ -862,7 +879,7 @@ Adres: %4 <translation>Skopiuj resztÄ™</translation> </message> <message> - <location line="+323"/> + <location line="+332"/> <source>highest</source> <translation>najwyższa</translation> </message> @@ -909,7 +926,7 @@ Adres: %4 <message> <location line="+11"/> <source>(%1 locked)</source> - <translation type="unfinished"/> + <translation>(%1 zablokowane)</translation> </message> <message> <location line="+31"/> @@ -917,7 +934,7 @@ Adres: %4 <translation type="unfinished"/> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation type="unfinished"/> </message> @@ -934,39 +951,39 @@ Adres: %4 <message> <location line="+10"/> <source>This label turns red, if the transaction size is greater than 1000 bytes.</source> - <translation type="unfinished"/> + <translation>Etykieta staje siÄ™ czerwona kiedy transakcja jest wiÄ™ksza niż 1000 bajtów.</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>Oznacza to wymaganÄ… opÅ‚atÄ™ minimum %1 na kB.</translation> </message> <message> <location line="-4"/> <source>Can vary +/- 1 byte per input.</source> - <translation type="unfinished"/> + <translation>Waha siÄ™ +/- 1 bajt na wejÅ›cie.</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>Transakcje o wyższym priorytecie zostajÄ… szybciej doÅ‚Ä…czone do bloku.</translation> </message> <message> <location line="+1"/> <source>This label turns red, if the priority is smaller than "medium".</source> - <translation type="unfinished"/> + <translation>Ta etykieta jest czerwona, jeżeli priorytet jest mniejszy niż "Å›redni"</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>Etykieta staje siÄ™ czerwona kiedy którykolwiek odbiorca otrzymuje kwotÄ™ mniejszÄ… niż %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>Oznacza to, że wymagana jest opÅ‚ata przynajmniej %1.</translation> </message> <message> <location line="-3"/> @@ -976,23 +993,23 @@ Adres: %4 <message> <location line="+2"/> <source>This label turns red, if the change is smaller than %1.</source> - <translation type="unfinished"/> + <translation>Etykieta staje siÄ™ czerwona kiedy reszta jest mniejsza niż %1.</translation> </message> <message> <location line="+43"/> - <location line="+66"/> + <location line="+63"/> <source>(no label)</source> <translation>(bez etykiety)</translation> </message> <message> <location line="-9"/> <source>change from %1 (%2)</source> - <translation type="unfinished"/> + <translation>reszta z %1 (%2)</translation> </message> <message> <location line="+1"/> <source>(change)</source> - <translation type="unfinished"/> + <translation>(reszta)</translation> </message> </context> <context> @@ -1000,7 +1017,7 @@ Adres: %4 <message> <location filename="../forms/editaddressdialog.ui" line="+14"/> <source>Edit Address</source> - <translation>Edytuj adres</translation> + <translation>ZmieÅ„ adres</translation> </message> <message> <location line="+11"/> @@ -1035,12 +1052,12 @@ Adres: %4 <message> <location line="+3"/> <source>Edit receiving address</source> - <translation>Edytuj adres odbioru</translation> + <translation>ZmieÅ„ adres odbioru</translation> </message> <message> <location line="+4"/> <source>Edit sending address</source> - <translation>Edytuj adres wysyÅ‚ania</translation> + <translation>ZmieÅ„ adres wysyÅ‚ania</translation> </message> <message> <location line="+76"/> @@ -1096,10 +1113,10 @@ Adres: %4 <message> <location filename="../forms/helpmessagedialog.ui" line="+19"/> <source>Bitcoin Core - Command-line options</source> - <translation type="unfinished"/> + <translation>Opcje konsoli</translation> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation>RdzeÅ„ BitCoin</translation> </message> @@ -1154,17 +1171,17 @@ Adres: %4 <message> <location line="+9"/> <source>Welcome to Bitcoin Core.</source> - <translation type="unfinished"/> + <translation>Witam w Bitcoin Core</translation> </message> <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>Ponieważ jest to pierwsze uruchomienie programu, możesz wybrać gdzie bÄ™dÄ… przechowywane informacje.</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>Program pobierze i bÄ™dzie przechowywaÅ‚ kopiÄ™ Å‚aÅ„cucha bloków Bitcoin. W wybranym katalogu musi być przynajmniej %1GB miejsca, a z czasem wielkość danych bÄ™dzie rosÅ‚a. Portfel bÄ™dzie przechowywany w tym samym katalogu.</translation> </message> <message> <location line="+10"/> @@ -1177,7 +1194,7 @@ Adres: %4 <translation>Użyj wybranego folderu dla danych</translation> </message> <message> - <location filename="../intro.cpp" line="+85"/> + <location filename="../intro.cpp" line="+82"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> @@ -1243,7 +1260,7 @@ Adres: %4 <translation>Główne</translation> </message> <message> - <location line="+6"/> + <location line="+122"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation>Opcjonalna prowizja za transakcje za kB, wspomaga ona szybkość przebiegu transakcji. WiÄ™kszość transakcji jest 1 kB.</translation> </message> @@ -1253,7 +1270,7 @@ Adres: %4 <translation>PÅ‚ać prowizjÄ™ za transakcje</translation> </message> <message> - <location line="+31"/> + <location line="-131"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation>Automatycznie uruchamia Bitcoin po zalogowaniu do systemu.</translation> </message> @@ -1268,14 +1285,9 @@ Adres: %4 <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"/> + <location line="+16"/> <source>MB</source> - <translation type="unfinished"/> + <translation>MB</translation> </message> <message> <location line="+27"/> @@ -1288,7 +1300,7 @@ Adres: %4 <translation>Ustaw liczbÄ™ wÄ…tków skryptu weryfikacji (do 16, 0 = auto, <0 = zostawia takÄ… ilość rdzenie wolnych, domyÅ›lnie: 0)</translation> </message> <message> - <location line="+58"/> + <location line="+153"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation type="unfinished"/> </message> @@ -1300,10 +1312,10 @@ Adres: %4 <message> <location line="+34"/> <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source> - <translation type="unfinished"/> + <translation>Adres IP serwera proxy (np. IPv4: 127.0.0.1 / IPv6: ::1)</translation> </message> <message> - <location line="+224"/> + <location line="+214"/> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1318,12 +1330,37 @@ Adres: %4 <translation>Z&resetuj Ustawienia</translation> </message> <message> - <location line="-323"/> + <location line="-313"/> <source>&Network</source> <translation>&Sieć</translation> </message> <message> - <location line="+6"/> + <location line="-95"/> + <source>W&allet</source> + <translation>Portfel</translation> + </message> + <message> + <location line="+65"/> + <source>Expert</source> + <translation>Ekspert</translation> + </message> + <message> + <location line="+9"/> + <source>Enable coin &control features</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> + <source>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.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>&Spend unconfirmed change</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+17"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>Automatycznie otwiera port klienta Bitcoin na routerze. Ta opcja dzieÅ‚a tylko jeÅ›li twój router wspiera UPnP i jest ono wÅ‚Ä…czone.</translation> </message> @@ -1418,17 +1455,12 @@ Adres: %4 <translation>&WyÅ›wietlaj adresy w liÅ›cie transakcji</translation> </message> <message> - <location line="+7"/> + <location line="-262"/> <source>Whether to show coin control features or not.</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Display coin &control features (experts only)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+136"/> + <location line="+398"/> <source>&OK</source> <translation>&OK</translation> </message> @@ -1438,17 +1470,17 @@ Adres: %4 <translation>&Anuluj</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+70"/> <source>default</source> <translation>domyÅ›lny</translation> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation type="unfinished"/> </message> <message> - <location line="+75"/> + <location line="+78"/> <source>Confirm options reset</source> <translation>Potwierdź reset ustawieÅ„</translation> </message> @@ -1456,17 +1488,17 @@ Adres: %4 <location line="+1"/> <location line="+29"/> <source>Client restart required to activate changes.</source> - <translation type="unfinished"/> + <translation>Wymagany restart programu, aby uaktywnić zmiany.</translation> </message> <message> <location line="-29"/> <source>Client will be shutdown, do you want to proceed?</source> - <translation type="unfinished"/> + <translation>Program zostanie wyÅ‚Ä…czony. Czy chcesz kontynuować?</translation> </message> <message> <location line="+33"/> <source>This change would require a client restart.</source> - <translation type="unfinished"/> + <translation>Ta zmiana może wymagać ponownego uruchomienia klienta.</translation> </message> <message> <location line="+34"/> @@ -1488,19 +1520,14 @@ Adres: %4 <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="-155"/> - <source>Unconfirmed:</source> - <translation>Niepotwierdzone:</translation> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation>Portfel</translation> </message> <message> <location line="+51"/> - <source>Confirmed:</source> - <translation>Potwierdzone:</translation> + <source>Available:</source> + <translation>DostÄ™pne:</translation> </message> <message> <location line="+16"/> @@ -1508,7 +1535,12 @@ Adres: %4 <translation>Twoje obecne saldo</translation> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation>W toku:</translation> + </message> + <message> + <location line="+16"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation>Suma transakcji, które nie zostaÅ‚y jeszcze potwierdzone, a które nie zostaÅ‚y wliczone do twojego obecnego salda</translation> </message> @@ -1641,21 +1673,26 @@ Adres: %4 <context> <name>QObject</name> <message> - <location filename="../bitcoin.cpp" line="+71"/> - <location line="+11"/> + <location filename="../bitcoin.cpp" line="+63"/> + <location line="+14"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="+1"/> + <location line="-13"/> <source>Error: Specified data directory "%1" does not exist.</source> <translation>BÅ‚Ä…d: OkreÅ›lony folder danych "%1" nie istnieje.</translation> </message> <message> - <location line="-12"/> + <location line="+13"/> <source>Error: Invalid combination of -regtest and -testnet.</source> <translation>BÅ‚Ä…d: Niepoprawna kombinacja -regtest i -testnet.</translation> </message> + <message> + <location filename="../guiutil.cpp" line="+82"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>Wprowadź adres Bitcoin (np. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> </context> <context> <name>QRImageWidget</name> @@ -1677,7 +1714,7 @@ Adres: %4 <message> <location line="+0"/> <source>PNG Image (*.png)</source> - <translation type="unfinished"/> + <translation>Obraz PNG (*.png)</translation> </message> </context> <context> @@ -1698,7 +1735,7 @@ Adres: %4 <location line="+36"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+359"/> + <location filename="../rpcconsole.cpp" line="+373"/> <source>N/A</source> <translation>NIEDOSTĘPNE</translation> </message> @@ -1715,12 +1752,12 @@ Adres: %4 <message> <location line="-10"/> <source>Debug window</source> - <translation type="unfinished"/> + <translation>Okno debugowania</translation> </message> <message> <location line="+25"/> <source>General</source> - <translation type="unfinished"/> + <translation>Ogólne</translation> </message> <message> <location line="+53"/> @@ -1794,11 +1831,13 @@ Adres: %4 </message> <message> <location line="+64"/> + <location filename="../rpcconsole.cpp" line="-10"/> <source>In:</source> <translation>WejÅ›cie:</translation> </message> <message> <location line="+80"/> + <location filename="../rpcconsole.cpp" line="+1"/> <source>Out:</source> <translation>WyjÅ›cie:</translation> </message> @@ -1823,7 +1862,7 @@ Adres: %4 <translation>Wyczyść konsolÄ™</translation> </message> <message> - <location filename="../rpcconsole.cpp" line="-30"/> + <location filename="../rpcconsole.cpp" line="-35"/> <source>Welcome to the Bitcoin RPC console.</source> <translation>Witam w konsoli Bitcoin RPC</translation> </message> @@ -1838,7 +1877,7 @@ Adres: %4 <translation>Wpisz <b>help</b> aby uzyskać listÄ™ dostÄ™pnych komend</translation> </message> <message> - <location line="+122"/> + <location line="+136"/> <source>%1 B</source> <translation>%1 B</translation> </message> @@ -1876,22 +1915,22 @@ Adres: %4 <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+83"/> + <location filename="../forms/receivecoinsdialog.ui" line="+107"/> <source>&Amount:</source> <translation>&Ilość:</translation> </message> <message> - <location line="-13"/> + <location line="-16"/> <source>&Label:</source> <translation>&Etykieta:</translation> </message> <message> - <location line="-34"/> + <location line="-37"/> <source>&Message:</source> <translation>&Wiadomość:</translation> </message> <message> - <location line="-17"/> + <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>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> @@ -1901,27 +1940,30 @@ Adres: %4 <translation>U%żyj ponownie istniejÄ…cy adres odbiorczy (niepolecane)</translation> </message> <message> - <location line="+27"/> - <source>An optional 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"/> </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"/> + <location line="-7"/> + <location line="+21"/> + <source>An optional label to associate with the new receiving address.</source> + <translation>Opcjonalna etykieta do skojarzenia z nowym adresem odbiorczym.</translation> </message> <message> - <location line="+7"/> + <location line="-7"/> <source>Use this form to request payments. All fields are <b>optional</b>.</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <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"/> </message> <message> - <location line="+17"/> + <location line="+32"/> <source>Clear all fields of the form.</source> <translation>Wyczyść pola formularza</translation> </message> @@ -1931,34 +1973,49 @@ Adres: %4 <translation>Wyczyść</translation> </message> <message> - <location line="+36"/> - <source>&Request payment</source> - <translation>&Żądaj pÅ‚atnoÅ›ci</translation> + <location line="+78"/> + <source>Requested payments history</source> + <translation>Żądanie historii pÅ‚atnoÅ›ci</translation> </message> <message> - <location line="+47"/> - <source>Requested payments</source> - <translation type="unfinished"/> + <location line="-98"/> + <source>&Request payment</source> + <translation>&Żądaj pÅ‚atnoÅ›ci</translation> </message> <message> - <location line="+16"/> + <location line="+120"/> <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"/> + <translation>Pokaż</translation> </message> <message> - <location line="+11"/> + <location line="+14"/> <source>Remove the selected entries from the list</source> - <translation type="unfinished"/> + <translation>UsuÅ„ zaznaczone z listy</translation> </message> <message> <location line="+3"/> <source>Remove</source> - <translation type="unfinished"/> + <translation>UsuÅ„</translation> + </message> + <message> + <location filename="../receivecoinsdialog.cpp" line="+39"/> + <source>Copy label</source> + <translation>Kopiuj etykietÄ™</translation> + </message> + <message> + <location line="+1"/> + <source>Copy message</source> + <translation>Kopiuj wiadomość</translation> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation>Kopiuj kwotÄ™</translation> </message> </context> <context> @@ -2059,14 +2116,19 @@ Adres: %4 <message> <location line="+9"/> <source>(no message)</source> - <translation type="unfinished"/> + <translation>(brak wiadomoÅ›ci)</translation> + </message> + <message> + <location line="+8"/> + <source>(no amount)</source> + <translation>(brak kwoty)</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>WyÅ›lij Monety</translation> @@ -2079,17 +2141,17 @@ Adres: %4 <message> <location line="+20"/> <source>Inputs...</source> - <translation type="unfinished"/> + <translation>WejÅ›cia...</translation> </message> <message> <location line="+7"/> <source>automatically selected</source> - <translation type="unfinished"/> + <translation>zaznaczone automatycznie</translation> </message> <message> <location line="+19"/> <source>Insufficient funds!</source> - <translation type="unfinished"/> + <translation>NiewystarczajÄ…ce Å›rodki</translation> </message> <message> <location line="+89"/> @@ -2134,7 +2196,7 @@ Adres: %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>Kiedy ta opcja jest wybrana, ale adres reszty jest pusty lub nieprawidÅ‚owy to reszta bÄ™dzie wysyÅ‚ana na adres nowo-wygenerowany.</translation> </message> <message> <location line="+3"/> @@ -2142,7 +2204,7 @@ Adres: %4 <translation type="unfinished"/> </message> <message> - <location line="+115"/> + <location line="+164"/> <source>Send to multiple recipients at once</source> <translation>WyÅ›lij do wielu odbiorców na raz</translation> </message> @@ -2152,7 +2214,7 @@ Adres: %4 <translation>Dodaj Odbio&rce</translation> </message> <message> - <location line="+20"/> + <location line="-23"/> <source>Clear all fields of the form.</source> <translation>Wyczyść wszystkie pola formularza</translation> </message> @@ -2162,12 +2224,12 @@ Adres: %4 <translation>Wyczyść &wszystko</translation> </message> <message> - <location line="+22"/> + <location line="+58"/> <source>Balance:</source> <translation>Saldo:</translation> </message> <message> - <location line="+41"/> + <location line="-84"/> <source>Confirm the send action</source> <translation>Potwierdź akcjÄ™ wysyÅ‚ania</translation> </message> @@ -2177,7 +2239,7 @@ Adres: %4 <translation>Wy&syÅ‚ka</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-228"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation>Potwierdź wysyÅ‚anie monet</translation> </message> @@ -2190,12 +2252,7 @@ Adres: %4 <translation>%1 do %2</translation> </message> <message> - <location line="-136"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Wprowadź adres Bitcoin (np. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> - <message> - <location line="+15"/> + <location line="-121"/> <source>Copy quantity</source> <translation>Skopiuj ilość</translation> </message> @@ -2237,7 +2294,7 @@ Adres: %4 <message> <location line="+170"/> <source>Total Amount %1 (= %2)</source> - <translation type="unfinished"/> + <translation>ÅÄ…czna kwota %1 (= %2)</translation> </message> <message> <location line="+2"/> @@ -2245,7 +2302,7 @@ Adres: %4 <translation>lub</translation> </message> <message> - <location line="+202"/> + <location line="+203"/> <source>The recipient address is not valid, please recheck.</source> <translation>Adres odbiorcy jest nieprawidÅ‚owy, proszÄ™ poprawić</translation> </message> @@ -2272,20 +2329,20 @@ Adres: %4 <message> <location line="+3"/> <source>Transaction creation failed!</source> - <translation type="unfinished"/> + <translation>Utworzenie transakcji nie powiodÅ‚o siÄ™!</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 type="unfinished"/> + <translation>Transakcja zostaÅ‚a odrzucona! Może siÄ™ to zdarzyć jeÅ›li część monet z portfela zostaÅ‚a już wydana używajÄ…c kopii pliku wallet.dat i nie zostaÅ‚o to tutaj uwzglÄ™dnione.</translation> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Warning: Invalid Bitcoin address</source> <translation>Ostrzeżenie: nieprawidÅ‚owy adres Bitcoin</translation> </message> <message> - <location line="+21"/> + <location line="+20"/> <source>(no label)</source> <translation>(bez etykiety)</translation> </message> @@ -2295,7 +2352,7 @@ Adres: %4 <translation>Ostrzeżenie: Nieznany adres</translation> </message> <message> - <location line="-366"/> + <location line="-367"/> <source>Are you sure you want to send?</source> <translation>Czy na pewno chcesz wysÅ‚ać?</translation> </message> @@ -2305,7 +2362,7 @@ Adres: %4 <translation>dodano jako opÅ‚ata transakcyjna</translation> </message> <message> - <location line="+170"/> + <location line="+171"/> <source>Payment request expired</source> <translation>Zażądanie pÅ‚atnoÅ›ci upÅ‚ynęło</translation> </message> @@ -2382,12 +2439,7 @@ Adres: %4 <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"/> + <location line="+968"/> <source>This is a verified payment request.</source> <translation>Zweryfikowano żądanie zapÅ‚aty.</translation> </message> @@ -2397,7 +2449,12 @@ Adres: %4 <translation>Wprowadź etykietÄ™ dla tego adresu by dodać go do listy użytych adresów</translation> </message> <message> - <location line="+459"/> + <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"/> + </message> + <message> + <location line="+426"/> <source>This is an unverified payment request.</source> <translation>To żądanie zapÅ‚aty nie zostaÅ‚o zweryfikowane.</translation> </message> @@ -2413,23 +2470,18 @@ Adres: %4 <source>Memo:</source> <translation>Notatka:</translation> </message> - <message> - <location filename="../sendcoinsentry.cpp" line="+1"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Wprowadź adres Bitcoin (np. 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"/> + <translation>Bitcoin Core siÄ™ zamyka...</translation> </message> <message> <location line="+1"/> <source>Do not shut down the computer until this window disappears.</source> - <translation type="unfinished"/> + <translation>Nie wyÅ‚Ä…czaj komputera dopóki to okno nie zniknie.</translation> </message> </context> <context> @@ -2455,19 +2507,19 @@ Adres: %4 <translation>Wprowadź adres Bitcoin (np. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location line="+10"/> - <location line="+213"/> + <location line="+7"/> + <location line="+210"/> <source>Choose previously used address</source> <translation>Wybierz wczeÅ›niej użyty adres</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>Wklej adres ze schowka</translation> </message> @@ -2508,12 +2560,12 @@ Adres: %4 </message> <message> <location line="+3"/> - <location line="+146"/> + <location line="+143"/> <source>Clear &All</source> <translation>Wyczyść &wszystko</translation> </message> <message> - <location line="-87"/> + <location line="-84"/> <source>&Verify Message</source> <translation>&Zweryfikuj wiadomość</translation> </message> @@ -2528,7 +2580,7 @@ Adres: %4 <translation>Wprowadź adres Bitcoin (np. 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>Zweryfikuj wiadomość, aby upewnić siÄ™, że zostaÅ‚a podpisana odpowiednim adresem Bitcoin.</translation> </message> @@ -2543,43 +2595,37 @@ Adres: %4 <translation>Resetuje wszystkie pola weryfikacji wiadomoÅ›ci</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>Wprowadź adres Bitcoin (np. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location line="-2"/> + <location line="-1"/> <source>Click "Sign Message" to generate signature</source> <translation>Kliknij "Podpisz Wiadomość" żeby uzyskać podpis</translation> </message> <message> - <location line="+3"/> - <source>Enter Bitcoin signature</source> - <translation>Wprowadź podpis Bitcoin</translation> - </message> - <message> <location line="+84"/> - <location line="+81"/> + <location line="+80"/> <source>The entered address is invalid.</source> <translation>Podany adres jest nieprawidÅ‚owy.</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>ProszÄ™ sprawdzić adres i spróbować ponownie.</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>Wprowadzony adres nie odnosi siÄ™ do klucza.</translation> </message> <message> - <location line="-73"/> + <location line="-72"/> <source>Wallet unlock was cancelled.</source> <translation>Odblokowanie portfela zostaÅ‚o anulowane.</translation> </message> @@ -2599,7 +2645,7 @@ Adres: %4 <translation>Wiadomość podpisana.</translation> </message> <message> - <location line="+59"/> + <location line="+58"/> <source>The signature could not be decoded.</source> <translation>Podpis nie może zostać zdekodowany.</translation> </message> @@ -2660,6 +2706,11 @@ Adres: %4 </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation>%1/offline</translation> </message> @@ -2821,12 +2872,12 @@ Adres: %4 <translation>, nie zostaÅ‚ jeszcze pomyÅ›lnie wyemitowany</translation> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <source>Open for %n more block(s)</source> <translation><numerusform>Otwórz dla %n bloku</numerusform><numerusform>Otwórz dla %n nastÄ™pnych bloków</numerusform><numerusform>Otwórz dla %n nastÄ™pnych bloków</numerusform></translation> </message> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation>nieznany</translation> </message> @@ -2867,12 +2918,12 @@ Adres: %4 <translation>Kwota</translation> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <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> @@ -2882,23 +2933,12 @@ Adres: %4 <translation>Otwórz do %1</translation> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> - <translation>Offline (%1 potwierdzeÅ„)</translation> - </message> - <message> - <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation>Niezatwierdzony (%1 z %2 potwierdzeÅ„)</translation> - </message> - <message> - <location line="-22"/> - <location line="+25"/> + <location line="+12"/> <source>Confirmed (%1 confirmations)</source> <translation>Zatwierdzony (%1 potwierdzeÅ„)</translation> </message> <message> - <location line="-22"/> + <location line="+9"/> <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> @@ -2908,7 +2948,27 @@ Adres: %4 <translation>Wygenerowano ale nie zaakceptowano</translation> </message> <message> - <location line="+62"/> + <location line="-21"/> + <source>Offline</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Unconfirmed</source> + <translation>Niepotwierdzone:</translation> + </message> + <message> + <location line="+3"/> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation>Potwierdzanie (%1 z %2 rekomendowanych potwierdzeÅ„)</translation> + </message> + <message> + <location line="+6"/> + <source>Conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation>Otrzymane przez</translation> </message> @@ -2938,7 +2998,7 @@ Adres: %4 <translation>(brak)</translation> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation>Status transakcji. Najedź na pole, aby zobaczyć liczbÄ™ potwierdzeÅ„.</translation> </message> @@ -3059,7 +3119,7 @@ Adres: %4 <message> <location line="+1"/> <source>Edit label</source> - <translation>Edytuj etykietÄ™</translation> + <translation>ZmieÅ„ etykietÄ™</translation> </message> <message> <location line="+1"/> @@ -3067,7 +3127,7 @@ Adres: %4 <translation>Pokaż szczegóły transakcji</translation> </message> <message> - <location line="+142"/> + <location line="+140"/> <source>Export Transaction History</source> <translation>Eksport historii transakcji</translation> </message> @@ -3188,12 +3248,12 @@ Adres: %4 <message> <location line="+0"/> <source>There was an error trying to save the wallet data to %1.</source> - <translation type="unfinished"/> + <translation>WystÄ…piÅ‚ bÅ‚Ä…d przy próbie zapisu pliku portfela do %1.</translation> </message> <message> <location line="+4"/> <source>The wallet data was successfully saved to %1.</source> - <translation type="unfinished"/> + <translation>Plik portfela zostaÅ‚ zapisany do %1.</translation> </message> <message> <location line="+0"/> @@ -3204,12 +3264,12 @@ Adres: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+226"/> <source>Usage:</source> <translation>Użycie:</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>List commands</source> <translation>Lista poleceÅ„</translation> </message> @@ -3239,12 +3299,7 @@ Adres: %4 <translation>Wskaż folder danych</translation> </message> <message> - <location line="-9"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation>Ustaw rozmiar w megabajtach cache-u bazy danych (domyÅ›lnie: 25)</translation> - </message> - <message> - <location line="-26"/> + <location line="-35"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>NasÅ‚uchuj poÅ‚Ä…czeÅ„ na <port> (domyÅ›lnie: 8333 lub testnet: 18333)</translation> </message> @@ -3264,47 +3319,47 @@ Adres: %4 <translation>Podaj swój publiczny adres</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <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="-148"/> + <location line="-151"/> <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="-36"/> + <location line="-38"/> <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="+34"/> + <location line="+36"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation>NasÅ‚uchuj poÅ‚Ä…czeÅ„ JSON-RPC na <port> (domyÅ›lnie: 8332 or testnet: 18332)</translation> </message> <message> - <location line="+45"/> + <location line="+46"/> <source>Accept command line and JSON-RPC commands</source> <translation>Akceptuj liniÄ™ poleceÅ„ oraz polecenia JSON-RPC</translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Run in the background as a daemon and accept commands</source> <translation>Uruchom w tle jako daemon i przyjmuj polecenia</translation> </message> <message> - <location line="+39"/> + <location line="+40"/> <source>Use the test network</source> <translation>Użyj sieci testowej</translation> </message> <message> - <location line="-118"/> + <location line="-120"/> <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="-95"/> + <location line="-98"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -3343,12 +3398,7 @@ na przykÅ‚ad: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo <translation>Skojarz z podanym adresem. Użyj formatu [host]:port dla IPv6 </translation> </message> <message> - <location line="+3"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> - <translation>Nie można zablokować folderu danych %s. Bitcoin prawdopodobnie już dziaÅ‚a.</translation> - </message> - <message> - <location line="+3"/> + <location line="+6"/> <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>WejÅ›cie w tryb testów regresji, który wykorzystuje specjalny Å‚aÅ„cuch, w którym bloki można rozwiÄ…zać natychmiast. To jest przeznaczone dla narzÄ™dzi testowania regresji i rozwoju aplikacji.</translation> </message> @@ -3359,6 +3409,11 @@ na przykÅ‚ad: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo </message> <message> <location line="+3"/> + <source>Error: Listening for incoming connections failed (listen returned error %d)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <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> @@ -3378,7 +3433,12 @@ na przykÅ‚ad: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo <translation>To jest testowa wersja - używaj na wÅ‚asne ryzyko - nie używaj do wykopywania oraz przy aplikacjach kupieckich</translation> </message> <message> - <location line="+5"/> + <location line="+3"/> + <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source> <translation type="unfinished"/> </message> @@ -3439,6 +3499,11 @@ na przykÅ‚ad: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo </message> <message> <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation>Wyczyść listÄ™ transakcji portfela (narzÄ™dzie diagnostyczne; implikuje -rescan)</translation> + </message> + <message> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation>ÅÄ…cz tylko do wskazanego wÄ™zÅ‚a</translation> </message> @@ -3465,7 +3530,7 @@ na przykÅ‚ad: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo <message> <location line="+1"/> <source>Do not load the wallet and disable wallet RPC calls</source> - <translation type="unfinished"/> + <translation>Nie Å‚aduj portfela i wyÅ‚Ä…cz odwoÅ‚ania RPC</translation> </message> <message> <location line="+1"/> @@ -3633,9 +3698,14 @@ na przykÅ‚ad: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo <translation>WyÅ›lij polecenie do serwera Bitcoin</translation> </message> <message> - <location line="+7"/> + <location line="+5"/> + <source>Set database cache size in megabytes (%d to %d, default: %d)</source> + <translation>Ustaw wielkość pamiÄ™ci podrÄ™cznej w megabajtach (%d do %d, domyÅ›lnie: %d)</translation> + </message> + <message> + <location line="+2"/> <source>Set maximum block size in bytes (default: %d)</source> - <translation type="unfinished"/> + <translation>Ustaw maksymalnÄ… wielkość bloku w bajtach (domyÅ›lnie: %d)</translation> </message> <message> <location line="+2"/> @@ -3649,6 +3719,11 @@ na przykÅ‚ad: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo </message> <message> <location line="+2"/> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation>Wydawaj niepotwierdzonÄ… resztÄ™ podczas wysyÅ‚ania transakcji (domyÅ›lnie: 1)</translation> + </message> + <message> + <location line="+1"/> <source>Start Bitcoin server</source> <translation>Startowanie serwera Bitcoin</translation> </message> @@ -3685,7 +3760,7 @@ na przykÅ‚ad: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo <message> <location line="+2"/> <source>Wallet options:</source> - <translation type="unfinished"/> + <translation>Opcje portfela:</translation> </message> <message> <location line="+2"/> @@ -3698,12 +3773,17 @@ na przykÅ‚ad: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo <translation>Musisz przebudować bazÄ™ używajÄ…c parametru -reindex aby zmienić -txindex</translation> </message> <message> - <location line="-79"/> + <location line="-80"/> <source>Imports blocks from external blk000??.dat file</source> <translation>Importuj bloki z zewnÄ™trznego pliku blk000??.dat</translation> </message> <message> - <location line="-105"/> + <location line="-126"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+19"/> <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> @@ -3715,7 +3795,7 @@ na przykÅ‚ad: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo <message> <location line="+2"/> <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source> - <translation type="unfinished"/> + <translation>Ustaw maksymalny rozmiar transakcji o wysokim priorytecie/niskiej prowizji w bajtach (domyÅ›lnie: 27000)</translation> </message> <message> <location line="+2"/> @@ -3723,7 +3803,7 @@ na przykÅ‚ad: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo <translation>Ustaw liczbÄ™ wÄ…tków skryptu weryfikacji (do 16, 0 = auto, <0 = zostawia takÄ… ilość rdzenie wolnych, domyÅ›lnie: 0)</translation> </message> <message> - <location line="+89"/> + <location line="+91"/> <source>Information</source> <translation>Informacja</translation> </message> @@ -3793,7 +3873,7 @@ na przykÅ‚ad: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo <translation>Wskaż czas oczekiwania bezczynnoÅ›ci poÅ‚Ä…czenia w milisekundach (domyÅ›lnie: 5000)</translation> </message> <message> - <location line="+6"/> + <location line="+7"/> <source>System error: </source> <translation>BÅ‚Ä…d systemu:</translation> </message> @@ -3839,6 +3919,11 @@ na przykÅ‚ad: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>version</source> <translation>wersja</translation> </message> @@ -3848,32 +3933,32 @@ na przykÅ‚ad: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo <translation>wallet.dat uszkodzony, odtworzenie siÄ™ nie powiodÅ‚o</translation> </message> <message> - <location line="-58"/> + <location line="-60"/> <source>Password for JSON-RPC connections</source> <translation>HasÅ‚o do poÅ‚Ä…czeÅ„ JSON-RPC</translation> </message> <message> - <location line="-70"/> + <location line="-71"/> <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="+80"/> + <location line="+81"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>WysyÅ‚aj polecenia do wÄ™zÅ‚a dziaÅ‚ajÄ…cego na <ip> (domyÅ›lnie: 127.0.0.1)</translation> </message> <message> - <location line="-132"/> + <location line="-134"/> <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="+161"/> + <location line="+164"/> <source>Upgrade wallet to latest format</source> <translation>Zaktualizuj portfel do najnowszego formatu.</translation> </message> <message> - <location line="-24"/> + <location line="-25"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Ustaw rozmiar puli kluczy na <n> (domyÅ›lnie: 100)</translation> </message> @@ -3883,12 +3968,12 @@ na przykÅ‚ad: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo <translation>Przeskanuj blok Å‚aÅ„cuchów żeby znaleźć zaginione transakcje portfela</translation> </message> <message> - <location line="+38"/> + <location line="+39"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Użyj OpenSSL (https) do poÅ‚Ä…czeÅ„ JSON-RPC</translation> </message> <message> - <location line="-30"/> + <location line="-31"/> <source>Server certificate file (default: server.cert)</source> <translation>Plik certyfikatu serwera (domyÅ›lnie: server.cert)</translation> </message> @@ -3898,7 +3983,7 @@ na przykÅ‚ad: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo <translation>Klucz prywatny serwera (domyÅ›lnie: server.pem)</translation> </message> <message> - <location line="+16"/> + <location line="+17"/> <source>This help message</source> <translation>Ta wiadomość pomocy</translation> </message> @@ -3908,12 +3993,12 @@ na przykÅ‚ad: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo <translation>Nie można przywiÄ…zać %s na tym komputerze (bind returned error %d, %s)</translation> </message> <message> - <location line="-107"/> + <location line="-109"/> <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="+60"/> + <location line="+61"/> <source>Loading addresses...</source> <translation>Wczytywanie adresów...</translation> </message> @@ -3928,12 +4013,12 @@ na przykÅ‚ad: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo <translation>BÅ‚Ä…d Å‚adowania wallet.dat: Portfel wymaga nowszej wersji Bitcoin</translation> </message> <message> - <location line="+98"/> + <location line="+99"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>Portfel wymaga przepisania: zrestartuj Bitcoina żeby ukoÅ„czyć</translation> </message> <message> - <location line="-100"/> + <location line="-101"/> <source>Error loading wallet.dat</source> <translation>BÅ‚Ä…d Å‚adowania wallet.dat</translation> </message> @@ -3943,7 +4028,7 @@ na przykÅ‚ad: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo <translation>NieprawidÅ‚owy adres -proxy: '%s'</translation> </message> <message> - <location line="+56"/> + <location line="+57"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Nieznana sieć w -onlynet: '%s'</translation> </message> @@ -3953,7 +4038,7 @@ na przykÅ‚ad: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo <translation>Nieznana wersja proxy w -socks: %i</translation> </message> <message> - <location line="-101"/> + <location line="-103"/> <source>Cannot resolve -bind address: '%s'</source> <translation>Nie można uzyskać adresu -bind: '%s'</translation> </message> @@ -3963,7 +4048,7 @@ na przykÅ‚ad: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo <translation>Nie można uzyskać adresu -externalip: '%s'</translation> </message> <message> - <location line="+48"/> + <location line="+49"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>NieprawidÅ‚owa kwota dla -paytxfee=<amount>: '%s'</translation> </message> @@ -3983,22 +4068,17 @@ na przykÅ‚ad: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo <translation>Åadowanie indeksu bloku...</translation> </message> <message> - <location line="-62"/> + <location line="-63"/> <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> <message> - <location line="-32"/> - <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source> - <translation>Nie można przywiÄ…zać %s na tym komputerze. Bitcoin prawdopodobnie już dziaÅ‚a.</translation> - </message> - <message> - <location line="+95"/> + <location line="+64"/> <source>Loading wallet...</source> <translation>Wczytywanie portfela...</translation> </message> <message> - <location line="-56"/> + <location line="-57"/> <source>Cannot downgrade wallet</source> <translation>Nie można dezaktualizować portfela</translation> </message> @@ -4008,7 +4088,7 @@ na przykÅ‚ad: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo <translation>Nie można zapisać domyÅ›lnego adresu</translation> </message> <message> - <location line="+67"/> + <location line="+68"/> <source>Rescanning...</source> <translation>Ponowne skanowanie...</translation> </message> @@ -4018,17 +4098,17 @@ na przykÅ‚ad: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo <translation>Wczytywanie zakoÅ„czone</translation> </message> <message> - <location line="+85"/> + <location line="+86"/> <source>To use the %s option</source> <translation>Aby użyć opcji %s</translation> </message> <message> - <location line="-77"/> + <location line="-78"/> <source>Error</source> <translation>BÅ‚Ä…d</translation> </message> <message> - <location line="-35"/> + <location line="-36"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_pt_BR.ts b/src/qt/locale/bitcoin_pt_BR.ts index 3627f33167..9a4f2fb48b 100644 --- a/src/qt/locale/bitcoin_pt_BR.ts +++ b/src/qt/locale/bitcoin_pt_BR.ts @@ -4,12 +4,12 @@ <message> <location filename="../forms/aboutdialog.ui" line="+14"/> <source>About Bitcoin Core</source> - <translation type="unfinished"/> + <translation>Sobre o Bitcoin Core</translation> </message> <message> <location line="+39"/> <source><b>Bitcoin Core</b> version</source> - <translation type="unfinished"/> + <translation>versão do <b>Bitcoin Core</b></translation> </message> <message> <location line="+57"/> @@ -34,7 +34,13 @@ Este produto inclui software desenvolvido pelo Projeto OpenSSL para uso no OpenS <message> <location line="+0"/> <source>The Bitcoin Core developers</source> - <translation type="unfinished"/> + <translation>Programadores do Bitcoin Core</translation> + </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source> (%1-bit)</source> + <translation>(%1-bit)</translation> </message> </context> <context> @@ -102,7 +108,7 @@ Este produto inclui software desenvolvido pelo Projeto OpenSSL para uso no OpenS <message> <location line="+1"/> <source>Choose the address to receive coins with</source> - <translation type="unfinished"/> + <translation>Escolha o endereço para receber moedas</translation> </message> <message> <location line="+5"/> @@ -127,7 +133,7 @@ Este produto inclui software desenvolvido pelo Projeto OpenSSL para uso no OpenS <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>Estes são os seus endereços Bitcoin para receber pagamentos. Recomenda-se a utilização de um novo endereço de recebimento para cada transação.</translation> </message> <message> <location line="+7"/> @@ -157,7 +163,7 @@ Este produto inclui software desenvolvido pelo Projeto OpenSSL para uso no OpenS <message> <location line="+1"/> <source>There was an error trying to save the address list to %1.</source> - <translation type="unfinished"/> + <translation>Ocorreu um erro ao tentar salvar a lista de endereço em %1.</translation> </message> </context> <context> @@ -339,7 +345,7 @@ Este produto inclui software desenvolvido pelo Projeto OpenSSL para uso no OpenS <message> <location line="-137"/> <source>Node</source> - <translation type="unfinished"/> + <translation>Nó</translation> </message> <message> <location line="+138"/> @@ -542,38 +548,38 @@ Este produto inclui software desenvolvido pelo Projeto OpenSSL para uso no OpenS <message> <location line="+163"/> <source>Request payments (generates QR codes and bitcoin: URIs)</source> - <translation type="unfinished"/> + <translation>Solicitações de pagamentos (gera códigos QR e bitcoin: URIs)</translation> </message> <message> <location line="+29"/> <location line="+2"/> <source>&About Bitcoin Core</source> - <translation type="unfinished"/> + <translation>&A respeito do Bitcoin Core</translation> </message> <message> <location line="+35"/> <source>Show the list of used sending addresses and labels</source> - <translation type="unfinished"/> + <translation>Mostrar a lista de endereços de envio e etiquetas usadas</translation> </message> <message> <location line="+2"/> <source>Show the list of used receiving addresses and labels</source> - <translation type="unfinished"/> + <translation>Mostrar a lista de endereços de recebimento usados ​​e etiquetas</translation> </message> <message> <location line="+3"/> <source>Open a bitcoin: URI or payment request</source> - <translation type="unfinished"/> + <translation>Abrir um bitcoin: URI ou cobrança</translation> </message> <message> <location line="+2"/> <source>&Command-line options</source> - <translation type="unfinished"/> + <translation>Opções de linha de &comando</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>Mostra a mensagem de ajuda do Bitcoin Core para pegar a lista com os comandos possÃveis</translation> </message> <message> <location line="+159"/> @@ -617,6 +623,16 @@ Este produto inclui software desenvolvido pelo Projeto OpenSSL para uso no OpenS <translation><numerusform>%n semana</numerusform><numerusform>%n semanas</numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation>%1 e %2</translation> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation><numerusform>%n ano</numerusform><numerusform>%n anos</numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation>%1 atrás</translation> @@ -689,7 +705,7 @@ Endereço: %4</translation> <translation>Carteira está <b>criptografada</b> e atualmente <b>bloqueada</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+435"/> <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> @@ -707,7 +723,7 @@ Endereço: %4</translation> <message> <location filename="../forms/coincontroldialog.ui" line="+14"/> <source>Coin Control Address Selection</source> - <translation type="unfinished"/> + <translation>Coin Control Address Selection</translation> </message> <message> <location line="+34"/> @@ -717,7 +733,7 @@ Endereço: %4</translation> <message> <location line="+29"/> <source>Bytes:</source> - <translation type="unfinished"/> + <translation>Bytes:</translation> </message> <message> <location line="+45"/> @@ -750,22 +766,22 @@ Endereço: %4</translation> <translation>trocar</translation> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> - <translation type="unfinished"/> + <translation>(de)selecionar tudo</translation> </message> <message> <location line="+13"/> <source>Tree mode</source> - <translation type="unfinished"/> + <translation>Modo árvore</translation> </message> <message> <location line="+16"/> <source>List mode</source> - <translation type="unfinished"/> + <translation>Modo lista</translation> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation>Quantidade</translation> </message> @@ -818,12 +834,12 @@ Endereço: %4</translation> <message> <location line="+1"/> <source>Lock unspent</source> - <translation type="unfinished"/> + <translation>Travar não gasto</translation> </message> <message> <location line="+1"/> <source>Unlock unspent</source> - <translation type="unfinished"/> + <translation>Destravar não gasto</translation> </message> <message> <location line="+22"/> @@ -838,7 +854,7 @@ Endereço: %4</translation> <message> <location line="+1"/> <source>Copy after fee</source> - <translation type="unfinished"/> + <translation>Copia pós-taxa</translation> </message> <message> <location line="+1"/> @@ -848,67 +864,67 @@ Endereço: %4</translation> <message> <location line="+1"/> <source>Copy priority</source> - <translation type="unfinished"/> + <translation>Copia prioridade</translation> </message> <message> <location line="+1"/> <source>Copy low output</source> - <translation type="unfinished"/> + <translation>Copia saÃda de pouco valor</translation> </message> <message> <location line="+1"/> <source>Copy change</source> - <translation type="unfinished"/> + <translation>Copia alteração</translation> </message> <message> <location line="+323"/> <source>highest</source> - <translation type="unfinished"/> + <translation>mais alta possÃvel</translation> </message> <message> <location line="+1"/> <source>higher</source> - <translation type="unfinished"/> + <translation>muito alta</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>média-alta</translation> </message> <message> <location line="+1"/> <source>medium</source> - <translation type="unfinished"/> + <translation>média</translation> </message> <message> <location line="+4"/> <source>low-medium</source> - <translation type="unfinished"/> + <translation>média-baixa</translation> </message> <message> <location line="+1"/> <source>low</source> - <translation type="unfinished"/> + <translation>baixa</translation> </message> <message> <location line="+1"/> <source>lower</source> - <translation type="unfinished"/> + <translation>muito baixa</translation> </message> <message> <location line="+1"/> <source>lowest</source> - <translation type="unfinished"/> + <translation>a mais baixa possÃvel</translation> </message> <message> <location line="+11"/> <source>(%1 locked)</source> - <translation type="unfinished"/> + <translation>(%1 travado)</translation> </message> <message> <location line="+31"/> @@ -916,66 +932,66 @@ Endereço: %4</translation> <translation>nenhum</translation> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> - <translation type="unfinished"/> + <translation>Sujeira</translation> </message> <message> <location line="+0"/> <source>yes</source> - <translation type="unfinished"/> + <translation>sim</translation> </message> <message> <location line="+0"/> <source>no</source> - <translation type="unfinished"/> + <translation>não</translation> </message> <message> <location line="+10"/> <source>This label turns red, if the transaction size is greater than 1000 bytes.</source> - <translation type="unfinished"/> + <translation>Esse marcador fica vermelho se a transação ultrapassar 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"/> + <translation>Isso significa que uma taxa de pelo menos %1 por kB é necessária.</translation> </message> <message> <location line="-4"/> <source>Can vary +/- 1 byte per input.</source> - <translation type="unfinished"/> + <translation>Pode variar +/- 1 byte por entrada.</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>Transações de alta prioridade são mais propensas a serem incluÃdas em um bloco.</translation> </message> <message> <location line="+1"/> <source>This label turns red, if the priority is smaller than "medium".</source> - <translation type="unfinished"/> + <translation>Esse marcador fica vermelho se a prioridade for menor que "média".</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>Esse marcador fica vermelho se qualquer destinatário receber uma quantia menor que %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>Isso significa que uma taxa de pelo menos %1 é necessária.</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>Quantias abaixo de 0,546 multiplicado pela taxa mÃnima é mostrada como sujeira.</translation> </message> <message> <location line="+2"/> <source>This label turns red, if the change is smaller than %1.</source> - <translation type="unfinished"/> + <translation>Esse marcador fica vermelho se o troco for menor que %1.</translation> </message> <message> <location line="+43"/> @@ -986,12 +1002,12 @@ Endereço: %4</translation> <message> <location line="-9"/> <source>change from %1 (%2)</source> - <translation type="unfinished"/> + <translation>troco de %1 (%2)</translation> </message> <message> <location line="+1"/> <source>(change)</source> - <translation type="unfinished"/> + <translation>(troco)</translation> </message> </context> <context> @@ -1009,12 +1025,12 @@ Endereço: %4</translation> <message> <location line="+10"/> <source>The label associated with this address list entry</source> - <translation type="unfinished"/> + <translation>A etiqueta associada com esta lista de endereço de entrada</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>O endereço associado a esta lista de endereços de entrada. Isso só pode ser modificado para o envio de endereços.</translation> </message> <message> <location line="-10"/> @@ -1095,10 +1111,10 @@ Endereço: %4</translation> <message> <location filename="../forms/helpmessagedialog.ui" line="+19"/> <source>Bitcoin Core - Command-line options</source> - <translation type="unfinished"/> + <translation>Bitcoin Core - Opções de linha de comando</translation> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation>Núcleo Bitcoin</translation> </message> @@ -1153,17 +1169,17 @@ Endereço: %4</translation> <message> <location line="+9"/> <source>Welcome to Bitcoin Core.</source> - <translation type="unfinished"/> + <translation>Bem vindo ao Bitcoin Core.</translation> </message> <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>A primeira vez que o programa é aberto você pode escolher onde o Bitcoin Core vai guardar os dados.</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 vai fazer download e guardar uma cópia da longa e única cadeia de blocos do Bitcoin: Blockchain. Pelo menos %1 GB de dados serão armazenados nesse diretório e isso aumentará ao longo do tempo. Sua carteira também será armazenada nesse diretório.</translation> </message> <message> <location line="+10"/> @@ -1206,27 +1222,27 @@ Endereço: %4</translation> <message> <location filename="../forms/openuridialog.ui" line="+14"/> <source>Open URI</source> - <translation type="unfinished"/> + <translation>Abrir URI</translation> </message> <message> <location line="+6"/> <source>Open payment request from URI or file</source> - <translation type="unfinished"/> + <translation>Cobrança aberta de URI ou arquivo</translation> </message> <message> <location line="+9"/> <source>URI:</source> - <translation type="unfinished"/> + <translation>URI:</translation> </message> <message> <location line="+11"/> <source>Select payment request file</source> - <translation type="unfinished"/> + <translation>Selecione o arquivo de cobrança</translation> </message> <message> <location filename="../openuridialog.cpp" line="+47"/> <source>Select payment request file to open</source> - <translation type="unfinished"/> + <translation>Selecione o arquivo de cobrança para ser aberto</translation> </message> </context> <context> @@ -1242,7 +1258,7 @@ Endereço: %4</translation> <translation>Principal</translation> </message> <message> - <location line="+6"/> + <location line="+122"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation>Taxa de transação opcional por kB que ajuda a garantir que suas transações sejam processadas rapidamente. A maioria das transações são de 1 kB.</translation> </message> @@ -1252,7 +1268,7 @@ Endereço: %4</translation> <translation>Pagar taxa de &transação</translation> </message> <message> - <location line="+31"/> + <location line="-131"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation>Iniciar Bitcoin automaticamente após se logar no sistema.</translation> </message> @@ -1264,22 +1280,17 @@ Endereço: %4</translation> <message> <location line="+9"/> <source>Size of &database cache</source> - <translation type="unfinished"/> + <translation>Tamanho do banco de &dados do cache</translation> </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"/> + <location line="+16"/> <source>MB</source> <translation>MB</translation> </message> <message> <location line="+27"/> <source>Number of script &verification threads</source> - <translation type="unfinished"/> + <translation>Número de threads do script de &verificação</translation> </message> <message> <location line="+13"/> @@ -1287,24 +1298,29 @@ Endereço: %4</translation> <translation>Defina o número de linhas de verificação (até 16, 0 = auto, <0 = deixar muitos núcleos livres, padrão: 0)</translation> </message> <message> - <location line="+58"/> + <location line="+107"/> + <source>&Spend unconfirmed change (experts only)</source> + <translation>Ga&star troco não confirmado (avançado)</translation> + </message> + <message> + <location line="+37"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> - <translation type="unfinished"/> + <translation>Conectado na rede do Bitcoin através de proxy SOCKS.</translation> </message> <message> <location line="+3"/> <source>&Connect through SOCKS proxy (default proxy):</source> - <translation type="unfinished"/> + <translation>&Conectado via proxy SOCKS (padrão proxy):</translation> </message> <message> <location line="+34"/> <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source> - <translation type="unfinished"/> + <translation>Endereço de IP do proxy (e.g. 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"/> + <translation>Ativa as opções de linha de comando que sobrescreve as opções acima:</translation> </message> <message> <location line="+43"/> @@ -1322,7 +1338,17 @@ Endereço: %4</translation> <translation>Rede</translation> </message> <message> - <location line="+6"/> + <location line="-86"/> + <source>W&allet</source> + <translation>C&arteira</translation> + </message> + <message> + <location line="+52"/> + <source>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.</source> + <translation>Se você desabilitar o gasto de um troco não confirmado, o troco da transação não poderá ser utilizado até a transação ter pelo menos uma confirmação. Isso também afeta seu saldo computado.</translation> + </message> + <message> + <location line="+40"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>Abrir as portas do cliente Bitcoin automaticamente no roteador. Isto só funcionará se seu roteador suportar UPnP e esta função estiver habilitada.</translation> </message> @@ -1419,12 +1445,12 @@ Endereço: %4</translation> <message> <location line="+7"/> <source>Whether to show coin control features or not.</source> - <translation type="unfinished"/> + <translation>Mostrar ou não opções de controle da moeda.</translation> </message> <message> <location line="+3"/> <source>Display coin &control features (experts only)</source> - <translation type="unfinished"/> + <translation>Mostrar opções de &controle de moeda (avançado)</translation> </message> <message> <location line="+136"/> @@ -1437,17 +1463,17 @@ Endereço: %4</translation> <translation>&Cancelar</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+70"/> <source>default</source> <translation>padrão</translation> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation>nenhum</translation> </message> <message> - <location line="+75"/> + <location line="+78"/> <source>Confirm options reset</source> <translation>Confirmar redefinição de opções</translation> </message> @@ -1455,17 +1481,17 @@ Endereço: %4</translation> <location line="+1"/> <location line="+29"/> <source>Client restart required to activate changes.</source> - <translation type="unfinished"/> + <translation>Reinicialização do aplicativo necessária para efetivar alterações.</translation> </message> <message> <location line="-29"/> <source>Client will be shutdown, do you want to proceed?</source> - <translation type="unfinished"/> + <translation>O aplicativo vai desligar, deseja continuar?</translation> </message> <message> <location line="+33"/> <source>This change would require a client restart.</source> - <translation type="unfinished"/> + <translation>Essa mudança requer uma reinicialização do aplicativo.</translation> </message> <message> <location line="+34"/> @@ -1487,19 +1513,14 @@ Endereço: %4</translation> <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="-155"/> - <source>Unconfirmed:</source> - <translation>Não confirmadas:</translation> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation>Carteira</translation> </message> <message> <location line="+51"/> - <source>Confirmed:</source> - <translation>Confirmado:</translation> + <source>Available:</source> + <translation>DisponÃvel:</translation> </message> <message> <location line="+16"/> @@ -1507,7 +1528,12 @@ Endereço: %4</translation> <translation>Seu saldo atual spendable</translation> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation>Pendente:</translation> + </message> + <message> + <location line="+16"/> <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> @@ -1559,7 +1585,7 @@ Endereço: %4</translation> <message> <location line="+96"/> <source>Requested payment amount of %1 is too small (considered dust).</source> - <translation type="unfinished"/> + <translation>Valor do pagamento solicitado de 1% é muito pequeno (Considerado poeira).</translation> </message> <message> <location line="-221"/> @@ -1579,37 +1605,37 @@ Endereço: %4</translation> <message> <location line="+58"/> <source>Net manager warning</source> - <translation type="unfinished"/> + <translation>Gerenciador de rede problemático</translation> </message> <message> <location line="+1"/> <source>Your active proxy doesn't support SOCKS5, which is required for payment requests via proxy.</source> - <translation type="unfinished"/> + <translation>Seu proxy ativo não suporta SOCKS5, que é obrigatório para cobranças via proxy.</translation> </message> <message> <location line="+52"/> <source>Payment request fetch URL is invalid: %1</source> - <translation type="unfinished"/> + <translation>URL de cobrança é inválida: %1</translation> </message> <message> <location line="+27"/> <source>Payment request file handling</source> - <translation type="unfinished"/> + <translation>Manipulação de arquivo de cobrança</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 type="unfinished"/> + <translation>Arquivo de cobrança não pôde ser lido ou processado! Isso pode ter sido causado por um arquivo de cobrança inválido.</translation> </message> <message> <location line="+73"/> <source>Unverified payment requests to custom payment scripts are unsupported.</source> - <translation type="unfinished"/> + <translation>Cobrança não verificada para scripts de pagamento personalizados não é suportado.</translation> </message> <message> <location line="+59"/> <source>Refund from %1</source> - <translation type="unfinished"/> + <translation>Reembolso de 1%</translation> </message> <message> <location line="+43"/> @@ -1619,7 +1645,7 @@ Endereço: %4</translation> <message> <location line="+24"/> <source>Payment request can not be parsed or processed!</source> - <translation type="unfinished"/> + <translation>Cobrança não pôde ser processada!</translation> </message> <message> <location line="+11"/> @@ -1681,7 +1707,7 @@ Endereço: %4</translation> <message> <location line="+0"/> <source>PNG Image (*.png)</source> - <translation type="unfinished"/> + <translation>PNG Imagem (*.png)</translation> </message> </context> <context> @@ -1719,7 +1745,7 @@ Endereço: %4</translation> <message> <location line="-10"/> <source>Debug window</source> - <translation type="unfinished"/> + <translation>Janela de debug</translation> </message> <message> <location line="+25"/> @@ -1844,37 +1870,37 @@ Endereço: %4</translation> <message> <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> @@ -1897,40 +1923,40 @@ Endereço: %4</translation> <message> <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>Reutilize um dos endereços de recebimento anteriormente utilizados. Reutilizar um endereço implica em problemas com segurança e privacidade. Não reutilize a menos que esteja refazendo uma cobrança já feita anteriormente.</translation> </message> <message> <location line="+3"/> <source>R&euse an existing receiving address (not recommended)</source> - <translation type="unfinished"/> + <translation>R&eutilize um endereço de recebimento (não recomendado)</translation> </message> <message> <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>Uma mensagem opcional que será anexada na cobrança e será mostrada quando ela for aberta. Nota: A mensagem não será enviada com o pagamento pela rede Bitcoin.</translation> </message> <message> <location line="-7"/> <location line="+21"/> <source>An optional label to associate with the new receiving address.</source> - <translation type="unfinished"/> + <translation>Um marcador opcional para associar ao novo endereço de recebimento.</translation> </message> <message> <location line="-7"/> <source>Use this form to request payments. All fields are <b>optional</b>.</source> - <translation type="unfinished"/> + <translation>Use esse formulário para fazer cobranças. Todos os campos são <b>opcionais</b>.</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>Uma quantia opcional para cobrar. Deixe vazio ou em branco se o pagador puder especificar a quantia.</translation> </message> <message> <location line="+32"/> <source>Clear all fields of the form.</source> - <translation type="unfinished"/> + <translation>Limpa todos os campos do formulário.</translation> </message> <message> <location line="+3"/> @@ -1940,7 +1966,7 @@ Endereço: %4</translation> <message> <location line="+78"/> <source>Requested payments history</source> - <translation type="unfinished"/> + <translation>Histórico de cobranças</translation> </message> <message> <location line="-98"/> @@ -1950,22 +1976,22 @@ Endereço: %4</translation> <message> <location line="+120"/> <source>Show the selected request (does the same as double clicking an entry)</source> - <translation type="unfinished"/> + <translation>Mostra a cobrança selecionada (o mesmo que clicar duas vezes em um registro)</translation> </message> <message> <location line="+3"/> <source>Show</source> - <translation type="unfinished"/> + <translation>Mostrar</translation> </message> <message> <location line="+11"/> <source>Remove the selected entries from the list</source> - <translation type="unfinished"/> + <translation>Remove o registro selecionado da lista</translation> </message> <message> <location line="+3"/> <source>Remove</source> - <translation type="unfinished"/> + <translation>Remover</translation> </message> <message> <location filename="../receivecoinsdialog.cpp" line="+38"/> @@ -1975,7 +2001,7 @@ Endereço: %4</translation> <message> <location line="+1"/> <source>Copy message</source> - <translation type="unfinished"/> + <translation>Copiar mensagem</translation> </message> <message> <location line="+1"/> @@ -2081,12 +2107,12 @@ Endereço: %4</translation> <message> <location line="+9"/> <source>(no message)</source> - <translation type="unfinished"/> + <translation>(sem mensagem)</translation> </message> <message> <location line="+8"/> <source>(no amount)</source> - <translation type="unfinished"/> + <translation>(sem quantia especificada)</translation> </message> </context> <context> @@ -2101,22 +2127,22 @@ Endereço: %4</translation> <message> <location line="+76"/> <source>Coin Control Features</source> - <translation type="unfinished"/> + <translation>Opções de Controle da Moeda</translation> </message> <message> <location line="+20"/> <source>Inputs...</source> - <translation type="unfinished"/> + <translation>Entradas...</translation> </message> <message> <location line="+7"/> <source>automatically selected</source> - <translation type="unfinished"/> + <translation>automaticamente selecionado</translation> </message> <message> <location line="+19"/> <source>Insufficient funds!</source> - <translation type="unfinished"/> + <translation>Saldo insuficiente!</translation> </message> <message> <location line="+89"/> @@ -2126,7 +2152,7 @@ Endereço: %4</translation> <message> <location line="+35"/> <source>Bytes:</source> - <translation type="unfinished"/> + <translation>Bytes:</translation> </message> <message> <location line="+48"/> @@ -2161,12 +2187,12 @@ Endereço: %4</translation> <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 isso estiver ativo e o endereço de troco estiver vazio ou inválido, o troco será enviado a um novo endereço gerado na hora.</translation> </message> <message> <location line="+3"/> <source>Custom change address</source> - <translation type="unfinished"/> + <translation>Endereço especÃfico de troco</translation> </message> <message> <location line="+164"/> @@ -2181,7 +2207,7 @@ Endereço: %4</translation> <message> <location line="-23"/> <source>Clear all fields of the form.</source> - <translation type="unfinished"/> + <translation>Limpar todos os campos do formulário.</translation> </message> <message> <location line="+3"/> @@ -2234,7 +2260,7 @@ Endereço: %4</translation> <message> <location line="+1"/> <source>Copy after fee</source> - <translation type="unfinished"/> + <translation>Copia pós-taxa</translation> </message> <message> <location line="+1"/> @@ -2244,22 +2270,22 @@ Endereço: %4</translation> <message> <location line="+1"/> <source>Copy priority</source> - <translation type="unfinished"/> + <translation>Copia prioridade</translation> </message> <message> <location line="+1"/> <source>Copy low output</source> - <translation type="unfinished"/> + <translation>Copia saÃda de pouco valor</translation> </message> <message> <location line="+1"/> <source>Copy change</source> - <translation type="unfinished"/> + <translation>Copia alteração</translation> </message> <message> <location line="+170"/> <source>Total Amount %1 (= %2)</source> - <translation type="unfinished"/> + <translation>Quantidade Total %1 (= %2)</translation> </message> <message> <location line="+2"/> @@ -2294,17 +2320,17 @@ Endereço: %4</translation> <message> <location line="+3"/> <source>Transaction creation failed!</source> - <translation type="unfinished"/> + <translation>A criação de transação falhou!</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 type="unfinished"/> + <translation>A transação foi rejeitada! Isso pode acontecer se alguns bitcoins na sua carteira já foram gastos em outro local, por exemplo se você tiver uma cópia do wallet.dat e os bitcoins tiverem sido gastos na cópia mas não marcados como gastos aqui ainda.</translation> </message> <message> <location line="+113"/> <source>Warning: Invalid Bitcoin address</source> - <translation type="unfinished"/> + <translation>Atenção: endereço de Bitcoin inválido</translation> </message> <message> <location line="+20"/> @@ -2314,7 +2340,7 @@ Endereço: %4</translation> <message> <location line="-11"/> <source>Warning: Unknown change address</source> - <translation type="unfinished"/> + <translation>Atenção: endereço de troco desconhecido</translation> </message> <message> <location line="-367"/> @@ -2369,12 +2395,12 @@ Endereço: %4</translation> <message> <location line="-50"/> <source>Choose previously used address</source> - <translation type="unfinished"/> + <translation>Escolher endereço usado anteriormente</translation> </message> <message> <location line="-40"/> <source>This is a normal payment.</source> - <translation type="unfinished"/> + <translation>Este é um pagamento normal.</translation> </message> <message> <location line="+50"/> @@ -2406,22 +2432,22 @@ Endereço: %4</translation> <message> <location line="+968"/> <source>This is a verified payment request.</source> - <translation type="unfinished"/> + <translation>Essa é cobrança verificada.</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"/> + <translation>Digite um nome para este endereço para adicioná-lo no catálogo</translation> </message> <message> <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>A mensagem que foi anexada ao bitcoin: URI na qual será gravada na transação para sua referência. Nota: Essa mensagem não será gravada publicamente na rede Bitcoin.</translation> </message> <message> <location line="+426"/> <source>This is an unverified payment request.</source> - <translation type="unfinished"/> + <translation>Essa é uma cobrança não verificada.</translation> </message> <message> <location line="+18"/> @@ -2441,7 +2467,7 @@ Endereço: %4</translation> <message> <location filename="../utilitydialog.cpp" line="+48"/> <source>Bitcoin Core is shutting down...</source> - <translation type="unfinished"/> + <translation>Bitcoin Core está desligando...</translation> </message> <message> <location line="+1"/> @@ -2475,7 +2501,7 @@ Endereço: %4</translation> <location line="+7"/> <location line="+210"/> <source>Choose previously used address</source> - <translation type="unfinished"/> + <translation>Escolha um endereço usado anteriormente</translation> </message> <message> <location line="-200"/> @@ -2646,7 +2672,7 @@ Endereço: %4</translation> <message> <location line="+2"/> <source>The Bitcoin Core developers</source> - <translation type="unfinished"/> + <translation>Programadores do Bitcoin Core</translation> </message> <message> <location line="+1"/> @@ -2659,7 +2685,7 @@ Endereço: %4</translation> <message> <location filename="../trafficgraphwidget.cpp" line="+79"/> <source>KB/s</source> - <translation type="unfinished"/> + <translation>KB/s</translation> </message> </context> <context> @@ -2671,6 +2697,11 @@ Endereço: %4</translation> </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation>em conflito</translation> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation>%1/offline</translation> </message> @@ -2794,7 +2825,7 @@ Endereço: %4</translation> <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 "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source> - <translation type="unfinished"/> + <translation>Bitcoins recém minerados precisam aguardar %1 blocos antes de serem gastos. Quando o bloco foi gerado, ele foi disseminado pela rede para ser adicionado à cadeia de blocos: blockchain. Se ele falhar em ser inserido na cadeia, seu estado será modificado para "não aceito" e ele não poderá ser gasto. Isso pode acontecer eventualmente quando blocos são gerados quase que simultaneamente.</translation> </message> <message> <location line="+8"/> @@ -2832,12 +2863,12 @@ Endereço: %4</translation> <translation>, ainda não foi propagada na rede com sucesso.</translation> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <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> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation>desconhecido</translation> </message> @@ -2878,12 +2909,12 @@ Endereço: %4</translation> <translation>Quantidade</translation> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> - <translation type="unfinished"/> + <translation>Recém-criado (%1 confirmações, disponÃvel somente após %2)</translation> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <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> @@ -2893,23 +2924,12 @@ Endereço: %4</translation> <translation>Aberto até %1</translation> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> - <translation>Offline (%1 confirmações)</translation> - </message> - <message> - <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation>Não confirmado (%1 of %2 confirmações)</translation> - </message> - <message> - <location line="-22"/> - <location line="+25"/> + <location line="+12"/> <source>Confirmed (%1 confirmations)</source> <translation>Confirmado (%1 confirmações)</translation> </message> <message> - <location line="-22"/> + <location line="+9"/> <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> @@ -2919,7 +2939,27 @@ Endereço: %4</translation> <translation>Gerado mas não aceito</translation> </message> <message> - <location line="+62"/> + <location line="-21"/> + <source>Offline</source> + <translation>Offline</translation> + </message> + <message> + <location line="+3"/> + <source>Unconfirmed</source> + <translation>Não confirmado</translation> + </message> + <message> + <location line="+3"/> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation>Confirmando (%1 de %2 confirmações recomendadas)</translation> + </message> + <message> + <location line="+6"/> + <source>Conflicted</source> + <translation>Conflitou</translation> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation>Recebido por</translation> </message> @@ -2949,7 +2989,7 @@ Endereço: %4</translation> <translation>(n/a)</translation> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation>Status da transação. Passe o mouse sobre este campo para mostrar o número de confirmações.</translation> </message> @@ -3080,7 +3120,7 @@ Endereço: %4</translation> <message> <location line="+142"/> <source>Export Transaction History</source> - <translation type="unfinished"/> + <translation>Exportar Histórico de Transação</translation> </message> <message> <location line="+19"/> @@ -3090,7 +3130,7 @@ Endereço: %4</translation> <message> <location line="+0"/> <source>There was an error trying to save the transaction history to %1.</source> - <translation type="unfinished"/> + <translation>Ocorreu um erro ao tentar salvar o histórico de transação em %1.</translation> </message> <message> <location line="+4"/> @@ -3100,7 +3140,7 @@ Endereço: %4</translation> <message> <location line="+0"/> <source>The transaction history was successfully saved to %1.</source> - <translation type="unfinished"/> + <translation>O histórico de transação foi gravado com sucesso em %1.</translation> </message> <message> <location line="-22"/> @@ -3158,7 +3198,7 @@ Endereço: %4</translation> <message> <location filename="../walletframe.cpp" line="+26"/> <source>No wallet has been loaded.</source> - <translation type="unfinished"/> + <translation>Nenhuma carteira foi carregada.</translation> </message> </context> <context> @@ -3199,12 +3239,12 @@ Endereço: %4</translation> <message> <location line="+0"/> <source>There was an error trying to save the wallet data to %1.</source> - <translation type="unfinished"/> + <translation>Ocorreu um erro ao tentar salvar os dados da carteira em %1.</translation> </message> <message> <location line="+4"/> <source>The wallet data was successfully saved to %1.</source> - <translation type="unfinished"/> + <translation>Os dados da carteira foram salvos com sucesso em %1.</translation> </message> <message> <location line="+0"/> @@ -3215,12 +3255,12 @@ Endereço: %4</translation> <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+223"/> <source>Usage:</source> <translation>Uso:</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>List commands</source> <translation>Lista de comandos</translation> </message> @@ -3275,12 +3315,12 @@ Endereço: %4</translation> <translation>Especificar seu próprio endereço público</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation>Limite para desconectar peers mal comportados (padrão: 100)</translation> </message> <message> - <location line="-148"/> + <location line="-150"/> <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> @@ -3300,17 +3340,17 @@ Endereço: %4</translation> <translation>Aceitar linha de comando e comandos JSON-RPC</translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <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="+39"/> + <location line="+40"/> <source>Use the test network</source> <translation>Usar rede de teste</translation> </message> <message> - <location line="-118"/> + <location line="-120"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>Aceitar conexões externas (padrão: 1 se opções -proxy ou -connect não estiverem presentes)</translation> </message> @@ -3342,7 +3382,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" 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>Codificadores aceitos (default: TLSv1.2+HIGH:TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!3DES:@STRENGTH)</translation> </message> <message> <location line="+5"/> @@ -3367,7 +3407,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <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"/> + <translation>Entra no modo de teste de regressão, que usa uma cadeia especial onde os blocos podem ser resolvidos instantaneamente.</translation> </message> <message> <location line="+3"/> @@ -3392,7 +3432,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+5"/> <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source> - <translation type="unfinished"/> + <translation>Use proxy SOCKS5 separado para alcançar nós via Tor hidden services (padrão: -proxy)</translation> </message> <message> <location line="+3"/> @@ -3427,7 +3467,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+9"/> <source><category> can be:</source> - <translation type="unfinished"/> + <translation><category> pode ser:</translation> </message> <message> <location line="+6"/> @@ -3437,12 +3477,12 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+1"/> <source>Bitcoin Core Daemon</source> - <translation type="unfinished"/> + <translation>Bitcoin Core Daemon</translation> </message> <message> <location line="+1"/> <source>Bitcoin RPC client version</source> - <translation type="unfinished"/> + <translation>Bitcoin RPC versão do cliente</translation> </message> <message> <location line="+1"/> @@ -3451,18 +3491,23 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation>Limpa a lista de transações da carteira (ferramenta de diagnóstico; implica -rescan)</translation> + </message> + <message> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation>Conectar apenas a nó(s) especÃfico(s)</translation> </message> <message> <location line="+1"/> <source>Connect through SOCKS proxy</source> - <translation type="unfinished"/> + <translation>Conecta através de proxy SOCKS</translation> </message> <message> <location line="+1"/> <source>Connect to JSON-RPC on <port> (default: 8332 or testnet: 18332)</source> - <translation type="unfinished"/> + <translation>Conectar-se ao JSON-RPC em <port> (default: 8332 or testnet: 18332)</translation> </message> <message> <location line="+2"/> @@ -3477,7 +3522,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+1"/> <source>Do not load the wallet and disable wallet RPC calls</source> - <translation type="unfinished"/> + <translation>Não carrega a carteira e desabilita as chamadas RPC para a carteira</translation> </message> <message> <location line="+1"/> @@ -3577,7 +3622,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+1"/> <source>Fee per kB to add to transactions you send</source> - <translation type="unfinished"/> + <translation>Taxa por kB para adicionar à s transações que você envia</translation> </message> <message> <location line="+1"/> @@ -3602,7 +3647,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+1"/> <source>If <category> is not supplied, output all debugging information.</source> - <translation type="unfinished"/> + <translation>Se <category> não for informada, logar toda informação de debug.</translation> </message> <message> <location line="+2"/> @@ -3612,7 +3657,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+3"/> <source>Invalid -onion address: '%s'</source> - <translation type="unfinished"/> + <translation>Endereço -onion inválido: '%s'</translation> </message> <message> <location line="+15"/> @@ -3622,7 +3667,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+5"/> <source>Prepend debug output with timestamp (default: 1)</source> - <translation type="unfinished"/> + <translation>Adiciona timestamp como prefixo no debug (padrão: 1)</translation> </message> <message> <location line="+1"/> @@ -3637,17 +3682,17 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+5"/> <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source> - <translation type="unfinished"/> + <translation>Seleciona versão SOCKS para -proxy (4 ou 5, padrão: 5)</translation> </message> <message> <location line="+1"/> <source>Send command to Bitcoin server</source> - <translation type="unfinished"/> + <translation>Enviar comando para um servidor Bitcoin</translation> </message> <message> <location line="+7"/> <source>Set maximum block size in bytes (default: %d)</source> - <translation type="unfinished"/> + <translation>Define o tamanho máximo de cada bloco em bytes (padrão: %d)</translation> </message> <message> <location line="+2"/> @@ -3661,18 +3706,23 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation>Permite gastar troco não confirmado ao criar transações (padrão: 1)</translation> + </message> + <message> + <location line="+1"/> <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"/> + <translation>Isso é usado para testes de regressão e ferramentas de desenvolvimento.</translation> </message> <message> <location line="+10"/> <source>Usage (deprecated, use bitcoin-cli):</source> - <translation type="unfinished"/> + <translation>Exemplo de uso (obsoleto, use bitcoin-cli):</translation> </message> <message> <location line="+7"/> @@ -3702,7 +3752,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+2"/> <source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source> - <translation type="unfinished"/> + <translation>Atenção: Parâmetro obsoleto -debugnet foi ignorado, use -debug=net</translation> </message> <message> <location line="+2"/> @@ -3710,24 +3760,24 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Você precisa reconstruir o banco de dados utilizando-reindexar a mudar-txindex</translation> </message> <message> - <location line="-79"/> + <location line="-80"/> <source>Imports blocks from external blk000??.dat file</source> <translation>Importar blocos de um arquivo externo blk000??.dat</translation> </message> <message> - <location line="-105"/> + <location line="-106"/> <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="+14"/> <source>Output debugging information (default: 0, supplying <category> is optional)</source> - <translation type="unfinished"/> + <translation>Informação de saÃda de debug (padrão: 0, definir <category> é opcional)</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>Define o tamanho máximo de alta-prioridade por taxa baixa nas transações em bytes (padrão: %d)</translation> </message> <message> <location line="+2"/> @@ -3735,7 +3785,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Defina o número de linhas de verificação (até 16, 0 = auto, <0 = deixar muitos núcleos livres, padrão: 0)</translation> </message> <message> - <location line="+89"/> + <location line="+90"/> <source>Information</source> <translation>Informação</translation> </message> @@ -3805,7 +3855,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Especifique o tempo limite (timeout) da conexão em milissegundos (padrão: 5000) </translation> </message> <message> - <location line="+6"/> + <location line="+7"/> <source>System error: </source> <translation>Erro de sistema:</translation> </message> @@ -3851,6 +3901,11 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation>Aniquilando todas as transações da carteira...</translation> + </message> + <message> + <location line="+1"/> <source>version</source> <translation>versão</translation> </message> @@ -3860,32 +3915,32 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>wallet.dat corrompido, recuperação falhou</translation> </message> <message> - <location line="-58"/> + <location line="-60"/> <source>Password for JSON-RPC connections</source> <translation>Senha para conexões JSON-RPC</translation> </message> <message> - <location line="-70"/> + <location line="-71"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Permitir conexões JSON-RPC de endereços IP especÃficos</translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>Enviar comando para nó rodando em <ip> (pardão: 127.0.0.1)</translation> </message> <message> - <location line="-132"/> + <location line="-133"/> <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="+161"/> + <location line="+163"/> <source>Upgrade wallet to latest format</source> <translation>Atualizar carteira para o formato mais recente</translation> </message> <message> - <location line="-24"/> + <location line="-25"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Determinar tamanho do pool de endereços para <n> (padrão: 100)</translation> </message> @@ -3895,12 +3950,12 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Re-escanear blocos procurando por transações perdidas da carteira</translation> </message> <message> - <location line="+38"/> + <location line="+39"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Usar OpenSSL (https) para conexões JSON-RPC</translation> </message> <message> - <location line="-30"/> + <location line="-31"/> <source>Server certificate file (default: server.cert)</source> <translation>Arquivo de certificado do servidor (padrão: server.cert)</translation> </message> @@ -3910,7 +3965,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Chave privada do servidor (padrão: server.pem)</translation> </message> <message> - <location line="+16"/> + <location line="+17"/> <source>This help message</source> <translation>Esta mensagem de ajuda</translation> </message> @@ -3920,12 +3975,12 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>ImpossÃvel vincular a %s neste computador (bind retornou erro %d, %s)</translation> </message> <message> - <location line="-107"/> + <location line="-109"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>Permitir consultas DNS para -addnode, -seednode e -connect</translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Loading addresses...</source> <translation>Carregando endereços...</translation> </message> @@ -3940,12 +3995,12 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Erro ao carregar wallet.dat: Carteira requer uma versão mais nova do Bitcoin</translation> </message> <message> - <location line="+98"/> + <location line="+99"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>A Carteira precisou ser reescrita: reinicie o Bitcoin para completar</translation> </message> <message> - <location line="-100"/> + <location line="-101"/> <source>Error loading wallet.dat</source> <translation>Erro ao carregar wallet.dat</translation> </message> @@ -3955,7 +4010,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Endereço -proxy inválido: '%s'</translation> </message> <message> - <location line="+56"/> + <location line="+57"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Rede desconhecida especificada em -onlynet: '%s'</translation> </message> @@ -3965,7 +4020,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Versão desconhecida do proxy -socks requisitada: %i</translation> </message> <message> - <location line="-101"/> + <location line="-103"/> <source>Cannot resolve -bind address: '%s'</source> <translation>ImpossÃvel encontrar o endereço -bind: '%s'</translation> </message> @@ -3975,7 +4030,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>ImpossÃvel encontrar endereço -externalip: '%s'</translation> </message> <message> - <location line="+48"/> + <location line="+49"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>Quantidade inválida para -paytxfee=<quantidade>: '%s'</translation> </message> @@ -3995,7 +4050,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Carregando Ãndice de blocos...</translation> </message> <message> - <location line="-62"/> + <location line="-63"/> <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> @@ -4005,12 +4060,12 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>ImpossÃvel vincular a %s neste computador. O Bitcoin provavelmente já está rodando.</translation> </message> <message> - <location line="+95"/> + <location line="+96"/> <source>Loading wallet...</source> <translation>Carregando carteira...</translation> </message> <message> - <location line="-56"/> + <location line="-57"/> <source>Cannot downgrade wallet</source> <translation>Não é possÃvel fazer downgrade da carteira</translation> </message> @@ -4020,7 +4075,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Não foi possÃvel escrever no endereço padrão</translation> </message> <message> - <location line="+67"/> + <location line="+68"/> <source>Rescanning...</source> <translation>Re-escaneando...</translation> </message> @@ -4030,17 +4085,17 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Carregamento terminado</translation> </message> <message> - <location line="+85"/> + <location line="+86"/> <source>To use the %s option</source> <translation>Para usar a opção %s</translation> </message> <message> - <location line="-77"/> + <location line="-78"/> <source>Error</source> <translation>Erro</translation> </message> <message> - <location line="-35"/> + <location line="-36"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_pt_PT.ts b/src/qt/locale/bitcoin_pt_PT.ts index 0786b23f91..cdc65386c1 100644 --- a/src/qt/locale/bitcoin_pt_PT.ts +++ b/src/qt/locale/bitcoin_pt_PT.ts @@ -36,6 +36,12 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open <source>The Bitcoin Core developers</source> <translation>Os programadores Bitcoin</translation> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source> (%1-bit)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>AddressBookPage</name> @@ -157,7 +163,7 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open <message> <location line="+1"/> <source>There was an error trying to save the address list to %1.</source> - <translation type="unfinished"/> + <translation>Ocorreu um erro ao tentar guardar a lista de endereços em %1.</translation> </message> </context> <context> @@ -175,7 +181,7 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open <message> <location line="+36"/> <source>(no label)</source> - <translation>(Sem rótulo)</translation> + <translation>(sem rótulo)</translation> </message> </context> <context> @@ -568,12 +574,12 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open <message> <location line="+2"/> <source>&Command-line options</source> - <translation type="unfinished"/> + <translation>Opções da linha de &comandos</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>Mostrar a mensagem de ajuda do Bitcoin Core para obter uma lista com possÃveis opções para a linha de comandos</translation> </message> <message> <location line="+159"/> @@ -617,6 +623,16 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open <translation><numerusform>%n semana</numerusform><numerusform>%n semanas</numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation>%1 em atraso</translation> @@ -690,7 +706,7 @@ Endereço: %4 <translation>A carteira está <b>encriptada</b> e atualmente <b>bloqueada</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+435"/> <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> @@ -708,7 +724,7 @@ Endereço: %4 <message> <location filename="../forms/coincontroldialog.ui" line="+14"/> <source>Coin Control Address Selection</source> - <translation>Controlo de selecção de endereço "Coin".</translation> + <translation>Seleção de Endereço Coin Control</translation> </message> <message> <location line="+34"/> @@ -738,7 +754,7 @@ Endereço: %4 <message> <location line="+32"/> <source>Low Output:</source> - <translation>Output Baixo:</translation> + <translation>SaÃda Baixa:</translation> </message> <message> <location line="+48"/> @@ -748,12 +764,12 @@ Endereço: %4 <message> <location line="+32"/> <source>Change:</source> - <translation>Alteração:</translation> + <translation>Troco:</translation> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> - <translation>(não)seleccionar todos</translation> + <translation>(des)seleccionar todos</translation> </message> <message> <location line="+13"/> @@ -766,7 +782,7 @@ Endereço: %4 <translation>Modo lista</translation> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation>Quantia</translation> </message> @@ -819,12 +835,12 @@ Endereço: %4 <message> <location line="+1"/> <source>Lock unspent</source> - <translation>Bloquear não-utilizados</translation> + <translation>Bloquear não gastos</translation> </message> <message> <location line="+1"/> <source>Unlock unspent</source> - <translation>Desbloquear não-utilizados</translation> + <translation>Desbloquear não gastos</translation> </message> <message> <location line="+22"/> @@ -917,7 +933,7 @@ Endereço: %4 <translation>nenhum</translation> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation>Lixo</translation> </message> @@ -955,7 +971,7 @@ Endereço: %4 <message> <location line="+1"/> <source>This label turns red, if the priority is smaller than "medium".</source> - <translation type="unfinished"/> + <translation>Esta legenda fica vermelha se a prioridade for menor que "médio".</translation> </message> <message> <location line="+3"/> @@ -1015,7 +1031,7 @@ Endereço: %4 <message> <location line="+17"/> <source>The address associated with this address list entry. This can only be modified for sending addresses.</source> - <translation>O endereço associado com a entrada do registo desta lista. Isto só pode ser modificado para os endereços de envio.</translation> + <translation>O endereço associado com o rótulo desta entrada. Isto só pode ser modificado para endereços de saÃda.</translation> </message> <message> <location line="-10"/> @@ -1078,7 +1094,7 @@ Endereço: %4 <message> <location line="+2"/> <source>Directory already exists. Add %1 if you intend to create a new directory here.</source> - <translation>O directório já existe. Adicione %1 se pretender criar um novo directório aqui.</translation> + <translation>A pasta já existe. Adicione %1 se pretender criar aqui uma nova pasta.</translation> </message> <message> <location line="+3"/> @@ -1096,10 +1112,10 @@ Endereço: %4 <message> <location filename="../forms/helpmessagedialog.ui" line="+19"/> <source>Bitcoin Core - Command-line options</source> - <translation type="unfinished"/> + <translation>Bitcoin Core - Opções da linha de comandos</translation> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation>Núcleo Bitcoin</translation> </message> @@ -1244,7 +1260,7 @@ A sua "carteira" também irá ser guardada neste directório.</transla <translation>&Principal</translation> </message> <message> - <location line="+6"/> + <location line="+122"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation>Taxa de transação opcional por KB que ajuda a assegurar que as suas transações serão processadas rapidamente. A maioria das transações tem 1 kB.</translation> </message> @@ -1254,7 +1270,7 @@ A sua "carteira" também irá ser guardada neste directório.</transla <translation>Pagar &taxa de transação</translation> </message> <message> - <location line="+31"/> + <location line="-131"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation>Começar o Bitcoin automaticamente ao iniciar sessão no sistema.</translation> </message> @@ -1269,19 +1285,14 @@ A sua "carteira" também irá ser guardada neste directório.</transla <translation>Tamanho dos temporários da &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"/> + <location line="+16"/> <source>MB</source> <translation>MB</translation> </message> <message> <location line="+27"/> <source>Number of script &verification threads</source> - <translation type="unfinished"/> + <translation>Número de processos de script e &verificação</translation> </message> <message> <location line="+13"/> @@ -1289,19 +1300,24 @@ A sua "carteira" também irá ser guardada neste directório.</transla <translation>Defina o número de processos de verificação (até 16, 0 = automático, <0 = disponibiliza esse número de núcleos livres, por defeito: 0)</translation> </message> <message> - <location line="+58"/> - <source>Connect to the Bitcoin network through a SOCKS proxy.</source> + <location line="+107"/> + <source>&Spend unconfirmed change (experts only)</source> <translation type="unfinished"/> </message> <message> + <location line="+37"/> + <source>Connect to the Bitcoin network through a SOCKS proxy.</source> + <translation>Ligar à rede Bitcoin através de um proxy SOCKS.</translation> + </message> + <message> <location line="+3"/> <source>&Connect through SOCKS proxy (default proxy):</source> - <translation type="unfinished"/> + <translation>Ligar através de um proxy SO&CKS (proxy por defeito):</translation> </message> <message> <location line="+34"/> <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source> - <translation type="unfinished"/> + <translation>Endereço IP do proxy (p.ex. IPv4: 127.0.0.1 / IPv6: ::1)</translation> </message> <message> <location line="+224"/> @@ -1324,7 +1340,17 @@ A sua "carteira" também irá ser guardada neste directório.</transla <translation>&Rede</translation> </message> <message> - <location line="+6"/> + <location line="-86"/> + <source>W&allet</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+52"/> + <source>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.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+40"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>Abrir a porta do cliente bitcoin automaticamente no seu router. Isto penas funciona se o seu router suportar UPnP e este se encontrar ligado.</translation> </message> @@ -1439,17 +1465,17 @@ A sua "carteira" também irá ser guardada neste directório.</transla <translation>&Cancelar</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+70"/> <source>default</source> <translation>padrão</translation> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation>nenhum</translation> </message> <message> - <location line="+75"/> + <location line="+78"/> <source>Confirm options reset</source> <translation>Confirme a reposição de opções</translation> </message> @@ -1457,17 +1483,17 @@ A sua "carteira" também irá ser guardada neste directório.</transla <location line="+1"/> <location line="+29"/> <source>Client restart required to activate changes.</source> - <translation type="unfinished"/> + <translation>Precisa reiniciar o cliente para ativar as mudanças.</translation> </message> <message> <location line="-29"/> <source>Client will be shutdown, do you want to proceed?</source> - <translation type="unfinished"/> + <translation>O cliente será desligado, deseja proceder?</translation> </message> <message> <location line="+33"/> <source>This change would require a client restart.</source> - <translation type="unfinished"/> + <translation>Esta mudança requer um reinÃcio do cliente.</translation> </message> <message> <location line="+34"/> @@ -1489,19 +1515,14 @@ A sua "carteira" também irá ser guardada neste directório.</transla <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="-155"/> - <source>Unconfirmed:</source> - <translation>Não confirmado:</translation> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation>Carteira</translation> </message> <message> <location line="+51"/> - <source>Confirmed:</source> - <translation>Confirmado:</translation> + <source>Available:</source> + <translation type="unfinished"/> </message> <message> <location line="+16"/> @@ -1509,7 +1530,12 @@ A sua "carteira" também irá ser guardada neste directório.</transla <translation>O seu saldo disponÃvel para gastar</translation> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> <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 ainda não confirmadas, e que não estão contabilizadas ainda no seu saldo actual</translation> </message> @@ -1581,7 +1607,7 @@ A sua "carteira" também irá ser guardada neste directório.</transla <message> <location line="+58"/> <source>Net manager warning</source> - <translation type="unfinished"/> + <translation>Aviso do gestor de rede</translation> </message> <message> <location line="+1"/> @@ -1657,6 +1683,11 @@ A sua "carteira" também irá ser guardada neste directório.</transla <source>Error: Invalid combination of -regtest and -testnet.</source> <translation>Erro: Combinação inválida de -regtest e -testnet.</translation> </message> + <message> + <location filename="../guiutil.cpp" line="+82"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>Introduza um endereço Bitcoin (p.ex. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> </context> <context> <name>QRImageWidget</name> @@ -1721,7 +1752,7 @@ A sua "carteira" também irá ser guardada neste directório.</transla <message> <location line="+25"/> <source>General</source> - <translation type="unfinished"/> + <translation>Geral</translation> </message> <message> <location line="+53"/> @@ -1741,7 +1772,7 @@ A sua "carteira" também irá ser guardada neste directório.</transla <message> <location line="+7"/> <source>Name</source> - <translation type="unfinished"/> + <translation>Nome</translation> </message> <message> <location line="+23"/> @@ -1877,24 +1908,24 @@ A sua "carteira" também irá ser guardada neste directório.</transla <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+83"/> + <location filename="../forms/receivecoinsdialog.ui" line="+107"/> <source>&Amount:</source> <translation>&Quantia:</translation> </message> <message> - <location line="-13"/> + <location line="-16"/> <source>&Label:</source> <translation>Rótu&lo:</translation> </message> <message> - <location line="-34"/> + <location line="-37"/> <source>&Message:</source> <translation>&Mensagem:</translation> </message> <message> - <location line="-17"/> + <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>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> + <translation>Reutilize uns dos anteriores endereços de entrada. 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 repetir uma requisição de pagamento feita anteriormente.</translation> </message> <message> <location line="+3"/> @@ -1902,27 +1933,30 @@ A sua "carteira" também irá ser guardada neste directório.</transla <translation>Reutilizar um endereço de recebimento existente (não recomendado)</translation> </message> <message> - <location line="+27"/> - <source>An optional 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"/> </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"/> + <location line="-7"/> + <location line="+21"/> + <source>An optional label to associate with the new receiving address.</source> + <translation>Um rótulo opcional a associar ao novo endereço de recebimento.</translation> </message> <message> - <location line="+7"/> + <location line="-7"/> <source>Use this form to request payments. All fields are <b>optional</b>.</source> - <translation type="unfinished"/> + <translation>Utilize este formulário para solicitar pagamentos. Todos os campos são <b>opcionais</b>.</translation> </message> <message> - <location line="+39"/> + <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"/> </message> <message> - <location line="+17"/> + <location line="+32"/> <source>Clear all fields of the form.</source> <translation>Limpar todos os campos do formulário.</translation> </message> @@ -1932,17 +1966,17 @@ A sua "carteira" também irá ser guardada neste directório.</transla <translation>Limpar</translation> </message> <message> - <location line="+36"/> - <source>&Request payment</source> - <translation>&Requisitar Pagamento</translation> + <location line="+78"/> + <source>Requested payments history</source> + <translation>Histórico de pagamentos requisitados</translation> </message> <message> - <location line="+47"/> - <source>Requested payments</source> - <translation type="unfinished"/> + <location line="-98"/> + <source>&Request payment</source> + <translation>&Requisitar Pagamento</translation> </message> <message> - <location line="+16"/> + <location line="+120"/> <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> @@ -1961,6 +1995,21 @@ A sua "carteira" também irá ser guardada neste directório.</transla <source>Remove</source> <translation>Remover</translation> </message> + <message> + <location filename="../receivecoinsdialog.cpp" line="+38"/> + <source>Copy label</source> + <translation>Copiar rótulo</translation> + </message> + <message> + <location line="+1"/> + <source>Copy message</source> + <translation>Copiar mensagem</translation> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation>Copiar quantia</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -2062,12 +2111,17 @@ A sua "carteira" também irá ser guardada neste directório.</transla <source>(no message)</source> <translation>(Sem mensagem)</translation> </message> + <message> + <location line="+8"/> + <source>(no amount)</source> + <translation>(sem quantia)</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>Enviar Moedas</translation> @@ -2143,7 +2197,7 @@ A sua "carteira" também irá ser guardada neste directório.</transla <translation>Personalização de endereço de alteração</translation> </message> <message> - <location line="+115"/> + <location line="+164"/> <source>Send to multiple recipients at once</source> <translation>Enviar para múltiplos destinatários de uma vez</translation> </message> @@ -2153,7 +2207,7 @@ A sua "carteira" também irá ser guardada neste directório.</transla <translation>Adicionar &Destinatário</translation> </message> <message> - <location line="+20"/> + <location line="-23"/> <source>Clear all fields of the form.</source> <translation>Limpar todos os campos do formulário.</translation> </message> @@ -2163,12 +2217,12 @@ A sua "carteira" também irá ser guardada neste directório.</transla <translation>&Limpar Tudo</translation> </message> <message> - <location line="+22"/> + <location line="+52"/> <source>Balance:</source> <translation>Saldo:</translation> </message> <message> - <location line="+41"/> + <location line="-78"/> <source>Confirm the send action</source> <translation>Confirme ação de envio</translation> </message> @@ -2178,7 +2232,7 @@ A sua "carteira" também irá ser guardada neste directório.</transla <translation>&Enviar</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-228"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation>Confirme envio de moedas</translation> </message> @@ -2191,12 +2245,7 @@ A sua "carteira" também irá ser guardada neste directório.</transla <translation>%1 para %2</translation> </message> <message> - <location line="-136"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Introduza um endereço Bitcoin (p.ex. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> - <message> - <location line="+15"/> + <location line="-121"/> <source>Copy quantity</source> <translation>Copiar quantidade</translation> </message> @@ -2246,7 +2295,7 @@ A sua "carteira" também irá ser guardada neste directório.</transla <translation>ou</translation> </message> <message> - <location line="+202"/> + <location line="+203"/> <source>The recipient address is not valid, please recheck.</source> <translation>O endereço de destino não é válido, por favor verifique.</translation> </message> @@ -2281,12 +2330,12 @@ A sua "carteira" 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="+112"/> + <location line="+113"/> <source>Warning: Invalid Bitcoin address</source> <translation>Aviso: Endereço Bitcoin inválido</translation> </message> <message> - <location line="+21"/> + <location line="+20"/> <source>(no label)</source> <translation>(Sem rótulo)</translation> </message> @@ -2296,7 +2345,7 @@ A sua "carteira" também irá ser guardada neste directório.</transla <translation>Aviso: Endereço de alteração desconhecido</translation> </message> <message> - <location line="-366"/> + <location line="-367"/> <source>Are you sure you want to send?</source> <translation>Tem a certeza que deseja enviar?</translation> </message> @@ -2306,7 +2355,7 @@ A sua "carteira" também irá ser guardada neste directório.</transla <translation>adicionados como taxa de transação</translation> </message> <message> - <location line="+170"/> + <location line="+171"/> <source>Payment request expired</source> <translation>Pedido de pagamento expirou</translation> </message> @@ -2383,12 +2432,7 @@ A sua "carteira" também irá ser guardada neste directório.</transla <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"/> + <location line="+968"/> <source>This is a verified payment request.</source> <translation>Este é um pedido de verificação de pagamento.</translation> </message> @@ -2398,7 +2442,12 @@ A sua "carteira" também irá ser guardada neste directório.</transla <translation>Escreva um rótulo para este endereço para o adicionar à sua lista de endereços usados</translation> </message> <message> - <location line="+459"/> + <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"/> + </message> + <message> + <location line="+426"/> <source>This is an unverified payment request.</source> <translation>Este é um pedido de pagamento não-verificado.</translation> </message> @@ -2414,18 +2463,13 @@ A sua "carteira" também irá ser guardada neste directório.</transla <source>Memo:</source> <translation>Memo:</translation> </message> - <message> - <location filename="../sendcoinsentry.cpp" line="+1"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Introduza um endereço Bitcoin (p.ex. 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"/> + <translation>O Bitcoin Core está a encerrar...</translation> </message> <message> <location line="+1"/> @@ -2456,19 +2500,19 @@ A sua "carteira" também irá ser guardada neste directório.</transla <translation>O endereço a utilizar para assinar a mensagem (p.ex. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location line="+10"/> - <location line="+213"/> + <location line="+7"/> + <location line="+210"/> <source>Choose previously used address</source> <translation>Escolher endereço usado previamente</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>Cole endereço da área de transferência</translation> </message> @@ -2509,12 +2553,12 @@ A sua "carteira" também irá ser guardada neste directório.</transla </message> <message> <location line="+3"/> - <location line="+146"/> + <location line="+143"/> <source>Clear &All</source> <translation>Limpar &Tudo</translation> </message> <message> - <location line="-87"/> + <location line="-84"/> <source>&Verify Message</source> <translation>&Verificar Mensagem</translation> </message> @@ -2529,7 +2573,7 @@ A sua "carteira" também irá ser guardada neste directório.</transla <translation>O endereço utilizado para assinar a mensagem (p.ex. 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>Verifique a mensagem para assegurar que foi assinada com o endereço Bitcoin especificado</translation> </message> @@ -2544,43 +2588,37 @@ A sua "carteira" também irá ser guardada neste directório.</transla <translation>Repôr todos os campos de verificação de mensagem</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>Introduza um endereço Bitcoin (p.ex. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location line="-2"/> + <location line="-1"/> <source>Click "Sign Message" to generate signature</source> <translation>Clique "Assinar mensagem" para gerar a assinatura</translation> </message> <message> - <location line="+3"/> - <source>Enter Bitcoin signature</source> - <translation>Introduza assinatura Bitcoin</translation> - </message> - <message> <location line="+84"/> - <location line="+81"/> + <location line="+80"/> <source>The entered address is invalid.</source> <translation>O endereço introduzido é inválido. </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>Por favor verifique o endereço e tente de novo.</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>O endereço introduzido não refere a chave alguma.</translation> </message> <message> - <location line="-73"/> + <location line="-72"/> <source>Wallet unlock was cancelled.</source> <translation>O desbloqueio da carteira foi cancelado.</translation> </message> @@ -2600,7 +2638,7 @@ A sua "carteira" também irá ser guardada neste directório.</transla <translation>Mensagem assinada.</translation> </message> <message> - <location line="+59"/> + <location line="+58"/> <source>The signature could not be decoded.</source> <translation>A assinatura não pôde ser descodificada.</translation> </message> @@ -2661,6 +2699,11 @@ A sua "carteira" também irá ser guardada neste directório.</transla </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation>%1/desligado</translation> </message> @@ -2822,12 +2865,12 @@ A sua "carteira" também irá ser guardada neste directório.</transla <translation>, ainda não foi transmitida com sucesso</translation> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <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> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation>desconhecido</translation> </message> @@ -2868,12 +2911,12 @@ A sua "carteira" também irá ser guardada neste directório.</transla <translation>Quantia</translation> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <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> @@ -2883,23 +2926,12 @@ A sua "carteira" também irá ser guardada neste directório.</transla <translation>Aberto até %1</translation> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> - <translation>Desligado (%1 confirmação)</translation> - </message> - <message> - <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation>Não confirmada (%1 de %2 confirmações)</translation> - </message> - <message> - <location line="-22"/> - <location line="+25"/> + <location line="+12"/> <source>Confirmed (%1 confirmations)</source> - <translation>Confirmada (%1 confirmação)</translation> + <translation>Confirmada (%1 confirmações)</translation> </message> <message> - <location line="-22"/> + <location line="+9"/> <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> @@ -2909,7 +2941,27 @@ A sua "carteira" também irá ser guardada neste directório.</transla <translation>Gerado mas não aceite</translation> </message> <message> - <location line="+62"/> + <location line="-21"/> + <source>Offline</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Unconfirmed</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation>Recebido com</translation> </message> @@ -2931,7 +2983,7 @@ A sua "carteira" também irá ser guardada neste directório.</transla <message> <location line="+2"/> <source>Mined</source> - <translation>Minado</translation> + <translation>Minadas</translation> </message> <message> <location line="+38"/> @@ -2939,7 +2991,7 @@ A sua "carteira" também irá ser guardada neste directório.</transla <translation>(n/d)</translation> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation>Estado da transação. Pairar por cima deste campo para mostrar o número de confirmações.</translation> </message> @@ -3205,12 +3257,12 @@ A sua "carteira" também irá ser guardada neste directório.</transla <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+223"/> <source>Usage:</source> <translation>Utilização:</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>List commands</source> <translation>Listar comandos</translation> </message> @@ -3265,12 +3317,12 @@ A sua "carteira" também irá ser guardada neste directório.</transla <translation>Especifique o seu endereço público</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <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="-148"/> + <location line="-150"/> <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> @@ -3290,17 +3342,17 @@ A sua "carteira" também irá ser guardada neste directório.</transla <translation>Aceitar comandos da consola e JSON-RPC</translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Run in the background as a daemon and accept commands</source> <translation>Correr o processo como um daemon e aceitar comandos</translation> </message> <message> - <location line="+39"/> + <location line="+40"/> <source>Use the test network</source> <translation>Utilizar a rede de testes - testnet</translation> </message> <message> - <location line="-118"/> + <location line="-120"/> <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> @@ -3357,7 +3409,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo <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"/> + <translation>Entre no modo de regressão, que usa uma cadeia especial cujos blocos podem ser resolvidos instantaneamente.</translation> </message> <message> <location line="+3"/> @@ -3397,7 +3449,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo <message> <location line="+3"/> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> - <translation>Aviso: A rede não parece estar completamente funcional! Parece que alguns bitcoiner's estão com dificuldades técnicas.</translation> + <translation>Aviso: A rede não parece estar completamente de acordo! Parece que alguns mineiros estão com dificuldades técnicas.</translation> </message> <message> <location line="+3"/> @@ -3441,6 +3493,11 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo </message> <message> <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation>Apenas ligar ao(s) nó(s) especificado(s)</translation> </message> @@ -3597,7 +3654,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo <message> <location line="+2"/> <source>Incorrect or no genesis block found. Wrong datadir for network?</source> - <translation>Incorrecto ou nenhum bloco de origem encontrado. Directório de dados errado para a rede?</translation> + <translation>Incorrecto ou nenhum bloco génesis encontrado. Pasta de dados errada para a rede?</translation> </message> <message> <location line="+3"/> @@ -3612,7 +3669,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo <message> <location line="+5"/> <source>Prepend debug output with timestamp (default: 1)</source> - <translation>Preceder output de depuração com marca-de-tempo (default: 1)</translation> + <translation>Preceder informação de depuração com selo temporal (por defeito: 1)</translation> </message> <message> <location line="+1"/> @@ -3651,6 +3708,11 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo </message> <message> <location line="+2"/> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Start Bitcoin server</source> <translation>Começar servidor Bitcoin</translation> </message> @@ -3687,7 +3749,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo <message> <location line="+2"/> <source>Wallet options:</source> - <translation type="unfinished"/> + <translation>Opções da carteira:</translation> </message> <message> <location line="+2"/> @@ -3700,12 +3762,12 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo <translation>Necessita reconstruir as bases de dados usando -reindex para mudar -txindex</translation> </message> <message> - <location line="-79"/> + <location line="-80"/> <source>Imports blocks from external blk000??.dat file</source> <translation>Importar blocos de um ficheiro blk000??.dat externo</translation> </message> <message> - <location line="-105"/> + <location line="-106"/> <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> @@ -3725,7 +3787,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo <translation>Defina o número de processos de verificação (até 16, 0 = automático, <0 = disponibiliza esse número de núcleos livres, por defeito: 0)</translation> </message> <message> - <location line="+89"/> + <location line="+90"/> <source>Information</source> <translation>Informação</translation> </message> @@ -3795,7 +3857,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo <translation>Especificar tempo de espera da ligação em millisegundos (por defeito: 5000)</translation> </message> <message> - <location line="+6"/> + <location line="+7"/> <source>System error: </source> <translation>Erro de sistema:</translation> </message> @@ -3841,6 +3903,11 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>version</source> <translation>versão</translation> </message> @@ -3850,32 +3917,32 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo <translation>wallet.dat corrupta, recuperação falhou</translation> </message> <message> - <location line="-58"/> + <location line="-60"/> <source>Password for JSON-RPC connections</source> <translation>Palavra-passe para ligações JSON-RPC</translation> </message> <message> - <location line="-70"/> + <location line="-71"/> <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="+80"/> + <location line="+81"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>Enviar comandos para o nó a correr em <ip> (por defeito: 127.0.0.1)</translation> </message> <message> - <location line="-132"/> + <location line="-133"/> <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="+161"/> + <location line="+163"/> <source>Upgrade wallet to latest format</source> <translation>Atualize a carteira para o formato mais recente</translation> </message> <message> - <location line="-24"/> + <location line="-25"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Definir o tamanho da memória de chaves para <n> (por defeito: 100)</translation> </message> @@ -3885,12 +3952,12 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo <translation>Reexaminar a cadeia de blocos para transações em falta na carteira</translation> </message> <message> - <location line="+38"/> + <location line="+39"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Usar OpenSSL (https) para ligações JSON-RPC</translation> </message> <message> - <location line="-30"/> + <location line="-31"/> <source>Server certificate file (default: server.cert)</source> <translation>Ficheiro de certificado do servidor (por defeito: server.cert)</translation> </message> @@ -3900,7 +3967,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo <translation>Chave privada do servidor (por defeito: server.pem)</translation> </message> <message> - <location line="+16"/> + <location line="+17"/> <source>This help message</source> <translation>Esta mensagem de ajuda</translation> </message> @@ -3910,12 +3977,12 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo <translation>Incapaz de vincular a %s neste computador (vÃnculo retornou erro %d, %s)</translation> </message> <message> - <location line="-107"/> + <location line="-109"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>Permitir procuras DNS para -addnode, -seednode e -connect</translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Loading addresses...</source> <translation>Carregar endereços...</translation> </message> @@ -3930,12 +3997,12 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo <translation>Erro ao carregar wallet.dat: A Carteira requer uma versão mais recente do Bitcoin</translation> </message> <message> - <location line="+98"/> + <location line="+99"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>A Carteira precisou ser reescrita: reinicie o Bitcoin para completar</translation> </message> <message> - <location line="-100"/> + <location line="-101"/> <source>Error loading wallet.dat</source> <translation>Erro ao carregar wallet.dat</translation> </message> @@ -3945,7 +4012,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo <translation>Endereço -proxy inválido: '%s'</translation> </message> <message> - <location line="+56"/> + <location line="+57"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Rede desconhecida especificada em -onlynet: '%s'</translation> </message> @@ -3955,7 +4022,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo <translation>Versão desconhecida de proxy -socks requisitada: %i</translation> </message> <message> - <location line="-101"/> + <location line="-103"/> <source>Cannot resolve -bind address: '%s'</source> <translation>Não conseguiu resolver endereço -bind: '%s'</translation> </message> @@ -3965,7 +4032,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo <translation>Não conseguiu resolver endereço -externalip: '%s'</translation> </message> <message> - <location line="+48"/> + <location line="+49"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>Quantia inválida para -paytxfee=<amount>: '%s'</translation> </message> @@ -3985,7 +4052,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo <translation>Carregar Ãndice de blocos...</translation> </message> <message> - <location line="-62"/> + <location line="-63"/> <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> @@ -3995,12 +4062,12 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo <translation>Incapaz de vincular à porta %s neste computador. Provavelmente o Bitcoin já está a funcionar.</translation> </message> <message> - <location line="+95"/> + <location line="+96"/> <source>Loading wallet...</source> <translation>Carregar carteira...</translation> </message> <message> - <location line="-56"/> + <location line="-57"/> <source>Cannot downgrade wallet</source> <translation>ImpossÃvel mudar a carteira para uma versão anterior</translation> </message> @@ -4010,7 +4077,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo <translation>ImpossÃvel escrever endereço por defeito</translation> </message> <message> - <location line="+67"/> + <location line="+68"/> <source>Rescanning...</source> <translation>Reexaminando...</translation> </message> @@ -4020,17 +4087,17 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo <translation>Carregamento completo</translation> </message> <message> - <location line="+85"/> + <location line="+86"/> <source>To use the %s option</source> <translation>Para usar a opção %s</translation> </message> <message> - <location line="-77"/> + <location line="-78"/> <source>Error</source> <translation>Erro</translation> </message> <message> - <location line="-35"/> + <location line="-36"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_ro_RO.ts b/src/qt/locale/bitcoin_ro_RO.ts index 7db0510183..277571152b 100644 --- a/src/qt/locale/bitcoin_ro_RO.ts +++ b/src/qt/locale/bitcoin_ro_RO.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="ro_RO" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="ro_RO" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -34,6 +34,12 @@ Acest produs include programe dezvoltate de către OpenSSL Project pentru a fi f <message> <location line="+0"/> <source>The Bitcoin Core developers</source> + <translation>Dezvoltatorii Bitcoin Core</translation> + </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source> (%1-bit)</source> <translation type="unfinished"/> </message> </context> @@ -65,7 +71,7 @@ Acest produs include programe dezvoltate de către OpenSSL Project pentru a fi f <translation>&Copiere</translation> </message> <message> - <location line="+52"/> + <location line="+58"/> <source>C&lose</source> <translation>&Inchidere</translation> </message> @@ -75,7 +81,7 @@ Acest produs include programe dezvoltate de către OpenSSL Project pentru a fi f <translation>&Copiază adresa</translation> </message> <message> - <location filename="../forms/addressbookpage.ui" line="-41"/> + <location filename="../forms/addressbookpage.ui" line="-47"/> <source>Delete the currently selected address from the list</source> <translation>Sterge adresele curent selectate din lista</translation> </message> @@ -157,7 +163,7 @@ Acest produs include programe dezvoltate de către OpenSSL Project pentru a fi f <message> <location line="+1"/> <source>There was an error trying to save the address list to %1.</source> - <translation type="unfinished"/> + <translation>A apărut o eroare încercând să se salveze lista de adrese la %1.</translation> </message> </context> <context> @@ -322,7 +328,7 @@ Acest produs include programe dezvoltate de către OpenSSL Project pentru a fi f <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+295"/> + <location filename="../bitcoingui.cpp" line="+294"/> <source>Sign &message...</source> <translation>Semnează &mesaj...</translation> </message> @@ -337,12 +343,12 @@ Acest produs include programe dezvoltate de către OpenSSL Project pentru a fi f <translation>&Imagine de ansamblu</translation> </message> <message> - <location line="-137"/> + <location line="-136"/> <source>Node</source> - <translation type="unfinished"/> + <translation>Nod</translation> </message> <message> - <location line="+138"/> + <location line="+137"/> <source>Show general overview of wallet</source> <translation>Arată o stare generală de ansamblu a portofelului</translation> </message> @@ -415,7 +421,7 @@ Acest produs include programe dezvoltate de către OpenSSL Project pentru a fi f <message> <location line="+3"/> <source>Open &URI...</source> - <translation type="unfinished"/> + <translation>VizitaÅ£i &URI...</translation> </message> <message> <location line="+325"/> @@ -463,17 +469,17 @@ Acest produs include programe dezvoltate de către OpenSSL Project pentru a fi f <translation>&Verifică mesajul...</translation> </message> <message> - <location line="+430"/> + <location line="+440"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-643"/> + <location line="-652"/> <source>Wallet</source> <translation>Portofelul</translation> </message> <message> - <location line="+146"/> + <location line="+145"/> <source>&Send</source> <translation>&Trimite</translation> </message> @@ -529,18 +535,18 @@ Acest produs include programe dezvoltate de către OpenSSL Project pentru a fi f <translation>Bara de file</translation> </message> <message> - <location line="-284"/> - <location line="+376"/> + <location line="-283"/> + <location line="+375"/> <source>[testnet]</source> <translation>[testnet]</translation> </message> <message> - <location line="-401"/> + <location line="-400"/> <source>Bitcoin Core</source> <translation>Bitcoin Core</translation> </message> <message> - <location line="+163"/> + <location line="+162"/> <source>Request payments (generates QR codes and bitcoin: URIs)</source> <translation>Cereti plati (genereaza coduri QR si bitcoin-uri: URls)</translation> </message> @@ -602,7 +608,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="+23"/> + <location line="+27"/> <source>%n hour(s)</source> <translation><numerusform>%n oră</numerusform><numerusform>%n ore</numerusform><numerusform>%n ore</numerusform></translation> </message> @@ -613,10 +619,21 @@ Acest produs include programe dezvoltate de către OpenSSL Project pentru a fi f </message> <message numerus="yes"> <location line="+4"/> + <location line="+6"/> <source>%n week(s)</source> <translation><numerusform>%n săptămână</numerusform><numerusform>%n săptămâni</numerusform><numerusform>%n de săptămâni</numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation>%1 si %2</translation> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation>%1 în urmă</translation> @@ -647,12 +664,12 @@ Acest produs include programe dezvoltate de către OpenSSL Project pentru a fi f <translation>InformaÈ›ie</translation> </message> <message> - <location line="-85"/> + <location line="-95"/> <source>Up to date</source> <translation>Actualizat</translation> </message> <message> - <location line="+34"/> + <location line="+44"/> <source>Catching up...</source> <translation>Se actualizează...</translation> </message> @@ -690,7 +707,7 @@ Adresa: %4 <translation>Portofelul este <b>criptat</b> iar în momentul de față este <b>blocat</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+441"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>A survenit o eroare fatala. Bitcoin nu mai poate continua in siguranta si se va opri.</translation> </message> @@ -698,7 +715,7 @@ Adresa: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+119"/> + <location filename="../clientmodel.cpp" line="+128"/> <source>Network Alert</source> <translation>Alertă reÈ›ea</translation> </message> @@ -751,7 +768,7 @@ Adresa: %4 <translation>Schimb:</translation> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation>(de)selectaÅ£i tot</translation> </message> @@ -766,7 +783,7 @@ Adresa: %4 <translation>Modul lista</translation> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation>Sumă</translation> </message> @@ -796,7 +813,7 @@ Adresa: %4 <translation>Prioritate</translation> </message> <message> - <location filename="../coincontroldialog.cpp" line="+42"/> + <location filename="../coincontroldialog.cpp" line="+41"/> <source>Copy address</source> <translation>Copiază adresa</translation> </message> @@ -862,7 +879,7 @@ Adresa: %4 <translation>CopiaÅ£i schimb</translation> </message> <message> - <location line="+323"/> + <location line="+332"/> <source>highest</source> <translation>cel mai mare</translation> </message> @@ -914,10 +931,10 @@ Adresa: %4 <message> <location line="+31"/> <source>none</source> - <translation type="unfinished"/> + <translation>nimic</translation> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation>Praf</translation> </message> @@ -955,7 +972,7 @@ Adresa: %4 <message> <location line="+1"/> <source>This label turns red, if the priority is smaller than "medium".</source> - <translation type="unfinished"/> + <translation>Aceasta eticheta se face rosie daca prioritatea e mai mica decat media</translation> </message> <message> <location line="+3"/> @@ -980,7 +997,7 @@ Adresa: %4 </message> <message> <location line="+43"/> - <location line="+66"/> + <location line="+63"/> <source>(no label)</source> <translation>(fără etichetă)</translation> </message> @@ -1096,10 +1113,10 @@ Adresa: %4 <message> <location filename="../forms/helpmessagedialog.ui" line="+19"/> <source>Bitcoin Core - Command-line options</source> - <translation type="unfinished"/> + <translation>Bitcoin Core - OpÅ£iuni Linie de comandă</translation> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation>Bitcoin Core</translation> </message> @@ -1177,7 +1194,7 @@ Adresa: %4 <translation>FoloseÈ™te un dosar de date personalizat:</translation> </message> <message> - <location filename="../intro.cpp" line="+85"/> + <location filename="../intro.cpp" line="+82"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> @@ -1243,7 +1260,7 @@ Adresa: %4 <translation>&Principal</translation> </message> <message> - <location line="+6"/> + <location line="+122"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation>Taxa optionala de tranzactie per kB care ajuta ca tranzactiile dumneavoastra sa fie procesate rapid. Majoritatea tranzactiilor sunt 1 kB.</translation> </message> @@ -1253,7 +1270,7 @@ Adresa: %4 <translation>PlăteÅŸte comision pentru tranzacÅ£ie &f</translation> </message> <message> - <location line="+31"/> + <location line="-131"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation>PorneÅŸte automat programul Bitcoin la pornirea computerului.</translation> </message> @@ -1268,14 +1285,9 @@ Adresa: %4 <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"/> + <location line="+16"/> <source>MB</source> - <translation type="unfinished"/> + <translation>MB</translation> </message> <message> <location line="+27"/> @@ -1288,9 +1300,9 @@ Adresa: %4 <translation type="unfinished"/> </message> <message> - <location line="+58"/> + <location line="+153"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> - <translation type="unfinished"/> + <translation>Conecteaza-te la reteaua Bitcoin printr-un proxy SOCKS</translation> </message> <message> <location line="+3"/> @@ -1303,7 +1315,7 @@ Adresa: %4 <translation type="unfinished"/> </message> <message> - <location line="+224"/> + <location line="+214"/> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1318,12 +1330,37 @@ Adresa: %4 <translation>&Resetează opÈ›iunile</translation> </message> <message> - <location line="-323"/> + <location line="-313"/> <source>&Network</source> <translation>&Retea</translation> </message> <message> - <location line="+6"/> + <location line="-95"/> + <source>W&allet</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+65"/> + <source>Expert</source> + <translation>expert</translation> + </message> + <message> + <location line="+9"/> + <source>Enable coin &control features</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> + <source>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.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>&Spend unconfirmed change</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+17"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>Deschide automat în router portul aferent clientului Bitcoin. FuncÅ£ionează doar în cazul în care routerul e compatibil UPnP ÅŸi opÅ£iunea e activată.</translation> </message> @@ -1418,17 +1455,12 @@ Adresa: %4 <translation>&AfiÅŸează adresele în lista de tranzacÅ£ii</translation> </message> <message> - <location line="+7"/> + <location line="-262"/> <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 &control features (experts only)</source> - <translation>AfiÅŸeare controlul caracteristicilor monedei (doat pentru experÅ£i)</translation> - </message> - <message> - <location line="+136"/> + <location line="+398"/> <source>&OK</source> <translation>& OK</translation> </message> @@ -1438,17 +1470,17 @@ Adresa: %4 <translation>& Renunta</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+70"/> <source>default</source> <translation>Initial</translation> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> - <translation type="unfinished"/> + <translation>nimic</translation> </message> <message> - <location line="+75"/> + <location line="+78"/> <source>Confirm options reset</source> <translation>Confirmă resetarea opÈ›iunilor</translation> </message> @@ -1456,17 +1488,17 @@ Adresa: %4 <location line="+1"/> <location line="+29"/> <source>Client restart required to activate changes.</source> - <translation type="unfinished"/> + <translation>Este necesar un restart al clientului pentru a activa schimbările.</translation> </message> <message> <location line="-29"/> <source>Client will be shutdown, do you want to proceed?</source> - <translation type="unfinished"/> + <translation>Clientul va fi închis, doriÅ£i să continuaÅ£i?</translation> </message> <message> <location line="+33"/> <source>This change would require a client restart.</source> - <translation type="unfinished"/> + <translation>Această schimbare va necesita un restart al clientului.</translation> </message> <message> <location line="+34"/> @@ -1488,19 +1520,14 @@ Adresa: %4 <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="-155"/> - <source>Unconfirmed:</source> - <translation>Neconfirmat:</translation> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation>Portofel</translation> </message> <message> <location line="+51"/> - <source>Confirmed:</source> - <translation>Confirmat:</translation> + <source>Available:</source> + <translation>Disponibil:</translation> </message> <message> <location line="+16"/> @@ -1508,7 +1535,12 @@ Adresa: %4 <translation>BalanÈ›a ta curentă de cheltuieli</translation> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation>ÃŽn aÅŸteptare:</translation> + </message> + <message> + <location line="+16"/> <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> @@ -1641,18 +1673,18 @@ Adresa: %4 <context> <name>QObject</name> <message> - <location filename="../bitcoin.cpp" line="+71"/> - <location line="+11"/> + <location filename="../bitcoin.cpp" line="+63"/> + <location line="+14"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="+1"/> + <location line="-13"/> <source>Error: Specified data directory "%1" does not exist.</source> <translation>Eroare: Directorul datelor specificate "%1" nu exista.</translation> </message> <message> - <location line="-12"/> + <location line="+13"/> <source>Error: Invalid combination of -regtest and -testnet.</source> <translation>Eroare: combinaÈ›ie nevalidă de -regtest È™i -testnet.</translation> </message> @@ -1703,7 +1735,7 @@ Adresa: %4 <location line="+36"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+359"/> + <location filename="../rpcconsole.cpp" line="+373"/> <source>N/A</source> <translation>N/A</translation> </message> @@ -1725,7 +1757,7 @@ Adresa: %4 <message> <location line="+25"/> <source>General</source> - <translation type="unfinished"/> + <translation>General</translation> </message> <message> <location line="+53"/> @@ -1799,11 +1831,13 @@ Adresa: %4 </message> <message> <location line="+64"/> + <location filename="../rpcconsole.cpp" line="-10"/> <source>In:</source> <translation>în:</translation> </message> <message> <location line="+80"/> + <location filename="../rpcconsole.cpp" line="+1"/> <source>Out:</source> <translation>IeÈ™ire.</translation> </message> @@ -1828,7 +1862,7 @@ Adresa: %4 <translation>Curăță consola</translation> </message> <message> - <location filename="../rpcconsole.cpp" line="-30"/> + <location filename="../rpcconsole.cpp" line="-35"/> <source>Welcome to the Bitcoin RPC console.</source> <translation>Bun venit la consola bitcoin RPC</translation> </message> @@ -1843,7 +1877,7 @@ Adresa: %4 <translation>Scrie <b>help</b> pentru a vedea comenzile disponibile</translation> </message> <message> - <location line="+122"/> + <location line="+136"/> <source>%1 B</source> <translation>%1 B</translation> </message> @@ -1920,7 +1954,7 @@ Adresa: %4 <message> <location line="-7"/> <source>Use this form to request payments. All fields are <b>optional</b>.</source> - <translation type="unfinished"/> + <translation>FoloseÈ™te acest formular pentru a solicita plăți. Toate câmpurile sunt <b>opÈ›ionale</b>.</translation> </message> <message> <location line="+23"/> @@ -1941,7 +1975,7 @@ Adresa: %4 <message> <location line="+78"/> <source>Requested payments history</source> - <translation type="unfinished"/> + <translation>Istoricul platilor a fost cerut</translation> </message> <message> <location line="-98"/> @@ -1959,7 +1993,7 @@ Adresa: %4 <translation>Arată</translation> </message> <message> - <location line="+11"/> + <location line="+14"/> <source>Remove the selected entries from the list</source> <translation type="unfinished"/> </message> @@ -1969,14 +2003,14 @@ Adresa: %4 <translation>Elimină</translation> </message> <message> - <location filename="../receivecoinsdialog.cpp" line="+38"/> + <location filename="../receivecoinsdialog.cpp" line="+39"/> <source>Copy label</source> <translation>Copiază eticheta</translation> </message> <message> <location line="+1"/> <source>Copy message</source> - <translation type="unfinished"/> + <translation>CopiaÅ£i mesajul</translation> </message> <message> <location line="+1"/> @@ -2190,12 +2224,12 @@ Adresa: %4 <translation>Șterge &tot</translation> </message> <message> - <location line="+52"/> + <location line="+58"/> <source>Balance:</source> <translation>Balanță:</translation> </message> <message> - <location line="-78"/> + <location line="-84"/> <source>Confirm the send action</source> <translation>Confirmă operaÈ›iunea de trimitere</translation> </message> @@ -2295,17 +2329,17 @@ Adresa: %4 <message> <location line="+3"/> <source>Transaction creation failed!</source> - <translation type="unfinished"/> + <translation>Creare de tranzactie nereusita!</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 type="unfinished"/> + <translation>Tranzactia a fost respinsa! Acest lucru se poate intampla daca o parte din monedele tale din portofel au fost deja cheltuite, la fel ca si cum ai fi folosit o copie a wallet.dat si monedele au fost cheltuite in copie, dar nu au fost marcate si si cheltuite si aici.</translation> </message> <message> <location line="+113"/> <source>Warning: Invalid Bitcoin address</source> - <translation type="unfinished"/> + <translation>Atentie: Adresa Bitcoin invalida!</translation> </message> <message> <location line="+20"/> @@ -2315,7 +2349,7 @@ Adresa: %4 <message> <location line="-11"/> <source>Warning: Unknown change address</source> - <translation type="unfinished"/> + <translation>Atentie: Schimbare de adresa necunoscuta</translation> </message> <message> <location line="-367"/> @@ -2375,7 +2409,7 @@ Adresa: %4 <message> <location line="-40"/> <source>This is a normal payment.</source> - <translation type="unfinished"/> + <translation>Aceasta este o tranzacÅ£ie normală.</translation> </message> <message> <location line="+50"/> @@ -2397,7 +2431,7 @@ Adresa: %4 <location line="+524"/> <location line="+536"/> <source>Remove this entry</source> - <translation type="unfinished"/> + <translation>Scoate aceasta introducere</translation> </message> <message> <location line="-1008"/> @@ -2407,7 +2441,7 @@ Adresa: %4 <message> <location line="+968"/> <source>This is a verified payment request.</source> - <translation type="unfinished"/> + <translation>Aceasta este o cerere de plata verificata</translation> </message> <message> <location line="-991"/> @@ -2422,13 +2456,13 @@ Adresa: %4 <message> <location line="+426"/> <source>This is an unverified payment request.</source> - <translation type="unfinished"/> + <translation>Aceasta este o cerere de plata neverificata</translation> </message> <message> <location line="+18"/> <location line="+532"/> <source>Pay To:</source> - <translation type="unfinished"/> + <translation>Plateste catre:</translation> </message> <message> <location line="-498"/> @@ -2442,12 +2476,12 @@ Adresa: %4 <message> <location filename="../utilitydialog.cpp" line="+48"/> <source>Bitcoin Core is shutting down...</source> - <translation type="unfinished"/> + <translation>Bitcoin Core se închide...</translation> </message> <message> <location line="+1"/> <source>Do not shut down the computer until this window disappears.</source> - <translation type="unfinished"/> + <translation>Nu închide calculatorul până ce această fereastră nu dispare.</translation> </message> </context> <context> @@ -2647,7 +2681,7 @@ Adresa: %4 <message> <location line="+2"/> <source>The Bitcoin Core developers</source> - <translation type="unfinished"/> + <translation>Dezvoltatorii Bitcoin Core</translation> </message> <message> <location line="+1"/> @@ -2672,6 +2706,11 @@ Adresa: %4 </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation>%1/deconectat</translation> </message> @@ -2833,12 +2872,12 @@ Adresa: %4 <translation>, nu s-a propagat încă</translation> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <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> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation>necunoscut</translation> </message> @@ -2879,12 +2918,12 @@ Adresa: %4 <translation>Cantitate</translation> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <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> @@ -2894,23 +2933,12 @@ Adresa: %4 <translation>Deschis până la %1</translation> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> - <translation>Neconectat (%1 confirmări)</translation> - </message> - <message> - <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation>Neconfirmat (%1 din %2 confirmări)</translation> - </message> - <message> - <location line="-22"/> - <location line="+25"/> + <location line="+12"/> <source>Confirmed (%1 confirmations)</source> <translation>Confirmat (%1 confirmări)</translation> </message> <message> - <location line="-22"/> + <location line="+9"/> <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> @@ -2920,7 +2948,27 @@ Adresa: %4 <translation>Generat dar neacceptat</translation> </message> <message> - <location line="+62"/> + <location line="-21"/> + <source>Offline</source> + <translation>Deconectat</translation> + </message> + <message> + <location line="+3"/> + <source>Unconfirmed</source> + <translation>Neconfirmat</translation> + </message> + <message> + <location line="+3"/> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation>Confirmare (%1 dintre %2 confirmări recomandate)</translation> + </message> + <message> + <location line="+6"/> + <source>Conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation>RecepÈ›ionat cu</translation> </message> @@ -2950,7 +2998,7 @@ Adresa: %4 <translation>(n/a)</translation> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation>Starea tranzacÈ›iei. Treci cu mausul peste acest câmp pentru afiÈ™area numărului de confirmări.</translation> </message> @@ -3079,29 +3127,29 @@ Adresa: %4 <translation>Arată detaliile tranzacÈ›iei</translation> </message> <message> - <location line="+142"/> + <location line="+140"/> <source>Export Transaction History</source> - <translation type="unfinished"/> + <translation>Exportare Istoric TranzacÅ£ii</translation> </message> <message> <location line="+19"/> <source>Exporting Failed</source> - <translation>Exportare esuata</translation> + <translation>Exportare EÅŸuată</translation> </message> <message> <location line="+0"/> <source>There was an error trying to save the transaction history to %1.</source> - <translation type="unfinished"/> + <translation>S-a produs o eroare încercând să se salveze istoricul tranzacÅ£iilor la %1.</translation> </message> <message> <location line="+4"/> <source>Exporting Successful</source> - <translation type="unfinished"/> + <translation>Exportare ReuÅŸită</translation> </message> <message> <location line="+0"/> <source>The transaction history was successfully saved to %1.</source> - <translation type="unfinished"/> + <translation>Istoricul tranzacÅ£iilor a fost salvat cu succes la %1.</translation> </message> <message> <location line="-22"/> @@ -3159,7 +3207,7 @@ Adresa: %4 <message> <location filename="../walletframe.cpp" line="+26"/> <source>No wallet has been loaded.</source> - <translation type="unfinished"/> + <translation>Nu a fost încărcat niciun portofel.</translation> </message> </context> <context> @@ -3200,12 +3248,12 @@ Adresa: %4 <message> <location line="+0"/> <source>There was an error trying to save the wallet data to %1.</source> - <translation type="unfinished"/> + <translation>S-a produs o eroare încercând să se salveze datele portofelului la %1.</translation> </message> <message> <location line="+4"/> <source>The wallet data was successfully saved to %1.</source> - <translation type="unfinished"/> + <translation>Datele portofelului s-au salvat cu succes la %1.</translation> </message> <message> <location line="+0"/> @@ -3216,12 +3264,12 @@ Adresa: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+226"/> <source>Usage:</source> <translation>Uz:</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>List commands</source> <translation>Listă de comenzi</translation> </message> @@ -3251,12 +3299,7 @@ Adresa: %4 <translation>Specifică dosarul de date</translation> </message> <message> - <location line="-9"/> - <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="-26"/> + <location line="-35"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>Ascultă pentru conectări pe <port> (implicit: 8333 sau testnet: 18333)</translation> </message> @@ -3276,47 +3319,47 @@ Adresa: %4 <translation>Specifică adresa ta publică</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <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="-148"/> + <location line="-151"/> <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="-36"/> + <location line="-38"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation>A intervenit o eroare in timp ce se seta portul RPC %u pentru ascultare pe IPv4: %s</translation> </message> <message> - <location line="+34"/> + <location line="+36"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation>Ascultă pentru conexiuni JSON-RPC pe <port> (implicit:8332 sau testnet: 18332)</translation> </message> <message> - <location line="+45"/> + <location line="+46"/> <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="+80"/> + <location line="+81"/> <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="+39"/> + <location line="+40"/> <source>Use the test network</source> <translation>Utilizează reÈ›eaua de test</translation> </message> <message> - <location line="-118"/> + <location line="-120"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>Acceptă conexiuni din afară (implicit: 1 dacă nu se foloseÈ™te -proxy sau -connect)</translation> </message> <message> - <location line="-95"/> + <location line="-98"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -3328,7 +3371,18 @@ If the file does not exist, create it with owner-readable-only file permissions. It is also recommended to set alertnotify so you are notified of problems; for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com </source> - <translation type="unfinished"/> + <translation>%s trebuie sa setezi o parola rpc in fisierul de configurare +%s +Este recomandat sa folosesti aceasta parola aleatorie: +rpcuser=bitcoinrpc +parola rpc=%s +(nu este necesar ca sa iti amintesti aceasta parola) +Numele de utilizator si parola NU trebuie sa fie la fel. +Daca fisierul nu exista, creaza-l cu fisier de citit permis doar proprietarului. +Este de asemenea recomandat sa setezi alerta de notificare ca sa primesti notificari ale problemelor; +spre exemplu: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo.com + +</translation> </message> <message> <location line="+12"/> @@ -3346,12 +3400,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Atasati adresei date si ascultati totdeauna pe ea. Folositi [host]:port notatia pentru IPv6</translation> </message> <message> - <location line="+3"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> - <translation>Nu se poate obÈ›ine o blocare a directorului de date %s. Bitcoin probabil rulează deja.</translation> - </message> - <message> - <location line="+3"/> + <location line="+6"/> <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>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> @@ -3362,6 +3411,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+3"/> + <source>Error: Listening for incoming connections failed (listen returned error %d)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <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> @@ -3381,12 +3435,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <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="+5"/> - <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source> + <location line="+3"/> + <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source> <translation type="unfinished"/> </message> <message> <location line="+3"/> + <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source> + <translation>Utilizare proxy SOCKS5 separat pentru a ajunge la servicii ascunse TOR (implicit: -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>Atentie: setarea -paytxfee este foarte ridicata! Aceasta este taxa tranzactiei pe care o vei plati daca trimiti o tranzactie.</translation> </message> @@ -3418,7 +3477,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+9"/> <source><category> can be:</source> - <translation type="unfinished"/> + <translation><category> poate fi:</translation> </message> <message> <location line="+6"/> @@ -3428,7 +3487,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+1"/> <source>Bitcoin Core Daemon</source> - <translation type="unfinished"/> + <translation>Daemon-ul Bitcoin Core</translation> </message> <message> <location line="+1"/> @@ -3442,13 +3501,18 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation>Conecteaza-te doar la nod(urile) specifice</translation> </message> <message> <location line="+1"/> <source>Connect through SOCKS proxy</source> - <translation type="unfinished"/> + <translation>Conectare prin proxy SOCKS</translation> </message> <message> <location line="+1"/> @@ -3618,7 +3682,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+1"/> <source>RPC client options:</source> - <translation type="unfinished"/> + <translation>OpÅ£iuni client RPC:</translation> </message> <message> <location line="+1"/> @@ -3628,7 +3692,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+5"/> <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source> - <translation type="unfinished"/> + <translation>SelectaÅ£i versiunea SOCKS pentru -proxy (4 din 5; iniÅ£ial: 5)</translation> </message> <message> <location line="+1"/> @@ -3636,12 +3700,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Trimite comanda la serverul Bitcoin</translation> </message> <message> - <location line="+7"/> - <source>Set maximum block size in bytes (default: %d)</source> + <location line="+5"/> + <source>Set database cache size in megabytes (%d to %d, default: %d)</source> <translation type="unfinished"/> </message> <message> <location line="+2"/> + <source>Set maximum block size in bytes (default: %d)</source> + <translation>SetaÅ£i dimensiunea maximă a unui block în bytes (implicit: %d)</translation> + </message> + <message> + <location line="+2"/> <source>Set the number of threads to service RPC calls (default: 4)</source> <translation type="unfinished"/> </message> @@ -3652,6 +3721,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Start Bitcoin server</source> <translation>A porni serverul Bitcoin</translation> </message> @@ -3678,7 +3752,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+1"/> <source>Wait for RPC server to start</source> - <translation type="unfinished"/> + <translation>AÅŸteptaÅ£i serverul RPC să pornească</translation> </message> <message> <location line="+1"/> @@ -3701,12 +3775,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Trebuie să reconstruieÈ™ti baza de date folosind -reindex pentru a schimba -txindex</translation> </message> <message> - <location line="-79"/> + <location line="-80"/> <source>Imports blocks from external blk000??.dat file</source> <translation>Importă blocuri dintr-un fiÈ™ier extern blk000??.dat</translation> </message> <message> - <location line="-105"/> + <location line="-126"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+19"/> <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> @@ -3726,7 +3805,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+89"/> + <location line="+91"/> <source>Information</source> <translation>InformaÈ›ie</translation> </message> @@ -3796,7 +3875,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Specifică intervalul maxim de conectare în milisecunde (implicit: 5000)</translation> </message> <message> - <location line="+6"/> + <location line="+7"/> <source>System error: </source> <translation>Eroare de sistem:</translation> </message> @@ -3842,6 +3921,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>version</source> <translation>versiunea</translation> </message> @@ -3851,32 +3935,32 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>wallet.dat corupt, recuperare eÈ™uată</translation> </message> <message> - <location line="-58"/> + <location line="-60"/> <source>Password for JSON-RPC connections</source> <translation>Parola pentru conexiunile JSON-RPC</translation> </message> <message> - <location line="-70"/> + <location line="-71"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Permite conexiuni JSON-RPC de la adresa IP specificată</translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>Trimite comenzi la nodul care rulează la <ip> (implicit: 127.0.0.1)</translation> </message> <message> - <location line="-132"/> + <location line="-134"/> <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="+161"/> + <location line="+164"/> <source>Upgrade wallet to latest format</source> <translation>Actualizează portofelul la ultimul format</translation> </message> <message> - <location line="-24"/> + <location line="-25"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Setează mărimea bazinului de chei la <n> (implicit: 100)</translation> </message> @@ -3886,12 +3970,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Rescanează lanÈ›ul de bloc pentru tranzacÈ›iile portofel lipsă</translation> </message> <message> - <location line="+38"/> + <location line="+39"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>FoloseÈ™te OpenSSL (https) pentru conexiunile JSON-RPC</translation> </message> <message> - <location line="-30"/> + <location line="-31"/> <source>Server certificate file (default: server.cert)</source> <translation>Certificatul serverului (implicit: server.cert)</translation> </message> @@ -3901,7 +3985,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Cheia privată a serverului (implicit: server.pem)</translation> </message> <message> - <location line="+16"/> + <location line="+17"/> <source>This help message</source> <translation>Acest mesaj de ajutor</translation> </message> @@ -3911,12 +3995,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Nu se poate folosi %s pe acest calculator (eroarea returnată este %d, %s)</translation> </message> <message> - <location line="-107"/> + <location line="-109"/> <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="+60"/> + <location line="+61"/> <source>Loading addresses...</source> <translation>ÃŽncarc adrese...</translation> </message> @@ -3931,12 +4015,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Eroare la încărcarea wallet.dat: Portofelul are nevoie de o versiune Bitcoin mai nouă</translation> </message> <message> - <location line="+98"/> + <location line="+99"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>Portofelul trebuie rescris: reporneÈ™te Bitcoin pentru finalizare</translation> </message> <message> - <location line="-100"/> + <location line="-101"/> <source>Error loading wallet.dat</source> <translation>Eroare la încărcarea wallet.dat</translation> </message> @@ -3946,7 +4030,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Adresa -proxy nevalidă: '%s'</translation> </message> <message> - <location line="+56"/> + <location line="+57"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>ReÈ›eaua specificată în -onlynet este necunoscută: '%s'</translation> </message> @@ -3956,7 +4040,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>S-a cerut o versiune necunoscută de proxy -socks: %i</translation> </message> <message> - <location line="-101"/> + <location line="-103"/> <source>Cannot resolve -bind address: '%s'</source> <translation>Nu se poate rezolva adresa -bind: '%s'</translation> </message> @@ -3966,7 +4050,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Nu se poate rezolva adresa -externalip: '%s'</translation> </message> <message> - <location line="+48"/> + <location line="+49"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>Suma nevalidă pentru -paytxfee=<amount>: '%s'</translation> </message> @@ -3986,22 +4070,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>ÃŽncarc indice bloc...</translation> </message> <message> - <location line="-62"/> + <location line="-63"/> <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="-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="+95"/> + <location line="+64"/> <source>Loading wallet...</source> <translation>ÃŽncarc portofel...</translation> </message> <message> - <location line="-56"/> + <location line="-57"/> <source>Cannot downgrade wallet</source> <translation>Nu se poate retrograda portofelul</translation> </message> @@ -4011,7 +4090,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Nu se poate scrie adresa implicită</translation> </message> <message> - <location line="+67"/> + <location line="+68"/> <source>Rescanning...</source> <translation>Rescanez...</translation> </message> @@ -4021,17 +4100,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>ÃŽncărcare terminată</translation> </message> <message> - <location line="+85"/> + <location line="+86"/> <source>To use the %s option</source> <translation>Pentru a folosi opÈ›iunea %s</translation> </message> <message> - <location line="-77"/> + <location line="-78"/> <source>Error</source> <translation>Eroare</translation> </message> <message> - <location line="-35"/> + <location line="-36"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_ru.ts b/src/qt/locale/bitcoin_ru.ts index dcb5a92e82..8df6ee4c88 100644 --- a/src/qt/locale/bitcoin_ru.ts +++ b/src/qt/locale/bitcoin_ru.ts @@ -36,6 +36,12 @@ This product includes software developed by the OpenSSL Project for use in the O <source>The Bitcoin Core developers</source> <translation>Разработчики Bitcoin Core</translation> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source> (%1-bit)</source> + <translation>(%1-bit)</translation> + </message> </context> <context> <name>AddressBookPage</name> @@ -122,7 +128,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>Ваши адреÑа Bitcoin Ð´Ð»Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸ ÑредÑтв. Совет: проверьте Ñумму и Ð°Ð´Ñ€ÐµÑ Ð½Ð°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¿ÐµÑ€ÐµÐ´ переводом.</translation> + <translation>Ðто ваши адреÑа Bitcoin Ð´Ð»Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸ платежей. Ð’Ñегда проверÑйте количеÑтво и Ð°Ð´Ñ€ÐµÑ Ð¿Ð¾Ð»ÑƒÑ‡Ð°Ñ‚ÐµÐ»Ñ Ð¿ÐµÑ€ÐµÐ´ отправкой перевода.</translation> </message> <message> <location line="+4"/> @@ -617,6 +623,16 @@ This product includes software developed by the OpenSSL Project for use in the O <translation><numerusform>%n неделÑ</numerusform><numerusform>%n недели</numerusform><numerusform>%n недель</numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation>%1 и %2</translation> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation><numerusform>%n год</numerusform><numerusform>%n лет</numerusform><numerusform>%n года</numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation>%1 позади</translation> @@ -690,7 +706,7 @@ Address: %4 <translation>Бумажник <b>зашифрован</b> и в наÑтоÑщее Ð²Ñ€ÐµÐ¼Ñ <b>заблокирован</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+435"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>Произошла неиÑÐ¿Ñ€Ð°Ð²Ð¸Ð¼Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°. Bitcoin не может безопаÑно продолжать работу и будет закрыт.</translation> </message> @@ -751,7 +767,7 @@ Address: %4 <translation>Сдача:</translation> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation>Отменить выбор вÑего</translation> </message> @@ -766,7 +782,7 @@ Address: %4 <translation>Режим ÑпиÑка</translation> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation>Сумма</translation> </message> @@ -917,7 +933,7 @@ Address: %4 <translation>ничего</translation> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation>Пыль</translation> </message> @@ -1099,7 +1115,7 @@ Address: %4 <translation>Bitcoin Core - опции командной Ñтроки</translation> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation>Bitcoin Core</translation> </message> @@ -1243,7 +1259,7 @@ Address: %4 <translation>&ГлавнаÑ</translation> </message> <message> - <location line="+6"/> + <location line="+122"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation>ÐеобÑÐ·Ð°Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ ÐºÐ¾Ð¼Ð¸ÑÑÐ¸Ñ Ð·Ð° каждый КБ транзакции, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ ÑƒÑкорÑет обработку Ваших транзакций. БольшинÑтво транзакций занимают 1КБ.</translation> </message> @@ -1253,7 +1269,7 @@ Address: %4 <translation>Заплатить ко&миÑÑию</translation> </message> <message> - <location line="+31"/> + <location line="-131"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation>ÐвтоматичеÑки запуÑкать Bitcoin поÑле входа в ÑиÑтему</translation> </message> @@ -1268,12 +1284,7 @@ Address: %4 <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"/> + <location line="+16"/> <source>MB</source> <translation>МБ</translation> </message> @@ -1288,7 +1299,12 @@ Address: %4 <translation>Задать чиÑло потоков проверки ÑÑ†ÐµÐ½Ð°Ñ€Ð¸Ñ (вплоть до 16, 0=авто, <0 = оÑтавить Ñтолько Ñдер Ñвободными, по умолчанию: 0)</translation> </message> <message> - <location line="+58"/> + <location line="+107"/> + <source>&Spend unconfirmed change (experts only)</source> + <translation>&Тратить неподтвержденную Ñдачу(Только Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð´Ð²Ð¸Ð½ÑƒÑ‚Ñ‹Ñ… пользователей!)</translation> + </message> + <message> + <location line="+37"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation>ПодключатьÑÑ Ðº Ñети Bitcoin через прокÑи SOCKS.</translation> </message> @@ -1323,7 +1339,17 @@ Address: %4 <translation>&Сеть</translation> </message> <message> - <location line="+6"/> + <location line="-86"/> + <source>W&allet</source> + <translation>Б&умажник</translation> + </message> + <message> + <location line="+52"/> + <source>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.</source> + <translation>При отключении траты неподтверждённой Ñдачи, Ñдача от транзакции не может быть иÑпользована до тех пор пока у Ñтой транзакции не будет Ñ…Ð¾Ñ‚Ñ Ð±Ñ‹ одно подтверждение. Ðто также влиÑет как ваш Ð±Ð°Ð»Ð°Ð½Ñ Ñ€Ð°ÑÑчитываетÑÑ.</translation> + </message> + <message> + <location line="+40"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>ÐвтоматичеÑки открыть порт Ð´Ð»Ñ Bitcoin-клиента на роутере. Работает только еÑли Ваш роутер поддерживает UPnP, и Ð´Ð°Ð½Ð½Ð°Ñ Ñ„ÑƒÐ½ÐºÑ†Ð¸Ñ Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½Ð°.</translation> </message> @@ -1438,17 +1464,17 @@ Address: %4 <translation>&Отмена</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+70"/> <source>default</source> <translation>по умолчанию</translation> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation>ничего</translation> </message> <message> - <location line="+75"/> + <location line="+78"/> <source>Confirm options reset</source> <translation>Подтвердите ÑÐ±Ñ€Ð¾Ñ Ð¾Ð¿Ñ†Ð¸Ð¹</translation> </message> @@ -1488,19 +1514,14 @@ Address: %4 <translation>ÐžÑ‚Ð¾Ð±Ñ€Ð°Ð¶Ð°ÐµÐ¼Ð°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¼Ð¾Ð¶ÐµÑ‚ быть уÑтаревшей. Ваш бумажник автоматичеÑки ÑинхронизируетÑÑ Ñ Ñетью Bitcoin поÑле подключениÑ, но Ñтот процеÑÑ Ð¿Ð¾ÐºÐ° не завершён.</translation> </message> <message> - <location line="-155"/> - <source>Unconfirmed:</source> - <translation>Ðе подтверждено:</translation> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation>Бумажник</translation> </message> <message> <location line="+51"/> - <source>Confirmed:</source> - <translation>Подтверждено</translation> + <source>Available:</source> + <translation>ДоÑтупно:</translation> </message> <message> <location line="+16"/> @@ -1508,7 +1529,12 @@ Address: %4 <translation>Ваш текущий раÑходный баланÑ</translation> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation>Ð’ ожидании:</translation> + </message> + <message> + <location line="+16"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation>ÐžÐ±Ñ‰Ð°Ñ Ñумма вÑех транзакций, которые до Ñих пор не подтверждены, и до Ñих пор не учитываютÑÑ Ð² раÑходном баланÑе</translation> </message> @@ -1656,6 +1682,11 @@ Address: %4 <source>Error: Invalid combination of -regtest and -testnet.</source> <translation>Ошибка: Ð½ÐµÐ²ÐµÑ€Ð½Ð°Ñ ÐºÐ¾Ð¼Ð±Ð¸Ð½Ð°Ñ†Ð¸Ñ -regtest и -testnet.</translation> </message> + <message> + <location filename="../guiutil.cpp" line="+82"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>Введите Bitcoin-Ð°Ð´Ñ€ÐµÑ (например 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> </context> <context> <name>QRImageWidget</name> @@ -1876,22 +1907,22 @@ Address: %4 <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+83"/> + <location filename="../forms/receivecoinsdialog.ui" line="+107"/> <source>&Amount:</source> <translation>&Сумма:</translation> </message> <message> - <location line="-13"/> + <location line="-16"/> <source>&Label:</source> <translation>&Метка:</translation> </message> <message> - <location line="-34"/> + <location line="-37"/> <source>&Message:</source> <translation>&Сообщение</translation> </message> <message> - <location line="-17"/> + <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>Повторно иÑпользовать один из ранее иÑпользованных адреÑов. Повторное иÑпользование адреÑов неÑÑ‘Ñ‚ риÑки безопаÑноÑти и приватноÑти. Ðе иÑпользуйте Ñту опцию, еÑли вы не Ñоздаёте повторно ранее Ñделанный Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð¿Ð»Ð°Ñ‚ÐµÐ¶Ð°.</translation> </message> @@ -1901,27 +1932,30 @@ Address: %4 <translation>&Повторно иÑпользовать ÑущеÑтвующий Ð°Ð´Ñ€ÐµÑ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ (не рекомендуетÑÑ)</translation> </message> <message> - <location line="+27"/> - <source>An optional label to associate with the new receiving address</source> - <translation>ÐеобÑÐ·Ð°Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð¼ÐµÑ‚ÐºÐ° Ð´Ð»Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ адреÑа получениÑ</translation> + <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>ÐеобÑзательное Ñообщение Ð´Ð»Ñ Ð·Ð°Ð¿Ñ€Ð¾Ñа платежа, которое будет показано при открытии запроÑа. Заметьте: Ñообщение не будет отправлено вмеÑте Ñ Ð¿Ð»Ð°Ñ‚ÐµÐ¶Ð¾Ð¼ через Ñеть Bitcoin.</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>ÐеобÑзательное Ñообщение Ð´Ð»Ñ Ð·Ð°Ð¿Ñ€Ð¾Ñа платежа, которое будет показано при открытии запроÑа. Внимание: Ñообщение не будет отправлено вмеÑте Ñ Ð¿Ð»Ð°Ñ‚ÐµÐ¶Ð¾Ð¼ через Ñеть Bitcoin.</translation> + <location line="-7"/> + <location line="+21"/> + <source>An optional label to associate with the new receiving address.</source> + <translation>ÐеобÑÐ·Ð°Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð¼ÐµÑ‚ÐºÐ° Ð´Ð»Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ адреÑа получениÑ.</translation> </message> <message> - <location line="+7"/> + <location line="-7"/> <source>Use this form to request payments. All fields are <b>optional</b>.</source> <translation>Заполните форму Ð´Ð»Ñ Ð·Ð°Ð¿Ñ€Ð¾Ñа платежей. Ð’Ñе Ð¿Ð¾Ð»Ñ <b>необÑзательны</b>.</translation> </message> <message> - <location line="+39"/> + <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>ÐеобÑÐ·Ð°Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ñумма Ð´Ð»Ñ Ð·Ð°Ð¿Ñ€Ð¾Ñа. ОÑтавьте пуÑтым или укажите ноль, чтобы запроÑить неопределённую Ñумму.</translation> </message> <message> - <location line="+17"/> + <location line="+32"/> <source>Clear all fields of the form.</source> <translation>ОчиÑтить вÑе Ð¿Ð¾Ð»Ñ Ñ„Ð¾Ñ€Ð¼Ñ‹.</translation> </message> @@ -1931,17 +1965,17 @@ Address: %4 <translation>ОчиÑтить</translation> </message> <message> - <location line="+36"/> - <source>&Request payment</source> - <translation>&ЗапроÑить платёж</translation> + <location line="+78"/> + <source>Requested payments history</source> + <translation>ИÑÑ‚Ð¾Ñ€Ð¸Ñ Ð·Ð°Ð¿Ñ€Ð¾ÑˆÐµÐ½Ð½Ñ‹Ñ… платежей</translation> </message> <message> - <location line="+47"/> - <source>Requested payments</source> - <translation>Запрошенные платежи</translation> + <location line="-98"/> + <source>&Request payment</source> + <translation>&ЗапроÑить платёж</translation> </message> <message> - <location line="+16"/> + <location line="+120"/> <source>Show the selected request (does the same as double clicking an entry)</source> <translation>Показать выбранный Ð·Ð°Ð¿Ñ€Ð¾Ñ (то же Ñамое, что и двойной клик по запиÑи)</translation> </message> @@ -1960,6 +1994,21 @@ Address: %4 <source>Remove</source> <translation>Удалить</translation> </message> + <message> + <location filename="../receivecoinsdialog.cpp" line="+38"/> + <source>Copy label</source> + <translation>Копировать метку</translation> + </message> + <message> + <location line="+1"/> + <source>Copy message</source> + <translation>Копировать Ñообщение</translation> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation>Скопировать Ñумму</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -2061,12 +2110,17 @@ Address: %4 <source>(no message)</source> <translation>(нет ÑообщениÑ)</translation> </message> + <message> + <location line="+8"/> + <source>(no amount)</source> + <translation>(нет Ñуммы)</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>Отправка</translation> @@ -2142,7 +2196,7 @@ Address: %4 <translation>Свой Ð°Ð´Ñ€ÐµÑ Ð´Ð»Ñ Ñдачи</translation> </message> <message> - <location line="+115"/> + <location line="+164"/> <source>Send to multiple recipients at once</source> <translation>Отправить неÑкольким получателÑм одновременно</translation> </message> @@ -2152,7 +2206,7 @@ Address: %4 <translation>&Добавить получателÑ</translation> </message> <message> - <location line="+20"/> + <location line="-23"/> <source>Clear all fields of the form.</source> <translation>ОчиÑтить вÑе Ð¿Ð¾Ð»Ñ Ñ„Ð¾Ñ€Ð¼Ñ‹</translation> </message> @@ -2162,12 +2216,12 @@ Address: %4 <translation>ОчиÑтить &вÑÑ‘</translation> </message> <message> - <location line="+22"/> + <location line="+52"/> <source>Balance:</source> <translation>БаланÑ:</translation> </message> <message> - <location line="+41"/> + <location line="-78"/> <source>Confirm the send action</source> <translation>Подтвердить отправку</translation> </message> @@ -2177,7 +2231,7 @@ Address: %4 <translation>&Отправить</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-228"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation>Подтвердите отправку монет</translation> </message> @@ -2190,12 +2244,7 @@ Address: %4 <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"/> + <location line="-121"/> <source>Copy quantity</source> <translation>Копировать количеÑтво</translation> </message> @@ -2245,7 +2294,7 @@ Address: %4 <translation>или</translation> </message> <message> - <location line="+202"/> + <location line="+203"/> <source>The recipient address is not valid, please recheck.</source> <translation>ÐÐ´Ñ€ÐµÑ Ð¿Ð¾Ð»ÑƒÑ‡Ð°Ñ‚ÐµÐ»Ñ Ð½ÐµÐ²ÐµÑ€Ð½Ñ‹Ð¹, пожалуйÑта, перепроверьте.</translation> </message> @@ -2280,12 +2329,12 @@ Address: %4 <translation>Ð¢Ñ€Ð°Ð½Ð·Ð°ÐºÑ†Ð¸Ñ Ð±Ñ‹Ð»Ð° отклонена! Такое может произойти, еÑли некоторые монеты уже были потрачены, например, еÑли Ð’Ñ‹ иÑпользуете одну копию бумажника (wallet.dat), а монеты были потрачены из другой копии, но не были отмечены как потраченные в Ñтой.</translation> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Warning: Invalid Bitcoin address</source> <translation>Внимание: неверный Ð°Ð´Ñ€ÐµÑ Bitcoin</translation> </message> <message> - <location line="+21"/> + <location line="+20"/> <source>(no label)</source> <translation>[нет метки]</translation> </message> @@ -2295,7 +2344,7 @@ Address: %4 <translation>Внимание: неизвеÑтный Ð°Ð´Ñ€ÐµÑ Ð´Ð»Ñ Ñдачи</translation> </message> <message> - <location line="-366"/> + <location line="-367"/> <source>Are you sure you want to send?</source> <translation>Ð’Ñ‹ уверены, что хотите отправить?</translation> </message> @@ -2305,7 +2354,7 @@ Address: %4 <translation>добавлено как комиÑÑиÑ</translation> </message> <message> - <location line="+170"/> + <location line="+171"/> <source>Payment request expired</source> <translation>Ð—Ð°Ð¿Ñ€Ð¾Ñ Ð¿Ð»Ð°Ñ‚ÐµÐ¶Ð° проÑрочен</translation> </message> @@ -2382,12 +2431,7 @@ Address: %4 <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"/> + <location line="+968"/> <source>This is a verified payment request.</source> <translation>Ðто проверенный Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð¿Ð»Ð°Ñ‚ÐµÐ¶Ð°.</translation> </message> @@ -2397,7 +2441,12 @@ Address: %4 <translation>Введите метку Ð´Ð»Ñ Ñтого адреÑа, чтобы добавить его в ÑпиÑок иÑпользованных</translation> </message> <message> - <location line="+459"/> + <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>К bitcoin: URI было прикреплено Ñообщение, которое будет Ñохранено вмеÑте Ñ Ñ‚Ñ€Ð°Ð½Ð·Ð°ÐºÑ†Ð¸ÐµÐ¹ Ð´Ð»Ñ Ð²Ð°ÑˆÐµÐ³Ð¾ ÑведениÑ. Заметьте: Ñообщение не будет отправлено через Ñеть Bitcoin.</translation> + </message> + <message> + <location line="+426"/> <source>This is an unverified payment request.</source> <translation>Ðто непроверенный Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð¿Ð»Ð°Ñ‚ÐµÐ¶Ð°.</translation> </message> @@ -2413,11 +2462,6 @@ Address: %4 <source>Memo:</source> <translation>Заметка:</translation> </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> @@ -2455,19 +2499,19 @@ Address: %4 <translation>ÐдреÑ, которым вы хотите подпиÑать Ñообщение (напр. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location line="+10"/> - <location line="+213"/> + <location line="+7"/> + <location line="+210"/> <source>Choose previously used address</source> <translation>Выберите ранее иÑпользованный адреÑ</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>Ð’Ñтавить Ð°Ð´Ñ€ÐµÑ Ð¸Ð· буфера обмена</translation> </message> @@ -2508,12 +2552,12 @@ Address: %4 </message> <message> <location line="+3"/> - <location line="+146"/> + <location line="+143"/> <source>Clear &All</source> <translation>ОчиÑтить &вÑÑ‘</translation> </message> <message> - <location line="-87"/> + <location line="-84"/> <source>&Verify Message</source> <translation>&Проверить Ñообщение</translation> </message> @@ -2528,7 +2572,7 @@ Address: %4 <translation>ÐдреÑ, которым было подпиÑано Ñообщение (напр. 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>Проверить Ñообщение, чтобы убедитьÑÑ, что оно было подпиÑано указанным адреÑом Bitcoin</translation> </message> @@ -2543,43 +2587,37 @@ Address: %4 <translation>СброÑить вÑе Ð¿Ð¾Ð»Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐºÐ¸ ÑообщениÑ</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>Введите Ð°Ð´Ñ€ÐµÑ Bitcoin (напр. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location line="-2"/> + <location line="-1"/> <source>Click "Sign Message" to generate signature</source> <translation>Ðажмите "ПодпиÑать Ñообщение" Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¿Ð¾Ð´Ð¿Ð¸Ñи</translation> </message> <message> - <location line="+3"/> - <source>Enter Bitcoin signature</source> - <translation>Введите подпиÑÑŒ Bitcoin</translation> - </message> - <message> <location line="+84"/> - <location line="+81"/> + <location line="+80"/> <source>The entered address is invalid.</source> <translation>Введённый Ð°Ð´Ñ€ÐµÑ Ð½ÐµÐ²ÐµÑ€ÐµÐ½</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>ПожалуйÑта, проверьте Ð°Ð´Ñ€ÐµÑ Ð¸ попробуйте ещё раз.</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>Введённый Ð°Ð´Ñ€ÐµÑ Ð½Ðµ ÑвÑзан Ñ ÐºÐ»ÑŽÑ‡Ð¾Ð¼</translation> </message> <message> - <location line="-73"/> + <location line="-72"/> <source>Wallet unlock was cancelled.</source> <translation>Разблокировка бумажника была отменена.</translation> </message> @@ -2599,7 +2637,7 @@ Address: %4 <translation>Сообщение подпиÑано</translation> </message> <message> - <location line="+59"/> + <location line="+58"/> <source>The signature could not be decoded.</source> <translation>ПодпиÑÑŒ не может быть раÑкодирована.</translation> </message> @@ -2660,6 +2698,11 @@ Address: %4 </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation>в противоречии</translation> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation>%1/отключен</translation> </message> @@ -2821,12 +2864,12 @@ Address: %4 <translation>, ещё не было уÑпешно разоÑлано</translation> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <source>Open for %n more block(s)</source> <translation><numerusform>Открыто Ð´Ð»Ñ ÐµÑ‰Ñ‘ %n блока</numerusform><numerusform>Открыто Ð´Ð»Ñ ÐµÑ‰Ñ‘ %n блоков</numerusform><numerusform>Открыто Ð´Ð»Ñ ÐµÑ‰Ñ‘ %n блоков</numerusform></translation> </message> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation>неизвеÑтно</translation> </message> @@ -2867,12 +2910,12 @@ Address: %4 <translation>Сумма</translation> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation>Ðезрелый (%1 подтверждений, будет доÑтупен поÑле %2)</translation> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <source>Open for %n more block(s)</source> <translation><numerusform>Открыто Ð´Ð»Ñ ÐµÑ‰Ñ‘ %n блока</numerusform><numerusform>Открыто Ð´Ð»Ñ ÐµÑ‰Ñ‘ %n блоков</numerusform><numerusform>Открыто Ð´Ð»Ñ ÐµÑ‰Ñ‘ %n блоков</numerusform></translation> </message> @@ -2882,23 +2925,12 @@ Address: %4 <translation>Открыто до %1</translation> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> - <translation>Оффлайн (%1 подтверждений)</translation> - </message> - <message> - <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation>Ðе подтверждено (%1 из %2 подтверждений)</translation> - </message> - <message> - <location line="-22"/> - <location line="+25"/> + <location line="+12"/> <source>Confirmed (%1 confirmations)</source> <translation>Подтверждено (%1 подтверждений)</translation> </message> <message> - <location line="-22"/> + <location line="+9"/> <source>This block was not received by any other nodes and will probably not be accepted!</source> <translation>Ðтот блок не был получен другими узлами и, возможно, не будет принÑÑ‚!</translation> </message> @@ -2908,7 +2940,27 @@ Address: %4 <translation>Сгенерированно, но не подтверждено</translation> </message> <message> - <location line="+62"/> + <location line="-21"/> + <source>Offline</source> + <translation>Ðет активных Ñоединений Ñ Ñетью</translation> + </message> + <message> + <location line="+3"/> + <source>Unconfirmed</source> + <translation>Ðеподтверждено</translation> + </message> + <message> + <location line="+3"/> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation>Подтверждено(%1 подтверждений, рекомендуетÑÑ 2% подтверждений)</translation> + </message> + <message> + <location line="+6"/> + <source>Conflicted</source> + <translation>Ð’ противоречии</translation> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation>Получено</translation> </message> @@ -2938,7 +2990,7 @@ Address: %4 <translation>[не доÑтупно]</translation> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation>Ð¡Ñ‚Ð°Ñ‚ÑƒÑ Ñ‚Ñ€Ð°Ð½Ð·Ð°ÐºÑ†Ð¸Ð¸. Подведите курÑор к нужному полю Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, чтобы увидеть количеÑтво подтверждений.</translation> </message> @@ -2989,7 +3041,7 @@ Address: %4 <message> <location line="+1"/> <source>Last month</source> - <translation>За поÑледний меÑÑц</translation> + <translation>Ð’ прошлом меÑÑце</translation> </message> <message> <location line="+1"/> @@ -3204,12 +3256,12 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+223"/> <source>Usage:</source> <translation>ИÑпользование:</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>List commands</source> <translation>СпиÑок команд </translation> @@ -3265,12 +3317,12 @@ Address: %4 <translation>Укажите ваш ÑобÑтвенный публичный адреÑ</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation>Порог Ð´Ð»Ñ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¾ ведущих ÑÐµÐ±Ñ ÑƒÐ·Ð»Ð¾Ð² (по умолчанию: 100)</translation> </message> <message> - <location line="-148"/> + <location line="-150"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>ЧиÑло Ñекунд Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¾ ведущих ÑÐµÐ±Ñ ÑƒÐ·Ð»Ð¾Ð² (по умолчанию: 86400)</translation> </message> @@ -3290,17 +3342,17 @@ Address: %4 <translation>Принимать командную Ñтроку и команды JSON-RPC</translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Run in the background as a daemon and accept commands</source> <translation>ЗапуÑкатьÑÑ Ð² фоне как демон и принимать команды</translation> </message> <message> - <location line="+39"/> + <location line="+40"/> <source>Use the test network</source> <translation>ИÑпользовать теÑтовую Ñеть</translation> </message> <message> - <location line="-118"/> + <location line="-120"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>Принимать Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð¸Ð·Ð²Ð½Ðµ (по умолчанию: 1, еÑли не иÑпользуетÑÑ -proxy или -connect)</translation> </message> @@ -3441,6 +3493,11 @@ rpcpassword=%s </message> <message> <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation>ОчиÑтить ÑпиÑок транзакций кошелька (диагноÑтичеÑкий инÑтрумент; включает в ÑÐµÐ±Ñ -rescan)</translation> + </message> + <message> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation>ПодключатьÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ к указанному узлу(ам)</translation> </message> @@ -3651,6 +3708,11 @@ rpcpassword=%s </message> <message> <location line="+2"/> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation>Тратить неподтвержденную Ñдачу при отправке транзакций (по умолчанию: 1)</translation> + </message> + <message> + <location line="+1"/> <source>Start Bitcoin server</source> <translation>ЗапуÑтить Bitcoin Ñервер</translation> </message> @@ -3700,12 +3762,12 @@ rpcpassword=%s <translation>Вам необходимо переÑобрать базы данных Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ -reindex, чтобы изменить -txindex</translation> </message> <message> - <location line="-79"/> + <location line="-80"/> <source>Imports blocks from external blk000??.dat file</source> <translation>Импортировать блоки из внешнего файла blk000??.dat</translation> </message> <message> - <location line="-105"/> + <location line="-106"/> <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> @@ -3725,7 +3787,7 @@ rpcpassword=%s <translation>Задать чиÑло потоков проверки ÑÑ†ÐµÐ½Ð°Ñ€Ð¸Ñ (вплоть до 16, 0=авто, <0 = оÑтавить Ñтолько Ñдер Ñвободными, по умолчанию: 0)</translation> </message> <message> - <location line="+89"/> + <location line="+90"/> <source>Information</source> <translation>ИнформациÑ</translation> </message> @@ -3796,7 +3858,7 @@ rpcpassword=%s <translation>Тайм-аут ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð² миллиÑекундах (по умолчанию: 5000)</translation> </message> <message> - <location line="+6"/> + <location line="+7"/> <source>System error: </source> <translation>СиÑÑ‚ÐµÐ¼Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°:</translation> </message> @@ -3842,6 +3904,11 @@ rpcpassword=%s </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation>Стираем вÑе транзакции из кошелька...</translation> + </message> + <message> + <location line="+1"/> <source>version</source> <translation>верÑиÑ</translation> </message> @@ -3851,32 +3918,32 @@ rpcpassword=%s <translation>wallet.dat повреждён, ÑпаÑение данных не удалоÑÑŒ</translation> </message> <message> - <location line="-58"/> + <location line="-60"/> <source>Password for JSON-RPC connections</source> <translation>Пароль Ð´Ð»Ñ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ð¹ JSON-RPC</translation> </message> <message> - <location line="-70"/> + <location line="-71"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Разрешить Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ JSON-RPC Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ð³Ð¾ IP</translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>ПоÑылать команды узлу, запущенному на <ip> (по умолчанию: 127.0.0.1)</translation> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>Выполнить команду, когда поÑвлÑетÑÑ Ð½Ð¾Ð²Ñ‹Ð¹ блок (%s в команде заменÑетÑÑ Ð½Ð° Ñ…Ñш блока)</translation> </message> <message> - <location line="+161"/> + <location line="+163"/> <source>Upgrade wallet to latest format</source> <translation>Обновить бумажник до поÑледнего формата</translation> </message> <message> - <location line="-24"/> + <location line="-25"/> <source>Set key pool size to <n> (default: 100)</source> <translation>УÑтановить размер запаÑа ключей в <n> (по умолчанию: 100)</translation> </message> @@ -3886,12 +3953,12 @@ rpcpassword=%s <translation>Перепроверить цепь блоков на предмет отÑутÑтвующих в бумажнике транзакций</translation> </message> <message> - <location line="+38"/> + <location line="+39"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>ИÑпользовать OpenSSL (https) Ð´Ð»Ñ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ð¹ JSON-RPC</translation> </message> <message> - <location line="-30"/> + <location line="-31"/> <source>Server certificate file (default: server.cert)</source> <translation>Файл Ñерверного Ñертификата (по умолчанию: server.cert)</translation> </message> @@ -3901,7 +3968,7 @@ rpcpassword=%s <translation>Приватный ключ Ñервера (по умолчанию: server.pem)</translation> </message> <message> - <location line="+16"/> + <location line="+17"/> <source>This help message</source> <translation>Ðта Ñправка</translation> </message> @@ -3911,12 +3978,12 @@ rpcpassword=%s <translation>Ðевозможно привÑзатьÑÑ Ðº %s на Ñтом компьютере (bind вернул ошибку %d, %s)</translation> </message> <message> - <location line="-107"/> + <location line="-109"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>Разрешить поиÑк в DNS Ð´Ð»Ñ -addnode, -seednode и -connect</translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Loading addresses...</source> <translation>Загрузка адреÑов...</translation> </message> @@ -3931,12 +3998,12 @@ rpcpassword=%s <translation>Ошибка загрузки wallet.dat: бумажник требует более новую верÑию Bitcoin</translation> </message> <message> - <location line="+98"/> + <location line="+99"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>Ðеобходимо перезапиÑать бумажник, перезапуÑтите Bitcoin Ð´Ð»Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¸Ñ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ð¸.</translation> </message> <message> - <location line="-100"/> + <location line="-101"/> <source>Error loading wallet.dat</source> <translation>Ошибка при загрузке wallet.dat</translation> </message> @@ -3946,7 +4013,7 @@ rpcpassword=%s <translation>Ðеверный Ð°Ð´Ñ€ÐµÑ -proxy: '%s'</translation> </message> <message> - <location line="+56"/> + <location line="+57"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Ð’ параметре -onlynet указана неизвеÑÑ‚Ð½Ð°Ñ Ñеть: '%s'</translation> </message> @@ -3956,7 +4023,7 @@ rpcpassword=%s <translation>Ð’ параметре -socks запрошена неизвеÑÑ‚Ð½Ð°Ñ Ð²ÐµÑ€ÑиÑ: %i</translation> </message> <message> - <location line="-101"/> + <location line="-103"/> <source>Cannot resolve -bind address: '%s'</source> <translation>Ðе удаётÑÑ Ñ€Ð°Ð·Ñ€ÐµÑˆÐ¸Ñ‚ÑŒ Ð°Ð´Ñ€ÐµÑ Ð² параметре -bind: '%s'</translation> </message> @@ -3966,7 +4033,7 @@ rpcpassword=%s <translation>Ðе удаётÑÑ Ñ€Ð°Ð·Ñ€ÐµÑˆÐ¸Ñ‚ÑŒ Ð°Ð´Ñ€ÐµÑ Ð² параметре -externalip: '%s'</translation> </message> <message> - <location line="+48"/> + <location line="+49"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>ÐÐµÐ²ÐµÑ€Ð½Ð°Ñ Ñумма в параметре -paytxfee=<кол-во>: '%s'</translation> </message> @@ -3986,7 +4053,7 @@ rpcpassword=%s <translation>Загрузка индекÑа блоков...</translation> </message> <message> - <location line="-62"/> + <location line="-63"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>Добавить узел Ð´Ð»Ñ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð¸ пытатьÑÑ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶Ð¸Ð²Ð°Ñ‚ÑŒ Ñоединение открытым</translation> </message> @@ -3996,12 +4063,12 @@ rpcpassword=%s <translation>Ðевозможно привÑзатьÑÑ Ðº %s на Ñтом компьютере. Возможно, Bitcoin уже работает.</translation> </message> <message> - <location line="+95"/> + <location line="+96"/> <source>Loading wallet...</source> <translation>Загрузка бумажника...</translation> </message> <message> - <location line="-56"/> + <location line="-57"/> <source>Cannot downgrade wallet</source> <translation>Ðе удаётÑÑ Ð¿Ð¾Ð½Ð¸Ð·Ð¸Ñ‚ÑŒ верÑию бумажника</translation> </message> @@ -4011,7 +4078,7 @@ rpcpassword=%s <translation>Ðе удаётÑÑ Ð·Ð°Ð¿Ð¸Ñать Ð°Ð´Ñ€ÐµÑ Ð¿Ð¾ умолчанию</translation> </message> <message> - <location line="+67"/> + <location line="+68"/> <source>Rescanning...</source> <translation>Сканирование...</translation> </message> @@ -4021,17 +4088,17 @@ rpcpassword=%s <translation>Загрузка завершена</translation> </message> <message> - <location line="+85"/> + <location line="+86"/> <source>To use the %s option</source> <translation>Чтобы иÑпользовать опцию %s</translation> </message> <message> - <location line="-77"/> + <location line="-78"/> <source>Error</source> <translation>Ошибка</translation> </message> <message> - <location line="-35"/> + <location line="-36"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_sl_SI.ts b/src/qt/locale/bitcoin_sl_SI.ts index 048b717163..828e9c3fe3 100644 --- a/src/qt/locale/bitcoin_sl_SI.ts +++ b/src/qt/locale/bitcoin_sl_SI.ts @@ -4,12 +4,12 @@ <message> <location filename="../forms/aboutdialog.ui" line="+14"/> <source>About Bitcoin Core</source> - <translation type="unfinished"/> + <translation>O jedru Bitcoina</translation> </message> <message> <location line="+39"/> <source><b>Bitcoin Core</b> version</source> - <translation type="unfinished"/> + <translation><b>Jedro Bitcoina</b> razliÄica</translation> </message> <message> <location line="+57"/> @@ -31,6 +31,12 @@ This product includes software developed by the OpenSSL Project for use in the O <source>The Bitcoin Core developers</source> <translation type="unfinished"/> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source> (%1-bit)</source> + <translation>(%1-bitov)</translation> + </message> </context> <context> <name>AddressBookPage</name> @@ -47,7 +53,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+3"/> <source>&New</source> - <translation type="unfinished"/> + <translation>&Novo</translation> </message> <message> <location line="+11"/> @@ -57,12 +63,12 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+3"/> <source>&Copy</source> - <translation type="unfinished"/> + <translation>&Kopiraj</translation> </message> <message> <location line="+52"/> <source>C&lose</source> - <translation type="unfinished"/> + <translation>&Zapri (close)</translation> </message> <message> <location filename="../addressbookpage.cpp" line="+74"/> @@ -82,7 +88,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+3"/> <source>&Export</source> - <translation type="unfinished"/> + <translation>&Izvozi</translation> </message> <message> <location line="-27"/> @@ -92,27 +98,27 @@ 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>Izberi naslov prejemnika kovancev</translation> </message> <message> <location line="+1"/> <source>Choose the address to receive coins with</source> - <translation type="unfinished"/> + <translation>Izberi naslov poÅ¡iljatelja kovancev</translation> </message> <message> <location line="+5"/> <source>C&hoose</source> - <translation type="unfinished"/> + <translation>&Izberi</translation> </message> <message> <location line="+6"/> <source>Sending addresses</source> - <translation type="unfinished"/> + <translation>PoÅ¡iljati naslove</translation> </message> <message> <location line="+1"/> <source>Receiving addresses</source> - <translation type="unfinished"/> + <translation>Prejemati naslovi</translation> </message> <message> <location line="+7"/> @@ -122,7 +128,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>To so vaÅ¡i Bitcoin naslovi za prejemanje plaÄil. PriporoÄljivo je uporabljati nov prejemni naslov za vsako izmed transakcij.</translation> </message> <message> <location line="+7"/> @@ -137,7 +143,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>Izvozi seznam naslovov</translation> </message> <message> <location line="+1"/> @@ -147,7 +153,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+13"/> <source>Exporting Failed</source> - <translation type="unfinished"/> + <translation>NeuspeÅ¡en izvoz</translation> </message> <message> <location line="+1"/> @@ -400,17 +406,17 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+10"/> <source>&Sending addresses...</source> - <translation type="unfinished"/> + <translation>&PoÅ¡iljanje naslovov...</translation> </message> <message> <location line="+2"/> <source>&Receiving addresses...</source> - <translation type="unfinished"/> + <translation>&Prejemanje naslovov...</translation> </message> <message> <location line="+3"/> <source>Open &URI...</source> - <translation type="unfinished"/> + <translation>Odpri &URI...</translation> </message> <message> <location line="+325"/> @@ -425,7 +431,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="-405"/> <source>Send coins to a Bitcoin address</source> - <translation type="unfinished"/> + <translation>PoÅ¡lji kovance na Bitcoin naslov</translation> </message> <message> <location line="+49"/> @@ -470,23 +476,23 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+146"/> <source>&Send</source> - <translation type="unfinished"/> + <translation>&PoÅ¡lji</translation> </message> <message> <location line="+7"/> <source>&Receive</source> - <translation type="unfinished"/> + <translation>&Sprejmi</translation> </message> <message> <location line="+46"/> <location line="+2"/> <source>&Show / Hide</source> - <translation type="unfinished"/> + <translation>&Prikaži / Skrij</translation> </message> <message> <location line="+1"/> <source>Show or hide the main Window</source> - <translation type="unfinished"/> + <translation>Prikaži ali skrij glavno okno</translation> </message> <message> <location line="+3"/> @@ -496,7 +502,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+7"/> <source>Sign messages with your Bitcoin addresses to prove you own them</source> - <translation type="unfinished"/> + <translation>Za dokaz, da ste lastniki sporoÄil, se podpiÅ¡ite z Bitcoin naslovom</translation> </message> <message> <location line="+2"/> @@ -543,22 +549,22 @@ This product includes software developed by the OpenSSL Project for use in the O <location line="+29"/> <location line="+2"/> <source>&About Bitcoin Core</source> - <translation type="unfinished"/> + <translation>&O jedru Bitcoina</translation> </message> <message> <location line="+35"/> <source>Show the list of used sending addresses and labels</source> - <translation type="unfinished"/> + <translation>Prikaži seznam uporabljenih naslovov za poÅ¡iljanje in oznak</translation> </message> <message> <location line="+2"/> <source>Show the list of used receiving addresses and labels</source> - <translation type="unfinished"/> + <translation>Prikaži seznam uporabljenih sprejemnih naslovov in oznak</translation> </message> <message> <location line="+3"/> <source>Open a bitcoin: URI or payment request</source> - <translation type="unfinished"/> + <translation>Odpri Bitcoin: URI ali zahteva o plaÄilu</translation> </message> <message> <location line="+2"/> @@ -599,22 +605,32 @@ This product includes software developed by the OpenSSL Project for use in the O <message numerus="yes"> <location line="+23"/> <source>%n hour(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>%n ura</numerusform><numerusform>%n uri</numerusform><numerusform>%n ure</numerusform><numerusform>%n ura</numerusform></translation> </message> <message numerus="yes"> <location line="+4"/> <source>%n day(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>%n dan</numerusform><numerusform>%n dneva</numerusform><numerusform>%n dnevi</numerusform><numerusform>%n dni</numerusform></translation> </message> <message numerus="yes"> <location line="+4"/> <source>%n week(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>%n teden</numerusform><numerusform>%n tedna</numerusform><numerusform>%n tedni</numerusform><numerusform>%n tednov</numerusform></translation> + </message> + <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation><numerusform>%n leto</numerusform><numerusform>%n leti</numerusform><numerusform>%n leta</numerusform><numerusform>%n let</numerusform></translation> </message> <message> <location line="+4"/> <source>%1 behind</source> - <translation type="unfinished"/> + <translation>%1 odzadaj</translation> </message> <message> <location line="+21"/> @@ -624,7 +640,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+2"/> <source>Transactions after this will not yet be visible.</source> - <translation type="unfinished"/> + <translation>Transkacija za tem ne bo bila Å¡e na voljo.</translation> </message> <message> <location line="+27"/> @@ -639,7 +655,7 @@ 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>Informacije</translation> </message> <message> <location line="-85"/> @@ -685,7 +701,7 @@ Naslov: %4 <translation>Denarnica je <b>Å¡ifrirana</b> in trenutno <b>zaklenjena</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+435"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -695,7 +711,7 @@ Naslov: %4 <message> <location filename="../clientmodel.cpp" line="+119"/> <source>Network Alert</source> - <translation type="unfinished"/> + <translation>Omrežno Opozorilo</translation> </message> </context> <context> @@ -713,7 +729,7 @@ Naslov: %4 <message> <location line="+29"/> <source>Bytes:</source> - <translation type="unfinished"/> + <translation>Biti:</translation> </message> <message> <location line="+45"/> @@ -723,12 +739,12 @@ Naslov: %4 <message> <location line="+29"/> <source>Priority:</source> - <translation type="unfinished"/> + <translation>Prednostno mesto:</translation> </message> <message> <location line="+45"/> <source>Fee:</source> - <translation type="unfinished"/> + <translation>Provizija:</translation> </message> <message> <location line="+32"/> @@ -746,7 +762,7 @@ Naslov: %4 <translation>Sprememba:</translation> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation type="unfinished"/> </message> @@ -761,7 +777,7 @@ Naslov: %4 <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation>KoliÄina</translation> </message> @@ -778,7 +794,7 @@ Naslov: %4 <message> <location line="+5"/> <source>Confirmations</source> - <translation type="unfinished"/> + <translation>Potrdila</translation> </message> <message> <location line="+3"/> @@ -788,7 +804,7 @@ Naslov: %4 <message> <location line="+5"/> <source>Priority</source> - <translation type="unfinished"/> + <translation>Prednostno mesto</translation> </message> <message> <location filename="../coincontroldialog.cpp" line="+42"/> @@ -809,7 +825,7 @@ Naslov: %4 <message> <location line="-25"/> <source>Copy transaction ID</source> - <translation type="unfinished"/> + <translation>Kopiraj ID transakcije</translation> </message> <message> <location line="+1"/> @@ -824,12 +840,12 @@ Naslov: %4 <message> <location line="+22"/> <source>Copy quantity</source> - <translation type="unfinished"/> + <translation>Kopiraj koliÄino</translation> </message> <message> <location line="+2"/> <source>Copy fee</source> - <translation type="unfinished"/> + <translation>Kopiraj provizijo</translation> </message> <message> <location line="+1"/> @@ -839,12 +855,12 @@ Naslov: %4 <message> <location line="+1"/> <source>Copy bytes</source> - <translation type="unfinished"/> + <translation>Kopiraj bite</translation> </message> <message> <location line="+1"/> <source>Copy priority</source> - <translation type="unfinished"/> + <translation>Kopiraj prednostno mesto</translation> </message> <message> <location line="+1"/> @@ -859,52 +875,52 @@ Naslov: %4 <message> <location line="+323"/> <source>highest</source> - <translation type="unfinished"/> + <translation>najviÅ¡ja</translation> </message> <message> <location line="+1"/> <source>higher</source> - <translation type="unfinished"/> + <translation>viÅ¡ja</translation> </message> <message> <location line="+1"/> <source>high</source> - <translation type="unfinished"/> + <translation>visoka</translation> </message> <message> <location line="+1"/> <source>medium-high</source> - <translation type="unfinished"/> + <translation>srednje visoka</translation> </message> <message> <location line="+1"/> <source>medium</source> - <translation type="unfinished"/> + <translation>srednje</translation> </message> <message> <location line="+4"/> <source>low-medium</source> - <translation type="unfinished"/> + <translation>srednje nizka</translation> </message> <message> <location line="+1"/> <source>low</source> - <translation type="unfinished"/> + <translation>nizka</translation> </message> <message> <location line="+1"/> <source>lower</source> - <translation type="unfinished"/> + <translation>nižja</translation> </message> <message> <location line="+1"/> <source>lowest</source> - <translation type="unfinished"/> + <translation>najnižja</translation> </message> <message> <location line="+11"/> <source>(%1 locked)</source> - <translation type="unfinished"/> + <translation>(%1 zaklenjeno)</translation> </message> <message> <location line="+31"/> @@ -912,9 +928,9 @@ Naslov: %4 <translation type="unfinished"/> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> - <translation type="unfinished"/> + <translation>Prah</translation> </message> <message> <location line="+0"/> @@ -929,7 +945,7 @@ Naslov: %4 <message> <location line="+10"/> <source>This label turns red, if the transaction size is greater than 1000 bytes.</source> - <translation type="unfinished"/> + <translation>V primeru, da je velikost transakcije veÄja od 1000 bitov, se ta oznaka se obarva rdeÄe.</translation> </message> <message> <location line="+1"/> @@ -1005,7 +1021,7 @@ Naslov: %4 <message> <location line="+10"/> <source>The label associated with this address list entry</source> - <translation type="unfinished"/> + <translation>Oznaka je povezana s tem vnosom seznama naslovov</translation> </message> <message> <location line="+17"/> @@ -1045,7 +1061,7 @@ Naslov: %4 <message> <location line="-5"/> <source>The entered address "%1" is not a valid Bitcoin address.</source> - <translation type="unfinished"/> + <translation>VneÅ¡eni naslov "%1" ni veljaven Bitcoin naslov.</translation> </message> <message> <location line="+10"/> @@ -1068,7 +1084,7 @@ Naslov: %4 <message> <location line="+22"/> <source>name</source> - <translation type="unfinished"/> + <translation>ime</translation> </message> <message> <location line="+2"/> @@ -1094,7 +1110,7 @@ Naslov: %4 <translation type="unfinished"/> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation>Jedro Bitcoina</translation> </message> @@ -1144,12 +1160,12 @@ Naslov: %4 <message> <location filename="../forms/intro.ui" line="+14"/> <source>Welcome</source> - <translation type="unfinished"/> + <translation>DobrodoÅ¡li</translation> </message> <message> <location line="+9"/> <source>Welcome to Bitcoin Core.</source> - <translation type="unfinished"/> + <translation>DobrodoÅ¡li v jedru Bitcoina</translation> </message> <message> <location line="+26"/> @@ -1189,7 +1205,7 @@ Naslov: %4 <message> <location line="+9"/> <source>GB of free space available</source> - <translation type="unfinished"/> + <translation>GB prostora na voljo</translation> </message> <message> <location line="+3"/> @@ -1202,17 +1218,17 @@ Naslov: %4 <message> <location filename="../forms/openuridialog.ui" line="+14"/> <source>Open URI</source> - <translation type="unfinished"/> + <translation>Odpri URl</translation> </message> <message> <location line="+6"/> <source>Open payment request from URI or file</source> - <translation type="unfinished"/> + <translation>Odpri zahtevo o plaÄilo od ORI ali datoteke</translation> </message> <message> <location line="+9"/> <source>URI:</source> - <translation type="unfinished"/> + <translation>URI:</translation> </message> <message> <location line="+11"/> @@ -1235,22 +1251,22 @@ Naslov: %4 <message> <location line="+13"/> <source>&Main</source> - <translation type="unfinished"/> + <translation>&Glavno</translation> </message> <message> - <location line="+6"/> + <location line="+122"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation type="unfinished"/> </message> <message> <location line="+15"/> <source>Pay transaction &fee</source> - <translation type="unfinished"/> + <translation>Nakazilo plaÄila & provizija</translation> </message> <message> - <location line="+31"/> + <location line="-131"/> <source>Automatically start Bitcoin after logging in to the system.</source> - <translation type="unfinished"/> + <translation>Po prijavi v sistem samodejno zaženite Bitcoin.</translation> </message> <message> <location line="+3"/> @@ -1263,14 +1279,9 @@ Naslov: %4 <translation type="unfinished"/> </message> <message> - <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"/> + <location line="+16"/> <source>MB</source> - <translation type="unfinished"/> + <translation>megabite</translation> </message> <message> <location line="+27"/> @@ -1283,7 +1294,12 @@ Naslov: %4 <translation type="unfinished"/> </message> <message> - <location line="+58"/> + <location line="+107"/> + <source>&Spend unconfirmed change (experts only)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+37"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation type="unfinished"/> </message> @@ -1318,7 +1334,17 @@ Naslov: %4 <translation>&Omrežje</translation> </message> <message> - <location line="+6"/> + <location line="-86"/> + <source>W&allet</source> + <translation>&Denarnica</translation> + </message> + <message> + <location line="+52"/> + <source>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.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+40"/> <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> @@ -1433,17 +1459,17 @@ Naslov: %4 <translation>&Prekini</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+70"/> <source>default</source> <translation>privzeto</translation> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation type="unfinished"/> </message> <message> - <location line="+75"/> + <location line="+78"/> <source>Confirm options reset</source> <translation type="unfinished"/> </message> @@ -1480,32 +1506,32 @@ Naslov: %4 <location line="+50"/> <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>Prikazanim podatkom je lahko potekel rok. VaÅ¡a denarnica bo po vzpostavitvi povezave samodejno sinhronizirana z Bitcoin omrežjem, ampak ta proces Å¡e ni bil zakljuÄen.</translation> </message> <message> - <location line="-155"/> - <source>Unconfirmed:</source> - <translation>Nepotrjeno:</translation> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation>Denarnica</translation> </message> <message> <location line="+51"/> - <source>Confirmed:</source> - <translation type="unfinished"/> + <source>Available:</source> + <translation>Razpoložljivost:</translation> </message> <message> <location line="+16"/> <source>Your current spendable balance</source> + <translation>VaÅ¡e trenutno razpoložljivo stanje</translation> + </message> + <message> + <location line="+16"/> + <source>Pending:</source> <translation type="unfinished"/> </message> <message> - <location line="+32"/> + <location line="+16"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> - <translation type="unfinished"/> + <translation>Skupno Å¡tevilo potrjenih transakcij, ki sicer niso bile priÅ¡tete k razpoložljivem stanju</translation> </message> <message> <location line="+16"/> @@ -1525,7 +1551,7 @@ Naslov: %4 <message> <location line="+16"/> <source>Your current total balance</source> - <translation type="unfinished"/> + <translation>VaÅ¡e trenutno skupno stanje</translation> </message> <message> <location line="+71"/> @@ -1565,7 +1591,7 @@ Naslov: %4 <location line="+18"/> <location line="+16"/> <source>Payment request error</source> - <translation type="unfinished"/> + <translation>Napaka pri zahtevi plaÄila</translation> </message> <message> <location line="-353"/> @@ -1610,7 +1636,7 @@ Naslov: %4 <message> <location line="+43"/> <source>Error communicating with %1: %2</source> - <translation type="unfinished"/> + <translation>Napaka pri povezavi z %1: %2</translation> </message> <message> <location line="+24"/> @@ -1620,17 +1646,17 @@ Naslov: %4 <message> <location line="+11"/> <source>Bad response from server %1</source> - <translation type="unfinished"/> + <translation>Slab odziv strežnika %1</translation> </message> <message> <location line="+33"/> <source>Payment acknowledged</source> - <translation type="unfinished"/> + <translation>PlaÄilo priznano</translation> </message> <message> <location line="-11"/> <source>Network request error</source> - <translation type="unfinished"/> + <translation>Napaka omrežne zahteve</translation> </message> </context> <context> @@ -1644,12 +1670,17 @@ Naslov: %4 <message> <location line="+1"/> <source>Error: Specified data directory "%1" does not exist.</source> - <translation type="unfinished"/> + <translation>Napaka: Želena nahajaliÅ¡Äe datoteke "%1" ne obstaja.</translation> </message> <message> <location line="-12"/> <source>Error: Invalid combination of -regtest and -testnet.</source> - <translation type="unfinished"/> + <translation>Napaka: Neveljavna kombinacija -regtest and -testnet</translation> + </message> + <message> + <location filename="../guiutil.cpp" line="+82"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>Vnesite bitcoin naslov (npr.: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> </context> <context> @@ -1657,12 +1688,12 @@ Naslov: %4 <message> <location filename="../receiverequestdialog.cpp" line="+36"/> <source>&Save Image...</source> - <translation type="unfinished"/> + <translation>&Shrani sliko...</translation> </message> <message> <location line="+3"/> <source>&Copy Image</source> - <translation type="unfinished"/> + <translation>&Kopiraj sliko</translation> </message> <message> <location line="+28"/> @@ -1672,7 +1703,7 @@ Naslov: %4 <message> <location line="+0"/> <source>PNG Image (*.png)</source> - <translation type="unfinished"/> + <translation>PNG slika (*.png)</translation> </message> </context> <context> @@ -1695,7 +1726,7 @@ Naslov: %4 <location line="+23"/> <location filename="../rpcconsole.cpp" line="+359"/> <source>N/A</source> - <translation type="unfinished"/> + <translation>Neznano</translation> </message> <message> <location line="-223"/> @@ -1775,17 +1806,17 @@ Naslov: %4 <message> <location line="+72"/> <source>&Network Traffic</source> - <translation type="unfinished"/> + <translation>&Omrežni promet</translation> </message> <message> <location line="+52"/> <source>&Clear</source> - <translation type="unfinished"/> + <translation>&PoÅ¡isti</translation> </message> <message> <location line="+13"/> <source>Totals</source> - <translation type="unfinished"/> + <translation>Vsote</translation> </message> <message> <location line="+64"/> @@ -1830,63 +1861,63 @@ Naslov: %4 <message> <location line="+1"/> <source>Type <b>help</b> for an overview of available commands.</source> - <translation type="unfinished"/> + <translation>Vtipkaj <b>pomoÄ</b> za vpogled v razpožljive ukaze.</translation> </message> <message> <location line="+122"/> <source>%1 B</source> - <translation type="unfinished"/> + <translation>%1 bitov</translation> </message> <message> <location line="+2"/> <source>%1 KB</source> - <translation type="unfinished"/> + <translation>%1 kilobitov</translation> </message> <message> <location line="+2"/> <source>%1 MB</source> - <translation type="unfinished"/> + <translation>%1 megabitov</translation> </message> <message> <location line="+2"/> <source>%1 GB</source> - <translation type="unfinished"/> + <translation>%1 gigabitov</translation> </message> <message> <location line="+7"/> <source>%1 m</source> - <translation type="unfinished"/> + <translation>%1 minut</translation> </message> <message> <location line="+5"/> <source>%1 h</source> - <translation type="unfinished"/> + <translation>%1 ur</translation> </message> <message> <location line="+2"/> <source>%1 h %2 m</source> - <translation type="unfinished"/> + <translation>%1 ur %2 minut</translation> </message> </context> <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+83"/> + <location filename="../forms/receivecoinsdialog.ui" line="+107"/> <source>&Amount:</source> - <translation type="unfinished"/> + <translation>&KoliÄina:</translation> </message> <message> - <location line="-13"/> + <location line="-16"/> <source>&Label:</source> <translation>&Oznaka:</translation> </message> <message> - <location line="-34"/> + <location line="-37"/> <source>&Message:</source> - <translation type="unfinished"/> + <translation>&SporoÄilo:</translation> </message> <message> - <location line="-17"/> + <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"/> </message> @@ -1896,47 +1927,50 @@ Naslov: %4 <translation type="unfinished"/> </message> <message> - <location line="+27"/> - <source>An optional 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"/> </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"/> + <location line="-7"/> + <location line="+21"/> + <source>An optional label to associate with the new receiving address.</source> + <translation>Pomožna oznaka je povezana z novim sprejemnim naslovom.</translation> </message> <message> - <location line="+7"/> + <location line="-7"/> <source>Use this form to request payments. All fields are <b>optional</b>.</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <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"/> </message> <message> - <location line="+17"/> + <location line="+32"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> <message> <location line="+3"/> <source>Clear</source> - <translation type="unfinished"/> + <translation>PoÄisti</translation> </message> <message> - <location line="+36"/> - <source>&Request payment</source> + <location line="+78"/> + <source>Requested payments history</source> <translation type="unfinished"/> </message> <message> - <location line="+47"/> - <source>Requested payments</source> - <translation type="unfinished"/> + <location line="-98"/> + <source>&Request payment</source> + <translation>&Zahtevaj plaÄilo</translation> </message> <message> - <location line="+16"/> + <location line="+120"/> <source>Show the selected request (does the same as double clicking an entry)</source> <translation type="unfinished"/> </message> @@ -1955,28 +1989,43 @@ Naslov: %4 <source>Remove</source> <translation>Odstrani</translation> </message> + <message> + <location filename="../receivecoinsdialog.cpp" line="+38"/> + <source>Copy label</source> + <translation>Kopiraj oznako</translation> + </message> + <message> + <location line="+1"/> + <source>Copy message</source> + <translation>Kopiraj sporoÄilo</translation> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation>Kopiraj koliÄino</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> <message> <location filename="../forms/receiverequestdialog.ui" line="+29"/> <source>QR Code</source> - <translation type="unfinished"/> + <translation>QR Koda</translation> </message> <message> <location line="+46"/> <source>Copy &URI</source> - <translation type="unfinished"/> + <translation>Kopraj &URl</translation> </message> <message> <location line="+7"/> <source>Copy &Address</source> - <translation type="unfinished"/> + <translation>Kopiraj &Naslov</translation> </message> <message> <location line="+7"/> <source>&Save Image...</source> - <translation type="unfinished"/> + <translation>&Shrani sliko..</translation> </message> <message> <location filename="../receiverequestdialog.cpp" line="+56"/> @@ -1986,7 +2035,7 @@ Naslov: %4 <message> <location line="+6"/> <source>Payment information</source> - <translation type="unfinished"/> + <translation>Informacija o plaÄilu</translation> </message> <message> <location line="+1"/> @@ -2056,12 +2105,17 @@ Naslov: %4 <source>(no message)</source> <translation>(ni sporoÄila)</translation> </message> + <message> + <location line="+8"/> + <source>(no amount)</source> + <translation>(brez koliÄine)</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>PoÅ¡lji kovance</translation> @@ -2074,17 +2128,17 @@ Naslov: %4 <message> <location line="+20"/> <source>Inputs...</source> - <translation type="unfinished"/> + <translation>Vnosi...</translation> </message> <message> <location line="+7"/> <source>automatically selected</source> - <translation type="unfinished"/> + <translation>samodejno izbran</translation> </message> <message> <location line="+19"/> <source>Insufficient funds!</source> - <translation type="unfinished"/> + <translation>Premalo sredstev!</translation> </message> <message> <location line="+89"/> @@ -2094,7 +2148,7 @@ Naslov: %4 <message> <location line="+35"/> <source>Bytes:</source> - <translation type="unfinished"/> + <translation>Biti:</translation> </message> <message> <location line="+48"/> @@ -2104,12 +2158,12 @@ Naslov: %4 <message> <location line="+32"/> <source>Priority:</source> - <translation type="unfinished"/> + <translation>Prednostno mesto:</translation> </message> <message> <location line="+48"/> <source>Fee:</source> - <translation type="unfinished"/> + <translation>Provizija:</translation> </message> <message> <location line="+32"/> @@ -2137,7 +2191,7 @@ Naslov: %4 <translation type="unfinished"/> </message> <message> - <location line="+115"/> + <location line="+164"/> <source>Send to multiple recipients at once</source> <translation>PoÅ¡lji veÄ prejemnikom hkrati</translation> </message> @@ -2147,7 +2201,7 @@ Naslov: %4 <translation>Dodaj &prejemnika</translation> </message> <message> - <location line="+20"/> + <location line="-23"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -2157,12 +2211,12 @@ Naslov: %4 <translation>PoÄisti &vse</translation> </message> <message> - <location line="+22"/> + <location line="+52"/> <source>Balance:</source> <translation>Dobroimetje:</translation> </message> <message> - <location line="+41"/> + <location line="-78"/> <source>Confirm the send action</source> <translation>Potrdi odlivno dejanje</translation> </message> @@ -2172,7 +2226,7 @@ Naslov: %4 <translation>P&oÅ¡lji</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-228"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation>Potrdi odliv kovancev </translation> </message> @@ -2185,14 +2239,9 @@ Naslov: %4 <translation type="unfinished"/> </message> <message> - <location line="-136"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Vnesite bitcoin naslov (npr.: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> - <message> - <location line="+15"/> + <location line="-121"/> <source>Copy quantity</source> - <translation type="unfinished"/> + <translation>Kopiraj koliÄino</translation> </message> <message> <location line="+1"/> @@ -2202,7 +2251,7 @@ Naslov: %4 <message> <location line="+1"/> <source>Copy fee</source> - <translation type="unfinished"/> + <translation>Kopiraj provizijo</translation> </message> <message> <location line="+1"/> @@ -2212,12 +2261,12 @@ Naslov: %4 <message> <location line="+1"/> <source>Copy bytes</source> - <translation type="unfinished"/> + <translation>Kopiraj bite</translation> </message> <message> <location line="+1"/> <source>Copy priority</source> - <translation type="unfinished"/> + <translation>Kopiraj prednostno mesto</translation> </message> <message> <location line="+1"/> @@ -2240,7 +2289,7 @@ Naslov: %4 <translation>ali</translation> </message> <message> - <location line="+202"/> + <location line="+203"/> <source>The recipient address is not valid, please recheck.</source> <translation type="unfinished"/> </message> @@ -2262,7 +2311,7 @@ Naslov: %4 <message> <location line="+3"/> <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation type="unfinished"/> + <translation>Najdena kopija naslova, možnost poÅ¡iljanja na vsakega izmed naslov le enkrat ob poÅ¡iljanju.</translation> </message> <message> <location line="+3"/> @@ -2275,12 +2324,12 @@ Naslov: %4 <translation type="unfinished"/> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Warning: Invalid Bitcoin address</source> <translation>Opozorilo: Neveljaven Bitcoin naslov</translation> </message> <message> - <location line="+21"/> + <location line="+20"/> <source>(no label)</source> <translation>(ni oznake)</translation> </message> @@ -2290,24 +2339,24 @@ Naslov: %4 <translation type="unfinished"/> </message> <message> - <location line="-366"/> + <location line="-367"/> <source>Are you sure you want to send?</source> - <translation type="unfinished"/> + <translation>Ali ste prepriÄani, da želite poslati?</translation> </message> <message> <location line="+9"/> <source>added as transaction fee</source> - <translation type="unfinished"/> + <translation>dodano kot provizija transakcije</translation> </message> <message> - <location line="+170"/> + <location line="+171"/> <source>Payment request expired</source> - <translation type="unfinished"/> + <translation>Zahteva plaÄila je potekla</translation> </message> <message> <location line="+8"/> <source>Invalid payment address %1</source> - <translation type="unfinished"/> + <translation>Neveljaven naslov plaÄila %1</translation> </message> </context> <context> @@ -2342,7 +2391,7 @@ Naslov: %4 <message> <location line="-50"/> <source>Choose previously used address</source> - <translation type="unfinished"/> + <translation>Izberi zadnje uporabljen naslov</translation> </message> <message> <location line="-40"/> @@ -2377,22 +2426,22 @@ Naslov: %4 <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"/> + <location line="+968"/> <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>Vnesite oznako za ta naslov, ki bo shranjena v seznam uporabljenih naslovov</translation> + </message> + <message> + <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"/> </message> <message> - <location line="+459"/> + <location line="+426"/> <source>This is an unverified payment request.</source> <translation type="unfinished"/> </message> @@ -2408,11 +2457,6 @@ Naslov: %4 <source>Memo:</source> <translation type="unfinished"/> </message> - <message> - <location filename="../sendcoinsentry.cpp" line="+1"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Vnesite bitcoin naslov (npr.: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> </context> <context> <name>ShutdownWindow</name> @@ -2424,7 +2468,7 @@ Naslov: %4 <message> <location line="+1"/> <source>Do not shut down the computer until this window disappears.</source> - <translation type="unfinished"/> + <translation>Ne zaustavite raÄunalnika dokler to okno ne izgine.</translation> </message> </context> <context> @@ -2450,19 +2494,19 @@ Naslov: %4 <translation type="unfinished"/> </message> <message> - <location line="+10"/> - <location line="+213"/> + <location line="+7"/> + <location line="+210"/> <source>Choose previously used address</source> - <translation type="unfinished"/> + <translation>Izberi zadnje uporabljen naslov</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>Prilepi naslov iz odložiÅ¡Äa</translation> </message> @@ -2479,7 +2523,7 @@ Naslov: %4 <message> <location line="+7"/> <source>Signature</source> - <translation type="unfinished"/> + <translation>Podpis</translation> </message> <message> <location line="+27"/> @@ -2503,12 +2547,12 @@ Naslov: %4 </message> <message> <location line="+3"/> - <location line="+146"/> + <location line="+143"/> <source>Clear &All</source> <translation>PoÄisti &vse </translation> </message> <message> - <location line="-87"/> + <location line="-84"/> <source>&Verify Message</source> <translation>&Preveri sporoÄilo</translation> </message> @@ -2523,14 +2567,14 @@ Naslov: %4 <translation type="unfinished"/> </message> <message> - <location line="+40"/> + <location line="+37"/> <source>Verify the message to ensure it was signed with the specified Bitcoin address</source> <translation type="unfinished"/> </message> <message> <location line="+3"/> <source>Verify &Message</source> - <translation type="unfinished"/> + <translation>Preveri &SporoÄilo</translation> </message> <message> <location line="+14"/> @@ -2538,50 +2582,44 @@ Naslov: %4 <translation type="unfinished"/> </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>Vnesite bitcoin naslov (npr.: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location line="-2"/> + <location line="-1"/> <source>Click "Sign Message" to generate signature</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> - <source>Enter Bitcoin signature</source> - <translation type="unfinished"/> + <translation>Kliknite "PodpiÅ¡i sporoÄilo" za ustvaritev podpisa</translation> </message> <message> <location line="+84"/> - <location line="+81"/> + <location line="+80"/> <source>The entered address is invalid.</source> - <translation type="unfinished"/> + <translation>VneÅ¡eni naslov ni veljaven.</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 type="unfinished"/> + <translation>Prosimo preverite naslov in poizkusite znova.</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 type="unfinished"/> </message> <message> - <location line="-73"/> + <location line="-72"/> <source>Wallet unlock was cancelled.</source> <translation>Odklepanje denarnice je bilo prekinjeno.</translation> </message> <message> <location line="+8"/> <source>Private key for the entered address is not available.</source> - <translation type="unfinished"/> + <translation>Zasebni kljuÄ vneÅ¡enega naslov ni na voljo.</translation> </message> <message> <location line="+12"/> @@ -2594,15 +2632,15 @@ Naslov: %4 <translation>SporoÄilo podpisano.</translation> </message> <message> - <location line="+59"/> + <location line="+58"/> <source>The signature could not be decoded.</source> - <translation type="unfinished"/> + <translation>Ni bilo mogoÄe deÅ¡ifrirati podpisa.</translation> </message> <message> <location line="+0"/> <location line="+13"/> <source>Please check the signature and try again.</source> - <translation type="unfinished"/> + <translation>Prosimo preverite podpis in poizkusite znova.</translation> </message> <message> <location line="+0"/> @@ -2655,6 +2693,11 @@ Naslov: %4 </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation type="unfinished"/> </message> @@ -2697,20 +2740,20 @@ Naslov: %4 <location line="+5"/> <location line="+17"/> <source>From</source> - <translation type="unfinished"/> + <translation>PoÅ¡iljatelj</translation> </message> <message> <location line="+1"/> <location line="+22"/> <location line="+58"/> <source>To</source> - <translation type="unfinished"/> + <translation>Prejemnik</translation> </message> <message> <location line="-77"/> <location line="+2"/> <source>own address</source> - <translation type="unfinished"/> + <translation>lasten naslov</translation> </message> <message> <location line="-2"/> @@ -2734,7 +2777,7 @@ Naslov: %4 <message> <location line="+2"/> <source>not accepted</source> - <translation type="unfinished"/> + <translation>ni bilo sprejeto</translation> </message> <message> <location line="+44"/> @@ -2747,12 +2790,12 @@ Naslov: %4 <message> <location line="-62"/> <source>Transaction fee</source> - <translation type="unfinished"/> + <translation>Provizija transakcije</translation> </message> <message> <location line="+16"/> <source>Net amount</source> - <translation type="unfinished"/> + <translation>Neto koliÄina</translation> </message> <message> <location line="+6"/> @@ -2773,7 +2816,7 @@ Naslov: %4 <message> <location line="+18"/> <source>Merchant</source> - <translation type="unfinished"/> + <translation>Trgovec</translation> </message> <message> <location line="+7"/> @@ -2793,7 +2836,7 @@ Naslov: %4 <message> <location line="+3"/> <source>Inputs</source> - <translation type="unfinished"/> + <translation>Vnosi</translation> </message> <message> <location line="+23"/> @@ -2803,12 +2846,12 @@ Naslov: %4 <message> <location line="+1"/> <source>true</source> - <translation type="unfinished"/> + <translation>pravilno</translation> </message> <message> <location line="+0"/> <source>false</source> - <translation type="unfinished"/> + <translation>nepravilno</translation> </message> <message> <location line="-232"/> @@ -2816,12 +2859,12 @@ Naslov: %4 <translation>, Å¡e ni bila uspeÅ¡no razneÅ¡ena</translation> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation>neznano</translation> </message> @@ -2862,12 +2905,12 @@ Naslov: %4 <translation>KoliÄina</translation> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> @@ -2877,23 +2920,12 @@ Naslov: %4 <translation>Odpri enoto %1</translation> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> - <translation>Brez povezave (%1 potrdil)</translation> - </message> - <message> - <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation>Nepotrjeno (&1 od %2 potrdil)</translation> - </message> - <message> - <location line="-22"/> - <location line="+25"/> + <location line="+12"/> <source>Confirmed (%1 confirmations)</source> <translation>Potrjeno (%1 potrdil)</translation> </message> <message> - <location line="-22"/> + <location line="+9"/> <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> @@ -2903,7 +2935,27 @@ Naslov: %4 <translation>Generirano, toda ne sprejeto</translation> </message> <message> - <location line="+62"/> + <location line="-21"/> + <source>Offline</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Unconfirmed</source> + <translation>Nepotrjeno</translation> + </message> + <message> + <location line="+3"/> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation>Prejeto z</translation> </message> @@ -2933,7 +2985,7 @@ Naslov: %4 <translation>(ni na voljo)</translation> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation>Stanje transakcije. Zapeljite z miÅ¡ko Äez to polje za prikaz Å¡tevila potrdil. </translation> </message> @@ -3049,7 +3101,7 @@ Naslov: %4 <message> <location line="+1"/> <source>Copy transaction ID</source> - <translation type="unfinished"/> + <translation>Kopiraj ID transakcije</translation> </message> <message> <location line="+1"/> @@ -3069,7 +3121,7 @@ Naslov: %4 <message> <location line="+19"/> <source>Exporting Failed</source> - <translation type="unfinished"/> + <translation>NeuspeÅ¡en izvoz</translation> </message> <message> <location line="+0"/> @@ -3079,12 +3131,12 @@ Naslov: %4 <message> <location line="+4"/> <source>Exporting Successful</source> - <translation type="unfinished"/> + <translation>UspeÅ¡en izvoz</translation> </message> <message> <location line="+0"/> <source>The transaction history was successfully saved to %1.</source> - <translation type="unfinished"/> + <translation>Zgodovina poteklih transakcij je bila uspeÅ¡no shranjena na %1.</translation> </message> <message> <location line="-22"/> @@ -3158,7 +3210,7 @@ Naslov: %4 <message> <location filename="../walletview.cpp" line="+43"/> <source>&Export</source> - <translation type="unfinished"/> + <translation>&Izvozi</translation> </message> <message> <location line="+1"/> @@ -3168,43 +3220,43 @@ Naslov: %4 <message> <location line="+181"/> <source>Backup Wallet</source> - <translation type="unfinished"/> + <translation>Napravi varnostno kopijo denarnice</translation> </message> <message> <location line="+1"/> <source>Wallet Data (*.dat)</source> - <translation type="unfinished"/> + <translation>Podatki denarnice (*.dat)</translation> </message> <message> <location line="+6"/> <source>Backup Failed</source> - <translation type="unfinished"/> + <translation>Varnostna kopijo neuspeÅ¡na</translation> </message> <message> <location line="+0"/> <source>There was an error trying to save the wallet data to %1.</source> - <translation type="unfinished"/> + <translation>PriÅ¡lo je do napake pri shranjevanju podatkov denarnice na %1.</translation> </message> <message> <location line="+4"/> <source>The wallet data was successfully saved to %1.</source> - <translation type="unfinished"/> + <translation>Podatki denarnice so bili uspeÅ¡no shranjena na %1.</translation> </message> <message> <location line="+0"/> <source>Backup Successful</source> - <translation type="unfinished"/> + <translation>Varnostna kopija uspeÅ¡na</translation> </message> </context> <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+223"/> <source>Usage:</source> <translation>Uporaba:</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>List commands</source> <translation>Prikaži ukaze</translation> </message> @@ -3256,15 +3308,15 @@ Naslov: %4 <message> <location line="+84"/> <source>Specify your own public address</source> - <translation type="unfinished"/> + <translation>DoloÄite vaÅ¡ lasten javni naslov</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation>Prag za prekinitev povezav s slabimi odjemalci (privzeto: 1000)</translation> </message> <message> - <location line="-148"/> + <location line="-150"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"/> </message> @@ -3284,17 +3336,17 @@ Naslov: %4 <translation>Sprejmi ukaze iz ukazne vrstice in JSON-RPC</translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Run in the background as a daemon and accept commands</source> <translation>Teci v ozadju in sprejemaj ukaze</translation> </message> <message> - <location line="+39"/> + <location line="+40"/> <source>Use the test network</source> <translation>Uporabi testno omrežje</translation> </message> <message> - <location line="-118"/> + <location line="-120"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> @@ -3346,22 +3398,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+3"/> <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> - <translation type="unfinished"/> + <translation>Napaka: Transakcija ni bila sprejeta! To se je morebiti zgodilo, ker so nekateri kovanci v vaÅ¡i denarnici bili že porabljeni, na primer Äe ste uporabili kopijo wallet.dat in so tako kovanci bili porabljeni v kopiji, ostali pa oznaÄeni kot neporabljeni.</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>Napaka: Ta transakcija potrebuje povizijo, ki je najmanj %s zaradi svoje koliÄine, kompliciranosti, ali zaradi uporabe prejetih sredstev.</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>Izvedi ukaz, ko bo transakcija denarnice se spremenila (V cmd je bil TxID zamenjan za %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 type="unfinished"/> + <translation>To je pred izdana poizkusna verzija - uporaba na lastno odgovornost - ne uporabljajte je za rudarstvo ali trgovske aplikacije</translation> </message> <message> <location line="+5"/> @@ -3391,7 +3443,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <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>Opozorilo: napaka pri branju wallet.dat! Vsi kljuÄi so bili pravilno prebrani, podatki o transakciji ali imenik vneÅ¡enih naslovov so morda izgubljeni ali nepravilni.</translation> </message> <message> <location line="+3"/> @@ -3401,7 +3453,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+9"/> <source><category> can be:</source> - <translation type="unfinished"/> + <translation><kategorija> je lahko:</translation> </message> <message> <location line="+6"/> @@ -3425,6 +3477,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation type="unfinished"/> </message> @@ -3481,17 +3538,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+2"/> <source>Error: Disk space is low!</source> - <translation type="unfinished"/> + <translation>Opozorilo: Premalo prostora na disku!</translation> </message> <message> <location line="+1"/> <source>Error: Wallet locked, unable to create transaction!</source> - <translation type="unfinished"/> + <translation>Opozorilo: Denarnica je zaklenjena, ni mogoÄe opraviti transkacijo! </translation> </message> <message> <location line="+1"/> <source>Error: system error: </source> - <translation type="unfinished"/> + <translation>Napaka: sistemska napaka:</translation> </message> <message> <location line="+1"/> @@ -3531,12 +3588,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+1"/> <source>Failed to write file info</source> - <translation type="unfinished"/> + <translation>Zapisovanje informacij o datoteki neuspeÅ¡no</translation> </message> <message> <location line="+1"/> <source>Failed to write to coin database</source> - <translation type="unfinished"/> + <translation>NeuspeÅ¡no zapisovanje na bazi podatkov kovancev</translation> </message> <message> <location line="+1"/> @@ -3561,7 +3618,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+1"/> <source>Generate coins (default: 0)</source> - <translation type="unfinished"/> + <translation>Ustvari kovance (privzeto: 0)</translation> </message> <message> <location line="+2"/> @@ -3616,7 +3673,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+1"/> <source>Send command to Bitcoin server</source> - <translation type="unfinished"/> + <translation>PoÅ¡lji ukaz na Bitcoin strežnik</translation> </message> <message> <location line="+7"/> @@ -3635,10 +3692,15 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> - <source>Start Bitcoin server</source> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> <translation type="unfinished"/> </message> <message> + <location line="+1"/> + <source>Start Bitcoin server</source> + <translation>Zaženi Bitcoin strežnik</translation> + </message> + <message> <location line="+3"/> <source>This is intended for regression testing tools and app development.</source> <translation type="unfinished"/> @@ -3661,7 +3723,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+1"/> <source>Wait for RPC server to start</source> - <translation type="unfinished"/> + <translation>PoÄakajte na zagon RPC strežnika</translation> </message> <message> <location line="+1"/> @@ -3684,12 +3746,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-79"/> + <location line="-80"/> <source>Imports blocks from external blk000??.dat file</source> <translation type="unfinished"/> </message> <message> - <location line="-105"/> + <location line="-106"/> <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> @@ -3709,9 +3771,9 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+89"/> + <location line="+90"/> <source>Information</source> - <translation type="unfinished"/> + <translation>Informacije</translation> </message> <message> <location line="+4"/> @@ -3779,24 +3841,24 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+7"/> <source>System error: </source> - <translation type="unfinished"/> + <translation>Sistemska napaka:</translation> </message> <message> <location line="+5"/> <source>Transaction amount too small</source> - <translation type="unfinished"/> + <translation>KoliÄina transakcije je pramajhna</translation> </message> <message> <location line="+1"/> <source>Transaction amounts must be positive</source> - <translation type="unfinished"/> + <translation>KoliÄina transkacije mora biti pozitivna</translation> </message> <message> <location line="+1"/> <source>Transaction too large</source> - <translation type="unfinished"/> + <translation>Transkacija je prevelika</translation> </message> <message> <location line="+8"/> @@ -3825,41 +3887,46 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>version</source> <translation>razliÄica</translation> </message> <message> <location line="+1"/> <source>wallet.dat corrupt, salvage failed</source> - <translation type="unfinished"/> + <translation>wallet.dat poÅ¡kodovana, neuspeÅ¡na obnova</translation> </message> <message> - <location line="-58"/> + <location line="-60"/> <source>Password for JSON-RPC connections</source> <translation>Geslo za JSON-RPC povezave</translation> </message> <message> - <location line="-70"/> + <location line="-71"/> <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="+80"/> + <location line="+81"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>PoÅ¡lji ukaze vozliÅ¡Äu na <ip> (privzet: 127.0.0.1)</translation> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+161"/> + <location line="+163"/> <source>Upgrade wallet to latest format</source> <translation>Posodobi denarnico v najnovejÅ¡i zapis</translation> </message> <message> - <location line="-24"/> + <location line="-25"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Nastavi velikost kljuÄa bazena na <n> (privzeto: 100)</translation> </message> @@ -3869,12 +3936,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Ponovno preglej verigo blokov za manjkajoÄe transakcije denarnice</translation> </message> <message> - <location line="+38"/> + <location line="+39"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Uporabi OpenSSL (https) za JSON-RPC povezave</translation> </message> <message> - <location line="-30"/> + <location line="-31"/> <source>Server certificate file (default: server.cert)</source> <translation>Datoteka potrdila strežnika (privzeta: server.cert)</translation> </message> @@ -3884,7 +3951,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Zasebni kljuÄ strežnika (privzet: server.pem)</translation> </message> <message> - <location line="+16"/> + <location line="+17"/> <source>This help message</source> <translation>To sporoÄilo pomoÄi</translation> </message> @@ -3894,12 +3961,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-107"/> + <location line="-109"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation type="unfinished"/> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Loading addresses...</source> <translation>Nalaganje naslovov ...</translation> </message> @@ -3914,12 +3981,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Napaka pri nalaganju wallet.dat: denarnica zahteva novejÅ¡o razliÄico Bitcoina</translation> </message> <message> - <location line="+98"/> + <location line="+99"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>Denarnica mora biti prepisana: ponovno zaženite Bitcoin za doknÄanje</translation> </message> <message> - <location line="-100"/> + <location line="-101"/> <source>Error loading wallet.dat</source> <translation>Napaka pri nalaganju wallet.dat</translation> </message> @@ -3929,7 +3996,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+56"/> + <location line="+57"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation type="unfinished"/> </message> @@ -3939,7 +4006,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-101"/> + <location line="-103"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -3949,19 +4016,19 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+48"/> + <location line="+49"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation type="unfinished"/> </message> <message> <location line="+1"/> <source>Invalid amount</source> - <translation type="unfinished"/> + <translation>Neveljavna koliÄina</translation> </message> <message> <location line="-6"/> <source>Insufficient funds</source> - <translation type="unfinished"/> + <translation>Premalo sredstev</translation> </message> <message> <location line="+10"/> @@ -3969,7 +4036,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Nalaganje indeksa blokov ...</translation> </message> <message> - <location line="-62"/> + <location line="-63"/> <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> @@ -3979,12 +4046,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+95"/> + <location line="+96"/> <source>Loading wallet...</source> <translation>Nalaganje denarnice ...</translation> </message> <message> - <location line="-56"/> + <location line="-57"/> <source>Cannot downgrade wallet</source> <translation>Ne morem </translation> </message> @@ -3994,7 +4061,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+67"/> + <location line="+68"/> <source>Rescanning...</source> <translation>Ponovno pregledovanje ...</translation> </message> @@ -4004,17 +4071,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Nalaganje konÄano</translation> </message> <message> - <location line="+85"/> + <location line="+86"/> <source>To use the %s option</source> <translation type="unfinished"/> </message> <message> - <location line="-77"/> + <location line="-78"/> <source>Error</source> <translation>Napaka</translation> </message> <message> - <location line="-35"/> + <location line="-36"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_sq.ts b/src/qt/locale/bitcoin_sq.ts index c473d560e0..ecfec40cf6 100644 --- a/src/qt/locale/bitcoin_sq.ts +++ b/src/qt/locale/bitcoin_sq.ts @@ -31,6 +31,12 @@ This product includes software developed by the OpenSSL Project for use in the O <source>The Bitcoin Core developers</source> <translation type="unfinished"/> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source> (%1-bit)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>AddressBookPage</name> @@ -612,6 +618,16 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation type="unfinished"/> @@ -681,7 +697,7 @@ Address: %4 <translation>Portofoli po <b> enkriptohet</b> dhe është <b> i kyçur</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+435"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -742,7 +758,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation type="unfinished"/> </message> @@ -757,7 +773,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation>Sasia</translation> </message> @@ -908,7 +924,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation type="unfinished"/> </message> @@ -1090,7 +1106,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation type="unfinished"/> </message> @@ -1234,7 +1250,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+122"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation type="unfinished"/> </message> @@ -1244,7 +1260,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="-131"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation type="unfinished"/> </message> @@ -1259,12 +1275,7 @@ Address: %4 <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"/> + <location line="+16"/> <source>MB</source> <translation type="unfinished"/> </message> @@ -1279,7 +1290,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+58"/> + <location line="+107"/> + <source>&Spend unconfirmed change (experts only)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+37"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation type="unfinished"/> </message> @@ -1314,7 +1330,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="-86"/> + <source>W&allet</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+52"/> + <source>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.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+40"/> <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> @@ -1429,17 +1455,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+70"/> <source>default</source> <translation type="unfinished"/> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation type="unfinished"/> </message> <message> - <location line="+75"/> + <location line="+78"/> <source>Confirm options reset</source> <translation type="unfinished"/> </message> @@ -1479,18 +1505,13 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-155"/> - <source>Unconfirmed:</source> - <translation>E pakonfirmuar:</translation> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation type="unfinished"/> </message> <message> <location line="+51"/> - <source>Confirmed:</source> + <source>Available:</source> <translation type="unfinished"/> </message> <message> @@ -1499,7 +1520,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation type="unfinished"/> </message> @@ -1647,6 +1673,11 @@ Address: %4 <source>Error: Invalid combination of -regtest and -testnet.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../guiutil.cpp" line="+82"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>Futni një adresë Bitkoini (p.sh. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> </context> <context> <name>QRImageWidget</name> @@ -1867,22 +1898,22 @@ Address: %4 <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+83"/> + <location filename="../forms/receivecoinsdialog.ui" line="+107"/> <source>&Amount:</source> <translation type="unfinished"/> </message> <message> - <location line="-13"/> + <location line="-16"/> <source>&Label:</source> <translation>&Etiketë:</translation> </message> <message> - <location line="-34"/> + <location line="-37"/> <source>&Message:</source> <translation type="unfinished"/> </message> <message> - <location line="-17"/> + <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"/> </message> @@ -1892,27 +1923,30 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+27"/> - <source>An optional 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"/> </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> + <location line="-7"/> + <location line="+21"/> + <source>An optional label to associate with the new receiving address.</source> <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="-7"/> <source>Use this form to request payments. All fields are <b>optional</b>.</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <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"/> </message> <message> - <location line="+17"/> + <location line="+32"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -1922,17 +1956,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+36"/> - <source>&Request payment</source> + <location line="+78"/> + <source>Requested payments history</source> <translation type="unfinished"/> </message> <message> - <location line="+47"/> - <source>Requested payments</source> + <location line="-98"/> + <source>&Request payment</source> <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+120"/> <source>Show the selected request (does the same as double clicking an entry)</source> <translation type="unfinished"/> </message> @@ -1951,6 +1985,21 @@ Address: %4 <source>Remove</source> <translation type="unfinished"/> </message> + <message> + <location filename="../receivecoinsdialog.cpp" line="+38"/> + <source>Copy label</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy message</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation type="unfinished"/> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -2052,12 +2101,17 @@ Address: %4 <source>(no message)</source> <translation type="unfinished"/> </message> + <message> + <location line="+8"/> + <source>(no amount)</source> + <translation type="unfinished"/> + </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>Dërgo Monedha</translation> @@ -2133,7 +2187,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+115"/> + <location line="+164"/> <source>Send to multiple recipients at once</source> <translation>Dërgo marrësve të ndryshëm njëkohësisht</translation> </message> @@ -2143,7 +2197,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+20"/> + <location line="-23"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -2153,12 +2207,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+22"/> + <location line="+52"/> <source>Balance:</source> <translation>Balanca:</translation> </message> <message> - <location line="+41"/> + <location line="-78"/> <source>Confirm the send action</source> <translation>Konfirmo veprimin e dërgimit</translation> </message> @@ -2168,7 +2222,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-228"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation>konfirmo dërgimin e monedhave</translation> </message> @@ -2181,12 +2235,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <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"/> + <location line="-121"/> <source>Copy quantity</source> <translation type="unfinished"/> </message> @@ -2236,7 +2285,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+202"/> + <location line="+203"/> <source>The recipient address is not valid, please recheck.</source> <translation type="unfinished"/> </message> @@ -2271,12 +2320,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Warning: Invalid Bitcoin address</source> <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+20"/> <source>(no label)</source> <translation>(pa etiketë)</translation> </message> @@ -2286,7 +2335,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-366"/> + <location line="-367"/> <source>Are you sure you want to send?</source> <translation type="unfinished"/> </message> @@ -2296,7 +2345,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+170"/> + <location line="+171"/> <source>Payment request expired</source> <translation type="unfinished"/> </message> @@ -2373,12 +2422,7 @@ Address: %4 <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"/> + <location line="+968"/> <source>This is a verified payment request.</source> <translation type="unfinished"/> </message> @@ -2388,7 +2432,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+459"/> + <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"/> + </message> + <message> + <location line="+426"/> <source>This is an unverified payment request.</source> <translation type="unfinished"/> </message> @@ -2404,11 +2453,6 @@ Address: %4 <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> @@ -2446,19 +2490,19 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+10"/> - <location line="+213"/> + <location line="+7"/> + <location line="+210"/> <source>Choose previously used address</source> <translation type="unfinished"/> </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>Ngjit nga memorja e sistemit</translation> </message> @@ -2499,12 +2543,12 @@ Address: %4 </message> <message> <location line="+3"/> - <location line="+146"/> + <location line="+143"/> <source>Clear &All</source> <translation type="unfinished"/> </message> <message> - <location line="-87"/> + <location line="-84"/> <source>&Verify Message</source> <translation type="unfinished"/> </message> @@ -2519,7 +2563,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+40"/> + <location line="+37"/> <source>Verify the message to ensure it was signed with the specified Bitcoin address</source> <translation type="unfinished"/> </message> @@ -2534,43 +2578,37 @@ Address: %4 <translation type="unfinished"/> </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>Futni një adresë Bitkoini (p.sh. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location line="-2"/> + <location line="-1"/> <source>Click "Sign Message" to generate signature</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Enter Bitcoin signature</source> - <translation type="unfinished"/> - </message> - <message> <location line="+84"/> - <location line="+81"/> + <location line="+80"/> <source>The entered address is invalid.</source> <translation type="unfinished"/> </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 type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location line="-73"/> + <location line="-72"/> <source>Wallet unlock was cancelled.</source> <translation type="unfinished"/> </message> @@ -2590,7 +2628,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+59"/> + <location line="+58"/> <source>The signature could not be decoded.</source> <translation type="unfinished"/> </message> @@ -2651,6 +2689,11 @@ Address: %4 </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation type="unfinished"/> </message> @@ -2812,12 +2855,12 @@ Address: %4 <translation>, nuk është transmetuar me sukses deri tani</translation> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation>i/e panjohur</translation> </message> @@ -2858,12 +2901,12 @@ Address: %4 <translation>Sasia</translation> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> @@ -2873,23 +2916,12 @@ Address: %4 <translation>Hapur deri më %1</translation> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> - <translation>Jashtë linje(%1 konfirmime)</translation> - </message> - <message> - <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation>I/E pakonfirmuar(%1 nga %2 konfirmime)</translation> - </message> - <message> - <location line="-22"/> - <location line="+25"/> + <location line="+12"/> <source>Confirmed (%1 confirmations)</source> <translation>I/E konfirmuar(%1 konfirmime)</translation> </message> <message> - <location line="-22"/> + <location line="+9"/> <source>This block was not received by any other nodes and will probably not be accepted!</source> <translation>Ky bllok është marrë nga ndonjë nyje dhe ka shumë mundësi të mos pranohet! </translation> </message> @@ -2899,7 +2931,27 @@ Address: %4 <translation>I krijuar por i papranuar</translation> </message> <message> - <location line="+62"/> + <location line="-21"/> + <source>Offline</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Unconfirmed</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation>Marrë me</translation> </message> @@ -2929,7 +2981,7 @@ Address: %4 <translation>(p/a)</translation> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation type="unfinished"/> </message> @@ -3195,12 +3247,12 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+223"/> <source>Usage:</source> <translation type="unfinished"/> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>List commands</source> <translation type="unfinished"/> </message> @@ -3255,12 +3307,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation type="unfinished"/> </message> <message> - <location line="-148"/> + <location line="-150"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"/> </message> @@ -3280,17 +3332,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Run in the background as a daemon and accept commands</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <location line="+40"/> <source>Use the test network</source> <translation type="unfinished"/> </message> <message> - <location line="-118"/> + <location line="-120"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> @@ -3421,6 +3473,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation type="unfinished"/> </message> @@ -3631,6 +3688,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Start Bitcoin server</source> <translation type="unfinished"/> </message> @@ -3680,12 +3742,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-79"/> + <location line="-80"/> <source>Imports blocks from external blk000??.dat file</source> <translation type="unfinished"/> </message> <message> - <location line="-105"/> + <location line="-106"/> <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> @@ -3705,7 +3767,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+89"/> + <location line="+90"/> <source>Information</source> <translation type="unfinished"/> </message> @@ -3775,7 +3837,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+7"/> <source>System error: </source> <translation type="unfinished"/> </message> @@ -3821,6 +3883,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>version</source> <translation type="unfinished"/> </message> @@ -3830,32 +3897,32 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-58"/> + <location line="-60"/> <source>Password for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-70"/> + <location line="-71"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation type="unfinished"/> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+161"/> + <location line="+163"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"/> </message> <message> - <location line="-24"/> + <location line="-25"/> <source>Set key pool size to <n> (default: 100)</source> <translation type="unfinished"/> </message> @@ -3865,12 +3932,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+38"/> + <location line="+39"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-30"/> + <location line="-31"/> <source>Server certificate file (default: server.cert)</source> <translation type="unfinished"/> </message> @@ -3880,7 +3947,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+17"/> <source>This help message</source> <translation type="unfinished"/> </message> @@ -3890,12 +3957,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-107"/> + <location line="-109"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation type="unfinished"/> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Loading addresses...</source> <translation type="unfinished"/> </message> @@ -3910,12 +3977,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+98"/> + <location line="+99"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation type="unfinished"/> </message> <message> - <location line="-100"/> + <location line="-101"/> <source>Error loading wallet.dat</source> <translation type="unfinished"/> </message> @@ -3925,7 +3992,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+56"/> + <location line="+57"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation type="unfinished"/> </message> @@ -3935,7 +4002,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-101"/> + <location line="-103"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -3945,7 +4012,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+48"/> + <location line="+49"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation type="unfinished"/> </message> @@ -3965,7 +4032,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-62"/> + <location line="-63"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"/> </message> @@ -3975,12 +4042,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+95"/> + <location line="+96"/> <source>Loading wallet...</source> <translation type="unfinished"/> </message> <message> - <location line="-56"/> + <location line="-57"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> @@ -3990,7 +4057,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+67"/> + <location line="+68"/> <source>Rescanning...</source> <translation type="unfinished"/> </message> @@ -4000,17 +4067,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+85"/> + <location line="+86"/> <source>To use the %s option</source> <translation type="unfinished"/> </message> <message> - <location line="-77"/> + <location line="-78"/> <source>Error</source> <translation type="unfinished"/> </message> <message> - <location line="-35"/> + <location line="-36"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_sr.ts b/src/qt/locale/bitcoin_sr.ts index a3eb9b4fa3..ad64683cb7 100644 --- a/src/qt/locale/bitcoin_sr.ts +++ b/src/qt/locale/bitcoin_sr.ts @@ -31,6 +31,12 @@ This product includes software developed by the OpenSSL Project for use in the O <source>The Bitcoin Core developers</source> <translation type="unfinished"/> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source> (%1-bit)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>AddressBookPage</name> @@ -612,6 +618,16 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation type="unfinished"/> @@ -681,7 +697,7 @@ Address: %4 <translation>Ðовчаник Ñ˜Ñ <b>шифрован</b> и тренутно <b>закључан</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+435"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -742,7 +758,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation type="unfinished"/> </message> @@ -757,7 +773,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation>iznos</translation> </message> @@ -908,7 +924,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation type="unfinished"/> </message> @@ -1090,7 +1106,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation type="unfinished"/> </message> @@ -1234,7 +1250,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+122"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation type="unfinished"/> </message> @@ -1244,7 +1260,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="-131"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation type="unfinished"/> </message> @@ -1259,12 +1275,7 @@ Address: %4 <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"/> + <location line="+16"/> <source>MB</source> <translation type="unfinished"/> </message> @@ -1279,7 +1290,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+58"/> + <location line="+107"/> + <source>&Spend unconfirmed change (experts only)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+37"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation type="unfinished"/> </message> @@ -1314,7 +1330,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="-86"/> + <source>W&allet</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+52"/> + <source>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.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+40"/> <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> @@ -1429,17 +1455,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+70"/> <source>default</source> <translation type="unfinished"/> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation type="unfinished"/> </message> <message> - <location line="+75"/> + <location line="+78"/> <source>Confirm options reset</source> <translation type="unfinished"/> </message> @@ -1479,18 +1505,13 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-155"/> - <source>Unconfirmed:</source> - <translation>Ðепотврђено:</translation> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation>новчаник</translation> </message> <message> <location line="+51"/> - <source>Confirmed:</source> + <source>Available:</source> <translation type="unfinished"/> </message> <message> @@ -1499,7 +1520,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation type="unfinished"/> </message> @@ -1647,6 +1673,11 @@ Address: %4 <source>Error: Invalid combination of -regtest and -testnet.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../guiutil.cpp" line="+82"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>Unesite Bitcoin adresu (n.pr. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> </context> <context> <name>QRImageWidget</name> @@ -1867,22 +1898,22 @@ Address: %4 <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+83"/> + <location filename="../forms/receivecoinsdialog.ui" line="+107"/> <source>&Amount:</source> <translation type="unfinished"/> </message> <message> - <location line="-13"/> + <location line="-16"/> <source>&Label:</source> <translation>&Етикета</translation> </message> <message> - <location line="-34"/> + <location line="-37"/> <source>&Message:</source> <translation type="unfinished"/> </message> <message> - <location line="-17"/> + <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"/> </message> @@ -1892,27 +1923,30 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+27"/> - <source>An optional 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"/> </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> + <location line="-7"/> + <location line="+21"/> + <source>An optional label to associate with the new receiving address.</source> <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="-7"/> <source>Use this form to request payments. All fields are <b>optional</b>.</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <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"/> </message> <message> - <location line="+17"/> + <location line="+32"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -1922,17 +1956,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+36"/> - <source>&Request payment</source> + <location line="+78"/> + <source>Requested payments history</source> <translation type="unfinished"/> </message> <message> - <location line="+47"/> - <source>Requested payments</source> + <location line="-98"/> + <source>&Request payment</source> <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+120"/> <source>Show the selected request (does the same as double clicking an entry)</source> <translation type="unfinished"/> </message> @@ -1951,6 +1985,21 @@ Address: %4 <source>Remove</source> <translation type="unfinished"/> </message> + <message> + <location filename="../receivecoinsdialog.cpp" line="+38"/> + <source>Copy label</source> + <translation>kopiraj naziv</translation> + </message> + <message> + <location line="+1"/> + <source>Copy message</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation>kopiraj iznos</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -2052,12 +2101,17 @@ Address: %4 <source>(no message)</source> <translation type="unfinished"/> </message> + <message> + <location line="+8"/> + <source>(no amount)</source> + <translation type="unfinished"/> + </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>Слање новца</translation> @@ -2133,7 +2187,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+115"/> + <location line="+164"/> <source>Send to multiple recipients at once</source> <translation type="unfinished"/> </message> @@ -2143,7 +2197,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+20"/> + <location line="-23"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -2153,12 +2207,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+22"/> + <location line="+52"/> <source>Balance:</source> <translation type="unfinished"/> </message> <message> - <location line="+41"/> + <location line="-78"/> <source>Confirm the send action</source> <translation>Потврди акцију Ñлања</translation> </message> @@ -2168,7 +2222,7 @@ Address: %4 <translation>&Пошаљи</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-228"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation type="unfinished"/> </message> @@ -2181,12 +2235,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-136"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Unesite Bitcoin adresu (n.pr. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> - <message> - <location line="+15"/> + <location line="-121"/> <source>Copy quantity</source> <translation type="unfinished"/> </message> @@ -2236,7 +2285,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+202"/> + <location line="+203"/> <source>The recipient address is not valid, please recheck.</source> <translation type="unfinished"/> </message> @@ -2271,12 +2320,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Warning: Invalid Bitcoin address</source> <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+20"/> <source>(no label)</source> <translation>(без етикете)</translation> </message> @@ -2286,7 +2335,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-366"/> + <location line="-367"/> <source>Are you sure you want to send?</source> <translation type="unfinished"/> </message> @@ -2296,7 +2345,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+170"/> + <location line="+171"/> <source>Payment request expired</source> <translation type="unfinished"/> </message> @@ -2373,12 +2422,7 @@ Address: %4 <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"/> + <location line="+968"/> <source>This is a verified payment request.</source> <translation type="unfinished"/> </message> @@ -2388,7 +2432,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+459"/> + <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"/> + </message> + <message> + <location line="+426"/> <source>This is an unverified payment request.</source> <translation type="unfinished"/> </message> @@ -2404,11 +2453,6 @@ Address: %4 <source>Memo:</source> <translation type="unfinished"/> </message> - <message> - <location filename="../sendcoinsentry.cpp" line="+1"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Unesite Bitcoin adresu (n.pr. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> </context> <context> <name>ShutdownWindow</name> @@ -2446,19 +2490,19 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+10"/> - <location line="+213"/> + <location line="+7"/> + <location line="+210"/> <source>Choose previously used address</source> <translation type="unfinished"/> </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 type="unfinished"/> </message> @@ -2499,12 +2543,12 @@ Address: %4 </message> <message> <location line="+3"/> - <location line="+146"/> + <location line="+143"/> <source>Clear &All</source> <translation type="unfinished"/> </message> <message> - <location line="-87"/> + <location line="-84"/> <source>&Verify Message</source> <translation type="unfinished"/> </message> @@ -2519,7 +2563,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+40"/> + <location line="+37"/> <source>Verify the message to ensure it was signed with the specified Bitcoin address</source> <translation type="unfinished"/> </message> @@ -2534,43 +2578,37 @@ Address: %4 <translation type="unfinished"/> </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>Unesite Bitcoin adresu (n.pr. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location line="-2"/> + <location line="-1"/> <source>Click "Sign Message" to generate signature</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Enter Bitcoin signature</source> - <translation type="unfinished"/> - </message> - <message> <location line="+84"/> - <location line="+81"/> + <location line="+80"/> <source>The entered address is invalid.</source> <translation type="unfinished"/> </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 type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location line="-73"/> + <location line="-72"/> <source>Wallet unlock was cancelled.</source> <translation type="unfinished"/> </message> @@ -2590,7 +2628,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+59"/> + <location line="+58"/> <source>The signature could not be decoded.</source> <translation type="unfinished"/> </message> @@ -2651,6 +2689,11 @@ Address: %4 </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation type="unfinished"/> </message> @@ -2812,12 +2855,12 @@ Address: %4 <translation>, nije joÅ¡ uvek uspeÅ¡no emitovan</translation> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation>nepoznato</translation> </message> @@ -2858,12 +2901,12 @@ Address: %4 <translation>iznos</translation> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> @@ -2873,23 +2916,12 @@ Address: %4 <translation>Otvoreno do %1</translation> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> - <translation>Offline * van mreže (%1 potvrdjenih)</translation> - </message> - <message> - <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation>Nepotvrdjeno (%1 of %2 potvrdjenih)</translation> - </message> - <message> - <location line="-22"/> - <location line="+25"/> + <location line="+12"/> <source>Confirmed (%1 confirmations)</source> <translation>Potvrdjena (%1 potvrdjenih)</translation> </message> <message> - <location line="-22"/> + <location line="+9"/> <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> @@ -2899,7 +2931,27 @@ Address: %4 <translation>Generisan ali nije prihvaćen</translation> </message> <message> - <location line="+62"/> + <location line="-21"/> + <source>Offline</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Unconfirmed</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation>Primljen sa</translation> </message> @@ -2929,7 +2981,7 @@ Address: %4 <translation>(n/a)</translation> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation>Status vaÅ¡e transakcije. Predjite miÅ¡em preko ovog polja da bi ste videli broj konfirmacija</translation> </message> @@ -3195,12 +3247,12 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+223"/> <source>Usage:</source> <translation>Korišćenje:</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>List commands</source> <translation>Listaj komande</translation> </message> @@ -3256,12 +3308,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation type="unfinished"/> </message> <message> - <location line="-148"/> + <location line="-150"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"/> </message> @@ -3281,17 +3333,17 @@ Address: %4 <translation>Prihvati komandnu liniju i JSON-RPC komande</translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Run in the background as a daemon and accept commands</source> <translation>Radi u pozadini kao daemon servis i prihvati komande</translation> </message> <message> - <location line="+39"/> + <location line="+40"/> <source>Use the test network</source> <translation>Koristi testnu mrežu</translation> </message> <message> - <location line="-118"/> + <location line="-120"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> @@ -3422,6 +3474,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation type="unfinished"/> </message> @@ -3632,6 +3689,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Start Bitcoin server</source> <translation type="unfinished"/> </message> @@ -3681,12 +3743,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-79"/> + <location line="-80"/> <source>Imports blocks from external blk000??.dat file</source> <translation type="unfinished"/> </message> <message> - <location line="-105"/> + <location line="-106"/> <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> @@ -3706,7 +3768,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+89"/> + <location line="+90"/> <source>Information</source> <translation type="unfinished"/> </message> @@ -3776,7 +3838,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+7"/> <source>System error: </source> <translation type="unfinished"/> </message> @@ -3822,6 +3884,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>version</source> <translation>верзија</translation> </message> @@ -3831,32 +3898,32 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-58"/> + <location line="-60"/> <source>Password for JSON-RPC connections</source> <translation>Lozinka za JSON-RPC konekcije</translation> </message> <message> - <location line="-70"/> + <location line="-71"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Dozvoli JSON-RPC konekcije sa posebne IP adrese</translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>PoÅ¡alji komande to nodu koji radi na <ip> (default: 127.0.0.1)</translation> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+161"/> + <location line="+163"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"/> </message> <message> - <location line="-24"/> + <location line="-25"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Odredi veliÄinu zaÅ¡tićenih kljuÄeva na <n> (default: 100)</translation> </message> @@ -3866,12 +3933,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Ponovo skeniraj lanac blokova za nedostajuće transakcije iz novÄanika</translation> </message> <message> - <location line="+38"/> + <location line="+39"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Koristi OpenSSL (https) za JSON-RPC konekcije</translation> </message> <message> - <location line="-30"/> + <location line="-31"/> <source>Server certificate file (default: server.cert)</source> <translation type="unfinished"/> </message> @@ -3881,7 +3948,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>privatni kljuÄ za Server (podrazumevan: server.pem)</translation> </message> <message> - <location line="+16"/> + <location line="+17"/> <source>This help message</source> <translation>Ova poruka Pomoći</translation> </message> @@ -3891,12 +3958,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-107"/> + <location line="-109"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation type="unfinished"/> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Loading addresses...</source> <translation>uÄitavam adrese....</translation> </message> @@ -3911,12 +3978,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Грешка током учитавања wallet.dat: Ðовчанику је неопходна нова верзија Bitcoin-a.</translation> </message> <message> - <location line="+98"/> + <location line="+99"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation type="unfinished"/> </message> <message> - <location line="-100"/> + <location line="-101"/> <source>Error loading wallet.dat</source> <translation>Грешка током учитавања wallet.dat </translation> </message> @@ -3926,7 +3993,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+56"/> + <location line="+57"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation type="unfinished"/> </message> @@ -3936,7 +4003,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-101"/> + <location line="-103"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -3946,7 +4013,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+48"/> + <location line="+49"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation type="unfinished"/> </message> @@ -3966,7 +4033,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>UÄitavam blok indeksa...</translation> </message> <message> - <location line="-62"/> + <location line="-63"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"/> </message> @@ -3976,12 +4043,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+95"/> + <location line="+96"/> <source>Loading wallet...</source> <translation>Ðовчаник Ñе учитава...</translation> </message> <message> - <location line="-56"/> + <location line="-57"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> @@ -3991,7 +4058,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+67"/> + <location line="+68"/> <source>Rescanning...</source> <translation>Ponovo skeniram...</translation> </message> @@ -4001,17 +4068,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>ZavrÅ¡eno uÄitavanje</translation> </message> <message> - <location line="+85"/> + <location line="+86"/> <source>To use the %s option</source> <translation type="unfinished"/> </message> <message> - <location line="-77"/> + <location line="-78"/> <source>Error</source> <translation type="unfinished"/> </message> <message> - <location line="-35"/> + <location line="-36"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_sv.ts b/src/qt/locale/bitcoin_sv.ts index 5743f1b36e..128bfa7ad3 100644 --- a/src/qt/locale/bitcoin_sv.ts +++ b/src/qt/locale/bitcoin_sv.ts @@ -37,6 +37,12 @@ Denna produkten innehÃ¥ller mjukvara utvecklad av OpenSSL Project för användni <source>The Bitcoin Core developers</source> <translation type="unfinished"/> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source> (%1-bit)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>AddressBookPage</name> @@ -618,6 +624,16 @@ Denna produkten innehÃ¥ller mjukvara utvecklad av OpenSSL Project för användni <translation><numerusform>%n vecka</numerusform><numerusform>%n veckor</numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation>%1 efter</translation> @@ -691,7 +707,7 @@ Adress: %4 <translation>Denna plÃ¥nbok är <b>krypterad</b> och för närvarande <b>lÃ¥st</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+435"/> <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> @@ -752,7 +768,7 @@ Adress: %4 <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation type="unfinished"/> </message> @@ -767,7 +783,7 @@ Adress: %4 <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation>Mängd</translation> </message> @@ -918,7 +934,7 @@ Adress: %4 <translation type="unfinished"/> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation type="unfinished"/> </message> @@ -1100,7 +1116,7 @@ Adress: %4 <translation type="unfinished"/> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation>Bitcoin Kärna</translation> </message> @@ -1244,7 +1260,7 @@ Adress: %4 <translation>&Allmänt</translation> </message> <message> - <location line="+6"/> + <location line="+122"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation>Valfri transaktionsavgift per kB som ser till att dina transaktioner behandlas snabbt. De flesta transaktioner är 1 kB.</translation> </message> @@ -1254,7 +1270,7 @@ Adress: %4 <translation>Betala överförings&avgift</translation> </message> <message> - <location line="+31"/> + <location line="-131"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation>Starta Bitcoin automatiskt efter inloggning.</translation> </message> @@ -1269,12 +1285,7 @@ Adress: %4 <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"/> + <location line="+16"/> <source>MB</source> <translation type="unfinished"/> </message> @@ -1289,7 +1300,12 @@ Adress: %4 <translation>Ange antalet skriptkontrolltrÃ¥dar (upp till 16, 0 = auto, <0 = lämna sÃ¥ mÃ¥nga kärnor lediga, förval: 0)</translation> </message> <message> - <location line="+58"/> + <location line="+107"/> + <source>&Spend unconfirmed change (experts only)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+37"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation type="unfinished"/> </message> @@ -1324,7 +1340,17 @@ Adress: %4 <translation>&Nätverk</translation> </message> <message> - <location line="+6"/> + <location line="-86"/> + <source>W&allet</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+52"/> + <source>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.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+40"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>Öppna automatiskt Bitcoin-klientens port pÃ¥ routern. Detta fungerar endast om din router har UPnP aktiverat.</translation> </message> @@ -1439,17 +1465,17 @@ Adress: %4 <translation>&Avbryt</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+70"/> <source>default</source> <translation>standard</translation> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation type="unfinished"/> </message> <message> - <location line="+75"/> + <location line="+78"/> <source>Confirm options reset</source> <translation>Bekräfta att alternativen ska Ã¥terställs</translation> </message> @@ -1489,19 +1515,14 @@ Adress: %4 <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="-155"/> - <source>Unconfirmed:</source> - <translation>Obekräftade:</translation> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation>PlÃ¥nbok</translation> </message> <message> <location line="+51"/> - <source>Confirmed:</source> - <translation>Bekräftade:</translation> + <source>Available:</source> + <translation type="unfinished"/> </message> <message> <location line="+16"/> @@ -1509,7 +1530,12 @@ Adress: %4 <translation>Ditt tillgängliga saldo</translation> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> <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> @@ -1657,6 +1683,11 @@ Adress: %4 <source>Error: Invalid combination of -regtest and -testnet.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../guiutil.cpp" line="+82"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>Ange en Bitcoin-adress (t.ex. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> </context> <context> <name>QRImageWidget</name> @@ -1877,22 +1908,22 @@ Adress: %4 <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+83"/> + <location filename="../forms/receivecoinsdialog.ui" line="+107"/> <source>&Amount:</source> <translation>%Belopp:</translation> </message> <message> - <location line="-13"/> + <location line="-16"/> <source>&Label:</source> <translation>&Etikett:</translation> </message> <message> - <location line="-34"/> + <location line="-37"/> <source>&Message:</source> <translation>&Meddelande:</translation> </message> <message> - <location line="-17"/> + <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"/> </message> @@ -1902,27 +1933,30 @@ Adress: %4 <translation type="unfinished"/> </message> <message> - <location line="+27"/> - <source>An optional 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"/> </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> + <location line="-7"/> + <location line="+21"/> + <source>An optional label to associate with the new receiving address.</source> <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="-7"/> <source>Use this form to request payments. All fields are <b>optional</b>.</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <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"/> </message> <message> - <location line="+17"/> + <location line="+32"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -1932,17 +1966,17 @@ Adress: %4 <translation>Rensa</translation> </message> <message> - <location line="+36"/> - <source>&Request payment</source> + <location line="+78"/> + <source>Requested payments history</source> <translation type="unfinished"/> </message> <message> - <location line="+47"/> - <source>Requested payments</source> + <location line="-98"/> + <source>&Request payment</source> <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+120"/> <source>Show the selected request (does the same as double clicking an entry)</source> <translation type="unfinished"/> </message> @@ -1961,6 +1995,21 @@ Adress: %4 <source>Remove</source> <translation type="unfinished"/> </message> + <message> + <location filename="../receivecoinsdialog.cpp" line="+38"/> + <source>Copy label</source> + <translation>Kopiera etikett</translation> + </message> + <message> + <location line="+1"/> + <source>Copy message</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation>Kopiera belopp</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -2062,12 +2111,17 @@ Adress: %4 <source>(no message)</source> <translation type="unfinished"/> </message> + <message> + <location line="+8"/> + <source>(no amount)</source> + <translation type="unfinished"/> + </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>Skicka pengar</translation> @@ -2143,7 +2197,7 @@ Adress: %4 <translation type="unfinished"/> </message> <message> - <location line="+115"/> + <location line="+164"/> <source>Send to multiple recipients at once</source> <translation>Skicka till flera mottagare samtidigt</translation> </message> @@ -2153,7 +2207,7 @@ Adress: %4 <translation>Lägg till &mottagare</translation> </message> <message> - <location line="+20"/> + <location line="-23"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -2163,12 +2217,12 @@ Adress: %4 <translation>Rensa &alla</translation> </message> <message> - <location line="+22"/> + <location line="+52"/> <source>Balance:</source> <translation>Balans:</translation> </message> <message> - <location line="+41"/> + <location line="-78"/> <source>Confirm the send action</source> <translation>Bekräfta sändordern</translation> </message> @@ -2178,7 +2232,7 @@ Adress: %4 <translation>&Skicka</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-228"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation>Bekräfta skickade mynt</translation> </message> @@ -2191,12 +2245,7 @@ Adress: %4 <translation>%1 till %2</translation> </message> <message> - <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"/> + <location line="-121"/> <source>Copy quantity</source> <translation type="unfinished"/> </message> @@ -2246,7 +2295,7 @@ Adress: %4 <translation type="unfinished"/> </message> <message> - <location line="+202"/> + <location line="+203"/> <source>The recipient address is not valid, please recheck.</source> <translation>Mottagarens adress är inte giltig, vänligen kontrollera igen.</translation> </message> @@ -2281,12 +2330,12 @@ Adress: %4 <translation type="unfinished"/> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Warning: Invalid Bitcoin address</source> <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+20"/> <source>(no label)</source> <translation>(Ingen etikett)</translation> </message> @@ -2296,7 +2345,7 @@ Adress: %4 <translation type="unfinished"/> </message> <message> - <location line="-366"/> + <location line="-367"/> <source>Are you sure you want to send?</source> <translation>Är du säker pÃ¥ att du vill skicka?</translation> </message> @@ -2306,7 +2355,7 @@ Adress: %4 <translation type="unfinished"/> </message> <message> - <location line="+170"/> + <location line="+171"/> <source>Payment request expired</source> <translation type="unfinished"/> </message> @@ -2383,12 +2432,7 @@ Adress: %4 <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"/> + <location line="+968"/> <source>This is a verified payment request.</source> <translation type="unfinished"/> </message> @@ -2398,7 +2442,12 @@ Adress: %4 <translation type="unfinished"/> </message> <message> - <location line="+459"/> + <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"/> + </message> + <message> + <location line="+426"/> <source>This is an unverified payment request.</source> <translation type="unfinished"/> </message> @@ -2414,11 +2463,6 @@ Adress: %4 <source>Memo:</source> <translation type="unfinished"/> </message> - <message> - <location filename="../sendcoinsentry.cpp" line="+1"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Ange en Bitcoin-adress (t.ex. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> </context> <context> <name>ShutdownWindow</name> @@ -2456,19 +2500,19 @@ Adress: %4 <translation>Adressen att signera meddelandet med (t.ex. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location line="+10"/> - <location line="+213"/> + <location line="+7"/> + <location line="+210"/> <source>Choose previously used address</source> <translation>Välj tidigare använda adresser</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>Klistra in adress frÃ¥n Urklipp</translation> </message> @@ -2509,12 +2553,12 @@ Adress: %4 </message> <message> <location line="+3"/> - <location line="+146"/> + <location line="+143"/> <source>Clear &All</source> <translation>Rensa &alla</translation> </message> <message> - <location line="-87"/> + <location line="-84"/> <source>&Verify Message</source> <translation>&Verifiera Meddelande</translation> </message> @@ -2529,7 +2573,7 @@ Adress: %4 <translation>Adressen som meddelandet var signerat med (t.ex. 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>Verifiera meddelandet för att vara säker pÃ¥ att den var signerad med den angivna Bitcoin-adressen</translation> </message> @@ -2544,43 +2588,37 @@ Adress: %4 <translation>Rensa alla fält</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>Ange en Bitcoin-adress (t.ex. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location line="-2"/> + <location line="-1"/> <source>Click "Sign Message" to generate signature</source> <translation>Klicka "Signera Meddelande" för att fÃ¥ en signatur</translation> </message> <message> - <location line="+3"/> - <source>Enter Bitcoin signature</source> - <translation>Ange Bitcoin-signatur</translation> - </message> - <message> <location line="+84"/> - <location line="+81"/> + <location line="+80"/> <source>The entered address is invalid.</source> <translation>Den angivna adressen är ogiltig.</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>Vad god kontrollera adressen och försök igen.</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>Den angivna adressen refererar inte till en nyckel.</translation> </message> <message> - <location line="-73"/> + <location line="-72"/> <source>Wallet unlock was cancelled.</source> <translation>UpplÃ¥sningen av plÃ¥nboken avbröts.</translation> </message> @@ -2600,7 +2638,7 @@ Adress: %4 <translation>Meddelandet är signerat.</translation> </message> <message> - <location line="+59"/> + <location line="+58"/> <source>The signature could not be decoded.</source> <translation>Signaturen kunde inte avkodas.</translation> </message> @@ -2661,6 +2699,11 @@ Adress: %4 </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation>%1/nerkopplad</translation> </message> @@ -2822,12 +2865,12 @@ Adress: %4 <translation>, har inte lyckats skickas ännu</translation> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <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> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation>okänd</translation> </message> @@ -2868,12 +2911,12 @@ Adress: %4 <translation>Mängd</translation> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <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> @@ -2883,23 +2926,12 @@ Adress: %4 <translation>Öppet till %1</translation> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> - <translation>Offline (%1 bekräftelser)</translation> - </message> - <message> - <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation>Obekräftad (%1 av %2 bekräftelser)</translation> - </message> - <message> - <location line="-22"/> - <location line="+25"/> + <location line="+12"/> <source>Confirmed (%1 confirmations)</source> <translation>Bekräftad (%1 bekräftelser)</translation> </message> <message> - <location line="-22"/> + <location line="+9"/> <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> @@ -2909,7 +2941,27 @@ Adress: %4 <translation>Genererad men inte accepterad</translation> </message> <message> - <location line="+62"/> + <location line="-21"/> + <source>Offline</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Unconfirmed</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation>Mottagen med</translation> </message> @@ -2939,7 +2991,7 @@ Adress: %4 <translation>(n/a)</translation> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation>Transaktionsstatus. HÃ¥ll muspekaren över för att se antal bekräftelser.</translation> </message> @@ -3205,12 +3257,12 @@ Adress: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+223"/> <source>Usage:</source> <translation>Användning:</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>List commands</source> <translation>Lista kommandon</translation> </message> @@ -3265,12 +3317,12 @@ Adress: %4 <translation>Ange din egen publika adress</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <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="-148"/> + <location line="-150"/> <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> @@ -3290,17 +3342,17 @@ Adress: %4 <translation>TillÃ¥t kommandon frÃ¥n kommandotolken och JSON-RPC-kommandon</translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <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="+39"/> + <location line="+40"/> <source>Use the test network</source> <translation>Använd testnätverket</translation> </message> <message> - <location line="-118"/> + <location line="-120"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>Acceptera anslutningar utifrÃ¥n (förvalt: 1 om ingen -proxy eller -connect)</translation> </message> @@ -3441,6 +3493,11 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo </message> <message> <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation>Koppla enbart upp till den/de specificerade noden/noder</translation> </message> @@ -3651,6 +3708,11 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo </message> <message> <location line="+2"/> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Start Bitcoin server</source> <translation>Starta Bitcoinserver</translation> </message> @@ -3700,12 +3762,12 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>Du mÃ¥ste Ã¥terskapa databasen med -reindex för att ändra -txindex</translation> </message> <message> - <location line="-79"/> + <location line="-80"/> <source>Imports blocks from external blk000??.dat file</source> <translation>Importerar block frÃ¥n extern blk000??.dat fil</translation> </message> <message> - <location line="-105"/> + <location line="-106"/> <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> @@ -3725,7 +3787,7 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>Ange antalet skriptkontrolltrÃ¥dar (upp till 16, 0 = auto, <0 = lämna sÃ¥ mÃ¥nga kärnor lediga, förval: 0)</translation> </message> <message> - <location line="+89"/> + <location line="+90"/> <source>Information</source> <translation>Information</translation> </message> @@ -3795,7 +3857,7 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>Ange timeout för uppkoppling i millisekunder (förvalt: 5000)</translation> </message> <message> - <location line="+6"/> + <location line="+7"/> <source>System error: </source> <translation>Systemfel:</translation> </message> @@ -3841,6 +3903,11 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>version</source> <translation>version</translation> </message> @@ -3850,32 +3917,32 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>wallet.dat korrupt, räddning misslyckades</translation> </message> <message> - <location line="-58"/> + <location line="-60"/> <source>Password for JSON-RPC connections</source> <translation>Lösenord för JSON-RPC-anslutningar</translation> </message> <message> - <location line="-70"/> + <location line="-71"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>TillÃ¥t JSON-RPC-anslutningar frÃ¥n specifika IP-adresser</translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>Skicka kommandon till klient pÃ¥ <ip> (förvalt: 127.0.0.1)</translation> </message> <message> - <location line="-132"/> + <location line="-133"/> <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="+161"/> + <location line="+163"/> <source>Upgrade wallet to latest format</source> <translation>Uppgradera plÃ¥nboken till senaste formatet</translation> </message> <message> - <location line="-24"/> + <location line="-25"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Sätt storleken pÃ¥ nyckelpoolen till <n> (förvalt: 100)</translation> </message> @@ -3885,12 +3952,12 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>Sök i blockkedjan efter saknade plÃ¥nboks transaktioner</translation> </message> <message> - <location line="+38"/> + <location line="+39"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Använd OpenSSL (https) för JSON-RPC-anslutningar</translation> </message> <message> - <location line="-30"/> + <location line="-31"/> <source>Server certificate file (default: server.cert)</source> <translation>Serverns certifikatfil (förvalt: server.cert)</translation> </message> @@ -3900,7 +3967,7 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>Serverns privata nyckel (förvalt: server.pem)</translation> </message> <message> - <location line="+16"/> + <location line="+17"/> <source>This help message</source> <translation>Det här hjälp medelandet</translation> </message> @@ -3910,12 +3977,12 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>Det gÃ¥r inte att binda till %s pÃ¥ den här datorn (bind returnerade felmeddelande %d, %s)</translation> </message> <message> - <location line="-107"/> + <location line="-109"/> <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="+60"/> + <location line="+61"/> <source>Loading addresses...</source> <translation>Laddar adresser...</translation> </message> @@ -3930,12 +3997,12 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>Fel vid inläsningen av wallet.dat: PlÃ¥nboken kräver en senare version av Bitcoin</translation> </message> <message> - <location line="+98"/> + <location line="+99"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>PlÃ¥nboken behöver skrivas om: Starta om Bitcoin för att färdigställa</translation> </message> <message> - <location line="-100"/> + <location line="-101"/> <source>Error loading wallet.dat</source> <translation>Fel vid inläsning av plÃ¥nboksfilen wallet.dat</translation> </message> @@ -3945,7 +4012,7 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>Ogiltig -proxy adress: '%s'</translation> </message> <message> - <location line="+56"/> + <location line="+57"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Okänt nätverk som anges i -onlynet: '%s'</translation> </message> @@ -3955,7 +4022,7 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>Okänd -socks proxy version begärd: %i</translation> </message> <message> - <location line="-101"/> + <location line="-103"/> <source>Cannot resolve -bind address: '%s'</source> <translation>Kan inte matcha -bind adress: '%s'</translation> </message> @@ -3965,7 +4032,7 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>Kan inte matcha -externalip adress: '%s'</translation> </message> <message> - <location line="+48"/> + <location line="+49"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>Ogiltigt belopp för -paytxfee=<belopp>:'%s'</translation> </message> @@ -3985,7 +4052,7 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>Laddar blockindex...</translation> </message> <message> - <location line="-62"/> + <location line="-63"/> <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> @@ -3995,12 +4062,12 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>Det gÃ¥r inte att binda till %s pÃ¥ den här datorn. Bitcoin är förmodligen redan igÃ¥ng.</translation> </message> <message> - <location line="+95"/> + <location line="+96"/> <source>Loading wallet...</source> <translation>Laddar plÃ¥nbok...</translation> </message> <message> - <location line="-56"/> + <location line="-57"/> <source>Cannot downgrade wallet</source> <translation>Kan inte nedgradera plÃ¥nboken</translation> </message> @@ -4010,7 +4077,7 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>Kan inte skriva standardadress</translation> </message> <message> - <location line="+67"/> + <location line="+68"/> <source>Rescanning...</source> <translation>Söker igen...</translation> </message> @@ -4020,17 +4087,17 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>Klar med laddning</translation> </message> <message> - <location line="+85"/> + <location line="+86"/> <source>To use the %s option</source> <translation>Att använda %s alternativet</translation> </message> <message> - <location line="-77"/> + <location line="-78"/> <source>Error</source> <translation>Fel</translation> </message> <message> - <location line="-35"/> + <location line="-36"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_th_TH.ts b/src/qt/locale/bitcoin_th_TH.ts index 9ddaf0ead7..539f820256 100644 --- a/src/qt/locale/bitcoin_th_TH.ts +++ b/src/qt/locale/bitcoin_th_TH.ts @@ -31,6 +31,12 @@ This product includes software developed by the OpenSSL Project for use in the O <source>The Bitcoin Core developers</source> <translation type="unfinished"/> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source> (%1-bit)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>AddressBookPage</name> @@ -612,6 +618,16 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation type="unfinished"><numerusform></numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation type="unfinished"/> @@ -681,7 +697,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+435"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -742,7 +758,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation type="unfinished"/> </message> @@ -757,7 +773,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation type="unfinished"/> </message> @@ -908,7 +924,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation type="unfinished"/> </message> @@ -1090,7 +1106,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation type="unfinished"/> </message> @@ -1234,7 +1250,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+122"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation type="unfinished"/> </message> @@ -1244,7 +1260,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="-131"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation type="unfinished"/> </message> @@ -1259,12 +1275,7 @@ Address: %4 <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"/> + <location line="+16"/> <source>MB</source> <translation type="unfinished"/> </message> @@ -1279,7 +1290,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+58"/> + <location line="+107"/> + <source>&Spend unconfirmed change (experts only)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+37"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation type="unfinished"/> </message> @@ -1314,7 +1330,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="-86"/> + <source>W&allet</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+52"/> + <source>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.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+40"/> <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> @@ -1429,17 +1455,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+70"/> <source>default</source> <translation type="unfinished"/> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation type="unfinished"/> </message> <message> - <location line="+75"/> + <location line="+78"/> <source>Confirm options reset</source> <translation type="unfinished"/> </message> @@ -1479,18 +1505,13 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-155"/> - <source>Unconfirmed:</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation type="unfinished"/> </message> <message> <location line="+51"/> - <source>Confirmed:</source> + <source>Available:</source> <translation type="unfinished"/> </message> <message> @@ -1499,7 +1520,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation type="unfinished"/> </message> @@ -1647,6 +1673,11 @@ Address: %4 <source>Error: Invalid combination of -regtest and -testnet.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../guiutil.cpp" line="+82"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>QRImageWidget</name> @@ -1867,22 +1898,22 @@ Address: %4 <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+83"/> + <location filename="../forms/receivecoinsdialog.ui" line="+107"/> <source>&Amount:</source> <translation type="unfinished"/> </message> <message> - <location line="-13"/> + <location line="-16"/> <source>&Label:</source> <translation type="unfinished"/> </message> <message> - <location line="-34"/> + <location line="-37"/> <source>&Message:</source> <translation type="unfinished"/> </message> <message> - <location line="-17"/> + <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"/> </message> @@ -1892,27 +1923,30 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+27"/> - <source>An optional 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"/> </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> + <location line="-7"/> + <location line="+21"/> + <source>An optional label to associate with the new receiving address.</source> <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="-7"/> <source>Use this form to request payments. All fields are <b>optional</b>.</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <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"/> </message> <message> - <location line="+17"/> + <location line="+32"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -1922,17 +1956,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+36"/> - <source>&Request payment</source> + <location line="+78"/> + <source>Requested payments history</source> <translation type="unfinished"/> </message> <message> - <location line="+47"/> - <source>Requested payments</source> + <location line="-98"/> + <source>&Request payment</source> <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+120"/> <source>Show the selected request (does the same as double clicking an entry)</source> <translation type="unfinished"/> </message> @@ -1951,6 +1985,21 @@ Address: %4 <source>Remove</source> <translation type="unfinished"/> </message> + <message> + <location filename="../receivecoinsdialog.cpp" line="+38"/> + <source>Copy label</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy message</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation type="unfinished"/> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -2052,12 +2101,17 @@ Address: %4 <source>(no message)</source> <translation type="unfinished"/> </message> + <message> + <location line="+8"/> + <source>(no amount)</source> + <translation type="unfinished"/> + </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 type="unfinished"/> @@ -2133,7 +2187,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+115"/> + <location line="+164"/> <source>Send to multiple recipients at once</source> <translation type="unfinished"/> </message> @@ -2143,7 +2197,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+20"/> + <location line="-23"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -2153,12 +2207,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+22"/> + <location line="+52"/> <source>Balance:</source> <translation type="unfinished"/> </message> <message> - <location line="+41"/> + <location line="-78"/> <source>Confirm the send action</source> <translation type="unfinished"/> </message> @@ -2168,7 +2222,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-228"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation type="unfinished"/> </message> @@ -2181,12 +2235,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-136"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+15"/> + <location line="-121"/> <source>Copy quantity</source> <translation type="unfinished"/> </message> @@ -2236,7 +2285,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+202"/> + <location line="+203"/> <source>The recipient address is not valid, please recheck.</source> <translation type="unfinished"/> </message> @@ -2271,12 +2320,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Warning: Invalid Bitcoin address</source> <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+20"/> <source>(no label)</source> <translation>(ไม่มีชื่à¸)</translation> </message> @@ -2286,7 +2335,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-366"/> + <location line="-367"/> <source>Are you sure you want to send?</source> <translation type="unfinished"/> </message> @@ -2296,7 +2345,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+170"/> + <location line="+171"/> <source>Payment request expired</source> <translation type="unfinished"/> </message> @@ -2373,12 +2422,7 @@ Address: %4 <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"/> + <location line="+968"/> <source>This is a verified payment request.</source> <translation type="unfinished"/> </message> @@ -2388,7 +2432,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+459"/> + <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"/> + </message> + <message> + <location line="+426"/> <source>This is an unverified payment request.</source> <translation type="unfinished"/> </message> @@ -2404,11 +2453,6 @@ Address: %4 <source>Memo:</source> <translation type="unfinished"/> </message> - <message> - <location filename="../sendcoinsentry.cpp" line="+1"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"/> - </message> </context> <context> <name>ShutdownWindow</name> @@ -2446,19 +2490,19 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+10"/> - <location line="+213"/> + <location line="+7"/> + <location line="+210"/> <source>Choose previously used address</source> <translation type="unfinished"/> </message> <message> - <location line="-203"/> - <location line="+213"/> + <location line="-200"/> + <location line="+210"/> <source>Alt+A</source> <translation type="unfinished"/> </message> <message> - <location line="-203"/> + <location line="-200"/> <source>Paste address from clipboard</source> <translation type="unfinished"/> </message> @@ -2499,12 +2543,12 @@ Address: %4 </message> <message> <location line="+3"/> - <location line="+146"/> + <location line="+143"/> <source>Clear &All</source> <translation type="unfinished"/> </message> <message> - <location line="-87"/> + <location line="-84"/> <source>&Verify Message</source> <translation type="unfinished"/> </message> @@ -2519,7 +2563,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+40"/> + <location line="+37"/> <source>Verify the message to ensure it was signed with the specified Bitcoin address</source> <translation type="unfinished"/> </message> @@ -2534,43 +2578,37 @@ Address: %4 <translation type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location line="-2"/> + <location line="-1"/> <source>Click "Sign Message" to generate signature</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Enter Bitcoin signature</source> - <translation type="unfinished"/> - </message> - <message> <location line="+84"/> - <location line="+81"/> + <location line="+80"/> <source>The entered address is invalid.</source> <translation type="unfinished"/> </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 type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location line="-73"/> + <location line="-72"/> <source>Wallet unlock was cancelled.</source> <translation type="unfinished"/> </message> @@ -2590,7 +2628,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+59"/> + <location line="+58"/> <source>The signature could not be decoded.</source> <translation type="unfinished"/> </message> @@ -2651,6 +2689,11 @@ Address: %4 </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation type="unfinished"/> </message> @@ -2812,12 +2855,12 @@ Address: %4 <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation type="unfinished"/> </message> @@ -2858,12 +2901,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform></translation> </message> @@ -2873,33 +2916,42 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> + <location line="+12"/> + <source>Confirmed (%1 confirmations)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+9"/> + <source>This block was not received by any other nodes and will probably not be accepted!</source> <translation type="unfinished"/> </message> <message> <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> + <source>Generated but not accepted</source> <translation type="unfinished"/> </message> <message> - <location line="-22"/> - <location line="+25"/> - <source>Confirmed (%1 confirmations)</source> + <location line="-21"/> + <source>Offline</source> <translation type="unfinished"/> </message> <message> - <location line="-22"/> - <source>This block was not received by any other nodes and will probably not be accepted!</source> + <location line="+3"/> + <source>Unconfirmed</source> <translation type="unfinished"/> </message> <message> <location line="+3"/> - <source>Generated but not accepted</source> + <source>Confirming (%1 of %2 recommended confirmations)</source> <translation type="unfinished"/> </message> <message> - <location line="+62"/> + <location line="+6"/> + <source>Conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation type="unfinished"/> </message> @@ -2929,7 +2981,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation type="unfinished"/> </message> @@ -3195,12 +3247,12 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+223"/> <source>Usage:</source> <translation type="unfinished"/> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>List commands</source> <translation type="unfinished"/> </message> @@ -3255,12 +3307,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation type="unfinished"/> </message> <message> - <location line="-148"/> + <location line="-150"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"/> </message> @@ -3280,17 +3332,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Run in the background as a daemon and accept commands</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <location line="+40"/> <source>Use the test network</source> <translation type="unfinished"/> </message> <message> - <location line="-118"/> + <location line="-120"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> @@ -3421,6 +3473,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation type="unfinished"/> </message> @@ -3631,6 +3688,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Start Bitcoin server</source> <translation type="unfinished"/> </message> @@ -3680,12 +3742,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-79"/> + <location line="-80"/> <source>Imports blocks from external blk000??.dat file</source> <translation type="unfinished"/> </message> <message> - <location line="-105"/> + <location line="-106"/> <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> @@ -3705,7 +3767,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+89"/> + <location line="+90"/> <source>Information</source> <translation type="unfinished"/> </message> @@ -3775,7 +3837,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+7"/> <source>System error: </source> <translation type="unfinished"/> </message> @@ -3821,6 +3883,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>version</source> <translation type="unfinished"/> </message> @@ -3830,32 +3897,32 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-58"/> + <location line="-60"/> <source>Password for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-70"/> + <location line="-71"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation type="unfinished"/> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+161"/> + <location line="+163"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"/> </message> <message> - <location line="-24"/> + <location line="-25"/> <source>Set key pool size to <n> (default: 100)</source> <translation type="unfinished"/> </message> @@ -3865,12 +3932,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+38"/> + <location line="+39"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-30"/> + <location line="-31"/> <source>Server certificate file (default: server.cert)</source> <translation type="unfinished"/> </message> @@ -3880,7 +3947,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+17"/> <source>This help message</source> <translation type="unfinished"/> </message> @@ -3890,12 +3957,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-107"/> + <location line="-109"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation type="unfinished"/> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Loading addresses...</source> <translation type="unfinished"/> </message> @@ -3910,12 +3977,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+98"/> + <location line="+99"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation type="unfinished"/> </message> <message> - <location line="-100"/> + <location line="-101"/> <source>Error loading wallet.dat</source> <translation type="unfinished"/> </message> @@ -3925,7 +3992,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+56"/> + <location line="+57"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation type="unfinished"/> </message> @@ -3935,7 +4002,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-101"/> + <location line="-103"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -3945,7 +4012,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+48"/> + <location line="+49"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation type="unfinished"/> </message> @@ -3965,7 +4032,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-62"/> + <location line="-63"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"/> </message> @@ -3975,12 +4042,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+95"/> + <location line="+96"/> <source>Loading wallet...</source> <translation type="unfinished"/> </message> <message> - <location line="-56"/> + <location line="-57"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> @@ -3990,7 +4057,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+67"/> + <location line="+68"/> <source>Rescanning...</source> <translation type="unfinished"/> </message> @@ -4000,17 +4067,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+85"/> + <location line="+86"/> <source>To use the %s option</source> <translation type="unfinished"/> </message> <message> - <location line="-77"/> + <location line="-78"/> <source>Error</source> <translation type="unfinished"/> </message> <message> - <location line="-35"/> + <location line="-36"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_tr.ts b/src/qt/locale/bitcoin_tr.ts index 9b17da2b0e..e0576e93d7 100644 --- a/src/qt/locale/bitcoin_tr.ts +++ b/src/qt/locale/bitcoin_tr.ts @@ -36,6 +36,12 @@ This product includes software developed by the OpenSSL Project for use in the O <source>The Bitcoin Core developers</source> <translation>Bitcoin ÇekirdeÄŸi geliÅŸtiricileri</translation> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source> (%1-bit)</source> + <translation> (%1-bit)</translation> + </message> </context> <context> <name>AddressBookPage</name> @@ -617,6 +623,16 @@ This product includes software developed by the OpenSSL Project for use in the O <translation><numerusform>%n hafta</numerusform><numerusform>%n hafta</numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation>%1 geride</translation> @@ -690,7 +706,7 @@ Adres: %4 <translation>Cüzdan <b>ÅŸifrelenmiÅŸtir</b> ve ÅŸu anda <b>kilitlidir</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+435"/> <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> @@ -751,7 +767,7 @@ Adres: %4 <translation>Para üstü:</translation> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation>tümünü seç(me)</translation> </message> @@ -766,7 +782,7 @@ Adres: %4 <translation>Liste kipi</translation> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation>MeblaÄŸ</translation> </message> @@ -917,7 +933,7 @@ Adres: %4 <translation>boÅŸ</translation> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation>Toz</translation> </message> @@ -1099,7 +1115,7 @@ Adres: %4 <translation>Bitcoin ÇekirdeÄŸi - Komut satırı seçenekleri</translation> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation>Bitcoin ÇekirdeÄŸi</translation> </message> @@ -1243,7 +1259,7 @@ Adres: %4 <translation>&Esas ayarlar</translation> </message> <message> - <location line="+6"/> + <location line="+122"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation>Muamelelerin hızlı iÅŸlenmesini garantilemeye yardım eden, seçime dayalı kB başı muamele ücreti. Muamelelerin çoÄŸunluÄŸunun boyutu 1 kB'dir.</translation> </message> @@ -1253,7 +1269,7 @@ Adres: %4 <translation>Muamele ücreti &öde</translation> </message> <message> - <location line="+31"/> + <location line="-131"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation>Sistemde oturum açıldığında Bitcoin'i otomatik olarak baÅŸlat.</translation> </message> @@ -1268,12 +1284,7 @@ Adres: %4 <translation>&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"/> + <location line="+16"/> <source>MB</source> <translation>MB</translation> </message> @@ -1288,7 +1299,12 @@ Adres: %4 <translation>Betik kontrolü iÅŸ parçacığı sayısını belirt (azami 16, 0 = otomatik, <0 = bu sayıda çekirdeÄŸi boÅŸ bırak, varsayılan: 0)</translation> </message> <message> - <location line="+58"/> + <location line="+107"/> + <source>&Spend unconfirmed change (experts only)</source> + <translation>DoÄŸrulanmamış para üstünü &harca (sadece uzman kullanıcılar için)</translation> + </message> + <message> + <location line="+37"/> <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> @@ -1323,7 +1339,17 @@ Adres: %4 <translation>&Åžebeke</translation> </message> <message> - <location line="+6"/> + <location line="-86"/> + <source>W&allet</source> + <translation>&Cüzdan</translation> + </message> + <message> + <location line="+52"/> + <source>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.</source> + <translation>Teyit edilmemiÅŸ para üstünü harcamayı devre dışı bırakırsanız, bir muamelenin para üstü bu muamele için en az bir teyit olana dek harcanamaz. Bu, aynı zamanda bakiyenizin nasıl hesaplandığını da etkiler.</translation> + </message> + <message> + <location line="+40"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>Yönlendiricide Bitcoin istemci portlarını otomatik olarak açar. Bu, sadece yönlendiricinizin UPnP desteÄŸi bulunuyorsa ve etkinse çalışabilir.</translation> </message> @@ -1438,17 +1464,17 @@ Adres: %4 <translation>&Ä°ptal</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+70"/> <source>default</source> <translation>varsayılan</translation> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation>boÅŸ</translation> </message> <message> - <location line="+75"/> + <location line="+78"/> <source>Confirm options reset</source> <translation>Seçeneklerin sıfırlanmasını teyit et</translation> </message> @@ -1488,19 +1514,14 @@ Adres: %4 <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="-155"/> - <source>Unconfirmed:</source> - <translation>DoÄŸrulanmamış:</translation> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation>Cüzdan</translation> </message> <message> <location line="+51"/> - <source>Confirmed:</source> - <translation>Teyit edilmiÅŸ:</translation> + <source>Available:</source> + <translation>Mevcut:</translation> </message> <message> <location line="+16"/> @@ -1508,7 +1529,12 @@ Adres: %4 <translation>Güncel harcanabilir bakiyeniz</translation> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation>Beklemede:</translation> + </message> + <message> + <location line="+16"/> <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> @@ -1656,6 +1682,11 @@ Adres: %4 <source>Error: Invalid combination of -regtest and -testnet.</source> <translation>Hata: -regtest ve -testnet'in geçersiz kombinasyonu.</translation> </message> + <message> + <location filename="../guiutil.cpp" line="+82"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>Bitcoin adresi giriniz (mesela 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> </context> <context> <name>QRImageWidget</name> @@ -1876,22 +1907,22 @@ Adres: %4 <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+83"/> + <location filename="../forms/receivecoinsdialog.ui" line="+107"/> <source>&Amount:</source> <translation>&MeblaÄŸ:</translation> </message> <message> - <location line="-13"/> + <location line="-16"/> <source>&Label:</source> <translation>&Etiket:</translation> </message> <message> - <location line="-34"/> + <location line="-37"/> <source>&Message:</source> <translation>Me&saj:</translation> </message> <message> - <location line="-17"/> + <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>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> @@ -1901,27 +1932,30 @@ Adres: %4 <translation>&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"/> + <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>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"/> + <location line="-7"/> + <location line="+21"/> + <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>Use this form to request payments. All fields are <b>optional</b>.</source> <translation>Ödeme talep etmek için bu formu kullanın. Tüm alanlar <b>seçime dayalıdır</b>.</translation> </message> <message> - <location line="+39"/> + <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>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"/> + <location line="+32"/> <source>Clear all fields of the form.</source> <translation>Formdaki tüm alanları temizle.</translation> </message> @@ -1931,17 +1965,17 @@ Adres: %4 <translation>Temizle</translation> </message> <message> - <location line="+36"/> - <source>&Request payment</source> - <translation>Ödeme &talep et</translation> + <location line="+78"/> + <source>Requested payments history</source> + <translation>Talep edilen ödemelerin tarihçesi</translation> </message> <message> - <location line="+47"/> - <source>Requested payments</source> - <translation>Talep edilen ödemeler</translation> + <location line="-98"/> + <source>&Request payment</source> + <translation>Ödeme &talep et</translation> </message> <message> - <location line="+16"/> + <location line="+120"/> <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> @@ -1960,6 +1994,21 @@ Adres: %4 <source>Remove</source> <translation>Kaldır</translation> </message> + <message> + <location filename="../receivecoinsdialog.cpp" line="+38"/> + <source>Copy label</source> + <translation>Etiketi kopyala</translation> + </message> + <message> + <location line="+1"/> + <source>Copy message</source> + <translation>Mesajı kopyala</translation> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation>Meblağı kopyala</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -2061,12 +2110,17 @@ Adres: %4 <source>(no message)</source> <translation>(boÅŸ mesaj)</translation> </message> + <message> + <location line="+8"/> + <source>(no amount)</source> + <translation>(boÅŸ meblaÄŸ)</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>Bitcoin yolla</translation> @@ -2142,7 +2196,7 @@ Adres: %4 <translation>Özel para üstü adresi</translation> </message> <message> - <location line="+115"/> + <location line="+164"/> <source>Send to multiple recipients at once</source> <translation>Birçok alıcıya aynı anda gönder</translation> </message> @@ -2152,7 +2206,7 @@ Adres: %4 <translation>&Alıcı ekle</translation> </message> <message> - <location line="+20"/> + <location line="-23"/> <source>Clear all fields of the form.</source> <translation>Formdaki tüm alanları temizle.</translation> </message> @@ -2162,12 +2216,12 @@ Adres: %4 <translation>Tümünü &temizle</translation> </message> <message> - <location line="+22"/> + <location line="+52"/> <source>Balance:</source> <translation>Bakiye:</translation> </message> <message> - <location line="+41"/> + <location line="-78"/> <source>Confirm the send action</source> <translation>Yollama etkinliÄŸini teyit ediniz</translation> </message> @@ -2177,7 +2231,7 @@ Adres: %4 <translation>G&önder</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-228"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation>Gönderiyi teyit ediniz</translation> </message> @@ -2190,12 +2244,7 @@ Adres: %4 <translation>%1 öğesinden %2 unsuruna</translation> </message> <message> - <location line="-136"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Bitcoin adresi giriniz (mesela 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> - <message> - <location line="+15"/> + <location line="-121"/> <source>Copy quantity</source> <translation>Miktarı kopyala</translation> </message> @@ -2245,7 +2294,7 @@ Adres: %4 <translation>veya</translation> </message> <message> - <location line="+202"/> + <location line="+203"/> <source>The recipient address is not valid, please recheck.</source> <translation>Alıcı adresi geçerli deÄŸildir, lütfen denetleyiniz.</translation> </message> @@ -2280,12 +2329,12 @@ Adres: %4 <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="+112"/> + <location line="+113"/> <source>Warning: Invalid Bitcoin address</source> <translation>Uyarı: geçersiz Bitcoin adresi</translation> </message> <message> - <location line="+21"/> + <location line="+20"/> <source>(no label)</source> <translation>(boÅŸ etiket)</translation> </message> @@ -2295,7 +2344,7 @@ Adres: %4 <translation>Uyarı: geçersiz para üstü adresi</translation> </message> <message> - <location line="-366"/> + <location line="-367"/> <source>Are you sure you want to send?</source> <translation>Göndermek istediÄŸinizden emin misiniz?</translation> </message> @@ -2305,7 +2354,7 @@ Adres: %4 <translation>muamele ücreti olarak eklendi</translation> </message> <message> - <location line="+170"/> + <location line="+171"/> <source>Payment request expired</source> <translation>Ödeme talebinin ömrü doldu</translation> </message> @@ -2382,12 +2431,7 @@ Adres: %4 <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'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"/> + <location line="+968"/> <source>This is a verified payment request.</source> <translation>Bu, teyit edilmiÅŸ bir ödeme talebidir.</translation> </message> @@ -2397,7 +2441,12 @@ Adres: %4 <translation>Kullanılmış adres listesine eklemek için bu adrese bir etiket girin</translation> </message> <message> - <location line="+459"/> + <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>Bitcoin: URI'siyle iliÅŸkili ve bilginiz için muameleyle saklanacak bir mesaj. Not: Bu mesaj Bitcoin ÅŸebekesi üzerinden gönderilmeyecektir.</translation> + </message> + <message> + <location line="+426"/> <source>This is an unverified payment request.</source> <translation>Bu, teyit edilmemiÅŸ bir ödeme talebidir.</translation> </message> @@ -2413,11 +2462,6 @@ Adres: %4 <source>Memo:</source> <translation>Not:</translation> </message> - <message> - <location filename="../sendcoinsentry.cpp" line="+1"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Bitcoin adresi giriniz (mesela 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> </context> <context> <name>ShutdownWindow</name> @@ -2455,19 +2499,19 @@ Adres: %4 <translation>Mesajın imzalanmasında kullanılacak adres (mesela 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location line="+10"/> - <location line="+213"/> + <location line="+7"/> + <location line="+210"/> <source>Choose previously used address</source> <translation>Önceden kullanılmış adres seç</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>Panodan adres yapıştır</translation> </message> @@ -2508,12 +2552,12 @@ Adres: %4 </message> <message> <location line="+3"/> - <location line="+146"/> + <location line="+143"/> <source>Clear &All</source> <translation>Tümünü &temizle</translation> </message> <message> - <location line="-87"/> + <location line="-84"/> <source>&Verify Message</source> <translation>Mesaj &kontrol et</translation> </message> @@ -2528,7 +2572,7 @@ Adres: %4 <translation>Mesajı imzalamak için kullanılmış olan adres (mesela 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>Belirtilen Bitcoin adresi ile imzalandığını doÄŸrulamak için mesajı kontrol et</translation> </message> @@ -2543,43 +2587,37 @@ Adres: %4 <translation>Tüm mesaj kontrolü alanlarını sıfırla</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>Bitcoin adresi giriniz (mesela 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location line="-2"/> + <location line="-1"/> <source>Click "Sign Message" to generate signature</source> <translation>Ä°mzayı oluÅŸturmak için "Mesaj Ä°mzala" unsurunu tıklayın</translation> </message> <message> - <location line="+3"/> - <source>Enter Bitcoin signature</source> - <translation>Bitcoin imzası gir</translation> - </message> - <message> <location line="+84"/> - <location line="+81"/> + <location line="+80"/> <source>The entered address is invalid.</source> <translation>Girilen adres geçersizdir.</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>Adresi kontrol edip tekrar deneyiniz.</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>Girilen adres herhangi bir anahtara iÅŸaret etmemektedir.</translation> </message> <message> - <location line="-73"/> + <location line="-72"/> <source>Wallet unlock was cancelled.</source> <translation>Cüzdan kilidinin açılması iptal edildi.</translation> </message> @@ -2599,7 +2637,7 @@ Adres: %4 <translation>Mesaj imzalandı.</translation> </message> <message> - <location line="+59"/> + <location line="+58"/> <source>The signature could not be decoded.</source> <translation>Ä°mzanın kodu çözülemedi.</translation> </message> @@ -2660,6 +2698,11 @@ Adres: %4 </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation>çakışma</translation> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation>%1/çevrim dışı</translation> </message> @@ -2821,12 +2864,12 @@ Adres: %4 <translation>, henüz baÅŸarılı bir ÅŸekilde yayınlanmadı</translation> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <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> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation>bilinmiyor</translation> </message> @@ -2867,12 +2910,12 @@ Adres: %4 <translation>MeblaÄŸ</translation> </message> <message> - <location line="+59"/> + <location line="+78"/> <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="+16"/> + <location line="-21"/> <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> @@ -2882,23 +2925,12 @@ Adres: %4 <translation>%1 deÄŸerine dek açık</translation> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> - <translation>Çevrimdışı (%1 teyit)</translation> - </message> - <message> - <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation>DoÄŸrulanmadı (%1 (toplam %2 üzerinden) teyit)</translation> - </message> - <message> - <location line="-22"/> - <location line="+25"/> + <location line="+12"/> <source>Confirmed (%1 confirmations)</source> <translation>DoÄŸrulandı (%1 teyit)</translation> </message> <message> - <location line="-22"/> + <location line="+9"/> <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> @@ -2908,7 +2940,27 @@ Adres: %4 <translation>OluÅŸturuldu ama kabul edilmedi</translation> </message> <message> - <location line="+62"/> + <location line="-21"/> + <source>Offline</source> + <translation>Çevrim dışı</translation> + </message> + <message> + <location line="+3"/> + <source>Unconfirmed</source> + <translation>Teyit edilmemiÅŸ</translation> + </message> + <message> + <location line="+3"/> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation>Teyit ediliyor (tavsiye edilen %2 teyit üzerinden %1 doÄŸrulama)</translation> + </message> + <message> + <location line="+6"/> + <source>Conflicted</source> + <translation>Çakışma</translation> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation>Åžununla alındı</translation> </message> @@ -2938,7 +2990,7 @@ Adres: %4 <translation>(mevcut deÄŸil)</translation> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation>Muamele durumu. DoÄŸrulama sayısını görüntülemek için imleci bu alanda tutunuz.</translation> </message> @@ -3204,12 +3256,12 @@ Adres: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+223"/> <source>Usage:</source> <translation>Kullanım:</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>List commands</source> <translation>Komutları listele</translation> </message> @@ -3264,12 +3316,12 @@ Adres: %4 <translation>Kendi genel adresinizi tanımlayın</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <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="-148"/> + <location line="-150"/> <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> @@ -3289,17 +3341,17 @@ Adres: %4 <translation>Konut satırı ve JSON-RPC komutlarını kabul et</translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <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="+39"/> + <location line="+40"/> <source>Use the test network</source> <translation>Deneme ÅŸebekesini kullan</translation> </message> <message> - <location line="-118"/> + <location line="-120"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>Dışarıdan gelen baÄŸlantıları kabul et (varsayılan: -proxy veya -connect yoksa 1)</translation> </message> @@ -3440,6 +3492,11 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com </message> <message> <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation>Cüzdanın muamele listesini temizle (tanı aracı; -rescan ima eder)</translation> + </message> + <message> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation>Sadece belirtilen düğüme veya düğümlere baÄŸlan</translation> </message> @@ -3650,6 +3707,11 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com </message> <message> <location line="+2"/> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation>Gönderme muamelelerinde teyit edilmemiÅŸ para üstünü harca (varsayılan: 1)</translation> + </message> + <message> + <location line="+1"/> <source>Start Bitcoin server</source> <translation>Bitcoin sunucusunu baÅŸlat</translation> </message> @@ -3699,12 +3761,12 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>-txindex'i deÄŸiÅŸtirmek için veritabanını -reindex kullanarak tekrar inÅŸa etmeniz gerekmektedir</translation> </message> <message> - <location line="-79"/> + <location line="-80"/> <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="-105"/> + <location line="-106"/> <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> @@ -3724,7 +3786,7 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Betik kontrolü iÅŸ parçacığı sayısını belirt (azami 16, 0 = otomatik, <0 = bu sayıda çekirdeÄŸi boÅŸ bırak, varsayılan: 0)</translation> </message> <message> - <location line="+89"/> + <location line="+90"/> <source>Information</source> <translation>Bilgi</translation> </message> @@ -3794,7 +3856,7 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>BaÄŸlantı zaman aşım süresini milisaniye olarak belirt (varsayılan: 5000)</translation> </message> <message> - <location line="+6"/> + <location line="+7"/> <source>System error: </source> <translation>Sistem hatası:</translation> </message> @@ -3840,6 +3902,11 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation>Cüzdandaki tüm muameleler kaldırılıyor...</translation> + </message> + <message> + <location line="+1"/> <source>version</source> <translation>sürüm</translation> </message> @@ -3849,32 +3916,32 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>wallet.dat bozuk, geri kazanım baÅŸarısız oldu</translation> </message> <message> - <location line="-58"/> + <location line="-60"/> <source>Password for JSON-RPC connections</source> <translation>JSON-RPC baÄŸlantıları için parola</translation> </message> <message> - <location line="-70"/> + <location line="-71"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Belirtilen Ä°P adresinden JSON-RPC baÄŸlantılarını kabul et</translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>Åžu <ip> adresinde (varsayılan: 127.0.0.1) çalışan düğüme komut yolla</translation> </message> <message> - <location line="-132"/> + <location line="-133"/> <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="+161"/> + <location line="+163"/> <source>Upgrade wallet to latest format</source> <translation>Cüzdanı en yeni biçime güncelle</translation> </message> <message> - <location line="-24"/> + <location line="-25"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Anahtar alan boyutunu <n> deÄŸerine ayarla (varsayılan: 100)</translation> </message> @@ -3884,12 +3951,12 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Blok zincirini eksik cüzdan muameleleri için tekrar tara</translation> </message> <message> - <location line="+38"/> + <location line="+39"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>JSON-RPC baÄŸlantıları için OpenSSL (https) kullan</translation> </message> <message> - <location line="-30"/> + <location line="-31"/> <source>Server certificate file (default: server.cert)</source> <translation>Sunucu sertifika dosyası (varsayılan: server.cert)</translation> </message> @@ -3899,7 +3966,7 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Sunucu özel anahtarı (varsayılan: server.pem)</translation> </message> <message> - <location line="+16"/> + <location line="+17"/> <source>This help message</source> <translation>Bu yardım mesajı</translation> </message> @@ -3909,12 +3976,12 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Bu bilgisayarda %s unsuruna baÄŸlanılamadı. (bind ÅŸu hatayı iletti: %d, %s)</translation> </message> <message> - <location line="-107"/> + <location line="-109"/> <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="+60"/> + <location line="+61"/> <source>Loading addresses...</source> <translation>Adresler yükleniyor...</translation> </message> @@ -3929,12 +3996,12 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>wallet.dat dosyasının yüklenmesinde hata oluÅŸtu: cüzdanın daha yeni bir Bitcoin sürümüne ihtiyacı var</translation> </message> <message> - <location line="+98"/> + <location line="+99"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>Cüzdanın tekrar yazılması gerekiyordu: iÅŸlemi tamamlamak için Bitcoin'i yeniden baÅŸlatınız</translation> </message> <message> - <location line="-100"/> + <location line="-101"/> <source>Error loading wallet.dat</source> <translation>wallet.dat dosyasının yüklenmesinde hata oluÅŸtu</translation> </message> @@ -3944,7 +4011,7 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Geçersiz -proxy adresi: '%s'</translation> </message> <message> - <location line="+56"/> + <location line="+57"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>-onlynet için bilinmeyen bir ÅŸebeke belirtildi: '%s'</translation> </message> @@ -3954,7 +4021,7 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Bilinmeyen bir -socks vekil sürümü talep edildi: %i</translation> </message> <message> - <location line="-101"/> + <location line="-103"/> <source>Cannot resolve -bind address: '%s'</source> <translation>-bind adresi çözümlenemedi: '%s'</translation> </message> @@ -3964,7 +4031,7 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>-externalip adresi çözümlenemedi: '%s'</translation> </message> <message> - <location line="+48"/> + <location line="+49"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>-paytxfee=<meblaÄŸ> için geçersiz meblaÄŸ: '%s'</translation> </message> @@ -3984,7 +4051,7 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Blok indeksi yükleniyor...</translation> </message> <message> - <location line="-62"/> + <location line="-63"/> <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> @@ -3994,12 +4061,12 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Bu bilgisayarda %s unsuruna baÄŸlanılamadı. Bitcoin muhtemelen hâlihazırda çalışmaktadır.</translation> </message> <message> - <location line="+95"/> + <location line="+96"/> <source>Loading wallet...</source> <translation>Cüzdan yükleniyor...</translation> </message> <message> - <location line="-56"/> + <location line="-57"/> <source>Cannot downgrade wallet</source> <translation>Cüzdan eski biçime geri alınamaz</translation> </message> @@ -4009,7 +4076,7 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Varsayılan adres yazılamadı</translation> </message> <message> - <location line="+67"/> + <location line="+68"/> <source>Rescanning...</source> <translation>Yeniden tarama...</translation> </message> @@ -4019,17 +4086,17 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Yükleme tamamlandı</translation> </message> <message> - <location line="+85"/> + <location line="+86"/> <source>To use the %s option</source> <translation>%s seçeneÄŸini kullanmak için</translation> </message> <message> - <location line="-77"/> + <location line="-78"/> <source>Error</source> <translation>Hata</translation> </message> <message> - <location line="-35"/> + <location line="-36"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_uk.ts b/src/qt/locale/bitcoin_uk.ts index a52245ea73..2ec9f7398b 100644 --- a/src/qt/locale/bitcoin_uk.ts +++ b/src/qt/locale/bitcoin_uk.ts @@ -36,6 +36,12 @@ This product includes software developed by the OpenSSL Project for use in the O <source>The Bitcoin Core developers</source> <translation type="unfinished"/> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source> (%1-bit)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>AddressBookPage</name> @@ -617,6 +623,16 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation type="unfinished"/> @@ -690,7 +706,7 @@ Address: %4 <translation><b>Зашифрований</b> гаманець <b>заблоковано</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+435"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>СталаÑÑ Ñ„Ð°Ñ‚Ð°Ð»ÑŒÐ½Ð° помилка. Bitcoin більше не може продовжувати безпечно Ñ– піде.</translation> </message> @@ -751,7 +767,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation type="unfinished"/> </message> @@ -766,7 +782,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation>КількіÑÑ‚ÑŒ</translation> </message> @@ -917,7 +933,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation type="unfinished"/> </message> @@ -1099,7 +1115,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation>Bitcoin Ядро</translation> </message> @@ -1243,7 +1259,7 @@ Address: %4 <translation>&Головні</translation> </message> <message> - <location line="+6"/> + <location line="+122"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation>Оплата додаткових транзакцій за Кб, що допомагає переконатиÑÑ, що ваші транзакції оброблÑÑŽÑ‚ÑŒÑÑ ÑˆÐ²Ð¸Ð´ÐºÐ¾. Велика чаÑтина операцій проводитьÑÑ 1 Кб.</translation> </message> @@ -1253,7 +1269,7 @@ Address: %4 <translation>Заплатити коміÑÑ–&ÑŽ</translation> </message> <message> - <location line="+31"/> + <location line="-131"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation>Ðвтоматично запуÑкати гаманець при вході до ÑиÑтеми.</translation> </message> @@ -1268,12 +1284,7 @@ Address: %4 <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"/> + <location line="+16"/> <source>MB</source> <translation type="unfinished"/> </message> @@ -1288,7 +1299,12 @@ Address: %4 <translation>Ð’Ñтановіть кількіÑÑ‚ÑŒ перевірки Ñкрипт потоків (до 16, 0 = авто, <0 = залишити, що багато Ñердечники безкоштовно, за замовчуваннÑм: 0)</translation> </message> <message> - <location line="+58"/> + <location line="+107"/> + <source>&Spend unconfirmed change (experts only)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+37"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation type="unfinished"/> </message> @@ -1323,7 +1339,17 @@ Address: %4 <translation>&Мережа</translation> </message> <message> - <location line="+6"/> + <location line="-86"/> + <source>W&allet</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+52"/> + <source>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.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+40"/> <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> @@ -1438,17 +1464,17 @@ Address: %4 <translation>&СкаÑувати</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+70"/> <source>default</source> <translation>типово</translation> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation type="unfinished"/> </message> <message> - <location line="+75"/> + <location line="+78"/> <source>Confirm options reset</source> <translation>ÐŸÑ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½Ñ ÑÐºÐ¸Ð´Ð°Ð½Ð½Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ–Ð²</translation> </message> @@ -1488,19 +1514,14 @@ Address: %4 <translation>Показана Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ Ð²Ð¶Ðµ може бути заÑтарілою. Ваш гаманець буде автоматично Ñинхронізовано з мережею Bitcoin піÑÐ»Ñ Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð¿Ñ–Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ, але цей Ð¿Ñ€Ð¾Ñ†ÐµÑ Ñ‰Ðµ не завершено.</translation> </message> <message> - <location line="-155"/> - <source>Unconfirmed:</source> - <translation>Ðепідтверджені:</translation> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation>Гаманець</translation> </message> <message> <location line="+51"/> - <source>Confirmed:</source> - <translation>підтверджено:</translation> + <source>Available:</source> + <translation type="unfinished"/> </message> <message> <location line="+16"/> @@ -1508,7 +1529,12 @@ Address: %4 <translation>Ваш поточний Ð±Ð°Ð»Ð°Ð½Ñ Ñ€Ð°Ñходуемого</translation> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation>Ð’Ñього угод, Ñкі ще мають бути підтверджені, Ñ– до цих пір не враховуютьÑÑ Ð² раÑходуемого баланÑу</translation> </message> @@ -1656,6 +1682,11 @@ Address: %4 <source>Error: Invalid combination of -regtest and -testnet.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../guiutil.cpp" line="+82"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>Введіть адреÑу Bitcoin (наприклад 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> </context> <context> <name>QRImageWidget</name> @@ -1876,22 +1907,22 @@ Address: %4 <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+83"/> + <location filename="../forms/receivecoinsdialog.ui" line="+107"/> <source>&Amount:</source> <translation>&КількіÑÑ‚ÑŒ:</translation> </message> <message> - <location line="-13"/> + <location line="-16"/> <source>&Label:</source> <translation>&Мітка:</translation> </message> <message> - <location line="-34"/> + <location line="-37"/> <source>&Message:</source> <translation>&ПовідомленнÑ:</translation> </message> <message> - <location line="-17"/> + <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"/> </message> @@ -1901,27 +1932,30 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+27"/> - <source>An optional 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"/> </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> + <location line="-7"/> + <location line="+21"/> + <source>An optional label to associate with the new receiving address.</source> <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="-7"/> <source>Use this form to request payments. All fields are <b>optional</b>.</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <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"/> </message> <message> - <location line="+17"/> + <location line="+32"/> <source>Clear all fields of the form.</source> <translation>ОчиÑтити вÑÑ– Ð¿Ð¾Ð»Ñ Ð² формі</translation> </message> @@ -1931,17 +1965,17 @@ Address: %4 <translation>ОчиÑтити</translation> </message> <message> - <location line="+36"/> - <source>&Request payment</source> + <location line="+78"/> + <source>Requested payments history</source> <translation type="unfinished"/> </message> <message> - <location line="+47"/> - <source>Requested payments</source> + <location line="-98"/> + <source>&Request payment</source> <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+120"/> <source>Show the selected request (does the same as double clicking an entry)</source> <translation type="unfinished"/> </message> @@ -1960,6 +1994,21 @@ Address: %4 <source>Remove</source> <translation type="unfinished"/> </message> + <message> + <location filename="../receivecoinsdialog.cpp" line="+38"/> + <source>Copy label</source> + <translation>Скопіювати мітку</translation> + </message> + <message> + <location line="+1"/> + <source>Copy message</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation>Копіювати кількіÑÑ‚ÑŒ</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -2061,12 +2110,17 @@ Address: %4 <source>(no message)</source> <translation type="unfinished"/> </message> + <message> + <location line="+8"/> + <source>(no amount)</source> + <translation type="unfinished"/> + </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>Відправити</translation> @@ -2142,7 +2196,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+115"/> + <location line="+164"/> <source>Send to multiple recipients at once</source> <translation>Відправити на декілька адреÑ</translation> </message> @@ -2152,7 +2206,7 @@ Address: %4 <translation>Дод&ати одержувача</translation> </message> <message> - <location line="+20"/> + <location line="-23"/> <source>Clear all fields of the form.</source> <translation>ОчиÑтити вÑÑ– Ð¿Ð¾Ð»Ñ Ð² формі</translation> </message> @@ -2162,12 +2216,12 @@ Address: %4 <translation>ОчиÑтити &вÑе</translation> </message> <message> - <location line="+22"/> + <location line="+52"/> <source>Balance:</source> <translation>БаланÑ:</translation> </message> <message> - <location line="+41"/> + <location line="-78"/> <source>Confirm the send action</source> <translation>Підтвердити відправленнÑ</translation> </message> @@ -2177,7 +2231,7 @@ Address: %4 <translation>&Відправити</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-228"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation>Підтвердіть відправленнÑ</translation> </message> @@ -2190,12 +2244,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-136"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Введіть адреÑу Bitcoin (наприклад 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> - <message> - <location line="+15"/> + <location line="-121"/> <source>Copy quantity</source> <translation type="unfinished"/> </message> @@ -2245,7 +2294,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+202"/> + <location line="+203"/> <source>The recipient address is not valid, please recheck.</source> <translation>ÐдреÑа отримувача невірна, будь лаÑка перепровірте.</translation> </message> @@ -2280,12 +2329,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Warning: Invalid Bitcoin address</source> <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+20"/> <source>(no label)</source> <translation>(немає назви)</translation> </message> @@ -2295,7 +2344,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-366"/> + <location line="-367"/> <source>Are you sure you want to send?</source> <translation>Ви впевнені, що хочете відправити?</translation> </message> @@ -2305,7 +2354,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+170"/> + <location line="+171"/> <source>Payment request expired</source> <translation type="unfinished"/> </message> @@ -2382,12 +2431,7 @@ Address: %4 <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"/> + <location line="+968"/> <source>This is a verified payment request.</source> <translation type="unfinished"/> </message> @@ -2397,7 +2441,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+459"/> + <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"/> + </message> + <message> + <location line="+426"/> <source>This is an unverified payment request.</source> <translation type="unfinished"/> </message> @@ -2413,11 +2462,6 @@ Address: %4 <source>Memo:</source> <translation>Ðотатка:</translation> </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> @@ -2455,19 +2499,19 @@ Address: %4 <translation>Введіть адреÑу Bitcoin (наприклад 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location line="+10"/> - <location line="+213"/> + <location line="+7"/> + <location line="+210"/> <source>Choose previously used address</source> <translation>Обрати ранiш викориÑтовувану адреÑу</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>Ð’Ñтавити адреÑу</translation> </message> @@ -2508,12 +2552,12 @@ Address: %4 </message> <message> <location line="+3"/> - <location line="+146"/> + <location line="+143"/> <source>Clear &All</source> <translation>ОчиÑтити &вÑе</translation> </message> <message> - <location line="-87"/> + <location line="-84"/> <source>&Verify Message</source> <translation>Перевірити повідомленнÑ</translation> </message> @@ -2528,7 +2572,7 @@ Address: %4 <translation>Введіть адреÑу Bitcoin (наприклад 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>Перевірте Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð´Ð»Ñ Ð²Ð¿ÐµÐ²Ð½ÐµÐ½Ð¾ÑÑ‚Ñ–, що воно підпиÑано вказаною Bitcoin-адреÑою</translation> </message> @@ -2543,43 +2587,37 @@ Address: %4 <translation>Скинути вÑÑ– Ð¿Ð¾Ð»Ñ Ð¿ÐµÑ€ÐµÐ²Ñ–Ñ€ÐºÐ¸ повідомленнÑ</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>Введіть адреÑу Bitcoin (наприклад 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location line="-2"/> + <location line="-1"/> <source>Click "Sign Message" to generate signature</source> <translation>ÐатиÑніть кнопку «ПідпиÑати повідомленнÑ», Ð´Ð»Ñ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ð¿Ñ–Ð´Ð¿Ð¸Ñу</translation> </message> <message> - <location line="+3"/> - <source>Enter Bitcoin signature</source> - <translation>Введіть Ñигнатуру Bitcoin</translation> - </message> - <message> <location line="+84"/> - <location line="+81"/> + <location line="+80"/> <source>The entered address is invalid.</source> <translation>Введена нечинна адреÑа.</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>Будь лаÑка, перевірте адреÑу та Ñпробуйте ще.</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>Введений адреÑа не відноÑитьÑÑ Ð´Ð¾ ключа.</translation> </message> <message> - <location line="-73"/> + <location line="-72"/> <source>Wallet unlock was cancelled.</source> <translation>Ð Ð¾Ð·Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð“Ð°Ð¼Ð°Ð½ÐµÑ†ÑŒ був ÑкаÑований.</translation> </message> @@ -2599,7 +2637,7 @@ Address: %4 <translation>ÐŸÐ¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ñ–Ð´Ð¿Ð¸Ñано.</translation> </message> <message> - <location line="+59"/> + <location line="+58"/> <source>The signature could not be decoded.</source> <translation>ÐŸÑ–Ð´Ð¿Ð¸Ñ Ð½Ðµ можливо декодувати.</translation> </message> @@ -2660,6 +2698,11 @@ Address: %4 </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation>%1/поза інтернетом</translation> </message> @@ -2821,12 +2864,12 @@ Address: %4 <translation>, ще не було уÑпішно розіÑлано</translation> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation>невідомий</translation> </message> @@ -2867,12 +2910,12 @@ Address: %4 <translation>КількіÑÑ‚ÑŒ</translation> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> @@ -2882,23 +2925,12 @@ Address: %4 <translation>Відкрити до %1</translation> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> - <translation>Поза інтернетом (%1 підтверджень)</translation> - </message> - <message> - <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation>Ðепідтверджено (%1 із %2 підтверджень)</translation> - </message> - <message> - <location line="-22"/> - <location line="+25"/> + <location line="+12"/> <source>Confirmed (%1 confirmations)</source> <translation>Підтверджено (%1 підтверджень)</translation> </message> <message> - <location line="-22"/> + <location line="+9"/> <source>This block was not received by any other nodes and will probably not be accepted!</source> <translation>Цей блок не був отриманий жодними іншими вузлами Ñ–, ймовірно, не буде прийнÑтий!</translation> </message> @@ -2908,7 +2940,27 @@ Address: %4 <translation>Згенеровано, але не підтверджено</translation> </message> <message> - <location line="+62"/> + <location line="-21"/> + <source>Offline</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Unconfirmed</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation>Отримано</translation> </message> @@ -2938,7 +2990,7 @@ Address: %4 <translation>(недоÑтупно)</translation> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation>Ð¡Ñ‚Ð°Ñ‚ÑƒÑ Ñ‚Ñ€Ð°Ð½Ð·Ð°ÐºÑ†Ñ–Ñ—. Ðаведіть вказівник на це поле, щоб показати кількіÑÑ‚ÑŒ підтверджень.</translation> </message> @@ -3204,12 +3256,12 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+223"/> <source>Usage:</source> <translation>ВикориÑтаннÑ:</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>List commands</source> <translation>СпиÑок команд</translation> </message> @@ -3264,12 +3316,12 @@ Address: %4 <translation>Вкажіть вашу влаÑну публічну адреÑу</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation>Поріг Ð²Ñ–Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¾ під'єднаних пірів (типово: 100)</translation> </message> <message> - <location line="-148"/> + <location line="-150"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>МакÑимальній розмір вхідного буферу на одне з'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ (типово: 86400)</translation> </message> @@ -3289,17 +3341,17 @@ Address: %4 <translation>Приймати команди із командного Ñ€Ñдка та команди JSON-RPC</translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Run in the background as a daemon and accept commands</source> <translation>ЗапуÑтити в фоновому режимі (Ñк демон) та приймати команди</translation> </message> <message> - <location line="+39"/> + <location line="+40"/> <source>Use the test network</source> <translation>ВикориÑтовувати теÑтову мережу</translation> </message> <message> - <location line="-118"/> + <location line="-120"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>Приймати з'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð·Ð·Ð¾Ð²Ð½Ñ– (за замовчуваннÑм: 1, Ñкщо ні-прокÑÑ– або-з'єднаннÑ)</translation> </message> @@ -3430,6 +3482,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation>ПідключитиÑÑŒ лише до вказаного вузла</translation> </message> @@ -3640,6 +3697,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Start Bitcoin server</source> <translation>ЗапуÑтити Ñервер Біткойну</translation> </message> @@ -3689,12 +3751,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-79"/> + <location line="-80"/> <source>Imports blocks from external blk000??.dat file</source> <translation>Імпорт блоків з зовнішнього файлу blk000??.dat</translation> </message> <message> - <location line="-105"/> + <location line="-106"/> <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> @@ -3714,7 +3776,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Ð’Ñтановіть кількіÑÑ‚ÑŒ перевірки Ñкрипт потоків (до 16, 0 = авто, <0 = залишити, що багато Ñердечники безкоштовно, за замовчуваннÑм: 0)</translation> </message> <message> - <location line="+89"/> + <location line="+90"/> <source>Information</source> <translation>ІнформаціÑ</translation> </message> @@ -3784,7 +3846,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Вказати тайм-аут Ð¿Ñ–Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ Ñƒ міліÑекундах (типово: 5000)</translation> </message> <message> - <location line="+6"/> + <location line="+7"/> <source>System error: </source> <translation>СиÑтемна помилка: </translation> </message> @@ -3830,6 +3892,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>version</source> <translation>верÑÑ–Ñ</translation> </message> @@ -3839,32 +3906,32 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>wallet.dat пошкоджено, Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð½Ðµ вдалоÑÑ</translation> </message> <message> - <location line="-58"/> + <location line="-60"/> <source>Password for JSON-RPC connections</source> <translation>Пароль Ð´Ð»Ñ JSON-RPC-з'єднань</translation> </message> <message> - <location line="-70"/> + <location line="-71"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Дозволити JSON-RPC-з'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð· вказаної IP-адреÑи</translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>ВідправлÑти команди на вузол, запущений на <ip> (типово: 127.0.0.1)</translation> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>Виконати команду, коли з'ÑвитьÑÑ Ð½Ð¾Ð²Ð¸Ð¹ блок (%s в команді змінюєтьÑÑ Ð½Ð° хеш блоку)</translation> </message> <message> - <location line="+161"/> + <location line="+163"/> <source>Upgrade wallet to latest format</source> <translation>Модернізувати гаманець до оÑтаннього формату</translation> </message> <message> - <location line="-24"/> + <location line="-25"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Ð’Ñтановити розмір пулу ключів <n> (типово: 100)</translation> </message> @@ -3874,12 +3941,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>ПереÑканувати ланцюжок блоків, в пошуку втрачених транзакцій</translation> </message> <message> - <location line="+38"/> + <location line="+39"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>ВикориÑтовувати OpenSSL (https) Ð´Ð»Ñ JSON-RPC-з'єднань</translation> </message> <message> - <location line="-30"/> + <location line="-31"/> <source>Server certificate file (default: server.cert)</source> <translation>Файл Ñертифіката Ñервера (типово: server.cert)</translation> </message> @@ -3889,7 +3956,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Закритий ключ Ñервера (типово: server.pem)</translation> </message> <message> - <location line="+16"/> + <location line="+17"/> <source>This help message</source> <translation>Дана довідка</translation> </message> @@ -3899,12 +3966,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Ðеможливо прив'Ñзати до порту %s на цьому комп'ютері (bind returned error %d, %s)</translation> </message> <message> - <location line="-107"/> + <location line="-109"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>Дозволити пошук в DNS Ð´Ð»Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´ -addnode, -seednode та -connect</translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Loading addresses...</source> <translation>Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð°Ð´Ñ€ÐµÑ...</translation> </message> @@ -3919,12 +3986,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Помилка при завантаженні wallet.dat: Гаманець потребує новішої верÑÑ–Ñ— Біткоін-клієнта</translation> </message> <message> - <location line="+98"/> + <location line="+99"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>Потрібно перезапиÑати гаманець: перезапуÑÑ‚Ñ–Ñ‚ÑŒ Біткоін-клієнт Ð´Ð»Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð½Ñ</translation> </message> <message> - <location line="-100"/> + <location line="-101"/> <source>Error loading wallet.dat</source> <translation>Помилка при завантаженні wallet.dat</translation> </message> @@ -3934,7 +4001,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Помилка в адреÑÑ– прокÑÑ–-Ñервера: «%s»</translation> </message> <message> - <location line="+56"/> + <location line="+57"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Ðевідома мережа вказана в -onlynet: «%s»</translation> </message> @@ -3944,7 +4011,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Ð’ параметрі -socks запитуєтьÑÑ Ð½ÐµÐ²Ñ–Ð´Ð¾Ð¼Ð° верÑÑ–Ñ: %i</translation> </message> <message> - <location line="-101"/> + <location line="-103"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -3954,7 +4021,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+48"/> + <location line="+49"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>Помилка у величині коміÑÑ–Ñ— -paytxfee=<amount>: «%s»</translation> </message> @@ -3974,7 +4041,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ñ–Ð½Ð´ÐµÐºÑу блоків...</translation> </message> <message> - <location line="-62"/> + <location line="-63"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>Додати вузол до Ð¿Ñ–Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ Ñ– лишити його відкритим</translation> </message> @@ -3984,12 +4051,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Ðеможливо прив'Ñзати до порту %s на цьому комп'ютері. Можливо гаманець вже запущено.</translation> </message> <message> - <location line="+95"/> + <location line="+96"/> <source>Loading wallet...</source> <translation>Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð³Ð°Ð¼Ð°Ð½Ñ†Ñ...</translation> </message> <message> - <location line="-56"/> + <location line="-57"/> <source>Cannot downgrade wallet</source> <translation>Ðе вдаєтьÑÑ Ð¿Ð¾Ð½Ð¸Ð·Ð¸Ñ‚Ð¸ верÑÑ–ÑŽ гаманцÑ</translation> </message> @@ -3999,7 +4066,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Ðеможливо запиÑати типову адреÑу</translation> </message> <message> - <location line="+67"/> + <location line="+68"/> <source>Rescanning...</source> <translation>СкануваннÑ...</translation> </message> @@ -4009,17 +4076,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ðµ</translation> </message> <message> - <location line="+85"/> + <location line="+86"/> <source>To use the %s option</source> <translation>Щоб викориÑтати опцію %s</translation> </message> <message> - <location line="-77"/> + <location line="-78"/> <source>Error</source> <translation>Помилка</translation> </message> <message> - <location line="-35"/> + <location line="-36"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_vi.ts b/src/qt/locale/bitcoin_vi.ts index ee0c8caaaf..b667bb4a84 100644 --- a/src/qt/locale/bitcoin_vi.ts +++ b/src/qt/locale/bitcoin_vi.ts @@ -31,6 +31,12 @@ This product includes software developed by the OpenSSL Project for use in the O <source>The Bitcoin Core developers</source> <translation type="unfinished"/> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source> (%1-bit)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>AddressBookPage</name> @@ -612,6 +618,16 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation type="unfinished"><numerusform></numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation type="unfinished"/> @@ -681,7 +697,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+435"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -742,7 +758,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation type="unfinished"/> </message> @@ -757,7 +773,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation>Số lượng</translation> </message> @@ -908,7 +924,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation type="unfinished"/> </message> @@ -1090,7 +1106,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation type="unfinished"/> </message> @@ -1234,7 +1250,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+122"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation type="unfinished"/> </message> @@ -1244,7 +1260,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="-131"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation type="unfinished"/> </message> @@ -1259,12 +1275,7 @@ Address: %4 <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"/> + <location line="+16"/> <source>MB</source> <translation type="unfinished"/> </message> @@ -1279,7 +1290,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+58"/> + <location line="+107"/> + <source>&Spend unconfirmed change (experts only)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+37"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation type="unfinished"/> </message> @@ -1314,7 +1330,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="-86"/> + <source>W&allet</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+52"/> + <source>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.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+40"/> <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> @@ -1429,17 +1455,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+70"/> <source>default</source> <translation type="unfinished"/> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation type="unfinished"/> </message> <message> - <location line="+75"/> + <location line="+78"/> <source>Confirm options reset</source> <translation type="unfinished"/> </message> @@ -1479,18 +1505,13 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-155"/> - <source>Unconfirmed:</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation type="unfinished"/> </message> <message> <location line="+51"/> - <source>Confirmed:</source> + <source>Available:</source> <translation type="unfinished"/> </message> <message> @@ -1499,7 +1520,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation type="unfinished"/> </message> @@ -1647,6 +1673,11 @@ Address: %4 <source>Error: Invalid combination of -regtest and -testnet.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../guiutil.cpp" line="+82"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>QRImageWidget</name> @@ -1867,22 +1898,22 @@ Address: %4 <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+83"/> + <location filename="../forms/receivecoinsdialog.ui" line="+107"/> <source>&Amount:</source> <translation type="unfinished"/> </message> <message> - <location line="-13"/> + <location line="-16"/> <source>&Label:</source> <translation type="unfinished"/> </message> <message> - <location line="-34"/> + <location line="-37"/> <source>&Message:</source> <translation type="unfinished"/> </message> <message> - <location line="-17"/> + <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"/> </message> @@ -1892,27 +1923,30 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+27"/> - <source>An optional 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"/> </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> + <location line="-7"/> + <location line="+21"/> + <source>An optional label to associate with the new receiving address.</source> <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="-7"/> <source>Use this form to request payments. All fields are <b>optional</b>.</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <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"/> </message> <message> - <location line="+17"/> + <location line="+32"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -1922,17 +1956,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+36"/> - <source>&Request payment</source> + <location line="+78"/> + <source>Requested payments history</source> <translation type="unfinished"/> </message> <message> - <location line="+47"/> - <source>Requested payments</source> + <location line="-98"/> + <source>&Request payment</source> <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+120"/> <source>Show the selected request (does the same as double clicking an entry)</source> <translation type="unfinished"/> </message> @@ -1951,6 +1985,21 @@ Address: %4 <source>Remove</source> <translation type="unfinished"/> </message> + <message> + <location filename="../receivecoinsdialog.cpp" line="+38"/> + <source>Copy label</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy message</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation type="unfinished"/> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -2052,12 +2101,17 @@ Address: %4 <source>(no message)</source> <translation type="unfinished"/> </message> + <message> + <location line="+8"/> + <source>(no amount)</source> + <translation type="unfinished"/> + </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 type="unfinished"/> @@ -2133,7 +2187,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+115"/> + <location line="+164"/> <source>Send to multiple recipients at once</source> <translation type="unfinished"/> </message> @@ -2143,7 +2197,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+20"/> + <location line="-23"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -2153,12 +2207,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+22"/> + <location line="+52"/> <source>Balance:</source> <translation type="unfinished"/> </message> <message> - <location line="+41"/> + <location line="-78"/> <source>Confirm the send action</source> <translation type="unfinished"/> </message> @@ -2168,7 +2222,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-228"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation type="unfinished"/> </message> @@ -2181,12 +2235,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-136"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+15"/> + <location line="-121"/> <source>Copy quantity</source> <translation type="unfinished"/> </message> @@ -2236,7 +2285,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+202"/> + <location line="+203"/> <source>The recipient address is not valid, please recheck.</source> <translation type="unfinished"/> </message> @@ -2271,12 +2320,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Warning: Invalid Bitcoin address</source> <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+20"/> <source>(no label)</source> <translation>(chÆ°a có nhãn)</translation> </message> @@ -2286,7 +2335,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-366"/> + <location line="-367"/> <source>Are you sure you want to send?</source> <translation type="unfinished"/> </message> @@ -2296,7 +2345,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+170"/> + <location line="+171"/> <source>Payment request expired</source> <translation type="unfinished"/> </message> @@ -2373,12 +2422,7 @@ Address: %4 <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"/> + <location line="+968"/> <source>This is a verified payment request.</source> <translation type="unfinished"/> </message> @@ -2388,7 +2432,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+459"/> + <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"/> + </message> + <message> + <location line="+426"/> <source>This is an unverified payment request.</source> <translation type="unfinished"/> </message> @@ -2404,11 +2453,6 @@ Address: %4 <source>Memo:</source> <translation type="unfinished"/> </message> - <message> - <location filename="../sendcoinsentry.cpp" line="+1"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"/> - </message> </context> <context> <name>ShutdownWindow</name> @@ -2446,19 +2490,19 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+10"/> - <location line="+213"/> + <location line="+7"/> + <location line="+210"/> <source>Choose previously used address</source> <translation type="unfinished"/> </message> <message> - <location line="-203"/> - <location line="+213"/> + <location line="-200"/> + <location line="+210"/> <source>Alt+A</source> <translation type="unfinished"/> </message> <message> - <location line="-203"/> + <location line="-200"/> <source>Paste address from clipboard</source> <translation type="unfinished"/> </message> @@ -2499,12 +2543,12 @@ Address: %4 </message> <message> <location line="+3"/> - <location line="+146"/> + <location line="+143"/> <source>Clear &All</source> <translation type="unfinished"/> </message> <message> - <location line="-87"/> + <location line="-84"/> <source>&Verify Message</source> <translation type="unfinished"/> </message> @@ -2519,7 +2563,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+40"/> + <location line="+37"/> <source>Verify the message to ensure it was signed with the specified Bitcoin address</source> <translation type="unfinished"/> </message> @@ -2534,43 +2578,37 @@ Address: %4 <translation type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location line="-2"/> + <location line="-1"/> <source>Click "Sign Message" to generate signature</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Enter Bitcoin signature</source> - <translation type="unfinished"/> - </message> - <message> <location line="+84"/> - <location line="+81"/> + <location line="+80"/> <source>The entered address is invalid.</source> <translation type="unfinished"/> </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 type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location line="-73"/> + <location line="-72"/> <source>Wallet unlock was cancelled.</source> <translation type="unfinished"/> </message> @@ -2590,7 +2628,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+59"/> + <location line="+58"/> <source>The signature could not be decoded.</source> <translation type="unfinished"/> </message> @@ -2651,6 +2689,11 @@ Address: %4 </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation type="unfinished"/> </message> @@ -2812,12 +2855,12 @@ Address: %4 <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation type="unfinished"/> </message> @@ -2858,12 +2901,12 @@ Address: %4 <translation>Số lượng</translation> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform></translation> </message> @@ -2873,33 +2916,42 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> + <location line="+12"/> + <source>Confirmed (%1 confirmations)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+9"/> + <source>This block was not received by any other nodes and will probably not be accepted!</source> <translation type="unfinished"/> </message> <message> <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> + <source>Generated but not accepted</source> <translation type="unfinished"/> </message> <message> - <location line="-22"/> - <location line="+25"/> - <source>Confirmed (%1 confirmations)</source> + <location line="-21"/> + <source>Offline</source> <translation type="unfinished"/> </message> <message> - <location line="-22"/> - <source>This block was not received by any other nodes and will probably not be accepted!</source> + <location line="+3"/> + <source>Unconfirmed</source> <translation type="unfinished"/> </message> <message> <location line="+3"/> - <source>Generated but not accepted</source> + <source>Confirming (%1 of %2 recommended confirmations)</source> <translation type="unfinished"/> </message> <message> - <location line="+62"/> + <location line="+6"/> + <source>Conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation type="unfinished"/> </message> @@ -2929,7 +2981,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation type="unfinished"/> </message> @@ -3195,12 +3247,12 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+223"/> <source>Usage:</source> <translation type="unfinished"/> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>List commands</source> <translation type="unfinished"/> </message> @@ -3255,12 +3307,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation type="unfinished"/> </message> <message> - <location line="-148"/> + <location line="-150"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"/> </message> @@ -3280,17 +3332,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Run in the background as a daemon and accept commands</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <location line="+40"/> <source>Use the test network</source> <translation type="unfinished"/> </message> <message> - <location line="-118"/> + <location line="-120"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> @@ -3421,6 +3473,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation type="unfinished"/> </message> @@ -3631,6 +3688,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Start Bitcoin server</source> <translation type="unfinished"/> </message> @@ -3680,12 +3742,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-79"/> + <location line="-80"/> <source>Imports blocks from external blk000??.dat file</source> <translation type="unfinished"/> </message> <message> - <location line="-105"/> + <location line="-106"/> <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> @@ -3705,7 +3767,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+89"/> + <location line="+90"/> <source>Information</source> <translation type="unfinished"/> </message> @@ -3775,7 +3837,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+7"/> <source>System error: </source> <translation type="unfinished"/> </message> @@ -3821,6 +3883,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>version</source> <translation type="unfinished"/> </message> @@ -3830,32 +3897,32 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-58"/> + <location line="-60"/> <source>Password for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-70"/> + <location line="-71"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation type="unfinished"/> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+161"/> + <location line="+163"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"/> </message> <message> - <location line="-24"/> + <location line="-25"/> <source>Set key pool size to <n> (default: 100)</source> <translation type="unfinished"/> </message> @@ -3865,12 +3932,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+38"/> + <location line="+39"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-30"/> + <location line="-31"/> <source>Server certificate file (default: server.cert)</source> <translation type="unfinished"/> </message> @@ -3880,7 +3947,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+17"/> <source>This help message</source> <translation type="unfinished"/> </message> @@ -3890,12 +3957,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-107"/> + <location line="-109"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation type="unfinished"/> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Loading addresses...</source> <translation type="unfinished"/> </message> @@ -3910,12 +3977,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+98"/> + <location line="+99"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation type="unfinished"/> </message> <message> - <location line="-100"/> + <location line="-101"/> <source>Error loading wallet.dat</source> <translation type="unfinished"/> </message> @@ -3925,7 +3992,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+56"/> + <location line="+57"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation type="unfinished"/> </message> @@ -3935,7 +4002,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-101"/> + <location line="-103"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -3945,7 +4012,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+48"/> + <location line="+49"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation type="unfinished"/> </message> @@ -3965,7 +4032,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-62"/> + <location line="-63"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"/> </message> @@ -3975,12 +4042,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+95"/> + <location line="+96"/> <source>Loading wallet...</source> <translation type="unfinished"/> </message> <message> - <location line="-56"/> + <location line="-57"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> @@ -3990,7 +4057,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+67"/> + <location line="+68"/> <source>Rescanning...</source> <translation type="unfinished"/> </message> @@ -4000,17 +4067,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+85"/> + <location line="+86"/> <source>To use the %s option</source> <translation type="unfinished"/> </message> <message> - <location line="-77"/> + <location line="-78"/> <source>Error</source> <translation type="unfinished"/> </message> <message> - <location line="-35"/> + <location line="-36"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_vi_VN.ts b/src/qt/locale/bitcoin_vi_VN.ts index 4a5eb877ea..fd98a7fc32 100644 --- a/src/qt/locale/bitcoin_vi_VN.ts +++ b/src/qt/locale/bitcoin_vi_VN.ts @@ -31,6 +31,12 @@ This product includes software developed by the OpenSSL Project for use in the O <source>The Bitcoin Core developers</source> <translation type="unfinished"/> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source> (%1-bit)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>AddressBookPage</name> @@ -612,6 +618,16 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation type="unfinished"><numerusform></numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation type="unfinished"/> @@ -681,7 +697,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+435"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -742,7 +758,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation type="unfinished"/> </message> @@ -757,7 +773,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation type="unfinished"/> </message> @@ -908,7 +924,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation type="unfinished"/> </message> @@ -1090,7 +1106,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation type="unfinished"/> </message> @@ -1234,7 +1250,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+122"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation type="unfinished"/> </message> @@ -1244,7 +1260,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="-131"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation type="unfinished"/> </message> @@ -1259,12 +1275,7 @@ Address: %4 <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"/> + <location line="+16"/> <source>MB</source> <translation type="unfinished"/> </message> @@ -1279,7 +1290,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+58"/> + <location line="+107"/> + <source>&Spend unconfirmed change (experts only)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+37"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation type="unfinished"/> </message> @@ -1314,7 +1330,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="-86"/> + <source>W&allet</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+52"/> + <source>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.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+40"/> <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> @@ -1429,17 +1455,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+70"/> <source>default</source> <translation type="unfinished"/> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation type="unfinished"/> </message> <message> - <location line="+75"/> + <location line="+78"/> <source>Confirm options reset</source> <translation type="unfinished"/> </message> @@ -1479,18 +1505,13 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-155"/> - <source>Unconfirmed:</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation type="unfinished"/> </message> <message> <location line="+51"/> - <source>Confirmed:</source> + <source>Available:</source> <translation type="unfinished"/> </message> <message> @@ -1499,7 +1520,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation type="unfinished"/> </message> @@ -1647,6 +1673,11 @@ Address: %4 <source>Error: Invalid combination of -regtest and -testnet.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../guiutil.cpp" line="+82"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>QRImageWidget</name> @@ -1867,22 +1898,22 @@ Address: %4 <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+83"/> + <location filename="../forms/receivecoinsdialog.ui" line="+107"/> <source>&Amount:</source> <translation type="unfinished"/> </message> <message> - <location line="-13"/> + <location line="-16"/> <source>&Label:</source> <translation type="unfinished"/> </message> <message> - <location line="-34"/> + <location line="-37"/> <source>&Message:</source> <translation type="unfinished"/> </message> <message> - <location line="-17"/> + <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"/> </message> @@ -1892,27 +1923,30 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+27"/> - <source>An optional 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"/> </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> + <location line="-7"/> + <location line="+21"/> + <source>An optional label to associate with the new receiving address.</source> <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="-7"/> <source>Use this form to request payments. All fields are <b>optional</b>.</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <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"/> </message> <message> - <location line="+17"/> + <location line="+32"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -1922,17 +1956,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+36"/> - <source>&Request payment</source> + <location line="+78"/> + <source>Requested payments history</source> <translation type="unfinished"/> </message> <message> - <location line="+47"/> - <source>Requested payments</source> + <location line="-98"/> + <source>&Request payment</source> <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+120"/> <source>Show the selected request (does the same as double clicking an entry)</source> <translation type="unfinished"/> </message> @@ -1951,6 +1985,21 @@ Address: %4 <source>Remove</source> <translation type="unfinished"/> </message> + <message> + <location filename="../receivecoinsdialog.cpp" line="+38"/> + <source>Copy label</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy message</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation type="unfinished"/> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -2052,12 +2101,17 @@ Address: %4 <source>(no message)</source> <translation type="unfinished"/> </message> + <message> + <location line="+8"/> + <source>(no amount)</source> + <translation type="unfinished"/> + </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 type="unfinished"/> @@ -2133,7 +2187,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+115"/> + <location line="+164"/> <source>Send to multiple recipients at once</source> <translation type="unfinished"/> </message> @@ -2143,7 +2197,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+20"/> + <location line="-23"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -2153,12 +2207,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+22"/> + <location line="+52"/> <source>Balance:</source> <translation type="unfinished"/> </message> <message> - <location line="+41"/> + <location line="-78"/> <source>Confirm the send action</source> <translation type="unfinished"/> </message> @@ -2168,7 +2222,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-228"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation type="unfinished"/> </message> @@ -2181,12 +2235,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-136"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+15"/> + <location line="-121"/> <source>Copy quantity</source> <translation type="unfinished"/> </message> @@ -2236,7 +2285,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+202"/> + <location line="+203"/> <source>The recipient address is not valid, please recheck.</source> <translation type="unfinished"/> </message> @@ -2271,12 +2320,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Warning: Invalid Bitcoin address</source> <translation type="unfinished"/> </message> <message> - <location line="+21"/> + <location line="+20"/> <source>(no label)</source> <translation type="unfinished"/> </message> @@ -2286,7 +2335,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-366"/> + <location line="-367"/> <source>Are you sure you want to send?</source> <translation type="unfinished"/> </message> @@ -2296,7 +2345,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+170"/> + <location line="+171"/> <source>Payment request expired</source> <translation type="unfinished"/> </message> @@ -2373,12 +2422,7 @@ Address: %4 <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"/> + <location line="+968"/> <source>This is a verified payment request.</source> <translation type="unfinished"/> </message> @@ -2388,7 +2432,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+459"/> + <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"/> + </message> + <message> + <location line="+426"/> <source>This is an unverified payment request.</source> <translation type="unfinished"/> </message> @@ -2404,11 +2453,6 @@ Address: %4 <source>Memo:</source> <translation type="unfinished"/> </message> - <message> - <location filename="../sendcoinsentry.cpp" line="+1"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"/> - </message> </context> <context> <name>ShutdownWindow</name> @@ -2446,19 +2490,19 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+10"/> - <location line="+213"/> + <location line="+7"/> + <location line="+210"/> <source>Choose previously used address</source> <translation type="unfinished"/> </message> <message> - <location line="-203"/> - <location line="+213"/> + <location line="-200"/> + <location line="+210"/> <source>Alt+A</source> <translation type="unfinished"/> </message> <message> - <location line="-203"/> + <location line="-200"/> <source>Paste address from clipboard</source> <translation type="unfinished"/> </message> @@ -2499,12 +2543,12 @@ Address: %4 </message> <message> <location line="+3"/> - <location line="+146"/> + <location line="+143"/> <source>Clear &All</source> <translation type="unfinished"/> </message> <message> - <location line="-87"/> + <location line="-84"/> <source>&Verify Message</source> <translation type="unfinished"/> </message> @@ -2519,7 +2563,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+40"/> + <location line="+37"/> <source>Verify the message to ensure it was signed with the specified Bitcoin address</source> <translation type="unfinished"/> </message> @@ -2534,43 +2578,37 @@ Address: %4 <translation type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location line="-2"/> + <location line="-1"/> <source>Click "Sign Message" to generate signature</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Enter Bitcoin signature</source> - <translation type="unfinished"/> - </message> - <message> <location line="+84"/> - <location line="+81"/> + <location line="+80"/> <source>The entered address is invalid.</source> <translation type="unfinished"/> </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 type="unfinished"/> </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 type="unfinished"/> </message> <message> - <location line="-73"/> + <location line="-72"/> <source>Wallet unlock was cancelled.</source> <translation type="unfinished"/> </message> @@ -2590,7 +2628,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+59"/> + <location line="+58"/> <source>The signature could not be decoded.</source> <translation type="unfinished"/> </message> @@ -2651,6 +2689,11 @@ Address: %4 </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation type="unfinished"/> </message> @@ -2812,12 +2855,12 @@ Address: %4 <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation type="unfinished"/> </message> @@ -2858,12 +2901,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform></translation> </message> @@ -2873,33 +2916,42 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> + <location line="+12"/> + <source>Confirmed (%1 confirmations)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+9"/> + <source>This block was not received by any other nodes and will probably not be accepted!</source> <translation type="unfinished"/> </message> <message> <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> + <source>Generated but not accepted</source> <translation type="unfinished"/> </message> <message> - <location line="-22"/> - <location line="+25"/> - <source>Confirmed (%1 confirmations)</source> + <location line="-21"/> + <source>Offline</source> <translation type="unfinished"/> </message> <message> - <location line="-22"/> - <source>This block was not received by any other nodes and will probably not be accepted!</source> + <location line="+3"/> + <source>Unconfirmed</source> <translation type="unfinished"/> </message> <message> <location line="+3"/> - <source>Generated but not accepted</source> + <source>Confirming (%1 of %2 recommended confirmations)</source> <translation type="unfinished"/> </message> <message> - <location line="+62"/> + <location line="+6"/> + <source>Conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation type="unfinished"/> </message> @@ -2929,7 +2981,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation type="unfinished"/> </message> @@ -3195,12 +3247,12 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+223"/> <source>Usage:</source> <translation type="unfinished"/> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>List commands</source> <translation type="unfinished"/> </message> @@ -3255,12 +3307,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation type="unfinished"/> </message> <message> - <location line="-148"/> + <location line="-150"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"/> </message> @@ -3280,17 +3332,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Run in the background as a daemon and accept commands</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <location line="+40"/> <source>Use the test network</source> <translation type="unfinished"/> </message> <message> - <location line="-118"/> + <location line="-120"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> @@ -3421,6 +3473,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation type="unfinished"/> </message> @@ -3631,6 +3688,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Start Bitcoin server</source> <translation type="unfinished"/> </message> @@ -3680,12 +3742,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-79"/> + <location line="-80"/> <source>Imports blocks from external blk000??.dat file</source> <translation type="unfinished"/> </message> <message> - <location line="-105"/> + <location line="-106"/> <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> @@ -3705,7 +3767,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+89"/> + <location line="+90"/> <source>Information</source> <translation type="unfinished"/> </message> @@ -3775,7 +3837,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+7"/> <source>System error: </source> <translation type="unfinished"/> </message> @@ -3821,6 +3883,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>version</source> <translation type="unfinished"/> </message> @@ -3830,32 +3897,32 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-58"/> + <location line="-60"/> <source>Password for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-70"/> + <location line="-71"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation type="unfinished"/> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+161"/> + <location line="+163"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"/> </message> <message> - <location line="-24"/> + <location line="-25"/> <source>Set key pool size to <n> (default: 100)</source> <translation type="unfinished"/> </message> @@ -3865,12 +3932,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+38"/> + <location line="+39"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-30"/> + <location line="-31"/> <source>Server certificate file (default: server.cert)</source> <translation type="unfinished"/> </message> @@ -3880,7 +3947,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+17"/> <source>This help message</source> <translation type="unfinished"/> </message> @@ -3890,12 +3957,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-107"/> + <location line="-109"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation type="unfinished"/> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Loading addresses...</source> <translation type="unfinished"/> </message> @@ -3910,12 +3977,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+98"/> + <location line="+99"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation type="unfinished"/> </message> <message> - <location line="-100"/> + <location line="-101"/> <source>Error loading wallet.dat</source> <translation type="unfinished"/> </message> @@ -3925,7 +3992,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+56"/> + <location line="+57"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation type="unfinished"/> </message> @@ -3935,7 +4002,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-101"/> + <location line="-103"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -3945,7 +4012,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+48"/> + <location line="+49"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation type="unfinished"/> </message> @@ -3965,7 +4032,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-62"/> + <location line="-63"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"/> </message> @@ -3975,12 +4042,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+95"/> + <location line="+96"/> <source>Loading wallet...</source> <translation type="unfinished"/> </message> <message> - <location line="-56"/> + <location line="-57"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> @@ -3990,7 +4057,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+67"/> + <location line="+68"/> <source>Rescanning...</source> <translation type="unfinished"/> </message> @@ -4000,17 +4067,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+85"/> + <location line="+86"/> <source>To use the %s option</source> <translation type="unfinished"/> </message> <message> - <location line="-77"/> + <location line="-78"/> <source>Error</source> <translation type="unfinished"/> </message> <message> - <location line="-35"/> + <location line="-36"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_zh_CN.ts b/src/qt/locale/bitcoin_zh_CN.ts index 4315045584..e45b9242a1 100644 --- a/src/qt/locale/bitcoin_zh_CN.ts +++ b/src/qt/locale/bitcoin_zh_CN.ts @@ -36,6 +36,12 @@ This product includes software developed by the OpenSSL Project for use in the O <source>The Bitcoin Core developers</source> <translation>Bitcoin Core çš„å¼€å‘者</translation> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source> (%1-bit)</source> + <translation>(%1 -比特)</translation> + </message> </context> <context> <name>AddressBookPage</name> @@ -157,7 +163,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+1"/> <source>There was an error trying to save the address list to %1.</source> - <translation type="unfinished"/> + <translation>地å€åˆ—表ä¿å˜è‡³ %1 æ—¶å‘生错误。</translation> </message> </context> <context> @@ -405,17 +411,17 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+10"/> <source>&Sending addresses...</source> - <translation type="unfinished"/> + <translation>&ä»˜æ¬¾åœ°å€ </translation> </message> <message> <location line="+2"/> <source>&Receiving addresses...</source> - <translation type="unfinished"/> + <translation>&收款地å€</translation> </message> <message> <location line="+3"/> <source>Open &URI...</source> - <translation type="unfinished"/> + <translation>打开 &URI...</translation> </message> <message> <location line="+325"/> @@ -568,12 +574,12 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+2"/> <source>&Command-line options</source> - <translation type="unfinished"/> + <translation>&命令行 选项</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>显示比特å¸æ ¸å¿ƒ 程åºå¸®åŠ©ä¿¡æ¯ï¼ŒèŽ·å–å¯ç”¨çš„命令行选项 </translation> </message> <message> <location line="+159"/> @@ -617,6 +623,16 @@ This product includes software developed by the OpenSSL Project for use in the O <translation><numerusform>%n 周å‰</numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation>%1 å’Œ %2</translation> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation><numerusform>%n å¹´</numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation>è½åŽ %1 </translation> @@ -659,7 +675,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+130"/> <source>Sent transaction</source> - <translation>å‘出交易</translation> + <translation>å‘é€äº¤æ˜“</translation> </message> <message> <location line="+0"/> @@ -690,7 +706,7 @@ Address: %4 <translation>钱包已被<b>åŠ å¯†</b>，当å‰ä¸º<b>é”定</b>状æ€</translation> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+435"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>å‘生严é‡é”™è¯¯ã€‚</translation> </message> @@ -708,7 +724,7 @@ Address: %4 <message> <location filename="../forms/coincontroldialog.ui" line="+14"/> <source>Coin Control Address Selection</source> - <translation type="unfinished"/> + <translation>选择交易æºåœ°å€</translation> </message> <message> <location line="+34"/> @@ -738,12 +754,12 @@ Address: %4 <message> <location line="+32"/> <source>Low Output:</source> - <translation type="unfinished"/> + <translation>低输出</translation> </message> <message> <location line="+48"/> <source>After Fee:</source> - <translation type="unfinished"/> + <translation>åŠ ä¸Šäº¤æ˜“è´¹ç”¨åŽ:</translation> </message> <message> <location line="+32"/> @@ -751,7 +767,7 @@ Address: %4 <translation>å˜æ›´ : </translation> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation>(ä¸)全选</translation> </message> @@ -766,7 +782,7 @@ Address: %4 <translation>列表模å¼</translation> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation>金é¢</translation> </message> @@ -819,27 +835,27 @@ Address: %4 <message> <location line="+1"/> <source>Lock unspent</source> - <translation type="unfinished"/> + <translation>é”定未花费</translation> </message> <message> <location line="+1"/> <source>Unlock unspent</source> - <translation type="unfinished"/> + <translation>解é”未花费</translation> </message> <message> <location line="+22"/> <source>Copy quantity</source> - <translation type="unfinished"/> + <translation>å¤åˆ¶é‡‘é¢</translation> </message> <message> <location line="+2"/> <source>Copy fee</source> - <translation type="unfinished"/> + <translation>å¤åˆ¶äº¤æ˜“è´¹</translation> </message> <message> <location line="+1"/> <source>Copy after fee</source> - <translation type="unfinished"/> + <translation>å¤åˆ¶å«äº¤æ˜“费的金é¢</translation> </message> <message> <location line="+1"/> @@ -854,12 +870,12 @@ Address: %4 <message> <location line="+1"/> <source>Copy low output</source> - <translation type="unfinished"/> + <translation>å¤åˆ¶ä½Žè¾“出</translation> </message> <message> <location line="+1"/> <source>Copy change</source> - <translation type="unfinished"/> + <translation>å¤åˆ¶é›¶é’±</translation> </message> <message> <location line="+323"/> @@ -909,7 +925,7 @@ Address: %4 <message> <location line="+11"/> <source>(%1 locked)</source> - <translation type="unfinished"/> + <translation>(%1 é”定)</translation> </message> <message> <location line="+31"/> @@ -917,9 +933,9 @@ Address: %4 <translation>æ— </translation> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> - <translation type="unfinished"/> + <translation>尘埃交易</translation> </message> <message> <location line="+0"/> @@ -934,49 +950,49 @@ 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"/> <source>Can vary +/- 1 byte per input.</source> - <translation type="unfinished"/> + <translation>æ¯ç¬”输入å¯èƒ½ä¼šæœ‰ æ£è´Ÿ1å—节的å差。</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>交易的优先级越高，被矿工收入数æ®å—的速度也越快。</translation> </message> <message> <location line="+1"/> <source>This label turns red, if the priority is smaller than "medium".</source> - <translation type="unfinished"/> + <translation>如果优先级å°äºŽ"ä¸ä½æ•°" ï¼Œæ ‡ç¾å°†å˜æˆçº¢è‰²ã€‚</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>如果收款地å€æ”¶åˆ°å°äºŽ%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>è¿™æ„味ç€è‡³å°‘éœ€è¦ %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>å°äºŽæœ€å°è½¬å‘交易费的0.546å€çš„ 转账金é¢å°†è¢«è§†ä¸º 尘埃交易。</translation> </message> <message> <location line="+2"/> <source>This label turns red, if the change is smaller than %1.</source> - <translation type="unfinished"/> + <translation>如果零钱å°äºŽ %1ï¼Œæ ‡ç¾å°†å˜æˆçº¢è‰²ã€‚</translation> </message> <message> <location line="+43"/> @@ -987,12 +1003,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> @@ -1096,10 +1112,10 @@ Address: %4 <message> <location filename="../forms/helpmessagedialog.ui" line="+19"/> <source>Bitcoin Core - Command-line options</source> - <translation type="unfinished"/> + <translation>比特å¸æ ¸å¿ƒç¨‹åº - 命令行选项</translation> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation>比特å¸æ ¸å¿ƒ</translation> </message> @@ -1155,17 +1171,17 @@ Address: %4 <message> <location line="+9"/> <source>Welcome to Bitcoin Core.</source> - <translation type="unfinished"/> + <translation>欢迎使用 比特å¸æ ¸å¿ƒ 程åºã€‚</translation> </message> <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>由于这是第一次è¿è¡Œ 比特å¸æ ¸å¿ƒ 程åºï¼Œæ‚¨å¯ä»¥é€‰æ‹©æ•°æ®å˜å‚¨ç›®å½•ã€‚</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>比特å¸æ ¸å¿ƒ 程åºä¼šä¸‹è½½å‚¨å˜ä¸€ä»½æ•°æ®å—链(blockchain)ã€‚è‡³å°‘éœ€è¦ %1 GBçš„å˜å‚¨ç©ºé—´ï¼Œéšç€æ—¶é—´æŽ¨ç§»ä¼šéœ€è¦æ›´å¤šçš„å˜å‚¨ç©ºé—´ã€‚钱包文件也储å˜åœ¨è¯¥ç›®å½•ã€‚</translation> </message> <message> <location line="+10"/> @@ -1208,27 +1224,27 @@ Address: %4 <message> <location filename="../forms/openuridialog.ui" line="+14"/> <source>Open URI</source> - <translation type="unfinished"/> + <translation>打开 URI</translation> </message> <message> <location line="+6"/> <source>Open payment request from URI or file</source> - <translation type="unfinished"/> + <translation>打开æ¥è‡ªURI或文件的付款请求 </translation> </message> <message> <location line="+9"/> <source>URI:</source> - <translation type="unfinished"/> + <translation>URI: </translation> </message> <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> @@ -1244,7 +1260,7 @@ Address: %4 <translation>主è¦(&M)</translation> </message> <message> - <location line="+6"/> + <location line="+122"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation>å¯é€‰çš„æ¯ kB 交易费，这有助于您的交易被更快的处ç†ã€‚大多数交易都是 1 kB。</translation> </message> @@ -1254,7 +1270,7 @@ Address: %4 <translation>支付交易费用(&F)</translation> </message> <message> - <location line="+31"/> + <location line="-131"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation>登录系统åŽè‡ªåŠ¨å¼€å¯æ¯”特å¸å®¢æˆ·ç«¯</translation> </message> @@ -1269,19 +1285,14 @@ Address: %4 <translation>æ•°æ®åº“缓å˜å¤§å°(&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"/> + <location line="+16"/> <source>MB</source> <translation>MB</translation> </message> <message> <location line="+27"/> <source>Number of script &verification threads</source> - <translation type="unfinished"/> + <translation>脚本&éªŒè¯ è¿›ç¨‹æ•° </translation> </message> <message> <location line="+13"/> @@ -1289,7 +1300,12 @@ Address: %4 <translation>设置脚本验è¯çº¿ç¨‹æ•°é‡ï¼ˆæœ€å¤š16，0 = 自动，<0 = ç•™ä¸‹è®¸å¤šç©ºé—²æ ¸å¿ƒï¼Œé»˜è®¤ä¸º 0）</translation> </message> <message> - <location line="+58"/> + <location line="+107"/> + <source>&Spend unconfirmed change (experts only)</source> + <translation>&使用未确认的零钱 (ä»…é™ä¸“家使用) </translation> + </message> + <message> + <location line="+37"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation>通过 SOCKS 代ç†è¿žæŽ¥åˆ°æ¯”特å¸ç½‘络。</translation> </message> @@ -1306,7 +1322,7 @@ Address: %4 <message> <location line="+224"/> <source>Active command-line options that override above options:</source> - <translation type="unfinished"/> + <translation>有效的命令行å‚数覆盖上述选项:</translation> </message> <message> <location line="+43"/> @@ -1324,7 +1340,17 @@ Address: %4 <translation>网络(&N)</translation> </message> <message> - <location line="+6"/> + <location line="-86"/> + <source>W&allet</source> + <translation>&钱包</translation> + </message> + <message> + <location line="+52"/> + <source>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.</source> + <translation>如果ç¦ç”¨æœªç¡®è®¤çš„零钱，则零钱至少需è¦1个确认æ‰èƒ½ä½¿ç”¨ã€‚åŒæ—¶è´¦æˆ·ä½™é¢æ˜¾ç¤ºä¼šå—到影å“。</translation> + </message> + <message> + <location line="+40"/> <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> @@ -1421,12 +1447,12 @@ Address: %4 <message> <location line="+7"/> <source>Whether to show coin control features or not.</source> - <translation type="unfinished"/> + <translation>是å¦éœ€è¦äº¤æ˜“æºåœ°å€æŽ§åˆ¶åŠŸèƒ½ã€‚</translation> </message> <message> <location line="+3"/> <source>Display coin &control features (experts only)</source> - <translation type="unfinished"/> + <translation>使用交易æºåœ°å€æŽ§åˆ¶åŠŸèƒ½ (ä»…é™ä¸“家使用) </translation> </message> <message> <location line="+136"/> @@ -1439,17 +1465,17 @@ Address: %4 <translation>å–消(&C)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+70"/> <source>default</source> <translation>默认</translation> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation>æ— </translation> </message> <message> - <location line="+75"/> + <location line="+78"/> <source>Confirm options reset</source> <translation>确认æ¢å¤ç¼ºçœè®¾ç½®</translation> </message> @@ -1489,19 +1515,14 @@ Address: %4 <translation>现在显示的消æ¯å¯èƒ½æ˜¯è¿‡æœŸçš„. 在连接上比特å¸ç½‘络节点åŽï¼Œæ‚¨çš„钱包将自动与网络åŒæ¥ï¼Œä½†æ˜¯è¿™ä¸ªè¿‡ç¨‹è¿˜æ²¡æœ‰å®Œæˆã€‚</translation> </message> <message> - <location line="-155"/> - <source>Unconfirmed:</source> - <translation>未确认：</translation> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation>钱包</translation> </message> <message> <location line="+51"/> - <source>Confirmed:</source> - <translation>已确认：</translation> + <source>Available:</source> + <translation>å¯ä½¿ç”¨çš„ä½™é¢ï¼š</translation> </message> <message> <location line="+16"/> @@ -1509,7 +1530,12 @@ Address: %4 <translation>您当å‰å¯ä½¿ç”¨çš„ä½™é¢</translation> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation>ç‰å¾…ä¸çš„ä½™é¢ï¼š</translation> + </message> + <message> + <location line="+16"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation>尚未确认的交易总é¢ï¼Œæœªè®¡å…¥å½“å‰ä½™é¢</translation> </message> @@ -1591,22 +1617,22 @@ Address: %4 <message> <location line="+52"/> <source>Payment request fetch URL is invalid: %1</source> - <translation type="unfinished"/> + <translation>付款请求URI链接éžæ³•: %1</translation> </message> <message> <location line="+27"/> <source>Payment request file handling</source> - <translation type="unfinished"/> + <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 type="unfinished"/> + <translation>付款请求文件ä¸èƒ½è¯»å–æˆ–æ— æ³•è¯†åˆ«ï¼è¿™å¯èƒ½æ˜¯ä¸ªä¸åˆæ ¼çš„付款请求文件。</translation> </message> <message> <location line="+73"/> <source>Unverified payment requests to custom payment scripts are unsupported.</source> - <translation type="unfinished"/> + <translation>ä¸æ”¯æŒåˆ°è‡ªå®šä¹‰ä»˜æ¬¾è„šæœ¬çš„未验è¯ä»˜æ¬¾è¯·æ±‚。</translation> </message> <message> <location line="+59"/> @@ -1657,6 +1683,11 @@ Address: %4 <source>Error: Invalid combination of -regtest and -testnet.</source> <translation>é”™è¯¯ï¼šæ— æ•ˆçš„ -regtest 与 -testnet 结åˆä½“。</translation> </message> + <message> + <location filename="../guiutil.cpp" line="+82"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>请输入比特å¸åœ°å€ï¼ˆä¾‹å¦‚: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L）</translation> + </message> </context> <context> <name>QRImageWidget</name> @@ -1678,7 +1709,7 @@ Address: %4 <message> <location line="+0"/> <source>PNG Image (*.png)</source> - <translation type="unfinished"/> + <translation>PNG图片(*.png)</translation> </message> </context> <context> @@ -1716,7 +1747,7 @@ Address: %4 <message> <location line="-10"/> <source>Debug window</source> - <translation type="unfinished"/> + <translation>调试窗å£</translation> </message> <message> <location line="+25"/> @@ -1877,22 +1908,22 @@ Address: %4 <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+83"/> + <location filename="../forms/receivecoinsdialog.ui" line="+107"/> <source>&Amount:</source> <translation>总é¢(&A)：</translation> </message> <message> - <location line="-13"/> + <location line="-16"/> <source>&Label:</source> <translation>æ ‡ç¾(&L)：</translation> </message> <message> - <location line="-34"/> + <location line="-37"/> <source>&Message:</source> <translation>消æ¯(&M)：</translation> </message> <message> - <location line="-17"/> + <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>é‡å¤ä½¿ç”¨ä»¥å‰ç”¨è¿‡çš„接收地å€ã€‚é‡ç”¨åœ°å€æœ‰å®‰å…¨å’Œéšç§æ–¹é¢çš„éšæ‚£ã€‚除éžæ˜¯ä¸ºé‡å¤ç”ŸæˆåŒä¸€é¡¹æ”¯ä»˜è¯·æ±‚，å¦åˆ™è¯·ä¸è¦è¿™æ ·åšã€‚</translation> </message> @@ -1902,27 +1933,30 @@ Address: %4 <translation>é‡ç”¨çŽ°æœ‰çš„接收地å€ï¼ˆä¸æŽ¨è）</translation> </message> <message> - <location line="+27"/> - <source>An optional label to associate with the new receiving address</source> - <translation>与新接收地å€ç›¸å…³çš„æ ‡ç¾ï¼Œå¯é€‰</translation> + <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>å¯åœ¨ä»˜æ¬¾è¯·æ±‚上备注一æ¡ä¿¡æ¯ï¼Œåœ¨æ‰“开付款请求时å¯ä»¥çœ‹åˆ°ã€‚注æ„：该消æ¯ä¸æ˜¯é€šè¿‡æ¯”特å¸ç½‘ç»œä¼ é€ã€‚</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"/> + <location line="-7"/> + <location line="+21"/> + <source>An optional label to associate with the new receiving address.</source> + <translation>å¯ä¸ºæ–°å»ºçš„收款地å€æ·»åŠ ä¸€ä¸ªæ ‡ç¾ã€‚</translation> </message> <message> - <location line="+7"/> + <location line="-7"/> <source>Use this form to request payments. All fields are <b>optional</b>.</source> <translation>使用æ¤è¡¨å•è¦æ±‚付款。所有å—段都是<b>å¯é€‰</b>。</translation> </message> <message> - <location line="+39"/> + <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>å¯é€‰çš„请求金é¢ã€‚留空或填零为ä¸è¦æ±‚具体金é¢ã€‚</translation> </message> <message> - <location line="+17"/> + <location line="+32"/> <source>Clear all fields of the form.</source> <translation>清空æ¤è¡¨å•çš„所有å—段。</translation> </message> @@ -1932,35 +1966,50 @@ Address: %4 <translation>清除</translation> </message> <message> - <location line="+36"/> - <source>&Request payment</source> - <translation>请求付款(&R)</translation> + <location line="+78"/> + <source>Requested payments history</source> + <translation>请求付款的历å²</translation> </message> <message> - <location line="+47"/> - <source>Requested payments</source> - <translation>已请求支付</translation> + <location line="-98"/> + <source>&Request payment</source> + <translation>请求付款(&R)</translation> </message> <message> - <location line="+16"/> + <location line="+120"/> <source>Show the selected request (does the same as double clicking an entry)</source> - <translation type="unfinished"/> + <translation>显示选ä¸çš„请求 (åŒå‡»ä¹Ÿå¯ä»¥æ˜¾ç¤º)</translation> </message> <message> <location line="+3"/> <source>Show</source> - <translation type="unfinished"/> + <translation>显示</translation> </message> <message> <location line="+11"/> <source>Remove the selected entries from the list</source> - <translation type="unfinished"/> + <translation>从列表ä¸ç§»é™¤é€‰ä¸çš„æ¡ç›®</translation> </message> <message> <location line="+3"/> <source>Remove</source> <translation>移除</translation> </message> + <message> + <location filename="../receivecoinsdialog.cpp" line="+38"/> + <source>Copy label</source> + <translation>å¤åˆ¶æ ‡ç¾</translation> + </message> + <message> + <location line="+1"/> + <source>Copy message</source> + <translation>å¤åˆ¶æ¶ˆæ¯ </translation> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation>å¤åˆ¶é‡‘é¢</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -2062,12 +2111,17 @@ Address: %4 <source>(no message)</source> <translation>(æ— æ¶ˆæ¯)</translation> </message> + <message> + <location line="+8"/> + <source>(no amount)</source> + <translation>(æ— é‡‘é¢) </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>å‘é€è´§å¸</translation> @@ -2075,7 +2129,7 @@ Address: %4 <message> <location line="+76"/> <source>Coin Control Features</source> - <translation type="unfinished"/> + <translation>交易æºåœ°å€æŽ§åˆ¶åŠŸèƒ½</translation> </message> <message> <location line="+20"/> @@ -2120,12 +2174,12 @@ Address: %4 <message> <location line="+32"/> <source>Low Output:</source> - <translation type="unfinished"/> + <translation>低输出</translation> </message> <message> <location line="+48"/> <source>After Fee:</source> - <translation type="unfinished"/> + <translation>åŠ ä¸Šäº¤æ˜“è´¹ç”¨åŽ:</translation> </message> <message> <location line="+32"/> @@ -2135,15 +2189,15 @@ Address: %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>如果激活该选项，但是零钱地å€ç”¨å…‰æˆ–者éžæ³•ï¼Œå°†ä¼šæ–°ç”Ÿæˆé›¶é’±åœ°å€ï¼Œè½¬å…¥é›¶é’±ã€‚</translation> </message> <message> <location line="+3"/> <source>Custom change address</source> - <translation type="unfinished"/> + <translation>自定义零钱地å€</translation> </message> <message> - <location line="+115"/> + <location line="+164"/> <source>Send to multiple recipients at once</source> <translation>一次å‘é€ç»™å¤šä¸ªæŽ¥æ”¶è€…</translation> </message> @@ -2153,7 +2207,7 @@ Address: %4 <translation>æ·»åŠ æ”¶æ¬¾äºº(&R)</translation> </message> <message> - <location line="+20"/> + <location line="-23"/> <source>Clear all fields of the form.</source> <translation>清除æ¤è¡¨å•çš„所有å—段。</translation> </message> @@ -2163,12 +2217,12 @@ Address: %4 <translation>清除所有(&A)</translation> </message> <message> - <location line="+22"/> + <location line="+52"/> <source>Balance:</source> <translation>ä½™é¢ï¼š</translation> </message> <message> - <location line="+41"/> + <location line="-78"/> <source>Confirm the send action</source> <translation>确认并å‘é€è´§å¸</translation> </message> @@ -2178,7 +2232,7 @@ Address: %4 <translation>å‘é€(&E)</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-228"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation>确认å‘é€è´§å¸</translation> </message> @@ -2191,14 +2245,9 @@ Address: %4 <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"/> + <location line="-121"/> <source>Copy quantity</source> - <translation type="unfinished"/> + <translation>å¤åˆ¶é‡‘é¢</translation> </message> <message> <location line="+1"/> @@ -2208,12 +2257,12 @@ Address: %4 <message> <location line="+1"/> <source>Copy fee</source> - <translation type="unfinished"/> + <translation>å¤åˆ¶äº¤æ˜“è´¹</translation> </message> <message> <location line="+1"/> <source>Copy after fee</source> - <translation type="unfinished"/> + <translation>å¤åˆ¶å«äº¤æ˜“费的金é¢</translation> </message> <message> <location line="+1"/> @@ -2228,12 +2277,12 @@ Address: %4 <message> <location line="+1"/> <source>Copy low output</source> - <translation type="unfinished"/> + <translation>å¤åˆ¶ä½Žè¾“出</translation> </message> <message> <location line="+1"/> <source>Copy change</source> - <translation type="unfinished"/> + <translation>å¤åˆ¶é›¶é’±</translation> </message> <message> <location line="+170"/> @@ -2246,7 +2295,7 @@ Address: %4 <translation>或</translation> </message> <message> - <location line="+202"/> + <location line="+203"/> <source>The recipient address is not valid, please recheck.</source> <translation>收款人地å€ä¸åˆæ³•ï¼Œè¯·æ£€æŸ¥ã€‚</translation> </message> @@ -2278,15 +2327,15 @@ Address: %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>错误：该交易被拒ç»ï¼å‘生这ç§é”™è¯¯çš„åŽŸå› å¯èƒ½æ˜¯ï¼šé’±åŒ…ä¸çš„比特å¸å·²ç»è¢«ç”¨æŽ‰ï¼Œæœ‰å¯èƒ½æ‚¨å¤åˆ¶äº†wallet.dat钱包文件，然åŽç”¨å¤åˆ¶çš„钱包文件支付了比特å¸ï¼Œä½†æ˜¯è¿™ä¸ªé’±åŒ…文件ä¸æ²¡æœ‰è®°å½•ã€‚</translation> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Warning: Invalid Bitcoin address</source> <translation>è¦å‘Šï¼šæ— 效的比特å¸åœ°å€</translation> </message> <message> - <location line="+21"/> + <location line="+20"/> <source>(no label)</source> <translation>(æ²¡æœ‰æ ‡ç¾)</translation> </message> @@ -2296,7 +2345,7 @@ Address: %4 <translation>è¦å‘Šï¼šæœªçŸ¥çš„更改地å€</translation> </message> <message> - <location line="-366"/> + <location line="-367"/> <source>Are you sure you want to send?</source> <translation>您确定è¦å‘出å—？</translation> </message> @@ -2306,7 +2355,7 @@ Address: %4 <translation>å·²æ·»åŠ äº¤æ˜“è´¹</translation> </message> <message> - <location line="+170"/> + <location line="+171"/> <source>Payment request expired</source> <translation>支付请求已过期</translation> </message> @@ -2383,12 +2432,7 @@ Address: %4 <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"/> + <location line="+968"/> <source>This is a verified payment request.</source> <translation>这是个有效的支付请求。</translation> </message> @@ -2398,7 +2442,12 @@ Address: %4 <translation>请为æ¤åœ°å€è¾“å…¥ä¸€ä¸ªæ ‡ç¾ä»¥å°†å®ƒåŠ 入用过的地å€åˆ—表</translation> </message> <message> - <location line="+459"/> + <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>bitcoin:URI 附带的备注信æ¯ï¼Œå°†ä¼šå’Œäº¤æ˜“一起å˜å‚¨ï¼Œå¤‡æŸ¥ã€‚ 注æ„：该消æ¯ä¸ä¼šé€šè¿‡æ¯”特å¸ç½‘ç»œä¼ è¾“ã€‚</translation> + </message> + <message> + <location line="+426"/> <source>This is an unverified payment request.</source> <translation>这是个éžæœ‰æ•ˆçš„支付请求。</translation> </message> @@ -2414,11 +2463,6 @@ Address: %4 <source>Memo:</source> <translation>便æ¡ï¼š</translation> </message> - <message> - <location filename="../sendcoinsentry.cpp" line="+1"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>请输入比特å¸åœ°å€ï¼ˆä¾‹å¦‚: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L）</translation> - </message> </context> <context> <name>ShutdownWindow</name> @@ -2456,19 +2500,19 @@ Address: %4 <translation>用于ç¾å消æ¯çš„地å€ï¼ˆä¾‹å¦‚: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L）</translation> </message> <message> - <location line="+10"/> - <location line="+213"/> + <location line="+7"/> + <location line="+210"/> <source>Choose previously used address</source> <translation>选择以å‰ç”¨è¿‡çš„地å€</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>从剪贴æ¿ç²˜è´´åœ°å€</translation> </message> @@ -2509,12 +2553,12 @@ Address: %4 </message> <message> <location line="+3"/> - <location line="+146"/> + <location line="+143"/> <source>Clear &All</source> <translation>清除所有(&A)</translation> </message> <message> - <location line="-87"/> + <location line="-84"/> <source>&Verify Message</source> <translation>验è¯æ¶ˆæ¯(&V)</translation> </message> @@ -2529,7 +2573,7 @@ Address: %4 <translation>用于ç¾å消æ¯çš„地å€(例如: 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>验è¯æ¶ˆæ¯ï¼Œç¡®ä¿æ¶ˆæ¯æ˜¯ç”±æŒ‡å®šçš„比特å¸åœ°å€ç¾å过的。</translation> </message> @@ -2544,43 +2588,37 @@ Address: %4 <translation>清空所有验è¯æ¶ˆæ¯æ </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>请输入比特å¸åœ°å€ (例如: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location line="-2"/> + <location line="-1"/> <source>Click "Sign Message" to generate signature</source> <translation>å•å‡»â€œç¾å消æ¯â€œäº§ç”Ÿç¾å。</translation> </message> <message> - <location line="+3"/> - <source>Enter Bitcoin signature</source> - <translation>输入比特å¸ç¾å</translation> - </message> - <message> <location line="+84"/> - <location line="+81"/> + <location line="+80"/> <source>The entered address is invalid.</source> <translation>输入的地å€éžæ³•ã€‚</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>请检查地å€åŽé‡è¯•ã€‚</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>输入的地å€æ²¡æœ‰å…³è”çš„å…¬ç§é’¥å¯¹ã€‚</translation> </message> <message> - <location line="-73"/> + <location line="-72"/> <source>Wallet unlock was cancelled.</source> <translation>钱包解é”动作å–消。</translation> </message> @@ -2600,7 +2638,7 @@ Address: %4 <translation>消æ¯å·²ç¾å。</translation> </message> <message> - <location line="+59"/> + <location line="+58"/> <source>The signature could not be decoded.</source> <translation>ç¾åæ— æ³•è§£ç 。</translation> </message> @@ -2661,6 +2699,11 @@ Address: %4 </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation>å‘现冲çª</translation> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation>%1 / 离线</translation> </message> @@ -2822,12 +2865,12 @@ Address: %4 <translation>，未被æˆåŠŸå¹¿æ’</translation> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <source>Open for %n more block(s)</source> <translation><numerusform>Open for %n more block</numerusform></translation> </message> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation>未知</translation> </message> @@ -2868,12 +2911,12 @@ Address: %4 <translation>æ•°é‡</translation> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation>未æˆç†Ÿ (%1 个确认，将在 %2 个åŽå¯ç”¨)</translation> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <source>Open for %n more block(s)</source> <translation><numerusform>Open for %n more block</numerusform></translation> </message> @@ -2883,23 +2926,12 @@ Address: %4 <translation>至 %1 个数æ®å—时开å¯</translation> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> - <translation>离线 (%1 个确认项)</translation> - </message> - <message> - <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation>未确认 (%1 / %2 æ¡ç¡®è®¤ä¿¡æ¯)</translation> - </message> - <message> - <location line="-22"/> - <location line="+25"/> + <location line="+12"/> <source>Confirmed (%1 confirmations)</source> <translation>已确认 (%1 æ¡ç¡®è®¤ä¿¡æ¯)</translation> </message> <message> - <location line="-22"/> + <location line="+9"/> <source>This block was not received by any other nodes and will probably not be accepted!</source> <translation>æ¤æ•°æ®å—未被任何其他节点接收，å¯èƒ½ä¸è¢«æŽ¥å—ï¼</translation> </message> @@ -2909,7 +2941,27 @@ Address: %4 <translation>已生æˆä½†æœªè¢«æŽ¥å—</translation> </message> <message> - <location line="+62"/> + <location line="-21"/> + <source>Offline</source> + <translation>掉线</translation> + </message> + <message> + <location line="+3"/> + <source>Unconfirmed</source> + <translation>未确认的 </translation> + </message> + <message> + <location line="+3"/> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation>ç¡®è®¤ä¸ (推è %2个确认，已ç»æœ‰ %1个确认)</translation> + </message> + <message> + <location line="+6"/> + <source>Conflicted</source> + <translation>冲çªçš„</translation> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation>接收于</translation> </message> @@ -2939,7 +2991,7 @@ Address: %4 <translation>（ä¸å¯ç”¨ï¼‰</translation> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation>交易状æ€ã€‚ é¼ æ ‡ç§»åˆ°æ¤åŒºåŸŸå¯æ˜¾ç¤ºç¡®è®¤é¡¹æ•°é‡ã€‚</translation> </message> @@ -3189,12 +3241,12 @@ Address: %4 <message> <location line="+0"/> <source>There was an error trying to save the wallet data to %1.</source> - <translation type="unfinished"/> + <translation>å°è¯•ä¿å˜é’±åŒ…æ•°æ®è‡³ %1 æ—¶å‘生错误。</translation> </message> <message> <location line="+4"/> <source>The wallet data was successfully saved to %1.</source> - <translation type="unfinished"/> + <translation>钱包数æ®æˆåŠŸä¿å˜è‡³ %1 。</translation> </message> <message> <location line="+0"/> @@ -3205,12 +3257,12 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+223"/> <source>Usage:</source> <translation>使用：</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>List commands</source> <translation>列出命令 </translation> @@ -3271,12 +3323,12 @@ Address: %4 <translation>指定您的公共地å€</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation>æ–开行为ä¸ç«¯å¯¹ç«¯é˜€å€¼ï¼ˆç¼ºçœ: 100）</translation> </message> <message> - <location line="-148"/> + <location line="-150"/> <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> @@ -3297,20 +3349,20 @@ Address: %4 </translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Run in the background as a daemon and accept commands</source> <translation>在åŽå°è¿è¡Œå¹¶æŽ¥å—命令 </translation> </message> <message> - <location line="+39"/> + <location line="+40"/> <source>Use the test network</source> <translation>使用测试网络 </translation> </message> <message> - <location line="-118"/> + <location line="-120"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>接å—æ¥è‡ªå¤–部的连接 (缺çœ: 如果ä¸å¸¦ -proxy or -connect å‚数设置为1)</translation> </message> @@ -3392,7 +3444,7 @@ rpcpassword=%s <message> <location line="+5"/> <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source> - <translation type="unfinished"/> + <translation>连接至 Toréšè—æœåŠ¡å™¨æ—¶ 使用ä¸åŒçš„SOCKS5ä»£ç† (缺çœ: -proxy) </translation> </message> <message> <location line="+3"/> @@ -3427,7 +3479,7 @@ rpcpassword=%s <message> <location line="+9"/> <source><category> can be:</source> - <translation type="unfinished"/> + <translation><category> å¯èƒ½æ˜¯ï¼š</translation> </message> <message> <location line="+6"/> @@ -3437,7 +3489,7 @@ rpcpassword=%s <message> <location line="+1"/> <source>Bitcoin Core Daemon</source> - <translation type="unfinished"/> + <translation>比特å¸æ ¸å¿ƒ 守护程åº</translation> </message> <message> <location line="+1"/> @@ -3451,13 +3503,18 @@ rpcpassword=%s </message> <message> <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation>清除钱包ä¸çš„交易记录 (诊æ–用，æ„味ç€éœ€è¦é‡æ–°æ‰«æ -rescan)</translation> + </message> + <message> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation>仅连接到指定节点</translation> </message> <message> <location line="+1"/> <source>Connect through SOCKS proxy</source> - <translation type="unfinished"/> + <translation>通过Socks代ç†è¿žæŽ¥:</translation> </message> <message> <location line="+1"/> @@ -3602,7 +3659,7 @@ rpcpassword=%s <message> <location line="+1"/> <source>If <category> is not supplied, output all debugging information.</source> - <translation type="unfinished"/> + <translation>如果<category>未æ供，将输出所有调试信æ¯ã€‚</translation> </message> <message> <location line="+2"/> @@ -3622,7 +3679,7 @@ rpcpassword=%s <message> <location line="+5"/> <source>Prepend debug output with timestamp (default: 1)</source> - <translation type="unfinished"/> + <translation>调试信æ¯è¾“出时，å‰é¢åŠ 上时间戳 (缺çœ: 1)</translation> </message> <message> <location line="+1"/> @@ -3661,6 +3718,11 @@ rpcpassword=%s </message> <message> <location line="+2"/> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation>付款时å…许使用未确认的零钱 (缺çœ: 1)</translation> + </message> + <message> + <location line="+1"/> <source>Start Bitcoin server</source> <translation>å¯åŠ¨æ¯”特å¸æœåŠ¡å™¨</translation> </message> @@ -3710,12 +3772,12 @@ rpcpassword=%s <translation>您需è¦å°† -reindex 改为 -txindex 以é‡å»ºæ•°æ®åº“</translation> </message> <message> - <location line="-79"/> + <location line="-80"/> <source>Imports blocks from external blk000??.dat file</source> <translation>从blk000??.dat文件导入数æ®å—</translation> </message> <message> - <location line="-105"/> + <location line="-106"/> <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> @@ -3727,7 +3789,7 @@ rpcpassword=%s <message> <location line="+2"/> <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source> - <translation type="unfinished"/> + <translation>设置 高优先级/低交易费 交易的最大å—节 (缺çœ: %d)</translation> </message> <message> <location line="+2"/> @@ -3735,7 +3797,7 @@ rpcpassword=%s <translation>设置脚本验è¯çº¿ç¨‹æ•°é‡ï¼ˆæœ€å¤š16，0 = 自动，<0 = ç•™ä¸‹è®¸å¤šç©ºé—²æ ¸å¿ƒï¼Œé»˜è®¤ä¸º 0）</translation> </message> <message> - <location line="+89"/> + <location line="+90"/> <source>Information</source> <translation>ä¿¡æ¯</translation> </message> @@ -3805,7 +3867,7 @@ rpcpassword=%s <translation>设置连接超时时间(缺çœï¼š5000毫秒)</translation> </message> <message> - <location line="+6"/> + <location line="+7"/> <source>System error: </source> <translation>系统错误：</translation> </message> @@ -3851,6 +3913,11 @@ rpcpassword=%s </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation>Zapping all transactions from wallet...</translation> + </message> + <message> + <location line="+1"/> <source>version</source> <translation>版本</translation> </message> @@ -3860,33 +3927,33 @@ rpcpassword=%s <translation>钱包文件wallet.datæŸå，抢救备份失败</translation> </message> <message> - <location line="-58"/> + <location line="-60"/> <source>Password for JSON-RPC connections</source> <translation>JSON-RPC 连接密ç </translation> </message> <message> - <location line="-70"/> + <location line="-71"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>å…许从指定IP接å—到的 JSON-RPC 连接</translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>å‘IP地å€ä¸º <ip> 的节点å‘é€æŒ‡ä»¤ (缺çœ: 127.0.0.1)</translation> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>当最佳数æ®å—å˜åŒ–时执行命令 (命令行ä¸çš„ %s 会被替æ¢æˆæ•°æ®å—哈希值)</translation> </message> <message> - <location line="+161"/> + <location line="+163"/> <source>Upgrade wallet to latest format</source> <translation>将钱包å‡çº§åˆ°æœ€æ–°çš„æ ¼å¼</translation> </message> <message> - <location line="-24"/> + <location line="-25"/> <source>Set key pool size to <n> (default: 100)</source> <translation>è®¾ç½®å¯†é’¥æ± å¤§å°ä¸º <n> (缺çœ: 100) </translation> @@ -3897,12 +3964,12 @@ rpcpassword=%s <translation>é‡æ–°æ‰«æ区å—链以查找é—æ¼çš„钱包交易</translation> </message> <message> - <location line="+38"/> + <location line="+39"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>为 JSON-RPC 连接使用 OpenSSL (https) 连接</translation> </message> <message> - <location line="-30"/> + <location line="-31"/> <source>Server certificate file (default: server.cert)</source> <translation>æœåŠ¡å™¨è¯ä¹¦ (默认为 server.cert) </translation> @@ -3914,7 +3981,7 @@ rpcpassword=%s </translation> </message> <message> - <location line="+16"/> + <location line="+17"/> <source>This help message</source> <translation>æœ¬å¸®åŠ©ä¿¡æ¯ </translation> @@ -3925,12 +3992,12 @@ rpcpassword=%s <translation>æ— æ³•ç»‘å®šæœ¬æœºç«¯å£ %s (è¿”å›žé”™è¯¯æ¶ˆæ¯ %d, %s)</translation> </message> <message> - <location line="-107"/> + <location line="-109"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>使用 -addnode, -seednode å’Œ -connect 选项时å…许查询DNS</translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Loading addresses...</source> <translation>æ£åœ¨åŠ 载地å€ç°¿...</translation> </message> @@ -3945,12 +4012,12 @@ rpcpassword=%s <translation>wallet.dat é’±åŒ…æ–‡ä»¶åŠ è½½é”™è¯¯ï¼šè¯·å‡çº§åˆ°æœ€æ–°ç‰ˆBitcoin客户端</translation> </message> <message> - <location line="+98"/> + <location line="+99"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>钱包文件需è¦è¢«é‡å†™ï¼šè¯·é€€å‡ºå¹¶é‡æ–°å¯åŠ¨Bitcoin客户端</translation> </message> <message> - <location line="-100"/> + <location line="-101"/> <source>Error loading wallet.dat</source> <translation>wallet.dat é’±åŒ…æ–‡ä»¶åŠ è½½å‡ºé”™</translation> </message> @@ -3960,7 +4027,7 @@ rpcpassword=%s <translation>æ— æ•ˆçš„ä»£ç†åœ°å€ï¼š%s</translation> </message> <message> - <location line="+56"/> + <location line="+57"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>-onlynet 指定的是未知网络：%s</translation> </message> @@ -3970,7 +4037,7 @@ rpcpassword=%s <translation>被指定的是未知socks代ç†ç‰ˆæœ¬: %i</translation> </message> <message> - <location line="-101"/> + <location line="-103"/> <source>Cannot resolve -bind address: '%s'</source> <translation>æ— æ³•è§£æž -bind 端å£åœ°å€: '%s'</translation> </message> @@ -3980,7 +4047,7 @@ rpcpassword=%s <translation>æ— æ³•è§£æž -externalip 地å€: '%s'</translation> </message> <message> - <location line="+48"/> + <location line="+49"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>éžæ³•é‡‘é¢ -paytxfee=<amount>: '%s'</translation> </message> @@ -4000,7 +4067,7 @@ rpcpassword=%s <translation>æ£åœ¨åŠ 载数æ®å—索引...</translation> </message> <message> - <location line="-62"/> + <location line="-63"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>æ·»åŠ èŠ‚ç‚¹å¹¶ä¸Žå…¶ä¿æŒè¿žæŽ¥</translation> </message> @@ -4010,12 +4077,12 @@ rpcpassword=%s <translation>æ— æ³•åœ¨æœ¬æœºç»‘å®š %s 端å£ã€‚比特å¸å®¢æˆ·ç«¯è½¯ä»¶å¯èƒ½å·²ç»åœ¨è¿è¡Œã€‚</translation> </message> <message> - <location line="+95"/> + <location line="+96"/> <source>Loading wallet...</source> <translation>æ£åœ¨åŠ 载钱包...</translation> </message> <message> - <location line="-56"/> + <location line="-57"/> <source>Cannot downgrade wallet</source> <translation>æ— æ³•é™çº§é’±åŒ…</translation> </message> @@ -4025,7 +4092,7 @@ rpcpassword=%s <translation>æ— æ³•å†™å…¥é»˜è®¤åœ°å€</translation> </message> <message> - <location line="+67"/> + <location line="+68"/> <source>Rescanning...</source> <translation>æ£åœ¨é‡æ–°æ‰«æ...</translation> </message> @@ -4035,17 +4102,17 @@ rpcpassword=%s <translation>åŠ è½½å®Œæˆ</translation> </message> <message> - <location line="+85"/> + <location line="+86"/> <source>To use the %s option</source> <translation>使用 %s 选项</translation> </message> <message> - <location line="-77"/> + <location line="-78"/> <source>Error</source> <translation>错误</translation> </message> <message> - <location line="-35"/> + <location line="-36"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp index e31542961c..394b5f3aea 100644 --- a/src/qt/optionsdialog.cpp +++ b/src/qt/optionsdialog.cpp @@ -14,7 +14,7 @@ #include "monitoreddatamapper.h" #include "optionsmodel.h" -#include "main.h" // for CTransaction::nMinTxFee +#include "main.h" // for CTransaction::nMinTxFee and MAX_SCRIPTCHECK_THREADS #include "netbase.h" #include "txdb.h" // for -dbcache defaults @@ -37,6 +37,8 @@ OptionsDialog::OptionsDialog(QWidget *parent) : /* Main elements init */ ui->databaseCache->setMinimum(nMinDbCache); ui->databaseCache->setMaximum(nMaxDbCache); + ui->threadsScriptVerif->setMinimum(-(int)boost::thread::hardware_concurrency()); + ui->threadsScriptVerif->setMaximum(MAX_SCRIPTCHECK_THREADS); /* Network elements init */ #ifndef USE_UPNP @@ -143,6 +145,8 @@ void OptionsDialog::setModel(OptionsModel *model) /* Main */ connect(ui->databaseCache, SIGNAL(valueChanged(int)), this, SLOT(showRestartWarning())); connect(ui->threadsScriptVerif, SIGNAL(valueChanged(int)), this, SLOT(showRestartWarning())); + /* Wallet */ + connect(ui->spendZeroConfChange, SIGNAL(clicked(bool)), this, SLOT(showRestartWarning())); /* Network */ connect(ui->connectSocks, SIGNAL(clicked(bool)), this, SLOT(showRestartWarning())); /* Display */ @@ -159,6 +163,7 @@ void OptionsDialog::setMapper() /* Wallet */ mapper->addMapping(ui->transactionFee, OptionsModel::Fee); mapper->addMapping(ui->spendZeroConfChange, OptionsModel::SpendZeroConfChange); + mapper->addMapping(ui->coinControlFeatures, OptionsModel::CoinControlFeatures); /* Network */ mapper->addMapping(ui->mapPortUpnp, OptionsModel::MapPortUPnP); @@ -178,7 +183,6 @@ void OptionsDialog::setMapper() mapper->addMapping(ui->lang, OptionsModel::Language); mapper->addMapping(ui->unit, OptionsModel::DisplayUnit); mapper->addMapping(ui->displayAddresses, OptionsModel::DisplayAddresses); - mapper->addMapping(ui->coinControlFeatures, OptionsModel::CoinControlFeatures); } void OptionsDialog::enableOkButton() diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp index 3b83a5ff62..9abe9351bb 100644 --- a/src/qt/optionsmodel.cpp +++ b/src/qt/optionsmodel.cpp @@ -30,6 +30,11 @@ OptionsModel::OptionsModel(QObject *parent) : Init(); } +void OptionsModel::addOverriddenOption(const std::string &option) +{ + strOverriddenByCommandLine += QString::fromStdString(option) + "=" + QString::fromStdString(mapArgs[option]) + " "; +} + // Writes all missing QSettings with their default values void OptionsModel::Init() { @@ -71,38 +76,39 @@ void OptionsModel::Init() // by command-line and show this in the UI. // Main + if (!settings.contains("nDatabaseCache")) + settings.setValue("nDatabaseCache", (qint64)nDefaultDbCache); + if (!SoftSetArg("-dbcache", settings.value("nDatabaseCache").toString().toStdString())) + addOverriddenOption("-dbcache"); + + if (!settings.contains("nThreadsScriptVerif")) + settings.setValue("nThreadsScriptVerif", DEFAULT_SCRIPTCHECK_THREADS); + if (!SoftSetArg("-par", settings.value("nThreadsScriptVerif").toString().toStdString())) + addOverriddenOption("-par"); + + // Wallet #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 "; + addOverriddenOption("-paytxfee"); if (!settings.contains("bSpendZeroConfChange")) settings.setValue("bSpendZeroConfChange", true); if (!SoftSetBoolArg("-spendzeroconfchange", settings.value("bSpendZeroConfChange").toBool())) - strOverriddenByCommandLine += "-spendzeroconfchange "; + addOverriddenOption("-spendzeroconfchange"); #endif - if (!settings.contains("nDatabaseCache")) - settings.setValue("nDatabaseCache", (qint64)nDefaultDbCache); - if (!SoftSetArg("-dbcache", settings.value("nDatabaseCache").toString().toStdString())) - strOverriddenByCommandLine += "-dbcache "; - - if (!settings.contains("nThreadsScriptVerif")) - settings.setValue("nThreadsScriptVerif", 0); - if (!SoftSetArg("-par", settings.value("nThreadsScriptVerif").toString().toStdString())) - strOverriddenByCommandLine += "-par "; - // Network if (!settings.contains("fUseUPnP")) #ifdef USE_UPNP settings.setValue("fUseUPnP", true); #else settings.setValue("fUseUPnP", false); -#endif +#endif if (!SoftSetBoolArg("-upnp", settings.value("fUseUPnP").toBool())) - strOverriddenByCommandLine += "-upnp "; + addOverriddenOption("-upnp"); if (!settings.contains("fUseProxy")) settings.setValue("fUseProxy", false); @@ -110,18 +116,18 @@ void OptionsModel::Init() settings.setValue("addrProxy", "127.0.0.1:9050"); // Only try to set -proxy, if user has enabled fUseProxy if (settings.value("fUseProxy").toBool() && !SoftSetArg("-proxy", settings.value("addrProxy").toString().toStdString())) - strOverriddenByCommandLine += "-proxy "; + addOverriddenOption("-proxy"); if (!settings.contains("nSocksVersion")) settings.setValue("nSocksVersion", 5); // Only try to set -socks, if user has enabled fUseProxy if (settings.value("fUseProxy").toBool() && !SoftSetArg("-socks", settings.value("nSocksVersion").toString().toStdString())) - strOverriddenByCommandLine += "-socks "; + addOverriddenOption("-socks"); // Display if (!settings.contains("language")) settings.setValue("language", ""); if (!SoftSetArg("-lang", settings.value("language").toString().toStdString())) - strOverriddenByCommandLine += "-lang"; + addOverriddenOption("-lang"); language = settings.value("language").toString(); } diff --git a/src/qt/optionsmodel.h b/src/qt/optionsmodel.h index a3487ddd2e..ece5ef78a4 100644 --- a/src/qt/optionsmodel.h +++ b/src/qt/optionsmodel.h @@ -75,6 +75,9 @@ private: /* settings that were overriden by command-line */ QString strOverriddenByCommandLine; + /// Add option to list of GUI options overridden through command line/config file + void addOverriddenOption(const std::string &option); + signals: void displayUnitChanged(int unit); void transactionFeeChanged(qint64); diff --git a/src/qt/receivecoinsdialog.cpp b/src/qt/receivecoinsdialog.cpp index 7539645b47..3ccfb429a6 100644 --- a/src/qt/receivecoinsdialog.cpp +++ b/src/qt/receivecoinsdialog.cpp @@ -19,6 +19,7 @@ #include <QMessageBox> #include <QTextDocument> #include <QScrollBar> +#include <QItemSelection> ReceiveCoinsDialog::ReceiveCoinsDialog(QWidget *parent) : QDialog(parent), @@ -60,23 +61,26 @@ void ReceiveCoinsDialog::setModel(WalletModel *model) if(model && model->getOptionsModel()) { + model->getRecentRequestsTableModel()->sort(RecentRequestsTableModel::Date, Qt::DescendingOrder); connect(model->getOptionsModel(), SIGNAL(displayUnitChanged(int)), this, SLOT(updateDisplayUnit())); updateDisplayUnit(); - ui->recentRequestsView->setModel(model->getRecentRequestsTableModel()); - ui->recentRequestsView->setAlternatingRowColors(true); - ui->recentRequestsView->setSelectionBehavior(QAbstractItemView::SelectRows); - ui->recentRequestsView->setSelectionMode(QAbstractItemView::ContiguousSelection); - ui->recentRequestsView->horizontalHeader()->resizeSection(RecentRequestsTableModel::Date, 130); - ui->recentRequestsView->horizontalHeader()->resizeSection(RecentRequestsTableModel::Label, 120); -#if QT_VERSION < 0x050000 - ui->recentRequestsView->horizontalHeader()->setResizeMode(RecentRequestsTableModel::Message, QHeaderView::Stretch); -#else - ui->recentRequestsView->horizontalHeader()->setSectionResizeMode(RecentRequestsTableModel::Message, QHeaderView::Stretch); -#endif - ui->recentRequestsView->horizontalHeader()->resizeSection(RecentRequestsTableModel::Amount, 100); - - model->getRecentRequestsTableModel()->sort(RecentRequestsTableModel::Date, Qt::DescendingOrder); + QTableView* tableView = ui->recentRequestsView; + + tableView->verticalHeader()->hide(); + tableView->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); + tableView->setModel(model->getRecentRequestsTableModel()); + tableView->setAlternatingRowColors(true); + tableView->setSelectionBehavior(QAbstractItemView::SelectRows); + tableView->setSelectionMode(QAbstractItemView::ContiguousSelection); + tableView->setColumnWidth(RecentRequestsTableModel::Date, DATE_COLUMN_WIDTH); + tableView->setColumnWidth(RecentRequestsTableModel::Label, LABEL_COLUMN_WIDTH); + + connect(tableView->selectionModel(), + SIGNAL(selectionChanged(QItemSelection, QItemSelection)), this, + SLOT(on_recentRequestsView_selectionChanged(QItemSelection, QItemSelection))); + // Last 2 columns are set by the columnResizingFixer, when the table geometry is ready. + columnResizingFixer = new GUIUtil::TableViewLastColumnResizingFixer(tableView, AMOUNT_MINIMUM_COLUMN_WIDTH, DATE_COLUMN_WIDTH); } } @@ -161,6 +165,15 @@ void ReceiveCoinsDialog::on_recentRequestsView_doubleClicked(const QModelIndex & dialog->show(); } +void ReceiveCoinsDialog::on_recentRequestsView_selectionChanged(const QItemSelection &selected, + const QItemSelection &deselected) +{ + // Enable Show/Remove buttons only if anything is selected. + bool enable = !ui->recentRequestsView->selectionModel()->selectedRows().isEmpty(); + ui->showRequestButton->setEnabled(enable); + ui->removeRequestButton->setEnabled(enable); +} + void ReceiveCoinsDialog::on_showRequestButton_clicked() { if(!model || !model->getRecentRequestsTableModel() || !ui->recentRequestsView->selectionModel()) @@ -185,6 +198,14 @@ void ReceiveCoinsDialog::on_removeRequestButton_clicked() model->getRecentRequestsTableModel()->removeRows(firstIndex.row(), selection.length(), firstIndex.parent()); } +// We override the virtual resizeEvent of the QWidget to adjust tables column +// sizes as the tables width is proportional to the dialogs width. +void ReceiveCoinsDialog::resizeEvent(QResizeEvent* event) +{ + QWidget::resizeEvent(event); + columnResizingFixer->stretchColumnWidth(RecentRequestsTableModel::Message); +} + void ReceiveCoinsDialog::keyPressEvent(QKeyEvent *event) { if (event->key() == Qt::Key_Return) diff --git a/src/qt/receivecoinsdialog.h b/src/qt/receivecoinsdialog.h index 12d2235782..ab63331597 100644 --- a/src/qt/receivecoinsdialog.h +++ b/src/qt/receivecoinsdialog.h @@ -6,11 +6,15 @@ #define RECEIVECOINSDIALOG_H #include <QDialog> +#include <QHeaderView> +#include <QItemSelection> #include <QKeyEvent> #include <QMenu> #include <QPoint> #include <QVariant> +#include "guiutil.h" + namespace Ui { class ReceiveCoinsDialog; } @@ -27,6 +31,13 @@ class ReceiveCoinsDialog : public QDialog Q_OBJECT public: + enum ColumnWidths { + DATE_COLUMN_WIDTH = 130, + LABEL_COLUMN_WIDTH = 120, + AMOUNT_MINIMUM_COLUMN_WIDTH = 160, + MINIMUM_COLUMN_WIDTH = 130 + }; + explicit ReceiveCoinsDialog(QWidget *parent = 0); ~ReceiveCoinsDialog(); @@ -42,15 +53,18 @@ protected: private: Ui::ReceiveCoinsDialog *ui; + GUIUtil::TableViewLastColumnResizingFixer *columnResizingFixer; WalletModel *model; QMenu *contextMenu; void copyColumnToClipboard(int column); + virtual void resizeEvent(QResizeEvent* event); private slots: void on_receiveButton_clicked(); void on_showRequestButton_clicked(); void on_removeRequestButton_clicked(); void on_recentRequestsView_doubleClicked(const QModelIndex &index); + void on_recentRequestsView_selectionChanged(const QItemSelection &, const QItemSelection &); void updateDisplayUnit(); void showMenu(const QPoint &); void copyLabel(); diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp index bd29efee86..ba5871ae2b 100644 --- a/src/qt/rpcconsole.cpp +++ b/src/qt/rpcconsole.cpp @@ -331,6 +331,13 @@ void RPCConsole::clear() tr("Type <b>help</b> for an overview of available commands.")), true); } +void RPCConsole::reject() +{ + // Ignore escape keypress if this is not a seperate window + if(windowType() != Qt::Widget) + QDialog::reject(); +} + void RPCConsole::message(int category, const QString &message, bool html) { QTime time = QTime::currentTime(); @@ -349,7 +356,14 @@ void RPCConsole::message(int category, const QString &message, bool html) void RPCConsole::setNumConnections(int count) { - ui->numberOfConnections->setText(QString::number(count)); + if (!clientModel) + return; + + QString connections = QString::number(count) + " ("; + connections += tr("In:") + " " + QString::number(clientModel->getNumConnections(CONNECTIONS_IN)) + " / "; + connections += tr("Out:") + " " + QString::number(clientModel->getNumConnections(CONNECTIONS_OUT)) + ")"; + + ui->numberOfConnections->setText(connections); } void RPCConsole::setNumBlocks(int count, int countOfPeers) diff --git a/src/qt/rpcconsole.h b/src/qt/rpcconsole.h index e5da01546a..f7a7772050 100644 --- a/src/qt/rpcconsole.h +++ b/src/qt/rpcconsole.h @@ -47,6 +47,7 @@ private slots: public slots: void clear(); + void reject(); void message(int category, const QString &message, bool html = false); /** Set number of connections shown in the UI */ void setNumConnections(int count); diff --git a/src/qt/sendcoinsentry.cpp b/src/qt/sendcoinsentry.cpp index ad8dd7b732..e0f56f8cd2 100644 --- a/src/qt/sendcoinsentry.cpp +++ b/src/qt/sendcoinsentry.cpp @@ -195,8 +195,10 @@ void SendCoinsEntry::setValue(const SendCoinsRecipient &value) ui->messageTextLabel->setVisible(!recipient.message.isEmpty()); ui->messageLabel->setVisible(!recipient.message.isEmpty()); - ui->payTo->setText(recipient.address); - ui->addAsLabel->setText(recipient.label); + ui->addAsLabel->clear(); + ui->payTo->setText(recipient.address); // this may set a label from addressbook + if (!recipient.label.isEmpty()) // if a label had been set from the addressbook, dont overwrite with an empty label + ui->addAsLabel->setText(recipient.label); ui->payAmount->setValue(recipient.amount); } } diff --git a/src/qt/splashscreen.cpp b/src/qt/splashscreen.cpp index cacf5dc49b..7c79b0efd0 100644 --- a/src/qt/splashscreen.cpp +++ b/src/qt/splashscreen.cpp @@ -5,8 +5,12 @@ #include "splashscreen.h" #include "clientversion.h" +#include "init.h" #include "ui_interface.h" #include "util.h" +#ifdef ENABLE_WALLET +#include "wallet.h" +#endif #include <QApplication> #include <QPainter> @@ -109,14 +113,33 @@ static void InitMessage(SplashScreen *splash, const std::string &message) Q_ARG(QColor, QColor(55,55,55))); } +static void ShowProgress(SplashScreen *splash, const std::string &title, int nProgress) +{ + InitMessage(splash, title + strprintf("%d", nProgress) + "%"); +} + +#ifdef ENABLE_WALLET +static void ConnectWallet(SplashScreen *splash, CWallet* wallet) +{ + wallet->ShowProgress.connect(boost::bind(ShowProgress, splash, _1, _2)); +} +#endif + void SplashScreen::subscribeToCoreSignals() { // Connect signals to client uiInterface.InitMessage.connect(boost::bind(InitMessage, this, _1)); +#ifdef ENABLE_WALLET + uiInterface.LoadWallet.connect(boost::bind(ConnectWallet, this, _1)); +#endif } void SplashScreen::unsubscribeFromCoreSignals() { // Disconnect signals from client uiInterface.InitMessage.disconnect(boost::bind(InitMessage, this, _1)); +#ifdef ENABLE_WALLET + if(pwalletMain) + pwalletMain->ShowProgress.disconnect(boost::bind(ShowProgress, this, _1, _2)); +#endif } diff --git a/src/qt/transactionview.cpp b/src/qt/transactionview.cpp index a0c3ce62aa..a363150919 100644 --- a/src/qt/transactionview.cpp +++ b/src/qt/transactionview.cpp @@ -168,6 +168,7 @@ void TransactionView::setModel(WalletModel *model) transactionProxyModel->setSortRole(Qt::EditRole); + transactionView->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); transactionView->setModel(transactionProxyModel); transactionView->setAlternatingRowColors(true); transactionView->setSelectionBehavior(QAbstractItemView::SelectRows); @@ -176,15 +177,12 @@ void TransactionView::setModel(WalletModel *model) transactionView->sortByColumn(TransactionTableModel::Status, Qt::DescendingOrder); transactionView->verticalHeader()->hide(); - transactionView->horizontalHeader()->resizeSection(TransactionTableModel::Status, 23); - transactionView->horizontalHeader()->resizeSection(TransactionTableModel::Date, 120); - transactionView->horizontalHeader()->resizeSection(TransactionTableModel::Type, 120); -#if QT_VERSION < 0x050000 - transactionView->horizontalHeader()->setResizeMode(TransactionTableModel::ToAddress, QHeaderView::Stretch); -#else - transactionView->horizontalHeader()->setSectionResizeMode(TransactionTableModel::ToAddress, QHeaderView::Stretch); -#endif - transactionView->horizontalHeader()->resizeSection(TransactionTableModel::Amount, 100); + transactionView->setColumnWidth(TransactionTableModel::Status, STATUS_COLUMN_WIDTH); + transactionView->setColumnWidth(TransactionTableModel::Date, DATE_COLUMN_WIDTH); + transactionView->setColumnWidth(TransactionTableModel::Type, TYPE_COLUMN_WIDTH); + transactionView->setColumnWidth(TransactionTableModel::Amount, AMOUNT_MINIMUM_COLUMN_WIDTH); + + columnResizingFixer = new GUIUtil::TableViewLastColumnResizingFixer(transactionView, AMOUNT_MINIMUM_COLUMN_WIDTH, MINIMUM_COLUMN_WIDTH); } } @@ -439,3 +437,11 @@ void TransactionView::focusTransaction(const QModelIndex &idx) transactionView->setCurrentIndex(targetIdx); transactionView->setFocus(); } + +// We override the virtual resizeEvent of the QWidget to adjust tables column +// sizes as the tables width is proportional to the dialogs width. +void TransactionView::resizeEvent(QResizeEvent* event) +{ + QWidget::resizeEvent(event); + columnResizingFixer->stretchColumnWidth(TransactionTableModel::ToAddress); +} diff --git a/src/qt/transactionview.h b/src/qt/transactionview.h index 18f2b9bfc9..ef4f9d6f34 100644 --- a/src/qt/transactionview.h +++ b/src/qt/transactionview.h @@ -5,6 +5,8 @@ #ifndef TRANSACTIONVIEW_H #define TRANSACTIONVIEW_H +#include "guiutil.h" + #include <QWidget> class TransactionFilterProxy; @@ -44,6 +46,14 @@ public: Range }; + enum ColumnWidths { + STATUS_COLUMN_WIDTH = 23, + DATE_COLUMN_WIDTH = 120, + TYPE_COLUMN_WIDTH = 120, + AMOUNT_MINIMUM_COLUMN_WIDTH = 120, + MINIMUM_COLUMN_WIDTH = 23 + }; + private: WalletModel *model; TransactionFilterProxy *transactionProxyModel; @@ -62,6 +72,10 @@ private: QWidget *createDateRangeWidget(); + GUIUtil::TableViewLastColumnResizingFixer *columnResizingFixer; + + virtual void resizeEvent(QResizeEvent* event); + private slots: void contextualMenu(const QPoint &); void dateRangeChanged(); diff --git a/src/qt/utilitydialog.cpp b/src/qt/utilitydialog.cpp index 24992db465..01b710e876 100644 --- a/src/qt/utilitydialog.cpp +++ b/src/qt/utilitydialog.cpp @@ -38,9 +38,9 @@ void AboutDialog::setModel(ClientModel *model) * 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); + version += " " + tr("(%1-bit)").arg(64); #elif defined(__i386__ ) - version += tr(" (%1-bit)").arg(32); + version += " " + tr("(%1-bit)").arg(32); #endif ui->versionLabel->setText(version); } @@ -72,10 +72,11 @@ HelpMessageDialog::HelpMessageDialog(QWidget *parent) : 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)"); + " -choosedatadir " + tr("Choose data directory on startup (default: 0)") + "\n" + + " -lang=<lang> " + tr("Set language, for example \"de_DE\" (default: system locale)") + "\n" + + " -min " + tr("Start minimized") + "\n" + + " -rootcertificates=<file> " + tr("Set SSL root certificates for payment request (default: -system-)") + "\n" + + " -splash " + tr("Show splash screen on startup (default: 1)"); ui->helpMessageLabel->setFont(GUIUtil::bitcoinAddressFont()); diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp index eae448fee4..424c9ee279 100644 --- a/src/qt/walletmodel.cpp +++ b/src/qt/walletmodel.cpp @@ -419,8 +419,17 @@ static void NotifyAddressBookChanged(WalletModel *walletmodel, CWallet *wallet, Q_ARG(int, status)); } +// queue notifications to show a non freezing progress dialog e.g. for rescan +static bool fQueueNotifications = false; +static std::vector<std::pair<uint256, ChangeType> > vQueueNotifications; static void NotifyTransactionChanged(WalletModel *walletmodel, CWallet *wallet, const uint256 &hash, ChangeType status) { + if (fQueueNotifications) + { + vQueueNotifications.push_back(make_pair(hash, status)); + return; + } + QString strHash = QString::fromStdString(hash.GetHex()); qDebug() << "NotifyTransactionChanged : " + strHash + " status= " + QString::number(status); @@ -429,12 +438,32 @@ static void NotifyTransactionChanged(WalletModel *walletmodel, CWallet *wallet, Q_ARG(int, status)); } +static void ShowProgress(WalletModel *walletmodel, const std::string &title, int nProgress) +{ + // emits signal "showProgress" + QMetaObject::invokeMethod(walletmodel, "showProgress", Qt::QueuedConnection, + Q_ARG(QString, QString::fromStdString(title)), + Q_ARG(int, nProgress)); + + if (nProgress == 0) + fQueueNotifications = true; + + if (nProgress == 100) + { + fQueueNotifications = false; + BOOST_FOREACH(const PAIRTYPE(uint256, ChangeType)& notification, vQueueNotifications) + NotifyTransactionChanged(walletmodel, NULL, notification.first, notification.second); + std::vector<std::pair<uint256, ChangeType> >().swap(vQueueNotifications); // clear + } +} + void WalletModel::subscribeToCoreSignals() { // Connect signals to wallet wallet->NotifyStatusChanged.connect(boost::bind(&NotifyKeyStoreStatusChanged, this, _1)); wallet->NotifyAddressBookChanged.connect(boost::bind(NotifyAddressBookChanged, this, _1, _2, _3, _4, _5, _6)); wallet->NotifyTransactionChanged.connect(boost::bind(NotifyTransactionChanged, this, _1, _2, _3)); + wallet->ShowProgress.connect(boost::bind(ShowProgress, this, _1, _2)); } void WalletModel::unsubscribeFromCoreSignals() @@ -443,6 +472,7 @@ void WalletModel::unsubscribeFromCoreSignals() wallet->NotifyStatusChanged.disconnect(boost::bind(&NotifyKeyStoreStatusChanged, this, _1)); wallet->NotifyAddressBookChanged.disconnect(boost::bind(NotifyAddressBookChanged, this, _1, _2, _3, _4, _5, _6)); wallet->NotifyTransactionChanged.disconnect(boost::bind(NotifyTransactionChanged, this, _1, _2, _3)); + wallet->ShowProgress.disconnect(boost::bind(ShowProgress, this, _1, _2)); } // WalletModel::UnlockContext implementation diff --git a/src/qt/walletmodel.h b/src/qt/walletmodel.h index 28a9169e27..ccf590aaed 100644 --- a/src/qt/walletmodel.h +++ b/src/qt/walletmodel.h @@ -237,6 +237,9 @@ signals: // Coins sent: from wallet, to recipient, in (serialized) transaction: void coinsSent(CWallet* wallet, SendCoinsRecipient recipient, QByteArray transaction); + // Show progress dialog e.g. for rescan + void showProgress(const QString &title, int nProgress); + public slots: /* Wallet status might have changed */ void updateStatus(); diff --git a/src/qt/walletview.cpp b/src/qt/walletview.cpp index 1a9c7866db..1cef48344f 100644 --- a/src/qt/walletview.cpp +++ b/src/qt/walletview.cpp @@ -24,6 +24,7 @@ #include <QActionGroup> #include <QFileDialog> #include <QHBoxLayout> +#include <QProgressDialog> #include <QPushButton> #include <QVBoxLayout> @@ -127,6 +128,9 @@ void WalletView::setWalletModel(WalletModel *walletModel) // Ask for passphrase if needed connect(walletModel, SIGNAL(requireUnlock()), this, SLOT(unlockWallet())); + + // Show progress dialog + connect(walletModel, SIGNAL(showProgress(QString,int)), this, SLOT(showProgress(QString,int))); } } @@ -277,3 +281,26 @@ void WalletView::usedReceivingAddresses() dlg->setModel(walletModel->getAddressTableModel()); dlg->show(); } + +void WalletView::showProgress(const QString &title, int nProgress) +{ + if (nProgress == 0) + { + progressDialog = new QProgressDialog(title, "", 0, 100); + progressDialog->setWindowModality(Qt::ApplicationModal); + progressDialog->setMinimumDuration(0); + progressDialog->setCancelButton(0); + progressDialog->setAutoClose(false); + progressDialog->setValue(0); + } + else if (nProgress == 100) + { + if (progressDialog) + { + progressDialog->close(); + progressDialog->deleteLater(); + } + } + else if (progressDialog) + progressDialog->setValue(nProgress); +} diff --git a/src/qt/walletview.h b/src/qt/walletview.h index ecfa06ac5a..9cfa8d6760 100644 --- a/src/qt/walletview.h +++ b/src/qt/walletview.h @@ -18,6 +18,7 @@ class WalletModel; QT_BEGIN_NAMESPACE class QModelIndex; +class QProgressDialog; QT_END_NAMESPACE /* @@ -60,6 +61,8 @@ private: TransactionView *transactionView; + QProgressDialog *progressDialog; + public slots: /** Switch to overview (home) page */ void gotoOverviewPage(); @@ -97,6 +100,9 @@ public slots: /** Re-emit encryption status signal */ void updateEncryptionStatus(); + /** Show progress dialog e.g. for rescan */ + void showProgress(const QString &title, int nProgress); + signals: /** Signal that we want to show the main window */ void showNormalIfMinimized(); diff --git a/src/rpcclient.cpp b/src/rpcclient.cpp index 37a501bb17..8620a87297 100644 --- a/src/rpcclient.cpp +++ b/src/rpcclient.cpp @@ -20,7 +20,6 @@ #include <boost/foreach.hpp> #include <boost/iostreams/concepts.hpp> #include <boost/iostreams/stream.hpp> -#include <boost/lexical_cast.hpp> #include <boost/shared_ptr.hpp> #include "json/json_spirit_writer_template.h" @@ -266,11 +265,12 @@ std::string HelpMessageCli(bool mainProgram) strUsage += " -rpcconnect=<ip> " + _("Send commands to node running on <ip> (default: 127.0.0.1)") + "\n"; strUsage += " -rpcport=<port> " + _("Connect to JSON-RPC on <port> (default: 8332 or testnet: 18332)") + "\n"; strUsage += " -rpcwait " + _("Wait for RPC server to start") + "\n"; - strUsage += " -rpcuser=<user> " + _("Username for JSON-RPC connections") + "\n"; - strUsage += " -rpcpassword=<pw> " + _("Password for JSON-RPC connections") + "\n"; if(mainProgram) { + strUsage += " -rpcuser=<user> " + _("Username for JSON-RPC connections") + "\n"; + strUsage += " -rpcpassword=<pw> " + _("Password for JSON-RPC connections") + "\n"; + strUsage += "\n" + _("SSL options: (see the Bitcoin Wiki for SSL setup instructions)") + "\n"; strUsage += " -rpcssl " + _("Use OpenSSL (https) for JSON-RPC connections") + "\n"; } diff --git a/src/rpcdump.cpp b/src/rpcdump.cpp index 635d4ac19b..9a24a99c17 100644 --- a/src/rpcdump.cpp +++ b/src/rpcdump.cpp @@ -14,7 +14,6 @@ #include <boost/algorithm/string.hpp> #include <boost/date_time/posix_time/posix_time.hpp> -#include <boost/lexical_cast.hpp> #include "json/json_spirit_value.h" using namespace json_spirit; @@ -213,6 +212,9 @@ Value importwallet(const Array& params, bool fHelp) while (pindex && pindex->pprev && pindex->nTime > nTimeBegin - 7200) pindex = pindex->pprev; + if (!pwalletMain->nTimeFirstKey || nTimeBegin < pwalletMain->nTimeFirstKey) + pwalletMain->nTimeFirstKey = nTimeBegin; + LogPrintf("Rescanning last %i blocks\n", chainActive.Height() - pindex->nHeight + 1); pwalletMain->ScanForWalletTransactions(pindex); pwalletMain->MarkDirty(); diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp index 564f0401f1..070cf1cb2a 100644 --- a/src/rpcmining.cpp +++ b/src/rpcmining.cpp @@ -204,6 +204,7 @@ Value setgenerate(const Array& params, bool fHelp) else // Not -regtest: start generate thread, return immediately { mapArgs["-gen"] = (fGenerate ? "1" : "0"); + mapArgs ["-genproclimit"] = itostr(nGenProcLimit); GenerateBitcoins(fGenerate, pwalletMain, nGenProcLimit); } diff --git a/src/rpcmisc.cpp b/src/rpcmisc.cpp index 353fb77b88..ae154f2ae4 100644 --- a/src/rpcmisc.cpp +++ b/src/rpcmisc.cpp @@ -46,8 +46,9 @@ Value getinfo(const Array& params, bool fHelp) " \"testnet\": true|false, (boolean) if the server is using testnet or not\n" " \"keypoololdest\": xxxxxx, (numeric) the timestamp (seconds since GMT epoch) of the oldest pre-generated key in the key pool\n" " \"keypoolsize\": xxxx, (numeric) how many new keys are pre-generated\n" - " \"paytxfee\": x.xxxx, (numeric) the transaction fee set in btc\n" " \"unlocked_until\": ttt, (numeric) the timestamp in seconds since epoch (midnight Jan 1 1970 GMT) that the wallet is unlocked for transfers, or 0 if the wallet is locked\n" + " \"paytxfee\": x.xxxx, (numeric) the transaction fee set in btc/kb\n" + " \"relayfee\": x.xxxx, (numeric) minimum relay fee for non-free transactions in btc/kb\n" " \"errors\": \"...\" (string) any error messages\n" "}\n" "\nExamples:\n" @@ -78,10 +79,11 @@ Value getinfo(const Array& params, bool fHelp) obj.push_back(Pair("keypoololdest", (boost::int64_t)pwalletMain->GetOldestKeyPoolTime())); obj.push_back(Pair("keypoolsize", (int)pwalletMain->GetKeyPoolSize())); } - obj.push_back(Pair("paytxfee", ValueFromAmount(nTransactionFee))); if (pwalletMain && pwalletMain->IsCrypted()) obj.push_back(Pair("unlocked_until", (boost::int64_t)nWalletUnlockTime)); + obj.push_back(Pair("paytxfee", ValueFromAmount(nTransactionFee))); #endif + obj.push_back(Pair("relayfee", ValueFromAmount(CTransaction::nMinRelayTxFee))); obj.push_back(Pair("errors", GetWarnings("statusbar"))); return obj; } @@ -255,7 +257,7 @@ Value createmultisig(const Array& params, bool fHelp) "\nCreate a multisig address from 2 addresses\n" + HelpExampleCli("createmultisig", "2 \"[\\\"16sSauSf5pF2UkUwvKGq4qjNRzBZYqgEL5\\\",\\\"171sgjn4YtPu27adkKGrdDwzRTxnRkBfKV\\\"]\"") + "\nAs a json rpc call\n" - + HelpExampleRpc("icreatemultisig", "2, \"[\\\"16sSauSf5pF2UkUwvKGq4qjNRzBZYqgEL5\\\",\\\"171sgjn4YtPu27adkKGrdDwzRTxnRkBfKV\\\"]\"") + + HelpExampleRpc("createmultisig", "2, \"[\\\"16sSauSf5pF2UkUwvKGq4qjNRzBZYqgEL5\\\",\\\"171sgjn4YtPu27adkKGrdDwzRTxnRkBfKV\\\"]\"") ; throw runtime_error(msg); } diff --git a/src/rpcnet.cpp b/src/rpcnet.cpp index efe4f54b0e..1b56d9ae7d 100644 --- a/src/rpcnet.cpp +++ b/src/rpcnet.cpp @@ -10,10 +10,6 @@ #include "protocol.h" #include "sync.h" #include "util.h" -#ifdef ENABLE_WALLET -#include "init.h" // for getinfo -#include "wallet.h" // for getinfo -#endif #include <boost/foreach.hpp> #include "json/json_spirit_value.h" @@ -138,8 +134,7 @@ Value getpeerinfo(const Array& params, bool fHelp) if (fStateStats) { obj.push_back(Pair("banscore", statestats.nMisbehavior)); } - if (stats.fSyncNode) - obj.push_back(Pair("syncnode", true)); + obj.push_back(Pair("syncnode", stats.fSyncNode)); ret.push_back(obj); } diff --git a/src/rpcprotocol.cpp b/src/rpcprotocol.cpp index 4ea84e99be..652b14d187 100644 --- a/src/rpcprotocol.cpp +++ b/src/rpcprotocol.cpp @@ -17,7 +17,6 @@ #include <boost/foreach.hpp> #include <boost/iostreams/concepts.hpp> #include <boost/iostreams/stream.hpp> -#include <boost/lexical_cast.hpp> #include <boost/shared_ptr.hpp> #include "json/json_spirit_writer_template.h" @@ -222,7 +221,7 @@ int ReadHTTPMessage(std::basic_istream<char>& stream, map<string, // unspecified (HTTP errors and contents of 'error'). // // 1.0 spec: http://json-rpc.org/wiki/specification -// 1.2 spec: http://groups.google.com/group/json-rpc/web/json-rpc-over-http +// 1.2 spec: http://jsonrpc.org/historical/json-rpc-over-http.html // http://www.codeproject.com/KB/recipes/JSON_Spirit.aspx // diff --git a/src/rpcprotocol.h b/src/rpcprotocol.h index 80cdb34f15..8b3df19621 100644 --- a/src/rpcprotocol.h +++ b/src/rpcprotocol.h @@ -49,6 +49,9 @@ 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_TRANSACTION_ERROR = -25, // General error during transaction submission + RPC_TRANSACTION_REJECTED = -26, // Transaction was rejected by network rules + RPC_TRANSACTION_ALREADY_IN_CHAIN= -27, // Transaction already in chain // P2P client errors RPC_CLIENT_NOT_CONNECTED = -9, // Bitcoin is not connected diff --git a/src/rpcrawtransaction.cpp b/src/rpcrawtransaction.cpp index 837aee7eaa..4b7dd617e0 100644 --- a/src/rpcrawtransaction.cpp +++ b/src/rpcrawtransaction.cpp @@ -536,7 +536,7 @@ Value signrawtransaction(const Array& params, bool fHelp) " \"privatekey\" (string) private key in base58-encoding\n" " ,...\n" " ]\n" - "4. \"sighashtype\" (string, optional, default=ALL) The signature has type. Must be one of\n" + "4. \"sighashtype\" (string, optional, default=ALL) The signature hash type. Must be one of\n" " \"ALL\"\n" " \"NONE\"\n" " \"SINGLE\"\n" @@ -777,25 +777,23 @@ Value sendrawtransaction(const Array& params, bool fHelp) } uint256 hashTx = tx.GetHash(); - bool fHave = false; CCoinsViewCache &view = *pcoinsTip; CCoins existingCoins; - { - fHave = view.GetCoins(hashTx, existingCoins); - if (!fHave) { - // push to local node - CValidationState state; - if (!AcceptToMemoryPool(mempool, state, tx, false, NULL, !fOverrideFees)) - throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "TX rejected"); // TODO: report validation state + bool fHaveMempool = mempool.exists(hashTx); + bool fHaveChain = view.GetCoins(hashTx, existingCoins) && existingCoins.nHeight < 1000000000; + if (!fHaveMempool && !fHaveChain) { + // push to local node and sync with wallets + CValidationState state; + if (AcceptToMemoryPool(mempool, state, tx, false, NULL, !fOverrideFees)) + SyncWithWallets(hashTx, tx, NULL); + else { + if(state.IsInvalid()) + throw JSONRPCError(RPC_TRANSACTION_REJECTED, strprintf("%i: %s", state.GetRejectCode(), state.GetRejectReason())); + else + throw JSONRPCError(RPC_TRANSACTION_ERROR, state.GetRejectReason()); } - } - if (fHave) { - if (existingCoins.nHeight < 1000000000) - throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "transaction already in block chain"); - // Not in block, but already in the memory pool; will drop - // through to re-relay it. - } else { - SyncWithWallets(hashTx, tx, NULL); + } else if (fHaveChain) { + throw JSONRPCError(RPC_TRANSACTION_ALREADY_IN_CHAIN, "transaction already in block chain"); } RelayTransaction(tx, hashTx); diff --git a/src/rpcserver.cpp b/src/rpcserver.cpp index 4d110124b2..d771a42427 100644 --- a/src/rpcserver.cpp +++ b/src/rpcserver.cpp @@ -22,7 +22,6 @@ #include <boost/foreach.hpp> #include <boost/iostreams/concepts.hpp> #include <boost/iostreams/stream.hpp> -#include <boost/lexical_cast.hpp> #include <boost/shared_ptr.hpp> #include "json/json_spirit_writer_template.h" @@ -223,85 +222,95 @@ Value stop(const Array& params, bool fHelp) static const CRPCCommand vRPCCommands[] = { // name actor (function) okSafeMode threadSafe reqWallet // ------------------------ ----------------------- ---------- ---------- --------- + /* Overall control/query calls */ + { "getinfo", &getinfo, true, false, false }, /* uses wallet if enabled */ { "help", &help, true, true, false }, { "stop", &stop, true, true, false }, - { "getblockcount", &getblockcount, true, false, false }, - { "getbestblockhash", &getbestblockhash, true, false, false }, - { "getconnectioncount", &getconnectioncount, true, false, false }, - { "getpeerinfo", &getpeerinfo, true, false, false }, - { "ping", &ping, true, false, false }, + + /* P2P networking */ { "addnode", &addnode, true, true, false }, { "getaddednodeinfo", &getaddednodeinfo, true, true, false }, + { "getconnectioncount", &getconnectioncount, true, false, false }, { "getnettotals", &getnettotals, true, true, false }, - { "getdifficulty", &getdifficulty, true, false, false }, - { "getinfo", &getinfo, true, false, false }, - { "getrawmempool", &getrawmempool, true, false, false }, + { "getpeerinfo", &getpeerinfo, true, false, false }, + { "ping", &ping, true, false, false }, + + /* Block chain and UTXO */ + { "getbestblockhash", &getbestblockhash, true, false, false }, + { "getblockcount", &getblockcount, true, false, false }, { "getblock", &getblock, false, false, false }, { "getblockhash", &getblockhash, false, false, false }, - { "getrawtransaction", &getrawtransaction, false, false, false }, - { "createrawtransaction", &createrawtransaction, false, false, false }, - { "decoderawtransaction", &decoderawtransaction, false, false, false }, - { "decodescript", &decodescript, false, false, false }, - { "signrawtransaction", &signrawtransaction, false, false, false }, - { "sendrawtransaction", &sendrawtransaction, false, false, false }, - { "gettxoutsetinfo", &gettxoutsetinfo, true, false, false }, + { "getdifficulty", &getdifficulty, true, false, false }, + { "getrawmempool", &getrawmempool, true, false, false }, { "gettxout", &gettxout, true, false, false }, + { "gettxoutsetinfo", &gettxoutsetinfo, true, false, false }, { "verifychain", &verifychain, true, false, false }, /* Mining */ - { "getnetworkhashps", &getnetworkhashps, true, false, false }, - { "getmininginfo", &getmininginfo, true, false, false }, { "getblocktemplate", &getblocktemplate, true, false, false }, + { "getmininginfo", &getmininginfo, true, false, false }, + { "getnetworkhashps", &getnetworkhashps, true, false, false }, { "submitblock", &submitblock, false, false, false }, - { "validateaddress", &validateaddress, true, false, false }, + + /* Raw transactions */ + { "createrawtransaction", &createrawtransaction, false, false, false }, + { "decoderawtransaction", &decoderawtransaction, false, false, false }, + { "decodescript", &decodescript, false, false, false }, + { "getrawtransaction", &getrawtransaction, false, false, false }, + { "sendrawtransaction", &sendrawtransaction, false, false, false }, + { "signrawtransaction", &signrawtransaction, false, false, false }, /* uses wallet if enabled */ + + /* Utility functions */ { "createmultisig", &createmultisig, true, true , false }, + { "validateaddress", &validateaddress, true, false, false }, /* uses wallet if enabled */ { "verifymessage", &verifymessage, false, false, false }, #ifdef ENABLE_WALLET /* Wallet */ - { "getnewaddress", &getnewaddress, true, false, true }, + { "addmultisigaddress", &addmultisigaddress, false, false, true }, + { "backupwallet", &backupwallet, true, false, true }, + { "dumpprivkey", &dumpprivkey, true, false, true }, + { "dumpwallet", &dumpwallet, true, false, true }, + { "encryptwallet", &encryptwallet, false, false, true }, { "getaccountaddress", &getaccountaddress, true, false, true }, - { "getrawchangeaddress", &getrawchangeaddress, true, false, true }, - { "setaccount", &setaccount, true, false, true }, { "getaccount", &getaccount, false, false, true }, { "getaddressesbyaccount", &getaddressesbyaccount, true, false, true }, - { "sendtoaddress", &sendtoaddress, false, false, true }, - { "getreceivedbyaddress", &getreceivedbyaddress, false, false, true }, - { "getreceivedbyaccount", &getreceivedbyaccount, false, false, true }, - { "listreceivedbyaddress", &listreceivedbyaddress, false, false, true }, - { "listreceivedbyaccount", &listreceivedbyaccount, false, false, true }, - { "backupwallet", &backupwallet, true, false, true }, - { "keypoolrefill", &keypoolrefill, true, false, true }, - { "walletpassphrase", &walletpassphrase, true, false, true }, - { "walletpassphrasechange", &walletpassphrasechange, false, false, true }, - { "walletlock", &walletlock, true, false, true }, - { "encryptwallet", &encryptwallet, false, false, true }, { "getbalance", &getbalance, false, false, true }, - { "getunconfirmedbalance", &getunconfirmedbalance, false, false, true }, - { "move", &movecmd, false, false, true }, - { "sendfrom", &sendfrom, false, false, true }, - { "sendmany", &sendmany, false, false, true }, - { "addmultisigaddress", &addmultisigaddress, false, false, true }, + { "getnewaddress", &getnewaddress, true, false, true }, + { "getrawchangeaddress", &getrawchangeaddress, true, false, true }, + { "getreceivedbyaccount", &getreceivedbyaccount, false, false, true }, + { "getreceivedbyaddress", &getreceivedbyaddress, false, false, true }, { "gettransaction", &gettransaction, false, false, true }, - { "listtransactions", &listtransactions, false, false, true }, - { "listaddressgroupings", &listaddressgroupings, false, false, true }, - { "signmessage", &signmessage, false, false, true }, - { "listaccounts", &listaccounts, false, false, true }, - { "listsinceblock", &listsinceblock, false, false, true }, - { "dumpprivkey", &dumpprivkey, true, false, true }, - { "dumpwallet", &dumpwallet, true, false, true }, + { "getunconfirmedbalance", &getunconfirmedbalance, false, false, true }, + { "getwalletinfo", &getwalletinfo, true, false, true }, { "importprivkey", &importprivkey, false, false, true }, { "importwallet", &importwallet, false, false, true }, + { "keypoolrefill", &keypoolrefill, true, false, true }, + { "listaccounts", &listaccounts, false, false, true }, + { "listaddressgroupings", &listaddressgroupings, false, false, true }, + { "listlockunspent", &listlockunspent, false, false, true }, + { "listreceivedbyaccount", &listreceivedbyaccount, false, false, true }, + { "listreceivedbyaddress", &listreceivedbyaddress, false, false, true }, + { "listsinceblock", &listsinceblock, false, false, true }, + { "listtransactions", &listtransactions, false, false, true }, { "listunspent", &listunspent, false, false, true }, { "lockunspent", &lockunspent, false, false, true }, - { "listlockunspent", &listlockunspent, false, false, true }, + { "move", &movecmd, false, false, true }, + { "sendfrom", &sendfrom, false, false, true }, + { "sendmany", &sendmany, false, false, true }, + { "sendtoaddress", &sendtoaddress, false, false, true }, + { "setaccount", &setaccount, true, false, true }, { "settxfee", &settxfee, false, false, true }, + { "signmessage", &signmessage, false, false, true }, + { "walletlock", &walletlock, true, false, true }, + { "walletpassphrasechange", &walletpassphrasechange, false, false, true }, + { "walletpassphrase", &walletpassphrase, true, false, true }, /* Wallet-enabled mining */ { "getgenerate", &getgenerate, true, false, false }, - { "setgenerate", &setgenerate, true, true, false }, { "gethashespersec", &gethashespersec, true, false, false }, - { "getwork", &getwork, true, false, true }, + { "getwork", &getwork, true, false, true }, + { "setgenerate", &setgenerate, true, true, false }, #endif // ENABLE_WALLET }; @@ -732,7 +741,7 @@ static string JSONRPCExecBatch(const Array& vReq) void ServiceConnection(AcceptedConnection *conn) { bool fRun = true; - while (fRun) + while (fRun && !ShutdownRequested()) { int nProto = 0; map<string, string> mapHeaders; diff --git a/src/rpcserver.h b/src/rpcserver.h index 0dd583c8eb..ea03c09bf6 100644 --- a/src/rpcserver.h +++ b/src/rpcserver.h @@ -163,6 +163,7 @@ extern json_spirit::Value walletlock(const json_spirit::Array& params, bool fHel extern json_spirit::Value encryptwallet(const json_spirit::Array& params, bool fHelp); extern json_spirit::Value validateaddress(const json_spirit::Array& params, bool fHelp); extern json_spirit::Value getinfo(const json_spirit::Array& params, bool fHelp); +extern json_spirit::Value getwalletinfo(const json_spirit::Array& params, bool fHelp); extern json_spirit::Value getrawtransaction(const json_spirit::Array& params, bool fHelp); // in rcprawtransaction.cpp extern json_spirit::Value listunspent(const json_spirit::Array& params, bool fHelp); diff --git a/src/rpcwallet.cpp b/src/rpcwallet.cpp index d3b6c349a7..a5a7df0867 100644 --- a/src/rpcwallet.cpp +++ b/src/rpcwallet.cpp @@ -1888,4 +1888,33 @@ Value settxfee(const Array& params, bool fHelp) return true; } +Value getwalletinfo(const Array& params, bool fHelp) +{ + if (fHelp || params.size() != 0) + throw runtime_error( + "getwalletinfo\n" + "Returns an object containing various wallet state info.\n" + "\nResult:\n" + "{\n" + " \"walletversion\": xxxxx, (numeric) the wallet version\n" + " \"balance\": xxxxxxx, (numeric) the total bitcoin balance of the wallet\n" + " \"txcount\": xxxxxxx, (numeric) the total number of transactions in the wallet\n" + " \"keypoololdest\": xxxxxx, (numeric) the timestamp (seconds since GMT epoch) of the oldest pre-generated key in the key pool\n" + " \"keypoolsize\": xxxx, (numeric) how many new keys are pre-generated\n" + " \"unlocked_until\": ttt, (numeric) the timestamp in seconds since epoch (midnight Jan 1 1970 GMT) that the wallet is unlocked for transfers, or 0 if the wallet is locked\n" + "}\n" + "\nExamples:\n" + + HelpExampleCli("getwalletinfo", "") + + HelpExampleRpc("getwalletinfo", "") + ); + Object obj; + obj.push_back(Pair("walletversion", pwalletMain->GetVersion())); + obj.push_back(Pair("balance", ValueFromAmount(pwalletMain->GetBalance()))); + obj.push_back(Pair("txcount", (int)pwalletMain->mapWallet.size())); + obj.push_back(Pair("keypoololdest", (boost::int64_t)pwalletMain->GetOldestKeyPoolTime())); + obj.push_back(Pair("keypoolsize", (int)pwalletMain->GetKeyPoolSize())); + if (pwalletMain->IsCrypted()) + obj.push_back(Pair("unlocked_until", (boost::int64_t)nWalletUnlockTime)); + return obj; +} diff --git a/src/serialize.h b/src/serialize.h index 4a9ff579f4..1341746592 100644 --- a/src/serialize.h +++ b/src/serialize.h @@ -1038,10 +1038,7 @@ public: if (nReadPosNext >= vch.size()) { if (nReadPosNext > vch.size()) - { setstate(std::ios::failbit, "CDataStream::ignore() : end of data"); - nSize = vch.size() - nReadPos; - } nReadPos = 0; vch.clear(); return (*this); diff --git a/src/test/Checkpoints_tests.cpp b/src/test/Checkpoints_tests.cpp index 78b0236b74..8f70f18c7c 100644 --- a/src/test/Checkpoints_tests.cpp +++ b/src/test/Checkpoints_tests.cpp @@ -1,3 +1,7 @@ +// Copyright (c) 2011-2013 The Bitcoin Core developers +// Distributed under the MIT/X11 software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + // // Unit tests for block-chain checkpoints // diff --git a/src/test/DoS_tests.cpp b/src/test/DoS_tests.cpp index fbca09b4dc..d86cc7a290 100644 --- a/src/test/DoS_tests.cpp +++ b/src/test/DoS_tests.cpp @@ -1,3 +1,7 @@ +// Copyright (c) 2011-2014 The Bitcoin Core developers +// Distributed under the MIT/X11 software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + // // Unit tests for denial-of-service detection/prevention code // @@ -21,7 +25,6 @@ // Tests this internal-to-main.cpp method: extern bool AddOrphanTx(const CTransaction& tx); extern unsigned int LimitOrphanTxSize(unsigned int nMaxOrphans); -extern void Misbehaving(NodeId nodeid, int howmuch); extern std::map<uint256, CTransaction> mapOrphanTransactions; extern std::map<uint256, std::set<uint256> > mapOrphanTransactionsByPrev; diff --git a/src/test/Makefile.am b/src/test/Makefile.am index 5a1f42ee61..b375ba1306 100644 --- a/src/test/Makefile.am +++ b/src/test/Makefile.am @@ -15,7 +15,8 @@ JSON_TEST_FILES = \ data/base58_keys_invalid.json \ data/script_invalid.json \ data/tx_invalid.json \ - data/tx_valid.json + data/tx_valid.json \ + data/sighash.json RAW_TEST_FILES = data/alertTests.raw diff --git a/src/test/accounting_tests.cpp b/src/test/accounting_tests.cpp index bfdb95927b..e2a75da349 100644 --- a/src/test/accounting_tests.cpp +++ b/src/test/accounting_tests.cpp @@ -1,4 +1,6 @@ - +// Copyright (c) 2012-2014 The Bitcoin Core developers +// Distributed under the MIT/X11 software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. #include "wallet.h" #include "walletdb.h" diff --git a/src/test/alert_tests.cpp b/src/test/alert_tests.cpp index a7e668222d..b16f3f7f57 100644 --- a/src/test/alert_tests.cpp +++ b/src/test/alert_tests.cpp @@ -1,3 +1,7 @@ +// Copyright (c) 2013 The Bitcoin Core developers +// Distributed under the MIT/X11 software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + // // Unit tests for alert system // diff --git a/src/test/allocator_tests.cpp b/src/test/allocator_tests.cpp index 490dff87e5..2752a0b215 100644 --- a/src/test/allocator_tests.cpp +++ b/src/test/allocator_tests.cpp @@ -1,4 +1,6 @@ - +// Copyright (c) 2012-2013 The Bitcoin Core developers +// Distributed under the MIT/X11 software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. #include "util.h" diff --git a/src/test/base32_tests.cpp b/src/test/base32_tests.cpp index 580e87f65f..87473585e3 100644 --- a/src/test/base32_tests.cpp +++ b/src/test/base32_tests.cpp @@ -1,4 +1,6 @@ - +// Copyright (c) 2012-2013 The Bitcoin Core developers +// Distributed under the MIT/X11 software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. #include "util.h" diff --git a/src/test/base58_tests.cpp b/src/test/base58_tests.cpp index 94e84049be..5689e69995 100644 --- a/src/test/base58_tests.cpp +++ b/src/test/base58_tests.cpp @@ -1,3 +1,7 @@ +// Copyright (c) 2011-2014 The Bitcoin Core developers +// Distributed under the MIT/X11 software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + #include "base58.h" #include "data/base58_encode_decode.json.h" diff --git a/src/test/base64_tests.cpp b/src/test/base64_tests.cpp index c59c290669..d4a23d9aa0 100644 --- a/src/test/base64_tests.cpp +++ b/src/test/base64_tests.cpp @@ -1,4 +1,6 @@ - +// Copyright (c) 2011-2013 The Bitcoin Core developers +// Distributed under the MIT/X11 software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. #include "util.h" diff --git a/src/test/bignum_tests.cpp b/src/test/bignum_tests.cpp index 205b15adcf..d5ee8c9778 100644 --- a/src/test/bignum_tests.cpp +++ b/src/test/bignum_tests.cpp @@ -1,3 +1,7 @@ +// Copyright (c) 2012-2014 The Bitcoin Core developers +// Distributed under the MIT/X11 software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + #include "bignum.h" #include <limits> @@ -35,11 +39,8 @@ BOOST_AUTO_TEST_SUITE(bignum_tests) // stack buffer overruns. // // For more accurate diagnostics, you can use an undefined arithmetic operation -// detector such as the clang-based tool: -// -// "IOC: An Integer Overflow Checker for C/C++" -// -// Available at: http://embed.cs.utah.edu/ioc/ +// detector such as the clang's undefined behaviour checker. +// See also: http://clang.llvm.org/docs/UsersManual.html#controlling-code-generation // // It might also be useful to use Google's AddressSanitizer to detect // stack buffer overruns, which valgrind can't currently detect. diff --git a/src/test/bip32_tests.cpp b/src/test/bip32_tests.cpp index 2bcca24336..9cf07fc38c 100644 --- a/src/test/bip32_tests.cpp +++ b/src/test/bip32_tests.cpp @@ -1,3 +1,7 @@ +// Copyright (c) 2013 The Bitcoin Core developers +// Distributed under the MIT/X11 software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + #include <boost/test/unit_test.hpp> #include "base58.h" diff --git a/src/test/bloom_tests.cpp b/src/test/bloom_tests.cpp index c4e4403b70..abedd3093c 100644 --- a/src/test/bloom_tests.cpp +++ b/src/test/bloom_tests.cpp @@ -1,3 +1,7 @@ +// Copyright (c) 2012-2013 The Bitcoin Core developers +// Distributed under the MIT/X11 software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + #include "bloom.h" #include "base58.h" diff --git a/src/test/canonical_tests.cpp b/src/test/canonical_tests.cpp index c521f2cf9c..a26ad335a4 100644 --- a/src/test/canonical_tests.cpp +++ b/src/test/canonical_tests.cpp @@ -1,3 +1,7 @@ +// Copyright (c) 2012-2013 The Bitcoin Core developers +// Distributed under the MIT/X11 software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + // // Unit tests for canonical signatures // diff --git a/src/test/checkblock_tests.cpp b/src/test/checkblock_tests.cpp index d47a33fd46..10352240f4 100644 --- a/src/test/checkblock_tests.cpp +++ b/src/test/checkblock_tests.cpp @@ -1,3 +1,7 @@ +// Copyright (c) 2013-2014 The Bitcoin Core developers +// Distributed under the MIT/X11 software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + // // Unit tests for block.CheckBlock() // @@ -15,8 +19,7 @@ BOOST_AUTO_TEST_SUITE(CheckBlock_tests) -bool -read_block(const std::string& filename, CBlock& block) +bool read_block(const std::string& filename, CBlock& block) { namespace fs = boost::filesystem; fs::path testFile = fs::current_path() / "data" / filename; diff --git a/src/test/compress_tests.cpp b/src/test/compress_tests.cpp index 4d16914774..719955ba85 100644 --- a/src/test/compress_tests.cpp +++ b/src/test/compress_tests.cpp @@ -1,4 +1,6 @@ - +// Copyright (c) 2012-2013 The Bitcoin Core developers +// Distributed under the MIT/X11 software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. #include "main.h" #include "util.h" diff --git a/src/test/data/README.md b/src/test/data/README.md new file mode 100644 index 0000000000..f69a021ca0 --- /dev/null +++ b/src/test/data/README.md @@ -0,0 +1,14 @@ +Description +------------ + +This directory contains data-driven tests for various aspects of Bitcoin. + +License +-------- + +The data files in this directory are + + Copyright (c) 2012-2014 The Bitcoin Core 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/test/data/script_invalid.json b/src/test/data/script_invalid.json index 761cc4a008..8cb365a46f 100644 --- a/src/test/data/script_invalid.json +++ b/src/test/data/script_invalid.json @@ -325,5 +325,7 @@ ["NOP1 0x01 1", "HASH160 0x14 0xda1745e9b549bd0bfa1a569971c77eba30cd5a4b EQUAL"], ["0 0x01 0x50", "HASH160 0x14 0xece424a6bb6ddf4db592c0faed60685047a361b1 EQUAL", "OP_RESERVED in P2SH should fail"], -["0 0x01 VER", "HASH160 0x14 0x0f4d7845db968f2a81b530b6f3c1d6246d4c7e01 EQUAL", "OP_VER in P2SH should fail"] +["0 0x01 VER", "HASH160 0x14 0x0f4d7845db968f2a81b530b6f3c1d6246d4c7e01 EQUAL", "OP_VER in P2SH should fail"], + +["0x00", "'00' EQUAL", "Basic OP_0 execution"] ] diff --git a/src/test/data/script_valid.json b/src/test/data/script_valid.json index e4c181cae8..3b4c191865 100644 --- a/src/test/data/script_valid.json +++ b/src/test/data/script_valid.json @@ -411,5 +411,7 @@ ["0x4c 0x40 0x42424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242", "0x4d 0x4000 0x42424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242 EQUAL", -"Basic PUSHDATA1 signedness check"] +"Basic PUSHDATA1 signedness check"], + +["0x00", "SIZE 0 EQUAL", "Basic OP_0 execution"] ] diff --git a/src/test/data/sighash.json b/src/test/data/sighash.json new file mode 100644 index 0000000000..d66a56ac35 --- /dev/null +++ b/src/test/data/sighash.json @@ -0,0 +1,503 @@ +[ + ["raw_transaction, script, input_index, hashType, signature_hash (result)"], + ["907c2bc503ade11cc3b04eb2918b6f547b0630ab569273824748c87ea14b0696526c66ba740200000004ab65ababfd1f9bdd4ef073c7afc4ae00da8a66f429c917a0081ad1e1dabce28d373eab81d8628de802000000096aab5253ab52000052ad042b5f25efb33beec9f3364e8a9139e8439d9d7e26529c3c30b6c3fd89f8684cfd68ea0200000009ab53526500636a52ab599ac2fe02a526ed040000000008535300516352515164370e010000000003006300ab2ec229", "", 2, 1864164639, "31af167a6cf3f9d5f6875caa4d31704ceb0eba078d132b78dab52c3b8997317e"], + ["a0aa3126041621a6dea5b800141aa696daf28408959dfb2df96095db9fa425ad3f427f2f6103000000015360290e9c6063fa26912c2e7fb6a0ad80f1c5fea1771d42f12976092e7a85a4229fdb6e890000000001abc109f6e47688ac0e4682988785744602b8c87228fcef0695085edf19088af1a9db126e93000000000665516aac536affffffff8fe53e0806e12dfd05d67ac68f4768fdbe23fc48ace22a5aa8ba04c96d58e2750300000009ac51abac63ab5153650524aa680455ce7b000000000000499e50030000000008636a00ac526563ac5051ee030000000003abacabd2b6fe000000000003516563910fb6b5", "65", 0, -1391424484, "48d6a1bd2cd9eec54eb866fc71209418a950402b5d7e52363bfb75c98e141175"], + ["6e7e9d4b04ce17afa1e8546b627bb8d89a6a7fefd9d892ec8a192d79c2ceafc01694a6a7e7030000000953ac6a51006353636a33bced1544f797f08ceed02f108da22cd24c9e7809a446c61eb3895914508ac91f07053a01000000055163ab516affffffff11dc54eee8f9e4ff0bcf6b1a1a35b1cd10d63389571375501af7444073bcec3c02000000046aab53514a821f0ce3956e235f71e4c69d91abe1e93fb703bd33039ac567249ed339bf0ba0883ef300000000090063ab65000065ac654bec3cc504bcf499020000000005ab6a52abac64eb060100000000076a6a5351650053bbbc130100000000056a6aab53abd6e1380100000000026a51c4e509b8", "acab655151", 0, 479279909, "2a3d95b09237b72034b23f2d2bb29fa32a58ab5c6aa72f6aafdfa178ab1dd01c"], + ["73107cbd025c22ebc8c3e0a47b2a760739216a528de8d4dab5d45cbeb3051cebae73b01ca10200000007ab6353656a636affffffffe26816dffc670841e6a6c8c61c586da401df1261a330a6c6b3dd9f9a0789bc9e000000000800ac6552ac6aac51ffffffff0174a8f0010000000004ac52515100000000", "5163ac63635151ac", 1, 1190874345, "06e328de263a87b09beabe222a21627a6ea5c7f560030da31610c4611f4a46bc"], + ["e93bbf6902be872933cb987fc26ba0f914fcfc2f6ce555258554dd9939d12032a8536c8802030000000453ac5353eabb6451e074e6fef9de211347d6a45900ea5aaf2636ef7967f565dce66fa451805c5cd10000000003525253ffffffff047dc3e6020000000007516565ac656aabec9eea010000000001633e46e600000000000015080a030000000001ab00000000", "5300ac6a53ab6a", 1, -886562767, "f03aa4fc5f97e826323d0daa03343ebf8a34ed67a1ce18631f8b88e5c992e798"], + ["50818f4c01b464538b1e7e7f5ae4ed96ad23c68c830e78da9a845bc19b5c3b0b20bb82e5e9030000000763526a63655352ffffffff023b3f9c040000000008630051516a6a5163a83caf01000000000553ab65510000000000", "6aac", 0, 946795545, "746306f322de2b4b58ffe7faae83f6a72433c22f88062cdde881d4dd8a5a4e2d"], + ["a93e93440250f97012d466a6cc24839f572def241c814fe6ae94442cf58ea33eb0fdd9bcc1030000000600636a0065acffffffff5dee3a6e7e5ad6310dea3e5b3ddda1a56bf8de7d3b75889fc024b5e233ec10f80300000007ac53635253ab53ffffffff0160468b04000000000800526a5300ac526a00000000", "ac00636a53", 1, 1773442520, "5c9d3a2ce9365bb72cfabbaa4579c843bb8abf200944612cf8ae4b56a908bcbd"], + ["ce7d371f0476dda8b811d4bf3b64d5f86204725deeaa3937861869d5b2766ea7d17c57e40b0100000003535265ffffffff7e7e9188f76c34a46d0bbe856bde5cb32f089a07a70ea96e15e92abb37e479a10100000006ab6552ab655225bcab06d1c2896709f364b1e372814d842c9c671356a1aa5ca4e060462c65ae55acc02d0000000006abac0063ac5281b33e332f96beebdbc6a379ebe6aea36af115c067461eb99d22ba1afbf59462b59ae0bd0200000004ab635365be15c23801724a1704000000000965006a65ac00000052ca555572", "53ab530051ab", 1, 2030598449, "c336b2f7d3702fbbdeffc014d106c69e3413c7c71e436ba7562d8a7a2871f181"], + ["d3b7421e011f4de0f1cea9ba7458bf3486bee722519efab711a963fa8c100970cf7488b7bb0200000003525352dcd61b300148be5d05000000000000000000", "535251536aac536a", 0, -1960128125, "29aa6d2d752d3310eba20442770ad345b7f6a35f96161ede5f07b33e92053e2a"], + ["04bac8c5033460235919a9c63c42b2db884c7c8f2ed8fcd69ff683a0a2cccd9796346a04050200000003655351fcad3a2c5a7cbadeb4ec7acc9836c3f5c3e776e5c566220f7f965cf194f8ef98efb5e3530200000007526a006552526526a2f55ba5f69699ece76692552b399ba908301907c5763d28a15b08581b23179cb01eac03000000075363ab6a516351073942c2025aa98a05000000000765006aabac65abd7ffa6030000000004516a655200000000", "53ac6365ac526a", 1, 764174870, "bf5fdc314ded2372a0ad078568d76c5064bf2affbde0764c335009e56634481b"], + ["c363a70c01ab174230bbe4afe0c3efa2d7f2feaf179431359adedccf30d1f69efe0c86ed390200000002ab51558648fe0231318b04000000000151662170000000000008ac5300006a63acac00000000", "", 0, 2146479410, "191ab180b0d753763671717d051f138d4866b7cb0d1d4811472e64de595d2c70"], + ["8d437a7304d8772210a923fd81187c425fc28c17a5052571501db05c7e89b11448b36618cd02000000026a6340fec14ad2c9298fde1477f1e8325e5747b61b7e2ff2a549f3d132689560ab6c45dd43c3010000000963ac00ac000051516a447ed907a7efffebeb103988bf5f947fc688aab2c6a7914f48238cf92c337fad4a79348102000000085352ac526a5152517436edf2d80e3ef06725227c970a816b25d0b58d2cd3c187a7af2cea66d6b27ba69bf33a0300000007000063ab526553f3f0d6140386815d030000000003ab6300de138f00000000000900525153515265abac1f87040300000000036aac6500000000", "51", 3, -315779667, "b6632ac53578a741ae8c36d8b69e79f39b89913a2c781cdf1bf47a8c29d997a5"], + ["fd878840031e82fdbe1ad1d745d1185622b0060ac56638290ec4f66b1beef4450817114a2c0000000009516a63ab53650051abffffffff37b7a10322b5418bfd64fb09cd8a27ddf57731aeb1f1f920ffde7cb2dfb6cdb70300000008536a5365ac53515369ecc034f1594690dbe189094dc816d6d57ea75917de764cbf8eccce4632cbabe7e116cd0100000003515352ffffffff035777fc000000000003515200abe9140300000000050063005165bed6d10200000000076300536363ab65195e9110", "635265", 0, 1729787658, "6e3735d37a4b28c45919543aabcb732e7a3e1874db5315abb7cc6b143d62ff10"], + ["f40a750702af06efff3ea68e5d56e42bc41cdb8b6065c98f1221fe04a325a898cb61f3d7ee030000000363acacffffffffb5788174aef79788716f96af779d7959147a0c2e0e5bfb6c2dba2df5b4b97894030000000965510065535163ac6affffffff0445e6fd0200000000096aac536365526a526aa6546b000000000008acab656a6552535141a0fd010000000000c897ea030000000008526500ab526a6a631b39dba3", "00abab5163ac", 1, -1778064747, "d76d0fc0abfa72d646df888bce08db957e627f72962647016eeae5a8412354cf"], + ["a63bc673049c75211aa2c09ecc38e360eaa571435fedd2af1116b5c1fa3d0629c269ecccbf0000000008ac65ab516352ac52ffffffffbf1a76fdda7f451a5f0baff0f9ccd0fe9136444c094bb8c544b1af0fa2774b06010000000463535253ffffffff13d6b7c3ddceef255d680d87181e100864eeb11a5bb6a3528cb0d70d7ee2bbbc02000000056a0052abab951241809623313b198bb520645c15ec96bfcc74a2b0f3db7ad61d455cc32db04afc5cc702000000016309c9ae25014d9473020000000004abab6aac3bb1e803", "", 3, -232881718, "6e48f3da3a4ac07eb4043a232df9f84e110485d7c7669dd114f679c27d15b97e"], + ["4c565efe04e7d32bac03ae358d63140c1cfe95de15e30c5b84f31bb0b65bb542d637f49e0f010000000551abab536348ae32b31c7d3132030a510a1b1aacf7b7c3f19ce8dc49944ef93e5fa5fe2d356b4a73a00100000009abac635163ac00ab514c8bc57b6b844e04555c0a4f4fb426df139475cd2396ae418bc7015820e852f711519bc202000000086a00510000abac52488ff4aec72cbcfcc98759c58e20a8d2d9725aa4a80f83964e69bc4e793a4ff25cd75dc701000000086a52ac6aac5351532ec6b10802463e0200000000000553005265523e08680100000000002f39a6b0", "", 3, 70712784, "c6076b6a45e6fcfba14d3df47a34f6aadbacfba107e95621d8d7c9c0e40518ed"], + ["1233d5e703403b3b8b4dae84510ddfc126b4838dcb47d3b23df815c0b3a07b55bf3098110e010000000163c5c55528041f480f40cf68a8762d6ed3efe2bd402795d5233e5d94bf5ddee71665144898030000000965525165655151656affffffff6381667e78bb74d0880625993bec0ea3bd41396f2bcccc3cc097b240e5e92d6a01000000096363acac6a63536365ffffffff04610ad60200000000065251ab65ab52e90d680200000000046351516ae30e98010000000008abab52520063656a671856010000000004ac6aac514c84e383", "6aabab636300", 1, -114996813, "aeb8c5a62e8a0b572c28f2029db32854c0b614dbecef0eaa726abebb42eebb8d"], + ["0c69702103b25ceaed43122cc2672de84a3b9aa49872f2a5bb458e19a52f8cc75973abb9f102000000055365656aacffffffff3ffb1cf0f76d9e3397de0942038c856b0ebbea355dc9d8f2b06036e19044b0450100000000ffffffff4b7793f4169617c54b734f2cd905ed65f1ce3d396ecd15b6c426a677186ca0620200000008655263526551006a181a25b703240cce0100000000046352ab53dee22903000000000865526a6a516a51005e121602000000000852ab52ababac655200000000", "6a516aab63", 1, -2040012771, "a6e6cb69f409ec14e10dd476f39167c29e586e99bfac93a37ed2c230fcc1dbbe"], + ["fd22692802db8ae6ab095aeae3867305a954278f7c076c542f0344b2591789e7e33e4d29f4020000000151ffffffffb9409129cfed9d3226f3b6bab7a2c83f99f48d039100eeb5796f00903b0e5e5e0100000006656552ac63abd226abac0403e649000000000007abab51ac5100ac8035f10000000000095165006a63526a52510d42db030000000007635365ac6a63ab24ef5901000000000453ab6a0000000000", "536a52516aac6a", 1, 309309168, "7ca0f75e6530ec9f80d031fc3513ca4ecd67f20cb38b4dacc6a1d825c3cdbfdb"], + ["a43f85f701ffa54a3cc57177510f3ea28ecb6db0d4431fc79171cad708a6054f6e5b4f89170000000008ac6a006a536551652bebeaa2013e779c05000000000665ac5363635100000000", "ac", 0, 2028978692, "58294f0d7f2e68fe1fd30c01764fe1619bcc7961d68968944a0e263af6550437"], + ["c2b0b99001acfecf7da736de0ffaef8134a9676811602a6299ba5a2563a23bb09e8cbedf9300000000026300ffffffff042997c50300000000045252536a272437030000000007655353ab6363ac663752030000000002ab6a6d5c900000000000066a6a5265abab00000000", "52ac525163515251", 0, -894181723, "8b300032a1915a4ac05cea2f7d44c26f2a08d109a71602636f15866563eaafdc"], + ["82f9f10304c17a9d954cf3380db817814a8c738d2c811f0412284b2c791ec75515f38c4f8c020000000265ab5729ca7db1b79abee66c8a757221f29280d0681355cb522149525f36da760548dbd7080a0100000001510b477bd9ce9ad5bb81c0306273a3a7d051e053f04ecf3a1dbeda543e20601a5755c0cfae030000000451ac656affffffff71141a04134f6c292c2e0d415e6705dfd8dcee892b0d0807828d5aeb7d11f5ef0300000001520b6c6dc802a6f3dd0000000000056aab515163bfb6800300000000015300000000", "", 3, -635779440, "d55ed1e6c53510f2608716c12132a11fb5e662ec67421a513c074537eeccc34b"], + ["8edcf5a1014b604e53f0d12fe143cf4284f86dc79a634a9f17d7e9f8725f7beb95e8ffcd2403000000046aabac52ffffffff01c402b5040000000005ab6a63525100000000", "6351525251acabab6a", 0, 1520147826, "2765bbdcd3ebb8b1a316c04656b28d637f80bffbe9b040661481d3dc83eea6d6"], + ["2074bad5011847f14df5ea7b4afd80cd56b02b99634893c6e3d5aaad41ca7c8ee8e5098df003000000026a6affffffff018ad59700000000000900ac656a526551635300000000", "65635265", 0, -1804671183, "663c999a52288c9999bff36c9da2f8b78d5c61b8347538f76c164ccba9868d0a"], + ["7100b11302e554d4ef249ee416e7510a485e43b2ba4b8812d8fe5529fe33ea75f36d392c4403000000020000ffffffff3d01a37e075e9a7715a657ae1bdf1e44b46e236ad16fd2f4c74eb9bf370368810000000007636553ac536365ffffffff01db696a0400000000065200ac656aac00000000", "63005151", 0, -1210499507, "b9c3aee8515a4a3b439de1ffc9c156824bda12cb75bfe5bc863164e8fd31bd7a"], + ["02c1017802091d1cb08fec512db7b012fe4220d57a5f15f9e7676358b012786e1209bcff950100000004acab6352ffffffff799bc282724a970a6fea1828984d0aeb0f16b67776fa213cbdc4838a2f1961a3010000000951516a536552ab6aabffffffff016c7b4b03000000000865abac5253ac5352b70195ad", "65655200516a", 0, -241626954, "be567cb47170b34ff81c66c1142cb9d27f9b6898a384d6dfc4fce16b75b6cb14"], + ["cb3178520136cd294568b83bb2520f78fecc507898f4a2db2674560d72fd69b9858f75b3b502000000066aac00515100ffffffff03ab005a01000000000563526363006e3836030000000001abfbda3200000000000665ab0065006500000000", "ab516a0063006a5300", 0, 1182109299, "2149e79c3f4513da4e4378608e497dcfdfc7f27c21a826868f728abd2b8a637a"], + ["18a4b0c004702cf0e39686ac98aab78ad788308f1d484b1ddfe70dc1997148ba0e28515c310300000000ffffffff05275a52a23c59da91129093364e275da5616c4070d8a05b96df5a2080ef259500000000096aac51656a6aac53ab66e64966b3b36a07dd2bb40242dd4a3743d3026e7e1e0d9e9e18f11d068464b989661321030000000265ac383339c4fae63379cafb63b0bab2eca70e1f5fc7d857eb5c88ccd6c0465093924bba8b2a000000000300636ab5e0545402bc2c4c010000000000cd41c002000000000000000000", "abac635253656a00", 3, 2052372230, "32db877b6b1ca556c9e859442329406f0f8246706522369839979a9f7a235a32"], + ["1d9c5df20139904c582285e1ea63dec934251c0f9cf5c47e86abfb2b394ebc57417a81f67c010000000353515222ba722504800d3402000000000353656a3c0b4a0200000000000fb8d20500000000076300ab005200516462f30400000000015200000000", "ab65", 0, -210854112, "edf73e2396694e58f6b619f68595b0c1cdcb56a9b3147845b6d6afdb5a80b736"], + ["4504cb1904c7a4acf375ddae431a74de72d5436efc73312cf8e9921f431267ea6852f9714a01000000066a656a656553a2fbd587c098b3a1c5bd1d6480f730a0d6d9b537966e20efc0e352d971576d0f87df0d6d01000000016321aeec3c4dcc819f1290edb463a737118f39ab5765800547522708c425306ebfca3f396603000000055300ac656a1d09281d05bfac57b5eb17eb3fa81ffcedfbcd3a917f1be0985c944d473d2c34d245eb350300000007656a51525152ac263078d9032f470f0500000000066aac00000052e12da60200000000003488410200000000076365006300ab539981e432", "52536a52526a", 1, -31909119, "f0a2deee7fd8a3a9fad6927e763ded11c940ee47e9e6d410f94fda5001f82e0c"], + ["14bc7c3e03322ec0f1311f4327e93059c996275302554473104f3f7b46ca179bfac9ef753503000000016affffffff9d405eaeffa1ca54d9a05441a296e5cc3a3e32bb8307afaf167f7b57190b07e00300000008abab51ab5263abab45533aa242c61bca90dd15d46079a0ab0841d85df67b29ba87f2393cd764a6997c372b55030000000452005263ffffffff0250f40e02000000000651516a0063630e95ab0000000000046a5151ac00000000", "6a65005151", 0, -1460947095, "aa418d096929394c9147be8818d8c9dafe6d105945ab9cd7ec682df537b5dd79"], + ["2b3bd0dd04a1832f893bf49a776cd567ec4b43945934f4786b615d6cb850dfc0349b33301a000000000565ac000051cf80c670f6ddafab63411adb4d91a69c11d9ac588898cbfb4cb16061821cc104325c895103000000025163ffffffffa9e2d7506d2d7d53b882bd377bbcc941f7a0f23fd15d2edbef3cd9df8a4c39d10200000009ac63006a52526a5265ffffffff44c099cdf10b10ce87d4b38658d002fd6ea17ae4a970053c05401d86d6e75f99000000000963ab53526a5252ab63ffffffff035af69c01000000000100ba9b8b0400000000004cead10500000000026a520b77d667", "ab52abac526553", 3, -1955078165, "eb9ceecc3b401224cb79a44d23aa8f428e29f1405daf69b4e01910b848ef1523"], + ["35df11f004a48ba439aba878fe9df20cc935b4a761c262b1b707e6f2b33e2bb7565cd68b130000000000ffffffffb2a2f99abf64163bb57ca900500b863f40c02632dfd9ea2590854c5fb4811da90200000006ac006363636affffffffaf9d89b2a8d2670ca37c8f7c140600b81259f2e037cb4590578ec6e37af8bf200000000005abac6a655270a4751eb551f058a93301ffeda2e252b6614a1fdd0e283e1d9fe53c96c5bbaafaac57b8030000000153ffffffff020d9f3b02000000000100ed7008030000000004abac000000000000", "abac", 3, 593793071, "88fdee1c2d4aeead71d62396e28dc4d00e5a23498eea66844b9f5d26d1f21042"], + ["a08ff466049fb7619e25502ec22fedfb229eaa1fe275aa0b5a23154b318441bf547989d0510000000005ab5363636affffffff2b0e335cb5383886751cdbd993dc0720817745a6b1c9b8ab3d15547fc9aafd03000000000965656a536a52656a532b53d10584c290d3ac1ab74ab0a19201a4a039cb59dc58719821c024f6bf2eb26322b33f010000000965ac6aac0053ab6353ffffffff048decba6ebbd2db81e416e39dde1f821ba69329725e702bcdea20c5cc0ecc6402000000086363ab5351ac6551466e377b0468c0fa00000000000651ab53ac6a513461c6010000000008636a636365535100eeb3dc010000000006526a52ac516a43f362010000000005000063536500000000", "0063516a", 1, -1158911348, "f6a1ecb50bd7c2594ebecea5a1aa23c905087553e40486dade793c2f127fdfae"], + ["5ac2f17d03bc902e2bac2469907ec7d01a62b5729340bc58c343b7145b66e6b97d434b30fa000000000163ffffffff44028aa674192caa0d0b4ebfeb969c284cb16b80c312d096efd80c6c6b094cca000000000763acabac516a52ffffffff10c809106e04b10f9b43085855521270fb48ab579266e7474657c6c625062d2d030000000351636595a0a97004a1b69603000000000465ab005352ad68010000000008636a5263acac5100da7105010000000002acab90325200000000000000000000", "6a6aab516a63526353", 2, 1518400956, "f7efb74b1dcc49d316b49c632301bc46f98d333c427e55338be60c7ef0d953be"], + ["aeb2e11902dc3770c218b97f0b1960d6ee70459ecb6a95eff3f05295dc1ef4a0884f10ba460300000005516352526393e9b1b3e6ae834102d699ddd3845a1e159aa7cf7635edb5c02003f7830fee3788b795f20100000009ab006a526553ac006ad8809c570469290e0400000000050000abab00b10fd5040000000008ab655263abac53ab630b180300000000009d9993040000000002516300000000", "5351ababac6a65", 0, 1084852870, "f2286001af0b0170cbdad92693d0a5ebaa8262a4a9d66e002f6d79a8c94026d1"], + ["9860ca9a0294ff4812534def8c3a3e3db35b817e1a2ddb7f0bf673f70eab71bb79e90a2f3100000000086a636551acac5165ffffffffed4d6d3cd9ff9b2d490e0c089739121161a1445844c3e204296816ab06e0a83702000000035100ac88d0db5201c3b59a050000000005ac6a0051ab00000000", "535263ab006a526aab", 1, -962088116, "30df2473e1403e2b8e637e576825f785528d998af127d501556e5f7f5ed89a2a"], + ["4ddaa680026ec4d8060640304b86823f1ac760c260cef81d85bd847952863d629a3002b54b0200000008526365636a656aab65457861fc6c24bdc760c8b2e906b6656edaf9ed22b5f50e1fb29ec076ceadd9e8ebcb6b000000000152ffffffff033ff04f00000000000551526a00657a1d900300000000002153af040000000003006a6300000000", "ab526a53acabab", 0, 1055317633, "7f21b62267ed52462e371a917eb3542569a4049b9dfca2de3c75872b39510b26"], + ["01e76dcd02ad54cbc8c71d68eaf3fa7c883b65d74217b30ba81f1f5144ef80b706c0dc82ca000000000352ab6a078ec18bcd0514825feced2e8b8ea1ccb34429fae41c70cc0b73a2799e85603613c6870002000000086363ab6365536a53ffffffff043acea90000000000016ad20e1803000000000100fa00830200000000056352515351e864ee00000000000865535253ab6a6551d0c46672", "6a6365abacab", 0, -1420559003, "8af0b4cbdbc011be848edf4dbd2cde96f0578d662cfebc42252495387114224a"], + ["fa00b26402670b97906203434aa967ce1559d9bd097d56dbe760469e6032e7ab61accb54160100000006635163630052fffffffffe0d3f4f0f808fd9cfb162e9f0c004601acf725cd7ea5683bbdc9a9a433ef15a0200000005ab52536563d09c7bef049040f305000000000153a7c7b9020000000004ac63ab52847a2503000000000553ab00655390ed80010000000005006553ab52860671d4", "536565ab52", 0, 799022412, "40ed8e7bbbd893e15f3cce210ae02c97669818de5946ca37eefc7541116e2c78"], + ["cb5c06dc01b022ee6105ba410f0eb12b9ce5b5aa185b28532492d839a10cef33d06134b91b010000000153ffffffff02cec0530400000000005e1e4504000000000865656551acacac6a00000000", "ab53", 0, -1514251329, "136beb95459fe6b126cd6cefd54eb5d971524b0e883e41a292a78f78015cb8d5"], + ["f10a0356031cd569d652dbca8e7a4d36c8da33cdff428d003338602b7764fe2c96c505175b010000000465ac516affffffffbb54563c71136fa944ee20452d78dc87073ac2365ba07e638dce29a5d179da600000000003635152ffffffff9a411d8e2d421b1e6085540ee2809901e590940bbb41532fa38bd7a16b68cc350100000007535251635365636195df1603b61c45010000000002ab65bf6a310400000000026352fcbba10200000000016aa30b7ff0", "5351", 0, 1552495929, "9eb8adf2caecb4bf9ac59d7f46bd20e83258472db2f569ee91aba4cf5ee78e29"], + ["c3325c9b012f659466626ca8f3c61dfd36f34670abc054476b7516a1839ec43cd0870aa0c0000000000753525265005351e7e3f04b0112650500000000000363ac6300000000", "acac", 0, -68961433, "5ca70e727d91b1a42b78488af2ed551642c32d3de4712a51679f60f1456a8647"], + ["2333e54c044370a8af16b9750ac949b151522ea6029bacc9a34261599549581c7b4e5ece470000000007510052006563abffffffff80630fc0155c750ce20d0ca4a3d0c8e8d83b014a5b40f0b0be0dd4c63ac28126020000000465000000ffffffff1b5f1433d38cdc494093bb1d62d84b10abbdae57e3d04e82e600857ab3b1dc990300000003515100b76564be13e4890a908ea7508afdad92ec1b200a9a67939fadce6eb7a29eb4550a0a28cb0300000001acffffffff02926c930300000000016373800201000000000153d27ee740", "ab6365ab516a53", 3, 598653797, "2be27a686eb7940dd32c44ff3a97c1b28feb7ab9c5c0b1593b2d762361cfc2db"], + ["b500ca48011ec57c2e5252e5da6432089130603245ffbafb0e4c5ffe6090feb629207eeb0e010000000652ab6a636aab8302c9d2042b44f40500000000015278c05a050000000004ac5251524be080020000000007636aac63ac5252c93a9a04000000000965ab6553636aab5352d91f9ddb", "52005100", 0, -2024394677, "49c8a6940a461cc7225637f1e512cdd174c99f96ec05935a59637ededc77124c"], + ["f52ff64b02ee91adb01f3936cc42e41e1672778962b68cf013293d649536b519bc3271dd2c00000000020065afee11313784849a7c15f44a61cd5fd51ccfcdae707e5896d131b082dc9322a19e12858501000000036aac654e8ca882022deb7c020000000006006a515352abd3defc0000000000016300000000", "63520063", 0, 1130989496, "7f208df9a5507e98c62cebc5c1e2445eb632e95527594929b9577b53363e96f6"], + ["ab7d6f36027a7adc36a5cf7528fe4fb5d94b2c96803a4b38a83a675d7806dda62b380df86a0000000003000000ffffffff5bc00131e29e22057c04be854794b4877dda42e416a7a24706b802ff9da521b20000000007ac6a0065ac52ac957cf45501b9f06501000000000500ac6363ab25f1110b", "00526500536a635253", 0, 911316637, "5fa09d43c8aef6f6fa01c383a69a5a61a609cd06e37dce35a39dc9eae3ddfe6c"], + ["f940888f023dce6360263c850372eb145b864228fdbbb4c1186174fa83aab890ff38f8c9a90300000000ffffffff01e80ccdb081e7bbae1c776531adcbfb77f2e5a7d0e5d0d0e2e6c8758470e85f00000000020053ffffffff03b49088050000000004656a52ab428bd604000000000951630065ab63ac636a0cbacf0400000000070063ac5265ac53d6e16604", "ac63", 0, 39900215, "713ddeeefcfe04929e7b6593c792a4efbae88d2b5280d1f0835d2214eddcbad6"], + ["530ecd0b01ec302d97ef6f1b5a6420b9a239714013e20d39aa3789d191ef623fc215aa8b940200000005ac5351ab6a3823ab8202572eaa04000000000752ab6a51526563fd8a270100000000036a006581a798f0", "525153656a0063", 0, 1784562684, "fe42f73a8742676e640698222b1bd6b9c338ff1ccd766d3d88d7d3c6c6ac987e"], + ["5d781d9303acfcce964f50865ddfddab527ea971aee91234c88e184979985c00b4de15204b0100000003ab6352a009c8ab01f93c8ef2447386c434b4498538f061845862c3f9d5751ad0fce52af442b3a902000000045165ababb909c66b5a3e7c81b3c45396b944be13b8aacfc0204f3f3c105a66fa8fa6402f1b5efddb01000000096a65ac636aacab656ac3c677c402b79fa4050000000004006aab5133e35802000000000751ab635163ab0078c2e025", "6aac51636a6a005265", 0, -882306874, "551ce975d58647f10adefb3e529d9bf9cda34751627ec45e690f135ef0034b95"], + ["25ee54ef0187387564bb86e0af96baec54289ca8d15e81a507a2ed6668dc92683111dfb7a50100000004005263634cecf17d0429aa4d000000000007636a6aabab5263daa75601000000000251ab4df70a01000000000151980a890400000000065253ac6a006377fd24e3", "65ab", 0, 797877378, "069f38fd5d47abff46f04ee3ae27db03275e9aa4737fa0d2f5394779f9654845"], + ["a9c57b1a018551bcbc781b256642532bbc09967f1cbe30a227d352a19365d219d3f11649a3030000000451655352b140942203182894030000000006ab00ac6aab654add350400000000003d379505000000000553abacac00e1739d36", "5363", 0, -1069721025, "6da32416deb45a0d720a1dbe6d357886eabc44029dd5db74d50feaffbe763245"], + ["05c4fb94040f5119dc0b10aa9df054871ed23c98c890f1e931a98ffb0683dac45e98619fdc0200000007acab6a525263513e7495651c9794c4d60da835d303eb4ee6e871f8292f6ad0b32e85ef08c9dc7aa4e03c9c010000000500ab52acacfffffffffee953259cf14ced323fe8d567e4c57ba331021a1ef5ac2fa90f7789340d7c550100000007ac6aacac6a6a53ffffffff08d9dc820d00f18998af247319f9de5c0bbd52a475ea587f16101af3afab7c210100000003535363569bca7c0468e34f00000000000863536353ac51ac6584e319010000000006650052ab6a533debea030000000003ac0053ee7070020000000006ac52005253ac00000000", "6351005253", 2, 1386916157, "76c4013c40bfa1481badd9d342b6d4b8118de5ab497995fafbf73144469e5ff0"], + ["c95ab19104b63986d7303f4363ca8f5d2fa87c21e3c5d462b99f1ebcb7c402fc012f5034780000000009006aac63ac65655265ffffffffbe91afa68af40a8700fd579c86d4b706c24e47f7379dad6133de389f815ef7f501000000046aac00abffffffff1520db0d81be4c631878494668d258369f30b8f2b7a71e257764e9a27f24b48701000000076a515100535300b0a989e1164db9499845bac01d07a3a7d6d2c2a76e4c04abe68f808b6e2ef5068ce6540e0100000009ac53636a63ab65656affffffff0309aac6050000000005ab6563656a6067e8020000000003ac536aec91c8030000000009655251ab65ac6a53acc7a45bc5", "63526a65abac", 1, 512079270, "fb7eca81d816354b6aedec8cafc721d5b107336657acafd0d246049556f9e04b"], + ["ca66ae10049533c2b39f1449791bd6d3f039efe0a121ab7339d39ef05d6dcb200ec3fb2b3b020000000465006a53ffffffff534b8f97f15cc7fb4f4cea9bf798472dc93135cd5b809e4ca7fe4617a61895980100000000ddd83c1dc96f640929dd5e6f1151dab1aa669128591f153310d3993e562cc7725b6ae3d903000000046a52536582f8ccddb8086d8550f09128029e1782c3f2624419abdeaf74ecb24889cc45ac1a64492a0100000002516a4867b41502ee6ccf03000000000752acacab52ab6a4b7ba80000000000075151ab0052536300000000", "6553", 2, -62969257, "8085e904164ab9a8c20f58f0d387f6adb3df85532e11662c03b53c3df8c943cb"], + ["ba646d0b0453999f0c70cb0430d4cab0e2120457bb9128ed002b6e9500e9c7f8d7baa20abe0200000001652a4e42935b21db02b56bf6f08ef4be5adb13c38bc6a0c3187ed7f6197607ba6a2c47bc8a03000000040052516affffffffa55c3cbfc19b1667594ac8681ba5d159514b623d08ed4697f56ce8fcd9ca5b0b00000000096a6a5263ac655263ab66728c2720fdeabdfdf8d9fb2bfe88b295d3b87590e26a1e456bad5991964165f888c03a0200000006630051ac00acffffffff0176fafe0100000000070063acac65515200000000", "63", 1, 2002322280, "9db4e320208185ee70edb4764ee195deca00ba46412d5527d9700c1cf1c3d057"], + ["2ddb8f84039f983b45f64a7a79b74ff939e3b598b38f436def7edd57282d0803c7ef34968d02000000026a537eb00c4187de96e6e397c05f11915270bcc383959877868ba93bac417d9f6ed9f627a7930300000004516551abffffffffacc12f1bb67be3ae9f1d43e55fda8b885340a0df1175392a8bbd9f959ad3605003000000025163ffffffff02ff0f4700000000000070bd99040000000003ac53abf8440b42", "", 2, -393923011, "0133f1a161363b71dfb3a90065c7128c56bd0028b558b610142df79e055ab5c7"], + ["b21fc15403b4bdaa994204444b59323a7b8714dd471bd7f975a4e4b7b48787e720cbd1f5f00000000000ffffffff311533001cb85c98c1d58de0a5fbf27684a69af850d52e22197b0dc941bc6ca9030000000765ab6363ab5351a8ae2c2c7141ece9a4ff75c43b7ea9d94ec79b7e28f63e015ac584d984a526a73fe1e04e0100000007526352536a5365ffffffff02a0a9ea030000000002ab52cfc4f300000000000465525253e8e0f342", "000000", 1, 1305253970, "d1df1f4bba2484cff8a816012bb6ec91c693e8ca69fe85255e0031711081c46a"], + ["d1704d6601acf710b19fa753e307cfcee2735eada0d982b5df768573df690f460281aad12d0000000007656300005100acffffffff0232205505000000000351ab632ca1bc0300000000016300000000", "ac65ab65ab51", 0, 165179664, "40b4f03c68288bdc996011b0f0ddb4b48dc3be6762db7388bdc826113266cd6c"], + ["d2f6c096025cc909952c2400bd83ac3d532bfa8a1f8f3e73c69b1fd7b8913379793f3ce92202000000076a00ab6a53516ade5332d81d58b22ed47b2a249ab3a2cb3a6ce9a6b5a6810e18e3e1283c1a1b3bd73e3ab00300000002acabffffffff01a9b2d40500000000056352abab00dc4b7f69", "ab0065", 0, -78019184, "2ef025e907f0fa454a2b48a4f3b81346ba2b252769b5c35d742d0c8985e0bf5e"], + ["3e6db1a1019444dba461247224ad5933c997256d15c5d37ade3d700506a0ba0a57824930d7010000000852ab6500ab00ac00ffffffff03389242020000000001aba8465a0200000000086a6a636a5100ab52394e6003000000000953ac51526351000053d21d9800", "abababacab53ab65", 0, 1643661850, "1f8a3aca573a609f4aea0c69522a82fcb4e15835449da24a05886ddc601f4f6a"], + ["f821a042036ad43634d29913b77c0fc87b4af593ac86e9a816a9d83fd18dfcfc84e1e1d57102000000076a63ac52006351ffffffffbcdaf490fc75086109e2f832c8985716b3a624a422cf9412fe6227c10585d21203000000095252abab5352ac526affffffff2efed01a4b73ad46c7f7bc7fa3bc480f8e32d741252f389eaca889a2e9d2007e000000000353ac53ffffffff032ac8b3020000000009636300000063516300d3d9f2040000000006510065ac656aafa5de0000000000066352ab5300ac9042b57d", "525365", 1, 667065611, "0d17a92c8d5041ba09b506ddf9fd48993be389d000aad54f9cc2a44fcc70426b"], + ["58e3f0f704a186ef55d3919061459910df5406a9121f375e7502f3be872a449c3f2bb058380100000000f0e858da3ac57b6c973f889ad879ffb2bd645e91b774006dfa366c74e2794aafc8bbc871010000000751ac65516a515131a68f120fd88ca08687ceb4800e1e3fbfea7533d34c84fef70cc5a96b648d580369526d000000000600ac00515363f6191d5b3e460fa541a30a6e83345dedfa3ed31ad8574d46d7bbecd3c9074e6ba5287c24020000000151e3e19d6604162602010000000004005100ac71e17101000000000065b5e90300000000040053ab53f6b7d101000000000200ac00000000", "6563ab", 1, -669018604, "8221d5dfb75fc301a80e919e158e0b1d1e86ffb08870a326c89408d9bc17346b"], + ["efec1cce044a676c1a3d973f810edb5a9706eb4cf888a240f2b5fb08636bd2db482327cf500000000005ab51656a52ffffffff46ef019d7c03d9456e5134eb0a7b5408d274bd8e33e83df44fab94101f7c5b650200000009ac5100006353630051407aadf6f5aaffbd318fdbbc9cae4bd883e67d524df06bb006ce2f7c7e2725744afb76960100000005536aab53acec0d64eae09e2fa1a7c4960354230d51146cf6dc45ee8a51f489e20508a785cbe6ca86fc000000000651536a516300ffffffff014ef598020000000006636aac655265a6ae1b75", "53516a5363526563ab", 2, -1823982010, "13e8b5ab4e5b2ceeff0045c625e19898bda2d39fd7af682e2d1521303cfe1154"], + ["3c436c2501442a5b700cbc0622ee5143b34b1b8021ea7bbc29e4154ab1f5bdfb3dff9d640501000000086aab5251ac5252acffffffff0170b9a20300000000066aab6351525114b13791", "63acabab52ab51ac65", 0, -2140612788, "87ddf1f9acb6640448e955bd1968f738b4b3e073983af7b83394ab7557f5cd61"], + ["d62f183e037e0d52dcf73f9b31f70554bce4f693d36d17552d0e217041e01f15ad3840c838000000000963acac6a6a6a63ab63ffffffffabdfb395b6b4e63e02a763830f536fc09a35ff8a0cf604021c3c751fe4c88f4d0300000006ab63ab65ac53aa4d30de95a2327bccf9039fb1ad976f84e0b4a0936d82e67eafebc108993f1e57d8ae39000000000165ffffffff04364ad30500000000036a005179fd84010000000007ab636aac6363519b9023030000000008510065006563ac6acd2a4a02000000000000000000", "52", 1, 595020383, "da8405db28726dc4e0f82b61b2bfd82b1baa436b4e59300305cc3b090b157504"], + ["44c200a5021238de8de7d80e7cce905606001524e21c8d8627e279335554ca886454d692e6000000000500acac52abbb8d1dc876abb1f514e96b21c6e83f429c66accd961860dc3aed5071e153e556e6cf076d02000000056553526a51870a928d0360a580040000000004516a535290e1e302000000000851ab6a00510065acdd7fc5040000000007515363ab65636abb1ec182", "6363", 0, -785766894, "ed53cc766cf7cb8071cec9752460763b504b2183442328c5a9761eb005c69501"], + ["d682d52d034e9b062544e5f8c60f860c18f029df8b47716cabb6c1b4a4b310a0705e754556020000000400656a0016eeb88eef6924fed207fba7ddd321ff3d84f09902ff958c815a2bf2bb692eb52032c4d803000000076365ac516a520099788831f8c8eb2552389839cfb81a9dc55ecd25367acad4e03cfbb06530f8cccf82802701000000085253655300656a53ffffffff02d543200500000000056a510052ac03978b05000000000700ac51525363acfdc4f784", "", 2, -696035135, "e1a256854099907050cfee7778f2018082e735a1f1a3d91437584850a74c87bb"], + ["e8c0dec5026575ddf31343c20aeeca8770afb33d4e562aa8ee52eeda6b88806fdfd4fe0a97030000000953acabab65ab516552ffffffffdde122c2c3e9708874286465f8105f43019e837746686f442666629088a970e0010000000153ffffffff01f98eee0100000000025251fe87379a", "63", 1, 633826334, "abe441209165d25bc6d8368f2e7e7dc21019056719fef1ace45542aa2ef282e2"], + ["b288c331011c17569293c1e6448e33a64205fc9dc6e35bc756a1ac8b97d18e912ea88dc0770200000007635300ac6aacabfc3c890903a3ccf8040000000004656500ac9c65c9040000000009ab6a6aabab65abac63ac5f7702000000000365005200000000", "526a63", 0, 1574937329, "0dd1bd5c25533bf5f268aa316ce40f97452cca2061f0b126a59094ca5b65f7a0"], + ["fc0a092003cb275fa9a25a72cf85d69c19e4590bfde36c2b91cd2c9c56385f51cc545530210000000004ab530063ffffffff729b006eb6d14d6e5e32b1c376acf1c62830a5d9246da38dbdb4db9f51fd1c74020000000463636500ffffffff0ae695c6d12ab7dcb8d3d4b547b03f178c7268765d1de9af8523d244e3836b12030000000151ffffffff0115c1e20100000000066a6aabac6a6a1ff59aec", "ab0053ac", 0, 931831026, "73fe22099c826c34a74edf45591f5d7b3a888c8178cd08facdfd96a9a681261c"], + ["0fcae7e004a71a4a7c8f66e9450c0c1785268679f5f1a2ee0fb3e72413d70a9049ecff75de020000000452005251ffffffff99c8363c4b95e7ec13b8c017d7bb6e80f7c04b1187d6072961e1c2479b1dc0320200000000ffffffff7cf03b3d66ab53ed740a70c5c392b84f780fff5472aee82971ac3bfeeb09b2df0200000006ab5265636a0058e4fe9257d7c7c7e82ff187757c6eadc14cceb6664dba2de03a018095fd3006682a5b9600000000056353536a636de26b2303ff76de010000000001acdc0a2e020000000001ab0a53ed020000000007530063ab51510088417307", "ac6aacab5165535253", 2, -902160694, "eea96a48ee572aea33d75d0587ce954fcfb425531a7da39df26ef9a6635201be"], + ["612701500414271138e30a46b7a5d95c70c78cc45bf8e40491dac23a6a1b65a51af04e6b94020000000451655153ffffffffeb72dc0e49b2fad3075c19e1e6e4b387f1365dca43d510f6a02136318ddecb7f0200000003536352e115ffc4f9bae25ef5baf534a890d18106fb07055c4d7ec9553ba89ed1ac2101724e507303000000080063006563acabac2ff07f69a080cf61a9d19f868239e6a4817c0eeb6a4f33fe254045d8af2bca289a8695de0300000000430736c404d317840500000000086a00abac5351ab65306e0503000000000963ab0051536aabab6a6c8aca01000000000565516351ab5dcf960100000000016a00000000", "ab", 2, -604581431, "5ec805e74ee934aa815ca5f763425785ae390282d46b5f6ea076b6ad6255a842"], + ["6b68ba00023bb4f446365ea04d68d48539aae66f5b04e31e6b38b594d2723ab82d44512460000000000200acffffffff5dfc6febb484fff69c9eeb7c7eb972e91b6d949295571b8235b1da8955f3137b020000000851ac6352516a535325828c8a03365da801000000000800636aabac6551ab0f594d03000000000963ac536365ac63636a45329e010000000005abac53526a00000000", "005151", 0, 1317038910, "42f5ba6f5fe1e00e652a08c46715871dc4b40d89d9799fd7c0ea758f86eab6a7"], + ["aff5850c0168a67296cc790c1b04a9ed9ad1ba0469263a9432fcb53676d1bb4e0eea8ea1410100000005ac65526a537d5fcb1d01d9c26d0200000000065265ab5153acc0617ca1", "51ab650063", 0, 1712981774, "8449d5247071325e5f8edcc93cb9666c0fecabb130ce0e5bef050575488477eb"], + ["e6d6b9d8042c27aec99af8c12b6c1f7a80453e2252c02515e1f391da185df0874e133696b50300000006ac5165650065ffffffff6a4b60a5bfe7af72b198eaa3cde2e02aa5fa36bdf5f24ebce79f6ecb51f3b554000000000652656aababac2ec4c5a6cebf86866b1fcc4c5bd5f4b19785a8eea2cdfe58851febf87feacf6f355324a80100000001537100145149ac1e287cef62f6f5343579189fad849dd33f25c25bfca841cb696f10c5a34503000000046a636a63df9d7c4c018d96e20100000000015100000000", "53ab", 1, -1924777542, "f98f95d0c5ec3ac3e699d81f6c440d2e7843eab15393eb023bc5a62835d6dcea"], + ["046ac25e030a344116489cc48025659a363da60bc36b3a8784df137a93b9afeab91a04c1ed020000000951ab0000526a65ac51ffffffff6c094a03869fde55b9a8c4942a9906683f0a96e2d3e5a03c73614ea3223b2c29020000000500ab636a6affffffff3da7aa5ecef9071600866267674b54af1740c5aeb88a290c459caa257a2683cb0000000004ab6565ab7e2a1b900301b916030000000005abac63656308f4ed03000000000852ab53ac63ac51ac73d620020000000003ab00008deb1285", "6a", 2, 1299505108, "f79e6b776e2592bad45ca328c54abf14050c241d8f822d982c36ea890fd45757"], + ["bd515acd0130b0ac47c2d87f8d65953ec7d657af8d96af584fc13323d0c182a2e5f9a96573000000000652ac51acac65ffffffff0467aade000000000003655363dc577d050000000006515252ab5300137f60030000000007535163530065004cdc860500000000036a5265241bf53e", "acab", 0, 621090621, "771d4d87f1591a13d77e51858c16d78f1956712fe09a46ff1abcabbc1e7af711"], + ["ff1ae37103397245ac0fa1c115b079fa20930757f5b6623db3579cb7663313c2dc4a3ffdb300000000076353656a000053ffffffff83c59e38e5ad91216ee1a312d15b4267bae2dd2e57d1a3fd5c2f0f809eeb5d46010000000800abab6a6a53ab51ffffffff9d5e706c032c1e0ca75915f8c6686f64ec995ebcd2539508b7dd8abc3e4d7d2a01000000006b2bdcda02a8fe070500000000045253000019e31d04000000000700ab63acab526a00000000", "53656aab6a525251", 0, 881938872, "726bb88cdf3af2f7603a31f33d2612562306d08972a4412a55dbbc0e3363721c"], + ["ff5400dd02fec5beb9a396e1cbedc82bedae09ed44bae60ba9bef2ff375a6858212478844b03000000025253ffffffff01e46c203577a79d1172db715e9cc6316b9cfc59b5e5e4d9199fef201c6f9f0f000000000900ab6552656a5165acffffffff02e8ce62040000000002515312ce3e00000000000251513f119316", "", 0, 1541581667, "1e0da47eedbbb381b0e0debbb76e128d042e02e65b11125e17fd127305fc65cd"], + ["28e3daa603c03626ad91ffd0ff927a126e28d29db5012588b829a06a652ea4a8a5732407030200000004ab6552acffffffff8e643146d3d0568fc2ad854fd7864d43f6f16b84e395db82b739f6f5c84d97b40000000004515165526b01c2dc1469db0198bd884e95d8f29056c48d7e74ff9fd37a9dec53e44b8769a6c99c030200000009ab006a516a53630065eea8738901002398000000000007ac5363516a51abeaef12f5", "52ab52515253ab", 2, 1687390463, "55591346aec652980885a558cc5fc2e3f8d21cbd09f314a798e5a7ead5113ea6"], + ["b54bf5ac043b62e97817abb892892269231b9b220ba08bc8dbc570937cd1ea7cdc13d9676c010000000451ab5365a10adb7b35189e1e8c00b86250f769319668189b7993d6bdac012800f1749150415b2deb0200000003655300ffffffff60b9f4fb9a7e17069fd00416d421f804e2ef2f2c67de4ca04e0241b9f9c1cc5d0200000003ab6aacfffffffff048168461cce1d40601b42fbc5c4f904ace0d35654b7cc1937ccf53fe78505a0100000008526563525265abacffffffff01dbf4e6040000000007acac656553636500000000", "63", 2, 882302077, "f5b38b0f06e246e47ce622e5ee27d5512c509f8ac0e39651b3389815eff2ab93"], + ["ebf628b30360bab3fa4f47ce9e0dcbe9ceaf6675350e638baff0c2c197b2419f8e4fb17e16000000000452516365ac4d909a79be207c6e5fb44fbe348acc42fc7fe7ef1d0baa0e4771a3c4a6efdd7e2c118b0100000003acacacffffffffa6166e9101f03975721a3067f1636cc390d72617be72e5c3c4f73057004ee0ee010000000863636a6a516a5252c1b1e82102d8d54500000000000153324c900400000000015308384913", "0063516a51", 1, -1658428367, "eb2d8dea38e9175d4d33df41f4087c6fea038a71572e3bad1ea166353bf22184"], + ["d6a8500303f1507b1221a91adb6462fb62d741b3052e5e7684ea7cd061a5fc0b0e93549fa50100000004acab65acfffffffffdec79bf7e139c428c7cfd4b35435ae94336367c7b5e1f8e9826fcb0ebaaaea30300000000ffffffffd115fdc00713d52c35ea92805414bd57d1e59d0e6d3b79a77ee18a3228278ada020000000453005151ffffffff040231510300000000085100ac6a6a000063c6041c0400000000080000536a6563acac138a0b04000000000263abd25fbe03000000000900656a00656aac510000000000", "ac526aac6a00", 1, -2007972591, "13d12a51598b34851e7066cd93ab8c5212d60c6ed2dae09d91672c10ccd7f87c"], + ["658cb1c1049564e728291a56fa79987a4ed3146775fce078bd2e875d1a5ca83baf6166a82302000000056a656351ab2170e7d0826cbdb45fda0457ca7689745fd70541e2137bb4f52e7b432dcfe2112807bd720300000007006a0052536351ffffffff8715ca2977696abf86d433d5c920ef26974f50e9f4a20c584fecbb68e530af5101000000009e49d864155bf1d3c757186d29f3388fd89c7f55cc4d9158b4cf74ca27a35a1dd93f945502000000096a535353ac656351510d29fa870230b809040000000006ab6a6a526a633b41da050000000004ab6a6a65ed63bf62", "52acabac", 2, -1774073281, "53ab197fa7e27b8a3f99ff48305e67081eb90e95d89d7e92d80cee25a03a6689"], + ["e92492cc01aec4e62df67ea3bc645e2e3f603645b3c5b353e4ae967b562d23d6e043badecd0100000003acab65ffffffff02c7e5ea040000000002ab52e1e584010000000005536365515195d16047", "6551", 0, -424930556, "93c34627f526d73f4bea044392d1a99776b4409f7d3d835f23b03c358f5a61c2"], + ["02e242db04be2d8ced9179957e98cee395d4767966f71448dd084426844cbc6d15f2182e85030000000200650c8ffce3db9de9c3f9cdb9104c7cb26647a7531ad1ebf7591c259a9c9985503be50f8de30000000007ac6a51636a6353ffffffffa2e33e7ff06fd6469987ddf8a626853dbf30c01719efb259ae768f051f803cd30300000000fffffffffd69d8aead941683ca0b1ee235d09eade960e0b1df3cd99f850afc0af1b73e070300000001ab60bb602a011659670100000000076363526300acac00000000", "6353ab515251", 3, 1451100552, "bbc9069b8615f3a52ac8a77359098dcc6c1ba88c8372d5d5fe080b99eb781e55"], + ["b28d5f5e015a7f24d5f9e7b04a83cd07277d452e898f78b50aae45393dfb87f94a26ef57720200000008ababac630053ac52ffffffff046475ed040000000008ab5100526363ac65c9834a04000000000251abae26b30100000000040000ac65ceefb900000000000000000000", "ac6551ac6a536553", 0, -1756558188, "5848d93491044d7f21884eef7a244fe7d38886f8ae60df49ce0dfb2a342cd51a"], + ["efb8b09801f647553b91922a5874f8e4bb2ed8ddb3536ed2d2ed0698fac5e0e3a298012391030000000952ac005263ac52006affffffff04cdfa0f050000000007ac53ab51abac65b68d1b02000000000553ab65ac00d057d50000000000016a9e1fda010000000007ac63ac536552ac00000000", "6aac", 0, 1947322973, "603a9b61cd30fcea43ef0a5c18b88ca372690b971b379ee9e01909c336280511"], + ["68a59fb901c21946797e7d07a4a3ea86978ce43df0479860d7116ac514ba955460bae78fff0000000001abffffffff03979be80100000000036553639300bc040000000008006552006a656565cfa78d0000000000076552acab63ab5100000000", "ab65ab", 0, 995583673, "3b320dd47f2702452a49a1288bdc74a19a4b849b132b6cad9a1d945d87dfbb23"], + ["67761f2a014a16f3940dcb14a22ba5dc057fcffdcd2cf6150b01d516be00ef55ef7eb07a830100000004636a6a51ffffffff01af67bd050000000008526553526300510000000000", "6a00", 0, 1570943676, "079fa62e9d9d7654da8b74b065da3154f3e63c315f25751b4d896733a1d67807"], + ["e20fe96302496eb436eee98cd5a32e1c49f2a379ceb71ada8a48c5382df7c8cd88bdc47ced03000000016556aa0e180660925a841b457aed0aae47fca2a92fa1d7afeda647abf67198a3902a7c80dd00000000085152ac636a535265bd18335e01803c810100000000046500ac52f371025e", "6363ab", 1, -651254218, "2921a0e5e3ba83c57ba57c25569380c17986bf34c366ec216d4188d5ba8b0b47"], + ["4e1bd9fa011fe7aa14eee8e78f27c9fde5127f99f53d86bc67bdab23ca8901054ee8a8b6eb0300000009ac535153006a6a0063ffffffff044233670500000000000a667205000000000652ab636a51abe5bf35030000000003535351d579e505000000000700630065ab51ac3419ac30", "52abac52", 0, -1807563680, "4aae6648f856994bed252d319932d78db55da50d32b9008216d5366b44bfdf8a"], + ["ec02fbee03120d02fde12574649660c441b40d330439183430c6feb404064d4f507e704f3c0100000000ffffffffe108d99c7a4e5f75cc35c05debb615d52fac6e3240a6964a29c1704d98017fb60200000002ab63fffffffff726ec890038977adfc9dadbeaf5e486d5fcb65dc23acff0dd90b61b8e2773410000000002ac65e9dace55010f881b010000000005ac00ab650000000000", "51ac525152ac6552", 2, -1564046020, "3f988922d8cd11c7adff1a83ce9499019e5ab5f424752d8d361cf1762e04269b"], + ["23dbdcc1039c99bf11938d8e3ccec53b60c6c1d10c8eb6c31197d62c6c4e2af17f52115c3a0300000008636352000063ababffffffff17823880e1df93e63ad98c29bfac12e36efd60254346cac9d3f8ada020afc0620300000003ab63631c26f002ac66e86cd22a25e3ed3cb39d982f47c5118f03253054842daadc88a6c41a2e1500000000096a00ab636a53635163195314de015570fd0100000000096a5263acab5200005300000000", "ababac6a6553", 1, 11586329, "bd36a50e0e0a4ecbf2709e68daef41eddc1c0c9769efaee57910e99c0a1d1343"], + ["33b03bf00222c7ca35c2f8870bbdef2a543b70677e413ce50494ac9b22ea673287b6aa55c50000000005ab00006a52ee4d97b527eb0b427e4514ea4a76c81e68c34900a23838d3e57d0edb5410e62eeb8c92b6000000000553ac6aacac42e59e170326245c000000000009656553536aab516aabb1a10603000000000852ab52ab6a516500cc89c802000000000763ac6a63ac516300000000", "", 0, 557416556, "41bead1b073e1e9fee065dd612a617ca0689e8f9d3fed9d0acfa97398ebb404c"], + ["813eda1103ac8159850b4524ef65e4644e0fc30efe57a5db0c0365a30446d518d9b9aa8fdd0000000003656565c2f1e89448b374b8f12055557927d5b33339c52228f7108228149920e0b77ef0bcd69da60000000006abac00ab63ab82cdb7978d28630c5e1dc630f332c4245581f787936f0b1e84d38d33892141974c75b4750300000004ac53ab65ffffffff0137edfb02000000000000000000", "0063", 1, -1948560575, "71dfcd2eb7f2e6473aed47b16a6d5fcbd0af22813d892e9765023151e07771ec"], + ["9e45d9aa0248c16dbd7f435e8c54ae1ad086de50c7b25795a704f3d8e45e1886386c653fbf01000000025352fb4a1acefdd27747b60d1fb79b96d14fb88770c75e0da941b7803a513e6d4c908c6445c7010000000163ffffffff014069a8010000000001520a794fb3", "51ac005363", 1, -719113284, "0d31a221c69bd322ef7193dd7359ddfefec9e0a1521d4a8740326d46e44a5d6a"], + ["36e42018044652286b19a90e5dd4f8d9f361d0760d080c5c5add1970296ff0f1de630233c8010000000200ac39260c7606017d2246ee14ddb7611586178067e6a4be38e788e33f39a3a95a55a13a6775010000000352ac638bea784f7c2354ed02ea0b93f0240cdfb91796fa77649beee6f7027caa70778b091deee700000000066a65ac656363ffffffff4d9d77ab676d711267ef65363f2d192e1bd55d3cd37f2280a34c72e8b4c559d700000000056a006aab00001764e1020d30220100000000085252516aacab0053472097040000000009635353ab6a636a5100a56407a1", "006a536551ab53ab", 0, 827296034, "daec2af5622bbe220c762da77bab14dc75e7d28aa1ade9b7f100798f7f0fd97a"], + ["5e06159a02762b5f3a5edcdfc91fd88c3bff08b202e69eb5ba74743e9f4291c4059ab008200000000001ac348f5446bb069ef977f89dbe925795d59fb5d98562679bafd61f5f5f3150c3559582992d0000000008ab5165515353abac762fc67703847ec6010000000000e200cf040000000002abaca64b86010000000008520000515363acabb82b491b", "ab53525352ab6a", 0, -61819505, "75a7db0df41485a28bf6a77a37ca15fa8eccc95b5d6014a731fd8adb9ada0f12"], + ["a1948872013b543d6d902ccdeead231c585195214ccf5d39f136023855958436a43266911501000000086aac006a6a6a51514951c9b2038a538a04000000000452526563c0f345050000000007526a5252ac526af9be8e03000000000752acac51ab006306198db2", "ab6353", 0, -326384076, "ced7ef84aad4097e1eb96310e0d1c8e512cfcb392a01d9010713459b23bc0cf4"], + ["c3efabba03cb656f154d1e159aa4a1a4bf9423a50454ebcef07bc3c42a35fb8ad84014864d0000000000d1cc73d260980775650caa272e9103dc6408bdacaddada6b9c67c88ceba6abaa9caa2f7d020000000553536a5265ffffffff9f946e8176d9b11ff854b76efcca0a4c236d29b69fb645ba29d406480427438e01000000066a0065005300ffffffff040419c0010000000003ab6a63cdb5b6010000000009006300ab5352656a63f9fe5e050000000004acac5352611b980100000000086a00acac00006a512d7f0c40", "0053", 0, -59089911, "c503001c16fbff82a99a18d88fe18720af63656fccd8511bca1c3d0d69bd7fc0"], + ["efb55c2e04b21a0c25e0e29f6586be9ef09f2008389e5257ebf2f5251051cdc6a79fce2dac020000000351006affffffffaba73e5b6e6c62048ba5676d18c33ccbcb59866470bb7911ccafb2238cfd493802000000026563ffffffffe62d7cb8658a6eca8a8babeb0f1f4fa535b62f5fc0ec70eb0111174e72bbec5e0300000009abababac516365526affffffffbf568789e681032d3e3be761642f25e46c20322fa80346c1146cb47ac999cf1b0300000000b3dbd55902528828010000000001ab0aac7b0100000000015300000000", "acac52", 3, 1638140535, "e84444d91580da41c8a7dcf6d32229bb106f1be0c811b2292967ead5a96ce9d4"], + ["91d3b21903629209b877b3e1aef09cd59aca6a5a0db9b83e6b3472aceec3bc2109e64ab85a0200000003530065ffffffffca5f92de2f1b7d8478b8261eaf32e5656b9eabbc58dcb2345912e9079a33c4cd010000000700ab65ab00536ad530611da41bbd51a389788c46678a265fe85737b8d317a83a8ff7a839debd18892ae5c80300000007ab6aac65ab51008b86c501038b8a9a05000000000263525b3f7a040000000007ab535353ab00abd4e3ff04000000000665ac51ab65630b7b656f", "6551525151516a00", 2, 499657927, "ef4bd7622eb7b2bbbbdc48663c1bc90e01d5bde90ff4cb946596f781eb420a0c"], + ["5d5c41ad0317aa7e40a513f5141ad5fc6e17d3916eebee4ddb400ddab596175b41a111ead20100000005536a5265acffffffff900ecb5e355c5c9f278c2c6ea15ac1558b041738e4bffe5ae06a9346d66d5b2b00000000080000ab636a65ab6affffffff99f4e08305fa5bd8e38fb9ca18b73f7a33c61ff7b3c68e696b30a04fea87f3ca000000000163d3d1760d019fc13a00000000000000000000", "ab53acabab6aac6a52", 2, 1007461922, "4012f5ff2f1238a0eb84854074670b4703238ebc15bfcdcd47ffa8498105fcd9"], + ["ceecfa6c02b7e3345445b82226b15b7a097563fa7d15f3b0c979232b138124b62c0be007890200000009abac51536a63525253ffffffffbae481ccb4f15d94db5ec0d8854c24c1cc8642bd0c6300ede98a91ca13a4539a0200000001ac50b0813d023110f5020000000006acabac526563e2b0d0040000000009656aac0063516a536300000000", "0063526500", 0, -1862053821, "e1600e6df8a6160a79ac32aa40bb4644daa88b5f76c0d7d13bf003327223f70c"], + ["ae62d5fd0380c4083a26642159f51af24bf55dc69008e6b7769442b6a69a603edd980a33000000000005ab5100ab53ffffffff49d048324d899d4b8ed5e739d604f5806a1104fede4cb9f92cc825a7fa7b4bfe0200000005536a000053ffffffff42e5cea5673c650881d0b4005fa4550fd86de5f21509c4564a379a0b7252ac0e0000000007530000526a53525f26a68a03bfacc3010000000000e2496f000000000009ab5253acac52636563b11cc600000000000700510065526a6a00000000", "abab", 1, -1600104856, "05cf0ec9c61f1a15f651a0b3c5c221aa543553ce6c804593f43bb5c50bb91ffb"], + ["f06f64af04fdcb830464b5efdb3d5ee25869b0744005375481d7b9d7136a0eb8828ad1f0240200000003516563fffffffffd3ba192dabe9c4eb634a1e3079fca4f072ee5ceb4b57deb6ade5527053a92c5000000000165ffffffff39f43401a36ba13a5c6dd7f1190e793933ae32ee3bf3e7bfb967be51e681af760300000009650000536552636a528e34f50b21183952cad945a83d4d56294b55258183e1627d6e8fb3beb8457ec36cadb0630000000005abab530052334a7128014bbfd10100000000085352ab006a63656afc424a7c", "53650051635253ac00", 2, 313255000, "d309da5afd91b7afa257cfd62df3ca9df036b6a9f4b38f5697d1daa1f587312b"], + ["6dfd2f98046b08e7e2ef5fff153e00545faf7076699012993c7a30cb1a50ec528281a9022f030000000152ffffffff1f535e4851920b968e6c437d84d6ecf586984ebddb7d5db6ae035bd02ba222a8010000000651006a53ab51605072acb3e17939fa0737bc3ee43bc393b4acd58451fc4ffeeedc06df9fc649828822d5010000000253525a4955221715f27788d302382112cf60719be9ae159c51f394519bd5f7e70a4f9816c7020200000009526a6a51636aab656a36d3a5ff0445548e0100000000086a6a00516a52655167030b050000000004ac6a63525cfda8030000000000e158200000000000010000000000", "535263ac6a65515153", 3, 585774166, "72b7da10704c3ca7d1deb60c31b718ee12c70dc9dfb9ae3461edce50789fe2ba"], + ["187eafed01389a45e75e9dda526d3acbbd41e6414936b3356473d1f9793d161603efdb45670100000002ab00ffffffff04371c8202000000000563630063523b3bde02000000000753516563006300e9e765010000000005516aac656a373f9805000000000665525352acab08d46763", "ab", 0, 122457992, "393aa6c758e0eed15fa4af6d9e2d7c63f49057246dbb92b4268ec24fc87301ca"], + ["7d50b977035d50411d814d296da9f7965ddc56f3250961ca5ba805cadd0454e7c521e31b0300000000003d0416c2cf115a397bacf615339f0e54f6c35ffec95aa009284d38390bdde1595cc7aa7c0100000005ab52ac5365ffffffff4232c6e796544d5ac848c9dc8d25cfa74e32e847a5fc74c74d8f38ca51188562030000000653ac51006a51ffffffff016bd8bb00000000000465ab5253163526f3", "51ab526a00005353", 1, -1311316785, "60b7544319b42e4159976c35c32c2644f0adf42eff13be1dc2f726fc0b6bb492"], + ["2a45cd1001bf642a2315d4a427eddcc1e2b0209b1c6abd2db81a800c5f1af32812de42032702000000050051525200ffffffff032177db050000000005530051abac49186f000000000004ab6aab00645c0000000000000765655263acabac00000000", "6a65", 0, -1774715722, "6a9ac3f7da4c7735fbc91f728b52ecbd602233208f96ac5592656074a5db118a"], + ["479358c202427f3c8d19e2ea3def6d6d3ef2281b4a93cd76214f0c7d8f040aa042fe19f71f0300000001abffffffffa2709be556cf6ecaa5ef530df9e4d056d0ed57ce96de55a5b1f369fa40d4e74a020000000700006a51635365c426be3f02af578505000000000363ab63fd8f590500000000065153abac53632dfb14b3", "520063ab51", 1, -763226778, "cfe147982afacde044ce66008cbc5b1e9f0fd9b8ed52b59fc7c0fecf95a39b0e"], + ["76179a8e03bec40747ad65ab0f8a21bc0d125b5c3c17ad5565556d5cb03ade7c83b4f32d98030000000151ffffffff99b900504e0c02b97a65e24f3ad8435dfa54e3c368f4e654803b756d011d24150200000003ac5353617a04ac61bb6cf697cfa4726657ba35ed0031432da8c0ffb252a190278830f9bd54f0320100000006656551005153c8e8fc8803677c77020000000007ac6553535253ac70f442030000000001535be0f20200000000026300bf46cb3a", "6aab52", 1, -58495673, "35e94b3776a6729d20aa2f3ddeeb06d3aad1c14cc4cde52fd21a4efc212ea16c"], + ["75ae53c2042f7546223ce5d5f9e00a968ddc68d52e8932ef2013fa40ce4e8c6ed0b6195cde01000000056563ac630079da0452c20697382e3dba6f4fc300da5f52e95a9dca379bb792907db872ba751b8024ee0300000009655151536500005163ffffffffe091b6d43f51ff00eff0ccfbc99b72d3aff208e0f44b44dfa5e1c7322cfc0c5f01000000075200005363ab63ffffffff7e96c3b83443260ac5cfd18258574fbc4225c630d3950df812bf51dceaeb0f9103000000065365655165639a6bf70b01b3e14305000000000563530063ac00000000", "6300ab00ac", 2, 982422189, "ee4ea49d2aae0dbba05f0b9785172da54408eb1ec67d36759ff7ed25bfc28766"], + ["1cdfa01e01e1b8078e9c2b0ca5082249bd18fdb8b629ead659adedf9a0dd5a04031871ba120200000008525351536565ab6affffffff011e28430200000000076a5363636aac52b2febd4a", "abacac63656300", 0, 387396350, "299dcaac2bdaa627eba0dfd74767ee6c6f27c9200b49da8ff6270b1041669e7e"], + ["cc28c1810113dfa6f0fcd9c7d9c9a30fb6f1d774356abeb527a8651f24f4e6b25cf763c4e00300000003ab636affffffff02dfc6050000000000080053636351ab0052afd56903000000000453ab5265f6c90d99", "006551abacacac", 0, 1299280838, "a4c0773204ab418a939e23f493bd4b3e817375d133d307609e9782f2cc38dbcf"], + ["ca816e7802cd43d66b9374cd9bf99a8da09402d69c688d8dcc5283ace8f147e1672b757e020200000005516aabab5240fb06c95c922342279fcd88ba6cd915933e320d7becac03192e0941e0345b79223e89570300000004005151ac353ecb5d0264dfbd010000000005ac6aacababd5d70001000000000752ac53ac6a5151ec257f71", "63ac", 1, 774695685, "cc180c4f797c16a639962e7aec58ec4b209853d842010e4d090895b22e7a7863"], + ["b42b955303942fedd7dc77bbd9040aa0de858afa100f399d63c7f167b7986d6c2377f66a7403000000066aac00525100ffffffff0577d04b64880425a3174055f94191031ad6b4ca6f34f6da9be7c3411d8b51fc000000000300526a6391e1cf0f22e45ef1c44298523b516b3e1249df153590f592fcb5c5fc432dc66f3b57cb03000000046a6aac65ffffffff0393a6c9000000000004516a65aca674ac0400000000046a525352c82c370000000000030053538e577f89", "", 1, -1237094944, "566953eb806d40a9fb684d46c1bf8c69dea86273424d562bd407b9461c8509af"], + ["92c9fe210201e781b72554a0ed5e22507fb02434ddbaa69aff6e74ea8bad656071f1923f3f02000000056a63ac6a514470cef985ba83dcb8eee2044807bedbf0d983ae21286421506ae276142359c8c6a34d68020000000863ac63525265006aa796dd0102ca3f9d05000000000800abab52ab535353cd5c83010000000007ac00525252005322ac75ee", "5165", 0, 97879971, "6e6307cef4f3a9b386f751a6f40acebab12a0e7e17171d2989293cbec7fd45c2"], + ["ccca1d5b01e40fe2c6b3ee24c660252134601dab785b8f55bd6201ffaf2fddc7b3e2192325030000000365535100496d4703b4b66603000000000665535253ac633013240000000000015212d2a502000000000951abac636353636a5337b82426", "0052", 0, -1691630172, "577bf2b3520b40aef44899a20d37833f1cded6b167e4d648fc5abe203e43b649"], + ["bc1a7a3c01691e2d0c4266136f12e391422f93655c71831d90935fbda7e840e50770c61da20000000008635253abac516353ffffffff031f32aa020000000003636563786dbc0200000000003e950f00000000000563516a655184b8a1de", "51536a", 0, -1627072905, "730bc25699b46703d7718fd5f5c34c4b5f00f594a9968ddc247fa7d5175124ed"], + ["076d209e02d904a6c40713c7225d23e7c25d4133c3c3477828f98c7d6dbd68744023dbb66b030000000753ab00536565acffffffff10975f1b8db8861ca94c8cc7c7cff086ddcd83e10b5fffd4fc8f2bdb03f9463c0100000000ffffffff029dff76010000000006526365530051a3be6004000000000000000000", "515253ac65acacac", 1, -1207502445, "66c488603b2bc53f0d22994a1f0f66fb2958203102eba30fe1d37b27a55de7a5"], + ["690fd1f80476db1f9eebe91317f2f130a60cbc1f4feadd9d6474d438e9cb7f91e4994600af0300000004ab536a63a15ce9fa6622d0c4171d895b42bff884dc6e8a7452f827fdc68a29c3c88e6fdee364eaf50000000002ab52ffffffff022dc39d3c0956b24d7f410b1e387859e7a72955f45d6ffb1e884d77888d18fe0300000005ac6a63656afffffffff10b06bce1800f5c49153d24748fdefb0bf514c12863247d1042d56018c3e25c03000000086a63ac6365536a52ffffffff031f162f0500000000060000655265abffbcd40500000000045151ac001a9c8c05000000000652ac53656a6300000000", "ac51ab63acac", 0, -67986012, "051c0df7ac688c2c930808dabde1f50300aea115f2bb3334f4753d5169b51e46"], + ["49ac2af00216c0307a29e83aa5de19770e6b20845de329290bd69cf0e0db7aed61ae41b39002000000035163ac8b2558ef84635bfc59635150e90b61fc753d34acfd10d97531043053e229cd720133cd95000000000463516a51ffffffff02458471040000000008abab636a51ac0065545aa80000000000096a6553516a5263ac6a00000000", "51526300ab5363", 1, 1449668540, "ddfd902bba312a06197810da96a0ddccb595f96670b28ded7dba88d8cd0469b8"], + ["fa4d868b024b010bd5dce46576c2fb489aa60bb797dac3c72a4836f49812c5c564c258414f03000000007a9b3a585e05027bdd89edbadf3c85ac61f8c3a04c773fa746517ae600ff1a9d6b6c02fb0200000004515163abffffffff01b17d020500000000046a65520000000000", "536565ab65635363", 0, -1718953372, "96c2b32f0a00a5925db7ba72d0b5d39922f30ea0f7443b22bc1b734808513c47"], + ["cac6382d0462375e83b67c7a86c922b569a7473bfced67f17afd96c3cd2d896cf113febf9e0300000003006a53ffffffffaa4913b7eae6821487dd3ca43a514e94dcbbf350f8cc4cafff9c1a88720711b800000000096a6a525300acac6353ffffffff184fc4109c34ea27014cc2c1536ef7ed1821951797a7141ddacdd6e429fae6ff01000000055251655200ffffffff9e7b79b4e6836e290d7b489ead931cba65d1030ccc06f20bd4ca46a40195b33c030000000008f6bc8304a09a2704000000000563655353511dbc73050000000000cf34c500000000000091f76e0000000000085200ab00005100abd07208cb", "0063656a", 2, -1488731031, "bf078519fa87b79f40abc38f1831731422722c59f88d86775535f209cb41b9b1"], + ["1711146502c1a0b82eaa7893976fefe0fb758c3f0e560447cef6e1bde11e42de91a125f71c030000000015bd8c04703b4030496c7461482481f290c623be3e76ad23d57a955807c9e851aaaa20270300000000d04abaf20326dcb7030000000001632225350400000000075263ac00520063dddad9020000000000af23d148", "52520053510063", 0, 1852122830, "e33d5ee08c0f3c130a44d7ce29606450271b676f4a80c52ab9ffab00cecf67f8"], + ["8d5b124d0231fbfc640c706ddb1d57bb49a18ba8ca0e1101e32c7e6e65a0d4c7971d93ea360100000008acabac0000abac65ffffffff8fe0fd7696597b845c079c3e7b87d4a44110c445a330d70342a5501955e17dd70100000004ab525363ef22e8a90346629f030000000009516a00ac63acac51657bd57b05000000000200acfd4288050000000009acab5352ab00ab636300000000", "53ac526553ab65", 0, 1253152975, "8b57a7c3170c6c02dd14ae1d392ce3d828197b20e9145c89c1cfd5de050e1562"], + ["38146dc502c7430e92b6708e9e107b61cd38e5e773d9395e5c8ad8986e7e4c03ee1c1e1e760100000000c8962ce2ac1bb3b1285c0b9ba07f4d2e5ce87c738c42ac0548cd8cec1100e6928cd6b0b6010000000763ab636aab52527cccefbd04e5f6f8020000000006006aabacac65ab2c4a00000000000351635209a6f40100000000026aacce57dc040000000008ab5353ab516a516a00000000", "ab", 0, -1205978252, "3cb5b030e7da0b60ccce5b4a7f3793e6ca56f03e3799fe2d6c3cc22d6d841dcb"], + ["22d81c740469695a6a83a9a4824f77ecff8804d020df23713990afce2b72591ed7de98500502000000065352526a6a6affffffff90dc85e118379b1005d7bbc7d2b8b0bab104dad7eaa49ff5bead892f17d8c3ba010000000665656300ab51ffffffff965193879e1d5628b52005d8560a35a2ba57a7f19201a4045b7cbab85133311d0200000003ac005348af21a13f9b4e0ad90ed20bf84e4740c8a9d7129632590349afc03799414b76fd6e826200000000025353ffffffff04a0d40d04000000000060702700000000000652655151516ad31f1502000000000365ac0069a1ac0500000000095100655300ab53525100000000", "51636a52ac", 0, -1644680765, "add7f5da27262f13da6a1e2cc2feafdc809bd66a67fb8ae2a6f5e6be95373b6f"], + ["a27dcbc801e3475174a183586082e0914c314bc9d79d1570f29b54591e5e0dff07fbb45a7f0000000004ac53ab51ffffffff027347f5020000000005535351ab63d0e5c9030000000009ac65ab6a63515200ab7cd632ed", "ac63636553", 0, -686435306, "883a6ea3b2cc53fe8a803c229106366ca14d25ffbab9fef8367340f65b201da6"], + ["b123ed2204410d4e8aaaa8cdb95234ca86dad9ff77fb4ae0fd4c06ebed36794f0215ede0040100000002ac63ffffffff3b58b81b19b90d8f402701389b238c3a84ff9ba9aeea298bbf15b41a6766d27a01000000056a6553ab00151824d401786153b819831fb15926ff1944ea7b03d884935a8bde01ed069d5fd80220310200000000ffffffffa9c9d246f1eb8b7b382a9032b55567e9a93f86c77f4e32c092aa1738f7f756c30100000002ab65ffffffff011a2b48000000000000ed44d1fb", "630051ab63", 2, -1118263883, "b5dab912bcabedff5f63f6dd395fc2cf030d83eb4dd28214baba68a45b4bfff0"], + ["1339051503e196f730955c5a39acd6ed28dec89b4dadc3f7c79b203b344511270e5747fa9900000000045151636affffffff378c6090e08a3895cedf1d25453bbe955a274657172491fd2887ed5c9aceca7b0100000000ffffffffcf7cc3c36ddf9d4749edfa9cefed496d2f86e870deb814bfcd3b5637a5496461030000000451006300ffffffff04dcf3fa010000000008526a63005263acabb41d84040000000004abac5153800eff020000000005656a535365106c5e00000000000000000000", "abac5300", 2, 2013719928, "7fc74de39ce6ca46ca25d760d3cec7bb21fd14f7efe1c443b5aa294f2cb5f546"], + ["0728c606014c1fd6005ccf878196ba71a54e86cc8c53d6db500c3cc0ac369a26fac6fcbc210000000005ab53ac5365ba9668290182d7870100000000066a000053655100000000", "65", 0, 1789961588, "ab6baa6da3b2bc853868d166f8996ad31d63ef981179f9104f49968fd61c8427"], + ["a1134397034bf4067b6c81c581e2b73fb63835a08819ba24e4e92df73074bf773c94577df7000000000465525251ffffffff8b6608feaa3c1f35f49c6330a769716fa01c5c6f6e0cdc2eb10dfc99bbc21e77010000000952656aac005352655180a0bda4bc72002c2ea8262e26e03391536ec36867258cab968a6fd6ec7523b64fa1d8c001000000056a53ac6353ffffffff04dbeeed05000000000553650052abcd5d0e01000000000463abab51104b2e0500000000066aac53ac5165283ca7010000000004535252ab00000000", "ab515151516552ab", 1, -324598676, "91178482112f94d1c8e929de443e4b9c893e18682998d393ca9ca77950412586"], + ["bcdafbae04aa18eb75855aeb1f5124f30044741351b33794254a80070940cb10552fa4fa8e0300000001acd0423fe6e3f3f88ae606f2e8cfab7a5ef87caa2a8f0401765ff9a47d718afcfb40c0099b0000000008ac6565ab53ac6aac645308009d680202d600e492b31ee0ab77c7c5883ebad5065f1ce87e4dfe6453e54023a0010000000151ffffffffb9d818b14245899e1d440152827c95268a676f14c3389fc47f5a11a7b38b1bde03000000026300ffffffff03cda22102000000000751ac535263005100a4d20400000000045200536ac8bef405000000000700ab51ab6563ac00000000", "6553516a526aab", 1, -2111409753, "5e1849e7368cf4f042718586d9bd831d61479b775bab97aba9f450042bd9876a"], + ["ed3bb93802ddbd08cb030ef60a2247f715a0226de390c9c1a81d52e83f8674879065b5f87d0300000003ab6552ffffffff04d2c5e60a21fb6da8de20bf206db43b720e2a24ce26779bca25584c3f765d1e0200000008ab656a6aacab00ab6e946ded025a811d04000000000951abac6352ac00ab5143cfa3030000000005635200636a00000000", "5352ac650065535300", 1, -668727133, "e9995065e1fddef72a796eef5274de62012249660dc9d233a4f24e02a2979c87"], + ["59f4629d030fa5d115c33e8d55a79ea3cba8c209821f979ed0e285299a9c72a73c5bba00150200000002636affffffffd8aca2176df3f7a96d0dc4ee3d24e6cecde1582323eec2ebef9a11f8162f17ac0000000007ab6565acab6553ffffffffeebc10af4f99c7a21cbc1d1074bd9f0ee032482a71800f44f26ee67491208e0403000000065352ac656351ffffffff0434e955040000000004ab515152caf2b305000000000365ac007b1473030000000003ab530033da970500000000060051536a5253bb08ab51", "", 2, 396340944, "0e9c47973ef2c292b2252c623f465bbb92046fe0b893eebf4e1c9e02cb01c397"], + ["286e3eb7043902bae5173ac3b39b44c5950bc363f474386a50b98c7bdab26f98dc83449c4a020000000752ac6a00510051ffffffff4339cd6a07f5a5a2cb5815e5845da70300f5c7833788363bf7fe67595d3225520100000000fffffffff9c2dd8b06ad910365ffdee1a966f124378a2b8021065c8764f6138bb1e951380200000005ab5153ac6affffffff0370202aba7a68df85436ea7c945139513384ef391fa33d16020420b8ad40e9a000000000900ab5165526353abacffffffff020c1907000000000004abac526a1b490b040000000000df1528f7", "5353ab", 3, -1407529517, "32154c09174a9906183abf26538c39e78468344ca0848bbd0785e24a3565d932"], + ["2e245cf80179e2e95cd1b34995c2aff49fe4519cd7cee93ad7587f7f7e8105fc2dff206cd30200000009006a63516a6553ab52350435a201d5ed2d02000000000352ab6558552c89", "00ab53", 0, -233917810, "4605ae5fd3d50f9c45d37db7118a81a9ef6eb475d2333f59df5d3e216f150d49"], + ["33a98004029d262f951881b20a8d746c8c707ea802cd2c8b02a33b7e907c58699f97e42be80100000007ac53536552abacdee04cc01d205fd8a3687fdf265b064d42ab38046d76c736aad8865ca210824b7c622ecf02000000070065006a536a6affffffff01431c5d010000000000270d48ee", "", 1, 921554116, "ff9d7394002f3f196ea25472ea6c46f753bd879a7244795157bb7235c9322902"], + ["aac18f2b02b144ed481557c53f2146ae523f24fcde40f3445ab0193b6b276c315dc2894d2300000000075165650000636a233526947dbffc76aec7db1e1baa6868ad4799c76e14794dcbaaec9e713a83967f6a65170200000005abac6551ab27d518be01b652a30000000000015300000000", "52ac5353", 1, 1559377136, "59fc2959bb7bb24576cc8a237961ed95bbb900679d94da6567734c4390cb6ef5"], + ["5ab79881033555b65fe58c928883f70ce7057426fbdd5c67d7260da0fe8b1b9e6a2674cb850300000009ac516aac6aac006a6affffffffa5be9223b43c2b1a4d120b5c5b6ec0484f637952a3252181d0f8e813e76e11580200000000e4b5ceb8118cb77215bbeedc9a076a4d087bb9cd1473ea32368b71daeeeacc451ec209010000000005acac5153aced7dc34e02bc5d11030000000005ac5363006a54185803000000000552ab00636a00000000", "5100", 1, 1927062711, "e9f53d531c12cce1c50abed4ac521a372b4449b6a12f9327c80020df6bff66c0"], + ["6c2c8fac0124b0b7d4b610c3c5b91dee32b7c927ac71abdf2d008990ca1ac40de0dfd530660300000006ababac5253656bd7eada01d847ec000000000004ac52006af4232ec8", "6a6a6a0051", 0, -340809707, "fb51eb9d7e47d32ff2086205214f90c7c139e08c257a64829ae4d2b301071c6a"], + ["6e3880af031735a0059c0bb5180574a7dcc88e522c8b56746d130f8d45a52184045f96793e0100000008acabac6a526a6553fffffffffe05f14cdef7d12a9169ec0fd37524b5fcd3295f73f48ca35a36e671da4a2f560000000008006a526a6351ab63ffffffffdfbd869ac9e472640a84caf28bdd82e8c6797f42d03b99817a705a24fde2736600000000010090a090a503db956b04000000000952ac53ab6a536a63ab358390010000000009656a5200525153ac65353ee204000000000763530052526aaba6ad83fb", "535151ab6300", 2, 222014018, "57a34ddeb1bf36d28c7294dda0432e9228a9c9e5cc5c692db98b6ed2e218d825"], + ["8df1cd19027db4240718dcaf70cdee33b26ea3dece49ae6917331a028c85c5a1fb7ee3e475020000000865ab6a00510063636157988bc84d8d55a8ba93cdea001b9bf9d0fa65b5db42be6084b5b1e1556f3602f65d4d0100000005ac00ab0052206c852902b2fb54030000000008ac5252536aacac5378c4a5050000000007acabac535163532784439e", "acab6a", 0, 1105620132, "edb7c74223d1f10f9b3b9c1db8064bc487321ff7bb346f287c6bc2fad83682de"], + ["0e803682024f79337b25c98f276d412bc27e56a300aa422c42994004790cee213008ff1b8303000000080051ac65ac655165f421a331892b19a44c9f88413d057fea03c3c4a6c7de4911fe6fe79cf2e9b3b10184b1910200000005525163630096cb1c670398277204000000000253acf7d5d502000000000963536a6a636a5363ab381092020000000002ac6a911ccf32", "6565", 1, -1492094009, "f0672638a0e568a919e9d8a9cbd7c0189a3e132940beeb52f111a89dcc2daa2c"], + ["7d71669d03022f9dd90edac323cde9e56354c6804c6b8e687e9ae699f46805aafb8bcaa636000000000253abffffffff698a5fdd3d7f2b8b000c68333e4dd58fa8045b3e2f689b889beeb3156cecdb490300000009525353abab0051acabc53f0aa821cdd69b473ec6e6cf45cf9b38996e1c8f52c27878a01ec8bb02e8cb31ad24e500000000055353ab0052ffffffff0447a23401000000000565ab53ab5133aaa0030000000006515163656563057d110300000000056a6aacac52cf13b5000000000003526a5100000000", "6a6a51", 1, -1349253507, "722efdd69a7d51d3d77bed0ac5544502da67e475ea5857cd5af6bdf640a69945"], + ["9ff618e60136f8e6bb7eabaaac7d6e2535f5fba95854be6d2726f986eaa9537cb283c701ff02000000026a65ffffffff012d1c0905000000000865ab00ac6a516a652f9ad240", "51515253635351ac", 0, 1571304387, "659cd3203095d4a8672646add7d77831a1926fc5b66128801979939383695a79"], + ["9fbd43ac025e1462ecd10b1a9182a8e0c542f6d1089322a41822ab94361e214ed7e1dfdd8a020000000263519d0437581538e8e0b6aea765beff5b4f3a4a202fca6e5d19b34c141078c6688f71ba5b8e0100000003ac6552ffffffff02077774050000000009655153655263acab6a0ae4e10100000000035152524c97136b", "635152ab", 0, 1969622955, "d82d4ccd9b67810f26a378ad9592eb7a30935cbbd27e859b00981aefd0a72e08"], + ["0117c92004314b84ed228fc11e2999e657f953b6de3b233331b5f0d0cf40d5cc149b93c7b30300000005515263516a083e8af1bd540e54bf5b309d36ba80ed361d77bbf4a1805c7aa73667ad9df4f97e2da410020000000600ab6351ab524d04f2179455e794b2fcb3d214670001c885f0802e4b5e015ed13a917514a7618f5f332203000000086a536aab51000063ecf029e65a4a009a5d67796c9f1eb358b0d4bd2620c8ad7330fb98f5a802ab92d0038b1002000000036a6551a184a88804b04490000000000009ab6a5152535165526a33d1ab020000000001518e92320000000000002913df04000000000952abac6353525353ac8b19bfdf", "000051ab0000", 0, 489433059, "8eebac87e60da524bbccaf285a44043e2c9232868dda6c6271a53c153e7f3a55"], + ["e7f5482903f98f0299e0984b361efb2fddcd9979869102281e705d3001a9d283fe9f3f3a1e02000000025365ffffffffcc5c7fe82feebad32a22715fc30bc584efc9cd9cadd57e5bc4b6a265547e676e0000000001ab579d21235bc2281e08bf5e7f8f64d3afb552839b9aa5c77cf762ba2366fffd7ebb74e49400000000055263ab63633df82cf40100982e05000000000453ac535300000000", "acacab", 2, -1362931214, "046de666545330e50d53083eb78c9336416902f9b96c77cc8d8e543da6dfc7e4"], + ["09adb2e90175ca0e816326ae2dce7750c1b27941b16f6278023dbc294632ab97977852a09d030000000465ab006affffffff027739cf0100000000075151ab63ac65ab8a5bb601000000000653ac5151520011313cdc", "ac", 0, -76831756, "478ee06501b4965b40bdba6cbaad9b779b38555a970912bb791b86b7191c54bc"], + ["f973867602e30f857855cd0364b5bbb894c049f44abbfd661d7ae5dbfeaafca89fac8959c20100000005ab52536a51ffffffffbeceb68a4715f99ba50e131884d8d20f4a179313691150adf0ebf29d05f8770303000000066352ab00ac63ffffffff021fddb90000000000036a656322a177000000000008526500ac5100acac84839083", "52acab53ac", 0, 1407879325, "db0329439490efc64b7104d6d009b03fbc6fac597cf54fd786fbbb5fd73b92b4"], + ["fd22ebaa03bd588ad16795bea7d4aa7f7d48df163d75ea3afebe7017ce2f350f6a0c1cb0bb00000000086aabac5153526363ffffffff488e0bb22e26a565d77ba07178d17d8f85702630ee665ec35d152fa05af3bda10200000004515163abffffffffeb21035849e85ad84b2805e1069a91bb36c425dc9c212d9bae50a95b6bfde1200300000001ab5df262fd02b69848040000000008ab6363636a6363ace23bf2010000000007655263635253534348c1da", "006353526563516a00", 0, -1491036196, "92364ba3c7a85d4e88885b8cb9b520dd81fc29e9d2b750d0790690e9c1246673"], + ["130b462d01dd49fac019dc4442d0fb54eaa6b1c2d1ad0197590b7df26969a67abd7f3fbb4f0100000008ac65abac53ab6563ffffffff0345f825000000000004ac53acac9d5816020000000002ababeff8e90500000000086aab006552ac6a53a892dc55", "ab0065ac530052", 0, 944483412, "1f4209fd4ce7f13d175fdd522474ae9b34776fe11a5f17a27d0796c77a2a7a9d"], + ["f8e50c2604609be2a95f6d0f31553081f4e1a49a0a30777fe51eb1c596c1a9a92c053cf28c0300000009656a51ac5252630052fffffffff792ed0132ae2bd2f11d4a2aab9d0c4fbdf9a66d9ae2dc4108afccdc14d2b1700100000007ab6a6563ac636a7bfb2fa116122b539dd6a2ab089f88f3bc5923e5050c8262c112ff9ce0a3cd51c6e3e84f02000000066551ac5352650d5e687ddf4cc9a497087cabecf74d236aa4fc3081c3f67b6d323cba795e10e7a171b725000000000852635351ab635100ffffffff02df5409020000000008ac6a53acab5151004156990200000000045163655200000000", "ac53abac65005300", 0, -173065000, "b596f206d7eba22b7e2d1b7a4f4cf69c7c541b6c84dcc943f84e19a99a923310"], + ["18020dd1017f149eec65b2ec23300d8df0a7dd64fc8558b36907723c03cd1ba672bbb0f51d0300000005ab65ab6a63ffffffff037cd7ae000000000009ab516a65005352ac65f1e4360400000000056353530053f118f0040000000009536363ab006500abac00000000", "63ab51acab52ac", 0, -550412404, "e19b796c14a0373674968e342f2741d8b51092a5f8409e9bff7dcd52e56fcbcb"], + ["b04154610363fdade55ceb6942d5e5a723323863b48a0cb04fdcf56210717955763f56b08d0300000009ac526a525151635151ffffffff93a176e76151a9eabdd7af00ef2af72f9e7af5ecb0aa4d45d00618f394cdd03c030000000074d818b332ebe05dc24c44d776cf9d275c61f471cc01efce12fd5a16464157f1842c65cb00000000066a0000ac6352d3c4134f01d8a1c0030000000005520000005200000000", "5200656a656351", 2, -9757957, "6e3e5ba77f760b6b5b5557b13043f1262418f3dd2ce7f0298b012811fc8ad5bc"], + ["9794b3ce033df7b1e32db62d2f0906b589eacdacf5743963dc2255b6b9a6cba211fadd0d41020000000600ab00650065ffffffffaae00687a6a4131152bbcaafedfaed461c86754b0bde39e2bef720e6d1860a0302000000070065516aac6552ffffffff50e4ef784d6230df7486e972e8918d919f005025bc2d9aacba130f58bed7056703000000075265ab52656a52ffffffff02c6f1a9000000000006005251006363cf450c040000000008abab63510053abac00000000", "ac0063ababab515353", 1, 2063905082, "fad092fc98f17c2c20e10ba9a8eb44cc2bcc964b006f4da45cb9ceb249c69698"], + ["94533db7015e70e8df715066efa69dbb9c3a42ff733367c18c22ff070392f988f3b93920820000000006535363636300ce4dac3e03169af80300000000080065ac6a53ac65ac39c050020000000006abacab6aacac708a02050000000005ac5251520000000000", "6553", 0, -360458507, "5418cf059b5f15774836edd93571e0eed3855ba67b2b08c99dccab69dc87d3e9"], + ["c8597ada04f59836f06c224a2640b79f3a8a7b41ef3efa2602592ddda38e7597da6c639fee0300000009005251635351acabacffffffff4c518f347ee694884b9d4072c9e916b1a1f0a7fc74a1c90c63fdf8e5a185b6ae02000000007113af55afb41af7518ea6146786c7c726641c68c8829a52925e8d4afd07d8945f68e7230300000008ab00ab65ab650063ffffffffc28e46d7598312c420e11dfaae12add68b4d85adb182ae5b28f8340185394b63000000000165ffffffff04dbabb7010000000000ee2f6000000000000852ab6500ab6a51acb62a27000000000009ac53515300ac006a6345fb7505000000000752516a0051636a00000000", "", 3, 15199787, "0d66003aff5bf78cf492ecbc8fd40c92891acd58d0a271be9062e035897f317e"], + ["1a28c4f702c8efaad96d879b38ec65c5283b5c084b819ad7db1c086e85e32446c7818dc7a90300000008656351536a525165fa78cef86c982f1aac9c5eb8b707aee8366f74574c8f42ef240599c955ef4401cf578be30200000002ab518893292204c430eb0100000000016503138a0300000000040053abac60e0eb010000000005525200ab63567c2d030000000004abab52006cf81e85", "ab51525152", 1, 2118315905, "4e4c9a781f626b59b1d3ad8f2c488eb6dee8bb19b9bc138bf0dc33e7799210d4"], + ["c6c7a87003f772bcae9f3a0ac5e499000b68703e1804b9ddc3e73099663564d53ddc4e1c6e01000000076a536a6aac63636e3102122f4c30056ef8711a6bf11f641ddfa6984c25ac38c3b3e286e74e839198a80a34010000000165867195cd425821dfa2f279cb1390029834c06f018b1e6af73823c867bf3a0524d1d6923b0300000005acab53ab65ffffffff02fa4c49010000000008ab656a0052650053e001100400000000008836d972", "ac526351acab", 1, 978122815, "a869c18a0edf563d6e5eddd5d5ae8686f41d07f394f95c9feb8b7e52761531ca"], + ["0ea580ac04c9495ab6af3b8d59108bb4194fcb9af90b3511c83f7bb046d87aedbf8423218e02000000085152acac006363ab9063d7dc25704e0caa5edde1c6f2dd137ded379ff597e055b2977b9c559b07a7134fcef2000000000200aca89e50181f86e9854ae3b453f239e2847cf67300fff802707c8e3867ae421df69274449402000000056365abababffffffff47a4760c881a4d7e51c69b69977707bd2fb3bcdc300f0efc61f5840e1ac72cee0000000000ffffffff0460179a020000000004ab53ab52a5250c0500000000096565acac6365ab52ab6c281e02000000000952635100ac006563654e55070400000000046552526500000000", "ab526563acac53ab", 2, 1426964167, "b1c50d58b753e8f6c7513752158e9802cf0a729ebe432b99acc0fe5d9b4e9980"], + ["c33028b301d5093e1e8397270d75a0b009b2a6509a01861061ab022ca122a6ba935b8513320200000000ffffffff013bcf5a0500000000015200000000", "", 0, -513413204, "6b1459536f51482f5dbf42d7e561896557461e1e3b6bf67871e2b51faae2832c"], + ["43b2727901a7dd06dd2abf690a1ccedc0b0739cb551200796669d9a25f24f71d8d101379f50300000000ffffffff0418e031040000000000863d770000000000085352ac526563ac5174929e040000000004ac65ac00ec31ac0100000000066a51ababab5300000000", "65", 0, -492874289, "154ff7a9f0875edcfb9f8657a0b98dd9600fabee3c43eb88af37cf99286d516c"], + ["4763ed4401c3e6ab204bed280528e84d5288f9cac5fb8a2e7bd699c7b98d4df4ac0c40e55303000000066a6aacab5165ffffffff015b57f80400000000046a63535100000000", "ac51abab53", 0, -592611747, "849033a2321b5755e56ef4527ae6f51e30e3bca50149d5707368479723d744f8"], + ["d24f647b02f71708a880e6819a1dc929c1a50b16447e158f8ff62f9ccd644e0ca3c592593702000000050053536a00ffffffff67868cd5414b6ca792030b18d649de5450a456407242b296d936bcf3db79e07b02000000005af6319c016022f50100000000036a516300000000", "6aab526353516a6a", 0, 1350782301, "8556fe52d1d0782361dc28baaf8774b13f3ce5ed486ae0f124b665111e08e3e3"], + ["fe6ddf3a02657e42a7496ef170b4a8caf245b925b91c7840fd28e4a22c03cb459cb498b8d603000000065263656a650071ce6bf8d905106f9f1faf6488164f3decac65bf3c5afe1dcee20e6bc3cb6d052561985a030000000163295b117601343dbb0000000000026563dba521df", "", 1, -1696179931, "d9684685c99ce48f398fb467a91a1a59629a850c429046fb3071f1fa9a5fe816"], + ["c61523ef0129bb3952533cbf22ed797fa2088f307837dd0be1849f20decf709cf98c6f032f03000000026563c0f1d378044338310400000000066363516a5165a14fcb0400000000095163536a6a00ab53657271d60200000000001d953f0500000000010000000000", "53516353005153", 0, 1141615707, "7e975a72db5adaa3c48d525d9c28ac11cf116d0f8b16ce08f735ad75a80aec66"], + ["ba3dac6c0182562b0a26d475fe1e36315f0913b6869bdad0ecf21f1339a5fcbccd32056c840200000000ffffffff04300351050000000000220ed405000000000851abac636565ac53dbbd19020000000007636363ac6a52acbb005a0500000000016abd0c78a8", "63006a635151005352", 0, 1359658828, "47bc8ab070273e1f4a0789c37b45569a6e16f3f3092d1ce94dddc3c34a28f9f4"], + ["ac27e7f5025fc877d1d99f7fc18dd4cadbafa50e34e1676748cc89c202f93abf36ed46362101000000036300abffffffff958cd5381962b765e14d87fc9524d751e4752dd66471f973ed38b9d562e525620100000003006500ffffffff02b67120050000000004ac51516adc330c0300000000015200000000", "656352", 1, 15049991, "f3374253d64ac264055bdbcc32e27426416bd595b7c7915936c70f839e504010"], + ["edb30140029182b80c8c3255b888f7c7f061c4174d1db45879dca98c9aab8c8fed647a6ffc03000000086a53510052ab6300ffffffff82f65f261db62d517362c886c429c8fbbea250bcaad93356be6f86ba573e9d930100000000ffffffff04daaf150400000000016a86d1300100000000096a6353535252ac5165d4ddaf000000000002abab5f1c6201000000000000000000", "ab6a6a00ac", 0, -2058017816, "8d7794703dad18e2e40d83f3e65269834bb293e2d2b8525932d6921884b8f368"], + ["7e50207303146d1f7ad62843ae8017737a698498d4b9118c7a89bb02e8370307fa4fada41d000000000753006300005152b7afefc85674b1104ba33ef2bf37c6ed26316badbc0b4aa6cb8b00722da4f82ff3555a6c020000000900ac656363ac51ac52ffffffff93fab89973bd322c5d7ad7e2b929315453e5f7ada3072a36d8e33ca8bebee6e0020000000300acab930da52b04384b04000000000004650052ac435e380200000000076a6a515263ab6aa9494705000000000600ab6a525252af8ba90100000000096565acab526353536a279b17ad", "acac005263536aac63", 1, -34754133, "4e6357da0057fb7ff79da2cc0f20c5df27ff8b2f8af4c1709e6530459f7972b0"], + ["c05764f40244fb4ebe4c54f2c5298c7c798aa90e62c29709acca0b4c2c6ec08430b26167440100000008acab6a6565005253ffffffffc02c2418f398318e7f34a3cf669d034eef2111ea95b9f0978b01493293293a870100000000e563e2e00238ee8d040000000002acab03fb060200000000076500ac656a516aa37f5534", "52ab6a0065", 1, -2033176648, "83deef4a698b62a79d4877dd9afebc3011a5275dbe06e89567e9ef84e8a4ee19"], + ["5a59e0b9040654a3596d6dab8146462363cd6549898c26e2476b1f6ae42915f73fd9aedfda00000000036363abffffffff9ac9e9ca90be0187be2214251ff08ba118e6bf5e2fd1ba55229d24e50a510d53010000000165ffffffff41d42d799ac4104644969937522873c0834cc2fcdab7cdbecd84d213c0e96fd60000000000ffffffffd838db2c1a4f30e2eaa7876ef778470f8729fcf258ad228b388df2488709f8410300000000fdf2ace002ceb6d903000000000265654c1310040000000003ac00657e91c0ec", "536a63ac", 0, 82144555, "98ccde2dc14d14f5d8b1eeea5364bd18fc84560fec2fcea8de4d88b49c00695e"], + ["156ebc8202065d0b114984ee98c097600c75c859bfee13af75dc93f57c313a877efb09f230010000000463536a51ffffffff81114e8a697be3ead948b43b5005770dd87ffb1d5ccd4089fa6c8b33d3029e9c03000000066a5251656351ffffffff01a87f140000000000050000ac51ac00000000", "00", 0, -362221092, "a903c84d8c5e71134d1ab6dc1e21ac307c4c1a32c90c90f556f257b8a0ec1bf5"], + ["15e37793023c7cbf46e073428908fce0331e49550f2a42b92468827852693f0532a01c29f70200000007005353636351acffffffff38426d9cec036f00eb56ec1dcd193647e56a7577278417b8a86a78ac53199bc403000000056353006a53ffffffff04a25ce103000000000900ab5365656a526a63c8eff7030000000004526353537ab6db0200000000016a11a3fa02000000000651acacab526500000000", "53ac6aab6a6551", 0, 1117532791, "83c68b3c5a89260ce16ce8b4dbf02e1f573c532d9a72f5ea57ab419fa2630214"], + ["f7a09f10027250fc1b70398fb5c6bffd2be9718d3da727e841a73596fdd63810c9e4520a6a010000000963ac516a636a65acac1d2e2c57ab28d311edc4f858c1663972eebc3bbc93ed774801227fda65020a7ec1965f780200000005ac5252516a8299fddc01dcbf7200000000000463ac6551960fda03", "65acab51", 1, 2017321737, "9c5fa02abfd34d0f9dec32bf3edb1089fca70016debdb41f4f54affcb13a2a2a"], + ["6d97a9a5029220e04f4ccc342d8394c751282c328bf1c132167fc05551d4ca4da4795f6d4e02000000076a0052ab525165ffffffff9516a205e555fa2a16b73e6db6c223a9e759a7e09c9a149a8f376c0a7233fa1b0100000007acab51ab63ac6affffffff04868aed04000000000652ac65ac536a396edf01000000000044386c0000000000076aab5363655200894d48010000000001ab8ebefc23", "6351526aac51", 1, 1943666485, "f0bd4ca8e97203b9b4e86bc24bdc8a1a726db5e99b91000a14519dc83fc55c29"], + ["8e3fddfb028d9e566dfdda251cd874cd3ce72e9dde837f95343e90bd2a93fe21c5daeb5eed01000000045151525140517dc818181f1e7564b8b1013fd68a2f9a56bd89469686367a0e72c06be435cf99db750000000003635251ffffffff01c051780300000000096552ababac6a65acab099766eb", "5163ab6a52ababab51", 1, 1296295812, "5509eba029cc11d7dd2808b8c9eb47a19022b8d8b7778893459bbc19ab7ea820"], + ["a603f37b02a35e5f25aae73d0adc0b4b479e68a734cf722723fd4e0267a26644c36faefdab0200000000ffffffff43374ad26838bf733f8302585b0f9c22e5b8179888030de9bdda180160d770650200000001004c7309ce01379099040000000005526552536500000000", "abababab005153", 0, 1409936559, "4ca73da4fcd5f1b10da07998706ffe16408aa5dff7cec40b52081a6514e3827e"], + ["9eeedaa8034471a3a0e3165620d1743237986f060c4434f095c226114dcb4b4ec78274729f03000000086a5365510052ac6afb505af3736e347e3f299a58b1b968fce0d78f7457f4eab69240cbc40872fd61b5bf8b120200000002ac52df8247cf979b95a4c97ecb8edf26b3833f967020cd2fb25146a70e60f82c9ee4b14e88b103000000008459e2fa0125cbcd05000000000000000000", "52ab5352006353516a", 0, -1832576682, "fb018ae54206fdd20c83ae5873ec82b8e320a27ed0d0662db09cda8a071f9852"], + ["05921d7c048cf26f76c1219d0237c226454c2a713c18bf152acc83c8b0647a94b13477c07f0300000003ac526afffffffff2f494453afa0cabffd1ba0a626c56f90681087a5c1bd81d6adeb89184b27b7402000000036a6352ffffffff0ad10e2d3ce355481d1b215030820da411d3f571c3f15e8daf22fe15342fed04000000000095f29f7b93ff814a9836f54dc6852ec414e9c4e16a506636715f569151559100ccfec1d100000000055263656a53ffffffff04f4ffef010000000008ac6a6aabacabab6a0e6689040000000006ab536a5352abe364d005000000000965536363655251ab53807e00010000000004526aab63f18003e3", "6363ac51", 3, -375891099, "001b0b176f0451dfe2d9787b42097ceb62c70d324e925ead4c58b09eebdf7f67"], + ["b9b44d9f04b9f15e787d7704e6797d51bc46382190c36d8845ec68dfd63ee64cf7a467b21e00000000096aac00530052ab636aba1bcb110a80c5cbe073f12c739e3b20836aa217a4507648d133a8eedd3f02cb55c132b203000000076a000063526352b1c288e3a9ff1f2da603f230b32ef7c0d402bdcf652545e2322ac01d725d75f5024048ad0100000000ffffffffffd882d963be559569c94febc0ef241801d09dc69527c9490210f098ed8203c700000000056a006300ab9109298d01719d9a0300000000066a52ab006365d7894c5b", "ac6351650063636a", 3, -622355349, "ac87b1b93a6baab6b2c6624f10e8ebf6849b0378ef9660a3329073e8f5553c8d"], + ["ff60473b02574f46d3e49814c484081d1adb9b15367ba8487291fc6714fd6e3383d5b335f001000000026a6ae0b82da3dc77e5030db23d77b58c3c20fa0b70aa7d341a0f95f3f72912165d751afd57230300000008ac536563516a6363ffffffff04f86c0200000000000553acab636ab13111000000000003510065f0d3f305000000000951ab516a65516aabab730a3a010000000002515200000000", "ac6a", 1, 1895032314, "0767e09bba8cd66d55915677a1c781acd5054f530d5cf6de2d34320d6c467d80"], + ["f218026204f4f4fc3d3bd0eada07c57b88570d544a0436ae9f8b753792c0c239810bb30fbc0200000002536affffffff8a468928d6ec4cc10aa0f73047697970e99fa64ae8a3b4dca7551deb0b639149010000000851ab520052650051ffffffffa98dc5df357289c9f6873d0f5afcb5b030d629e8f23aa082cf06ec9a95f3b0cf0000000000ffffffffea2c2850c5107705fd380d6f29b03f533482fd036db88739122aac9eff04e0aa010000000365536a03bd37db034ac4c4020000000007515152655200ac33b27705000000000151efb71e0000000000007b65425b", "515151", 3, -1772252043, "de35c84a58f2458c33f564b9e58bc57c3e028d629f961ad1b3c10ee020166e5a"], + ["48e7d42103b260b27577b70530d1ac2fed2551e9dd607cbcf66dca34bb8c03862cf8f5fd5401000000075151526aacab00ffffffff1e3d3b841552f7c6a83ee379d9d66636836673ce0b0eda95af8f2d2523c91813030000000665acac006365ffffffff388b3c386cd8c9ef67c83f3eaddc79f1ff910342602c9152ffe8003bce51b28b0100000008636363006a636a52ffffffff04b8f67703000000000852005353ac6552520cef720200000000085151ab6352ab00ab5096d6030000000005516a005100662582020000000001ac6c137280", "6a65", 1, 1513618429, "e2fa3e1976aed82c0987ab30d4542da2cb1cffc2f73be13480132da8c8558d5c"], + ["91ebc4cf01bc1e068d958d72ee6e954b196f1d85b3faf75a521b88a78021c543a06e056279000000000265ab7c12df0503832121030000000000cc41a6010000000005ab5263516540a951050000000006ab63ab65acac00000000", "526a0065636a6a6aac", 0, -614046478, "7de4ba875b2e584a7b658818c112e51ee5e86226f5a80e5f6b15528c86400573"], + ["3cd4474201be7a6c25403bf00ca62e2aa8f8f4f700154e1bb4d18c66f7bb7f9b975649f0dc0100000006535151535153ffffffff01febbeb000000000006005151006aac00000000", "", 0, -1674687131, "6b77ca70cc452cc89acb83b69857cda98efbfc221688fe816ef4cb4faf152f86"], + ["92fc95f00307a6b3e2572e228011b9c9ed41e58ddbaefe3b139343dbfb3b34182e9fcdc3f50200000002acab847bf1935fde8bcfe41c7dd99683289292770e7f163ad09deff0e0665ed473cd2b56b0f40300000006516551ab6351294dab312dd87b9327ce2e95eb44b712cfae0e50fda15b07816c8282e8365b643390eaab01000000026aacffffffff016e0b6b040000000001ac00000000", "650065acac005300", 2, -1885164012, "bd7d26bb3a98fc8c90c972500618bf894cb1b4fe37bf5481ff60eef439d3b970"], + ["4db591ab018adcef5f4f3f2060e41f7829ce3a07ea41d681e8cb70a0e37685561e4767ac3b0000000005000052acabd280e63601ae6ef20000000000036a636326c908f7", "ac6a51526300630052", 0, 862877446, "355ccaf30697c9c5b966e619a554d3323d7494c3ea280a9b0dfb73f953f5c1cb"], + ["503fd5ef029e1beb7b242d10032ac2768f9a1aca0b0faffe51cec24770664ec707ef7ede4f01000000045253ac53375e350cc77741b8e96eb1ce2d3ca91858c052e5f5830a0193200ae2a45b413dda31541f0000000003516553ffffffff0175a5ba0500000000015200000000", "6aab65510053ab65", 1, 1603081205, "353ca9619ccb0210ae18b24d0e57efa7abf8e58fa6f7102738e51e8e72c9f0c4"], + ["c80abebd042cfec3f5c1958ee6970d2b4586e0abec8305e1d99eb9ee69ecc6c2cbd76374380000000007ac53006300ac510acee933b44817db79320df8094af039fd82111c7726da3b33269d3820123694d849ee5001000000056a65ab526562699bea8530dc916f5d61f0babea709dac578774e8a4dcd9c640ec3aceb6cb2443f24f302000000020063ea780e9e57d1e4245c1e5df19b4582f1bf704049c5654f426d783069bcc039f2d8fa659f030000000851ab53635200006a8d00de0b03654e8500000000000463ab635178ebbb0400000000055100636aab239f1d030000000006ab006300536500000000", "6565ac515100", 3, 1460851377, "b35bb1b72d02fab866ed6bbbea9726ab32d968d33a776686df3ac16aa445871e"], + ["0337b2d5043eb6949a76d6632b8bb393efc7fe26130d7409ef248576708e2d7f9d0ced9d3102000000075352636a5163007034384dfa200f52160690fea6ce6c82a475c0ef1caf5c9e5a39f8f9ddc1c8297a5aa0eb02000000026a51ffffffff38e536298799631550f793357795d432fb2d4231f4effa183c4e2f61a816bcf0030000000463ac5300706f1cd3454344e521fde05b59b96e875c8295294da5d81d6cc7efcfe8128f150aa54d6503000000008f4a98c704c1561600000000000072cfa6000000000000e43def01000000000100cf31cc0500000000066365526a6500cbaa8e2e", "", 3, 2029506437, "7615b4a7b3be865633a31e346bc3db0bcc410502c8358a65b8127089d81b01f8"], + ["59f6cffd034733f4616a20fe19ea6aaf6abddb30b408a3a6bd86cd343ab6fe90dc58300cc90200000000ffffffffc835430a04c3882066abe7deeb0fa1fdaef035d3233460c67d9eabdb05e95e5a02000000080065ac535353ab00ffffffff4b9a043e89ad1b4a129c8777b0e8d87a014a0ab6a3d03e131c27337bbdcb43b402000000066a5100abac6ad9e9bf62014bb118010000000001526cbe484f", "ab526352ab65", 0, 2103515652, "4f2ccf981598639bec57f885b4c3d8ea8db445ea6e61cfd45789c69374862e5e"], + ["cbc79b10020b15d605680a24ee11d8098ad94ae5203cb6b0589e432832e20c27b72a926af20300000006ab65516a53acbb854f3146e55c508ece25fa3d99dbfde641a58ed88c051a8a51f3dacdffb1afb827814b02000000026352c43e6ef30302410a020000000000ff4bd90100000000065100ab63000008aa8e0400000000095265526565ac5365abc52c8a77", "53526aac0051", 0, 202662340, "984efe0d8d12e43827b9e4b27e97b3777ece930fd1f589d616c6f9b71dab710e"], + ["7c07419202fa756d29288c57b5c2b83f3c847a807f4a9a651a3f6cd6c46034ae0aa3a7446b0200000004ab6a6365ffffffff9da83cf4219bb96c76f2d77d5df31c1411a421171d9b59ec02e5c1218f29935403000000008c13879002f8b1ac0400000000086a63536a636553653c584f02000000000000000000", "abac53ab656363", 1, -1038419525, "4a74f365a161bc6c9bddd249cbd70f5dadbe3de70ef4bd745dcb6ee1cd299fbd"], + ["351cbb57021346e076d2a2889d491e9bfa28c54388c91b46ee8695874ad9aa576f1241874d0200000008ab6563525300516affffffffe13e61b8880b8cd52be4a59e00f9723a4722ea58013ec579f5b3693b9e115b1100000000096363abac5252635351ffffffff027fee02040000000008ab6a5200ab006a65b85f130200000000086a52630053ab52ab00000000", "ab6aab65", 1, 586415826, "08bbb746a596991ab7f53a76e19acad087f19cf3e1db54054aab403c43682d09"], + ["a8252ea903f1e8ff953adb16c1d1455a5036222c6ea98207fc21818f0ece2e1fac310f9a0100000000095163ac635363ac0000be6619e9fffcde50a0413078821283ce3340b3993ad00b59950bae7a9f931a9b0a3a035f010000000463005300b8b0583fbd6049a1715e7adacf770162811989f2be20af33f5f60f26eba653dc26b024a00000000006525351636552ffffffff046d2acc030000000002636a9a2d430500000000080065005165ab53abecf63204000000000052b9ed050000000008acacac53ab65656500000000", "65ab53635253636a51", 2, 1442639059, "8ca11838775822f9a5beee57bdb352f4ee548f122de4a5ca61c21b01a1d50325"], + ["2f1a425c0471a5239068c4f38f9df135b1d24bf52d730d4461144b97ea637504495aec360801000000055300515365c71801dd1f49f376dd134a9f523e0b4ae611a4bb122d8b26de66d95203f181d09037974300000000025152ffffffff9bdcea7bc72b6e5262e242c94851e3a5bf8f314b3e5de0e389fc9e5b3eadac030000000009525265655151005153ffffffffdbb53ce99b5a2320a4e6e2d13b01e88ed885a0957d222e508e9ec8e4f83496cb0200000007635200abac63ac04c96237020cc5490100000000080000516a51ac6553074a360200000000025152225520ca", "6551ab65ac65516a", 1, -489869549, "9bc5bb772c553831fb40abe466074e59a469154679c7dee042b8ea3001c20393"], + ["ef3acfd4024defb48def411b8f8ba2dc408dc9ee97a4e8bde4d6cb8e10280f29c98a6e8e9103000000035100513d5389e3d67e075469dfd9f204a7d16175653a149bd7851619610d7ca6eece85a516b2df0300000005516aac6552ca678bdf02f477f003000000000057e45b0300000000055252525252af35c20a", "5165ac53ab", 1, -1900839569, "78eb6b24365ac1edc386aa4ffd15772f601059581c8776c34f92f8a7763c9ccf"], + ["ff4468dc0108475fc8d4959a9562879ce4ab4867a419664bf6e065f17ae25043e6016c70480100000000ffffffff02133c6f0400000000000bd0a8020000000004006a520035afa4f6", "51ac65ab", 0, -537664660, "f6da59b9deac63e83728850ac791de61f5dfcaeed384ebcbb20e44afcd8c8910"], + ["4e8594d803b1d0a26911a2bcdd46d7cbc987b7095a763885b1a97ca9cbb747d32c5ab9aa91030000000353ac53a0cc4b215e07f1d648b6eeb5cdbe9fa32b07400aa773b9696f582cebfd9930ade067b2b200000000060065abab6500fc99833216b8e27a02defd9be47fafae4e4a97f52a9d2a210d08148d2a4e5d02730bcd460100000004516351ac37ce3ae1033baa55040000000006006a636a63acc63c990400000000025265eb1919030000000005656a6a516a00000000", "", 1, -75217178, "04c5ee48514cd033b82a28e336c4d051074f477ef2675ce0ce4bafe565ee9049"], + ["a88830a7023f13ed19ab14fd757358eb6af10d6520f9a54923a6d613ac4f2c11e249cda8aa030000000851630065abababacffffffff8f5fe0bc04a33504c4b47e3991d25118947a0261a9fa520356731eeabd561dd3020000000363ababffffffff038404bd010000000008ab5153516aab6a63d33a5601000000000263004642dc020000000009655152acac636352004be6f3af", "5253536565006aab6a", 0, 1174417836, "2e42ead953c9f4f81b72c27557e6dc7d48c37ff2f5c46c1dbe9778fb0d79f5b2"], + ["44e1a2b4010762af23d2027864c784e34ef322b6e24c70308a28c8f2157d90d17b99cd94a401000000085163656565006300ffffffff0198233d020000000002000000000000", "52525153656365", 0, 1119696980, "d9096de94d70c6337da6202e6e588166f31bff5d51bb5adc9468594559d65695"], + ["44ca65b901259245abd50a745037b17eb51d9ce1f41aa7056b4888285f48c6f26cb97b7a25020000000552636363abffffffff047820350400000000040053acab14f3e603000000000652635100ab630ce66c03000000000001bdc704000000000765650065ac51ac3e886381", "51", 0, -263340864, "ed5622ac642d11f90e68c0feea6a2fe36d880ecae6b8c0d89c4ea4b3d162bd90"], + ["cfa147d2017fe84122122b4dda2f0d6318e59e60a7207a2d00737b5d89694d480a2c26324b0000000006006351526552ffffffff0456b5b804000000000800516aab525363ab166633000000000004655363ab254c0e02000000000952ab6a6a00ab525151097c1b020000000009656a52ac6300530065ad0d6e50", "6a535165ac6a536500", 0, -574683184, "f926d4036eac7f019a2b0b65356c4ee2fe50e089dd7a70f1843a9f7bc6997b35"], + ["91c5d5f6022fea6f230cc4ae446ce040d8313071c5ac1749c82982cc1988c94cb1738aa48503000000016a19e204f30cb45dd29e68ff4ae160da037e5fc93538e21a11b92d9dd51cf0b5efacba4dd70000000005656a6aac51ffffffff03db126905000000000953006a53ab6563636a36a273030000000006656a52656552b03ede00000000000352516500000000", "530052526a00", 1, 1437328441, "255c125b60ee85f4718b2972174c83588ee214958c3627f51f13b5fb56c8c317"], + ["03f20dc202c886907b607e278731ebc5d7373c348c8c66cac167560f19b341b782dfb634cb03000000076a51ac6aab63abea3e8de7adb9f599c9caba95aa3fa852e947fc88ed97ee50e0a0ec0d14d164f44c0115c10100000004ab5153516fdd679e0414edbd000000000005ac636a53512021f2040000000007006a0051536a52c73db2050000000005525265ac5369046e000000000003ab006a1ef7bd1e", "52656a", 0, 1360223035, "5a0a05e32ce4cd0558aabd5d79cd5fcbffa95c07137506e875a9afcba4bef5a2"], + ["d9611140036881b61e01627078512bc3378386e1d4761f959d480fdb9d9710bebddba2079d020000000763536aab5153ab819271b41e228f5b04daa1d4e72c8e1955230accd790640b81783cfc165116a9f535a74c000000000163ffffffffa2e7bb9a28e810624c251ff5ba6b0f07a356ac082048cf9f39ec036bba3d431a02000000076a000000ac65acffffffff01678a820000000000085363515153ac635100000000", "535353", 2, -82213851, "52b9e0778206af68998cbc4ebdaad5a9469e04d0a0a6cef251abfdbb74e2f031"], + ["98b3a0bf034233afdcf0df9d46ac65be84ef839e58ee9fa59f32daaa7d684b6bdac30081c60200000007636351acabababffffffffc71cf82ded4d1593e5825618dc1d5752ae30560ecfaa07f192731d68ea768d0f0100000006650052636563f3a2888deb5ddd161430177ce298242c1a86844619bc60ca2590d98243b5385bc52a5b8f00000000095365acacab520052ac50d4722801c3b8a60300000000035165517e563b65", "51", 1, -168940690, "b6b684e2d2ecec8a8dce4ed3fc1147f8b2e45732444222aa8f52d860c2a27a9d"], + ["97be4f7702dc20b087a1fdd533c7de762a3f2867a8f439bddf0dcec9a374dfd0276f9c55cc0300000000cdfb1dbe6582499569127bda6ca4aaff02c132dc73e15dcd91d73da77e92a32a13d1a0ba0200000002ab51ffffffff048cfbe202000000000900516351515363ac535128ce0100000000076aac5365ab6aabc84e8302000000000863536a53ab6a6552f051230500000000066aac535153510848d813", "ac51", 0, 229541474, "e5da9a416ea883be1f8b8b2d178463633f19de3fa82ae25d44ffb531e35bdbc8"], + ["085b6e04040b5bff81e29b646f0ed4a45e05890a8d32780c49d09643e69cdccb5bd81357670100000001abffffffffa5c981fe758307648e783217e3b4349e31a557602225e237f62b636ec26df1a80300000004650052ab4792e1da2930cc90822a8d2a0a91ea343317bce5356b6aa8aae6c3956076aa33a5351a9c0300000004abac5265e27ddbcd472a2f13325cc6be40049d53f3e266ac082172f17f6df817db1936d9ff48c02b000000000152ffffffff021aa7670500000000085353635163ab51ac14d584000000000001aca4d136cc", "6a525300536352536a", 0, -1398925877, "41ecca1e8152ec55074f4c39f8f2a7204dda48e9ec1e7f99d5e7e4044d159d43"], + ["eec32fff03c6a18b12cd7b60b7bdc2dd74a08977e53fdd756000af221228fe736bd9c42d870100000007005353ac515265ffffffff037929791a188e9980e8b9cc154ad1b0d05fb322932501698195ab5b219488fc02000000070063510065ab6a0bfc176aa7e84f771ea3d45a6b9c24887ceea715a0ff10ede63db8f089e97d927075b4f1000000000551abab63abffffffff02eb933c000000000000262c420000000000036563632549c2b6", "6352", 2, 1480445874, "ff8a4016dfdd918f53a45d3a1f62b12c407cd147d68ca5c92b7520e12c353ff5"], + ["98ea7eac0313d9fb03573fb2b8e718180c70ce647bebcf49b97a8403837a2556cb8c9377f30000000004ac53ac65ffffffff8caac77a5e52f0d8213ef6ce998bedbb50cfdf108954771031c0e0cd2a78423900000000010066e99a44937ebb37015be3693761078ad5c73aa73ec623ac7300b45375cc8eef36087eb80000000007515352acac5100ffffffff0114a51b02000000000000000000", "6aacab", 0, 243527074, "bad77967f98941af4dd52a8517d5ad1e32307c0d511e15461e86465e1b8b5273"], + ["3ab70f4604e8fc7f9de395ec3e4c3de0d560212e84a63f8d75333b604237aa52a10da17196000000000763526a6553ac63a25de6fd66563d71471716fe59087be0dde98e969e2b359282cf11f82f14b00f1c0ac70f02000000050052516aacdffed6bb6889a13e46956f4b8af20752f10185838fd4654e3191bf49579c961f5597c36c0100000005ac636363abc3a1785bae5b8a1b4be5d0cbfadc240b4f7acaa7dfed6a66e852835df5eb9ac3c553766801000000036a65630733b7530218569602000000000952006a6a6a51acab52777f06030000000007ac0063530052abc08267c9", "000000536aac0000", 1, 1919096509, "df1c87cf3ba70e754d19618a39fdbd2970def0c1bfc4576260cba5f025b87532"], + ["bdb6b4d704af0b7234ced671c04ba57421aba7ead0a117d925d7ebd6ca078ec6e7b93eea6600000000026565ffffffff3270f5ad8f46495d69b9d71d4ab0238cbf86cc4908927fbb70a71fa3043108e6010000000700516a65655152ffffffff6085a0fdc03ae8567d0562c584e8bfe13a1bd1094c518690ebcb2b7c6ce5f04502000000095251530052536a53aba576a37f2c516aad9911f687fe83d0ae7983686b6269b4dd54701cb5ce9ec91f0e6828390300000000ffffffff04cc76cc020000000002656a01ffb702000000000253ab534610040000000009acab006565516a00521f55f5040000000000389dfee9", "6a525165", 0, 1336204763, "71c294523c48fd7747eebefbf3ca06e25db7b36bff6d95b41c522fecb264a919"], + ["54258edd017d22b274fbf0317555aaf11318affef5a5f0ae45a43d9ca4aa652c6e85f8a040010000000953ac65ab5251656500ffffffff03321d450000000000085265526a51526a529ede8b030000000003635151ce6065020000000001534c56ec1b", "acac", 0, 2094130012, "110d90fea9470dfe6c5048f45c3af5e8cc0cb77dd58fd13d338268e1c24b1ccc"], + ["ce0d322e04f0ffc7774218b251530a7b64ebefca55c90db3d0624c0ff4b3f03f918e8cf6f60300000003656500ffffffff9cce943872da8d8af29022d0b6321af5fefc004a281d07b598b95f6dcc07b1830200000007abab515351acab8d926410e69d76b7e584aad1470a97b14b9c879c8b43f9a9238e52a2c2fefc2001c56af8010000000400ab5253cd2cd1fe192ce3a93b5478af82fa250c27064df82ba416dfb0debf4f0eb307a746b6928901000000096500abacac6a0063514214524502947efc0200000000035251652c40340100000000096a6aab52000052656a5231c54c", "51", 2, -2090320538, "0322ca570446869ec7ec6ad66d9838cff95405002d474c0d3c17708c7ee039c6"], + ["47ac54940313430712ebb32004679d3a512242c2b33d549bf5bbc8420ec1fd0850ed50eb6d0300000009536aac6a65acacab51ffffffffb843e44266ce2462f92e6bff54316661048c8c17ecb092cb493b39bfca9117850000000001519ab348c05e74ebc3f67423724a3371dd99e3bceb4f098f8860148f48ad70000313c4c223000000000653006565656512c2d8dc033f3c97010000000002636aa993aa010000000006526365ab526ab7cf560300000000076a0065ac6a526500000000", "005352535300ab6a", 2, 59531991, "8b5b3d00d9c658f062fe6c5298e54b1fe4ed3a3eab2a87af4f3119edc47b1691"], + ["233cd90b043916fc41eb870c64543f0111fb31f3c486dc72457689dea58f75c16ae59e9eb2000000000500536a6a6affffffff9ae30de76be7cd57fb81220fce78d74a13b2dbcad4d023f3cadb3c9a0e45a3ce000000000965ac6353ac5165515130834512dfb293f87cb1879d8d1b20ebad9d7d3d5c3e399a291ce86a3b4d30e4e32368a9020000000453005165ffffffff26d84ae93eb58c81158c9b3c3cbc24a84614d731094f38d0eea8686dec02824d0300000005636a65abacf02c784001a0bd5d03000000000900655351ab65ac516a416ef503", "", 1, -295106477, "b79f31c289e95d9dadec48ebf88e27c1d920661e50d090e422957f90ff94cb6e"], + ["9200e26b03ff36bc4bf908143de5f97d4d02358db642bd5a8541e6ff709c420d1482d471b70000000008abab65536a636553ffffffff61ba6d15f5453b5079fb494af4c48de713a0c3e7f6454d7450074a2a80cb6d880300000007ac6a00ab5165515dfb7574fbce822892c2acb5d978188b1d65f969e4fe874b08db4c791d176113272a5cc10100000000ffffffff0420958d000000000009ac63516a0063516353dd885505000000000465ac00007b79e901000000000066d8bf010000000005525252006a00000000", "ac5152", 0, 2089531339, "89ec7fab7cfe7d8d7d96956613c49dc48bf295269cfb4ea44f7333d88c170e62"], + ["45f335ba01ce2073a8b0273884eb5b48f56df474fc3dff310d9706a8ac7202cf5ac188272103000000025363ffffffff049d859502000000000365ab6a8e98b1030000000002ac51f3a80603000000000752535151ac00000306e30300000000020051b58b2b3a", "", 0, 1899564574, "78e01310a228f645c23a2ad0acbb8d91cedff4ecdf7ca997662c6031eb702b11"], + ["d8f652a6043b4faeada05e14b81756cd6920cfcf332e97f4086961d49232ad6ffb6bc6c097000000000453526563ffffffff1ea4d60e5e91193fbbc1a476c8785a79a4c11ec5e5d6c9950c668ceacfe07a15020000000352ab51fffffffffe029a374595c4edd382875a8dd3f20b9820abb3e93f877b622598d11d0b09e503000000095351000052ac515152ffffffff9d65fea491b979699ceb13caf2479cd42a354bd674ded3925e760758e85a756803000000046365acabffffffff0169001d00000000000651636a65656300000000", "ab0063630000ac", 3, 1050965951, "4cc85cbc2863ee7dbce15490d8ca2c5ded61998257b9eeaff968fe38e9f009ae"], + ["718662be026e1dcf672869ac658fd0c87d6835cfbb34bd854c44e577d5708a7faecda96e260300000004526a636a489493073353b678549adc7640281b9cbcb225037f84007c57e55b874366bb7b0fa03bdc00000000095165ababac65ac00008ab7f2a802eaa53d000000000007acac516aac526ae92f380100000000056aac00536500000000", "ab00", 1, 43296088, "2d642ceee910abff0af2116af75b2e117ffb7469b2f19ad8fef08f558416d8f7"], + ["94083c840288d40a6983faca876d452f7c52a07de9268ad892e70a81e150d602a773c175ad03000000007ec3637d7e1103e2e7e0c61896cbbf8d7e205b2ecc93dd0d6d7527d39cdbf6d335789f660300000000ffffffff019e1f7b03000000000800ac0051acac0053539cb363", "", 1, -183614058, "a17b66d6bb427f42653d08207a22b02353dd19ccf2c7de6a9a3a2bdb7c49c9e7"], + ["30e0d4d20493d0cd0e640b757c9c47a823120e012b3b64c9c1890f9a087ae4f2001ca22a61010000000152f8f05468303b8fcfaad1fb60534a08fe90daa79bff51675472528ebe1438b6f60e7f60c10100000009526aab6551ac510053ffffffffaaab73957ea2133e32329795221ed44548a0d3a54d1cf9c96827e7cffd1706df0200000009ab00526a005265526affffffffd19a6fe54352015bf170119742821696f64083b5f14fb5c7d1b5a721a3d7786801000000085265abababac53abffffffff020f39bd030000000004ab6aac52049f6c050000000004ab52516aba5b4c60", "6a6365516a6a655253", 0, -624256405, "8e221a6c4bf81ca0d8a0464562674dcd14a76a32a4b7baf99450dd9195d411e6"], + ["f9c69d940276ec00f65f9fe08120fc89385d7350388508fd80f4a6ba2b5d4597a9e21c884f010000000663ab63ababab15473ae6d82c744c07fc876ecd53bd0f3018b2dbedad77d757d5bdf3811b23d294e8c0170000000001abafababe00157ede2050000000006ac6a5263635300000000", "ab53", 1, 606547088, "714d8b14699835b26b2f94c58b6ea4c53da3f7adf0c62ea9966b1e1758272c47"], + ["5c0ac112032d6885b7a9071d3c5f493aa16c610a4a57228b2491258c38de8302014276e8be030000000300ab6a17468315215262ad5c7393bb5e0c5a6429fd1911f78f6f72dafbbbb78f3149a5073e24740300000003ac5100ffffffff33c7a14a062bdea1be3c9c8e973f54ade53fe4a69dcb5ab019df5f3345050be00100000008ac63655163526aab428defc0033ec36203000000000765516365536a00ae55b2000000000002ab53f4c0080400000000095265516a536563536a00000000", "6a005151006a", 2, 272749594, "91082410630337a5d89ff19145097090f25d4a20bdd657b4b953927b2f62c73b"], + ["e3683329026720010b08d4bec0faa244f159ae10aa582252dd0f3f80046a4e145207d54d31000000000852acac52656aacac3aaf2a5017438ad6adfa3f9d05f53ebed9ceb1b10d809d507bcf75e0604254a8259fc29c020000000653526552ab51f926e52c04b44918030000000000f7679c0100000000090000525152005365539e3f48050000000009516500ab635363ab008396c905000000000253650591024f", "6a6365", 0, 908746924, "458aec3b5089a585b6bad9f99fd37a2b443dc5a2eefac2b7e8c5b06705efc9db"], + ["48c4afb204204209e1df6805f0697edaa42c0450bbbd767941fe125b9bc40614d63d757e2203000000066a5363005152dc8b6a605a6d1088e631af3c94b8164e36e61445e2c60130292d81dabd30d15f54b355a802000000036a6353ffffffff1d05dcec4f3dedcfd02c042ce5d230587ee92cb22b52b1e59863f3717df2362f0300000005536552ac52ffffffffd4d71c4f0a7d53ba47bb0289ca79b1e33d4c569c1e951dd611fc9c9c1ca8bc6c030000000865536a65ab51abacffffffff042f9aa905000000000753655153656351ab93d8010000000002655337440e0300000000005d4c690000000000015278587acb", "ab006565526a51", 0, 1502064227, "bbed77ff0f808aa8abd946ba9e7ec1ddb003a969fa223dee0af779643cb841a9"], + ["00b20fd104dd59705b84d67441019fa26c4c3dec5fd3b50eca1aa549e750ef9ddb774dcabe000000000651ac656aac65ffffffff52d4246f2db568fc9eea143e4d260c698a319f0d0670f84c9c83341204fde48b0200000000ffffffffb8aeabb85d3bcbc67b132f1fd815b451ea12dcf7fc169c1bc2e2cf433eb6777a03000000086a51ac6aab6563acd510d209f413da2cf036a31b0def1e4dcd8115abf2e511afbcccb5ddf41d9702f28c52900100000006ac52ab6a0065ffffffff039c8276000000000008ab53655200656a52401561010000000003acab0082b7160100000000035100ab00000000", "535265", 1, -947367579, "3212c6d6dd8d9d3b2ac959dec11f4638ccde9be6ed5d36955769294e23343da0"], + ["455131860220abbaa72015519090a666faf137a0febce7edd49da1eada41feab1505a0028b02000000036365ab453ead4225724eb69beb590f2ec56a7693a608871e0ab0c34f5e96157f90e0a96148f3c502000000085251ab51535163acffffffff022d1249040000000009abac00acac6565630088b310040000000000e3920e59", "5152ab6a52ac5152", 0, 294375737, "c40fd7dfa72321ac79516502500478d09a35cc22cc264d652c7d18b14400b739"], + ["624d28cb02c8747915e9af2b13c79b417eb34d2fa2a73547897770ace08c6dd9de528848d3030000000651ab63abab533c69d3f9b75b6ef8ed2df50c2210fd0bf4e889c42477d58682f711cbaece1a626194bb85030000000765acab53ac5353ffffffff018cc280040000000009abacabac52636352ac6859409e", "ac51ac", 1, 1005144875, "919144aada50db8675b7f9a6849c9d263b86450570293a03c245bd1e3095e292"], + ["8f28471d02f7d41b2e70e9b4c804f2d90d23fb24d53426fa746bcdcfffea864925bdeabe3e0200000001acffffffff76d1d35d04db0e64d65810c808fe40168f8d1f2143902a1cc551034fd193be0e0000000001acffffffff048a5565000000000005005151516afafb610400000000045263ac53648bb30500000000086363516a6a5165513245de01000000000000000000", "6a0053510053", 1, -1525137460, "305fc8ff5dc04ebd9b6448b03c9a3d945a11567206c8d5214666b30ec6d0d6cc"], + ["10ec50d7046b8b40e4222a3c6449490ebe41513aad2eca7848284a08f3069f3352c2a9954f0000000009526aac656352acac53ffffffff0d979f236155aa972472d43ee6f8ce22a2d052c740f10b59211454ff22cb7fd00200000007acacacab63ab53ffffffffbbf97ebde8969b35725b2e240092a986a2cbfd58de48c4475fe077bdd493a20c010000000663ab5365ababffffffff4600722d33b8dba300d3ad037bcfc6038b1db8abfe8008a15a1de2da2264007302000000035351ac6dbdafaf020d0ccf04000000000663ab6a51ab6ae06e5e0200000000036aabab00000000", "", 0, -1658960232, "2420dd722e229eccafae8508e7b8d75c6920bfdb3b5bac7cb8e23419480637c2"], + ["fef98b7101bf99277b08a6eff17d08f3fcb862e20e13138a77d66fba55d54f26304143e5360100000006515365abab00ffffffff04265965030000000004655252ace2c775010000000001002b23b4040000000007516a5153ab53ac456a7a00000000000753ab525251acacba521291", "526aacacab00abab53", 0, -1614097109, "4370d05c07e231d6515c7e454a4e401000b99329d22ed7def323976fa1d2eeb5"], + ["34a2b8830253661b373b519546552a2c3bff7414ea0060df183b1052683d78d8f54e842442000000000152ffffffffd961a8e34cf374151058dfcddc86509b33832bc57267c63489f69ff01199697c0300000002abacba856cfb01b17c2f050000000008515365ac53ab000000000000", "5263ab656a", 1, -2104480987, "2f9993e0a84a6ca560d6d1cc2b63ffe7fd71236d9cfe7d809491cef62bbfad84"], + ["43559290038f32fda86580dd8a4bc4422db88dd22a626b8bd4f10f1c9dd325c8dc49bf479f01000000026351ffffffff401339530e1ed3ffe996578a17c3ec9d6fccb0723dd63e7b3f39e2c44b976b7b0300000006ab6a65656a51ffffffff6fb9ba041c96b886482009f56c09c22e7b0d33091f2ac5418d05708951816ce7000000000551ac525100ffffffff020921e40500000000035365533986f40500000000016a00000000", "52ac51", 0, 1769771809, "02040283ef2291d8e1f79bb71bdabe7c1546c40d7ed615c375643000a8b9600d"], + ["6878a6bd02e7e1c8082d5e3ee1b746cfebfac9e8b97e61caa9e0759d8a8ecb3743e36a30de0100000002ab532a911b0f12b73e0071f5d50b6bdaf783f4b9a6ce90ec0cad9eecca27d5abae188241ddec0200000001651c7758d803f7457b0500000000036551515f4e90000000000001007022080200000000035365acc86b6946", "6351ab", 0, -1929374995, "f24be499c58295f3a07f5f1c6e5084496ae160450bd61fdb2934e615289448f1"], + ["35b6fc06047ebad04783a5167ab5fc9878a00c4eb5e7d70ef297c33d5abd5137a2dea9912402000000036aacacffffffff21dc291763419a584bdb3ed4f6f8c60b218aaa5b99784e4ba8acfec04993e50c03000000046a00ac6affffffff69e04d77e4b662a82db71a68dd72ef0af48ca5bebdcb40f5edf0caf591bb41020200000000b5db78a16d93f5f24d7d932f93a29bb4b784febd0cbb1943f90216dc80bba15a0567684b000000000853ab52ab5100006a1be2208a02f6bdc103000000000265ab8550ea04000000000365636a00000000", "", 0, -1114114836, "1c8655969b241e717b841526f87e6bd68b2329905ba3fc9e9f72526c0b3ea20c"], + ["bebb90c302bf91fd4501d33555a5fc5f2e1be281d9b7743680979b65c3c919108cc2f517510100000003abab00ffffffff969c30053f1276550532d0aa33cfe80ca63758cd215b740448a9c08a84826f3303000000056565ab5153ffffffff04bf6f2a04000000000565ab5265ab903e760100000000026a6a7103fa020000000006526553525365b05b2c000000000006ab000000535300000000", "51510053ab63635153", 1, 1081291172, "94338cd47a4639be30a71e21a7103cee4c99ef7297e0edd56aaf57a068b004de"], + ["af48319f031b4eeb4319714a285f44244f283cbff30dcb9275b06f2348ccd0d7f015b54f8500000000066363ac65ac6affffffff2560a9817ebbc738ad01d0c9b9cf657b8f9179b1a7f073eb0b67517409d108180200000005ac6365ab52ffffffff0bdd67cd4ecae96249a2e2a96db1490ee645f042fd9d5579de945e22b799f4d003000000086552ab515153ab00cf187c8202e51abf0300000000066552006a00abadf37d000000000004ac6a535100000000", "63ab65", 1, -1855554446, "60caf46a7625f303c04706cec515a44b68ec319ee92273acb566cca4f66861c1"], + ["f35befbc03faf8c25cc4bc0b92f6239f477e663b44b83065c9cb7cf231243032cf367ce3130000000005ab65526a517c4c334149a9c9edc39e29276a4b3ffbbab337de7908ea6f88af331228bd90086a6900ba020000000151279d19950d2fe81979b72ce3a33c6d82ebb92f9a2e164b6471ac857f3bbd3c0ea213b542010000000953ab51635363520065052657c20300a9ba04000000000452636a6a0516ea020000000008535253656365ababcfdd3f01000000000865ac516aac00530000000000", "", 2, -99793521, "c834a5485e68dc13edb6c79948784712122440d7fa5bbaa5cd2fc3d4dac8185d"], + ["d3da18520216601acf885414538ce2fb4d910997eeb91582cac42eb6982c9381589587794f0300000000fffffffff1b1c9880356852e10cf41c02e928748dd8fae2e988be4e1c4cb32d0bfaea6f7000000000465ab6aabffffffff02fb0d69050000000002ababeda8580500000000085163526565ac52522b913c95", "ac", 1, -1247973017, "99b32b5679d91e0f9cdd6737afeb07459806e5acd7630c6a3b9ab5d550d0c003"], + ["8218eb740229c695c252e3630fc6257c42624f974bc856b7af8208df643a6c520ef681bfd00000000002510066f30f270a09b2b420e274c14d07430008e7886ec621ba45665057120afce58befca96010300000004525153ab84c380a9015d96100000000000076a5300acac526500000000", "ac005263", 0, -1855679695, "5071f8acf96aea41c7518bd1b5b6bbe16258b529df0c03f9e374b83c66b742c6"], + ["1123e7010240310013c74e5def60d8e14dd67aedff5a57d07a24abc84d933483431b8cf8ea0300000003530051fc6775ff1a23c627a2e605dd2560e84e27f4208300071e90f4589e762ad9c9fe8d0da95e020000000465655200ffffffff04251598030000000004ab65ab639d28d90400000000096563636aacac525153474df801000000000851525165ac51006a75e23b040000000000e5bd3a4a", "6363636565", 0, -467124448, "9cb0dd04e9fe287b112e94a1647590d27e8b164ca13c4fe70c610fd13f82c2fd"], + ["fd92fe1003083c5179f97e77bf7d71975788138147adbdb283306802e261c0aee080fa22630200000000860c643ba9a1816b9badf36077b4554d11720e284e395a1121bc45279e148b2064c65e49020000000651ab6a53636a2c713088d20f4bc4001264d972cce05b9fe004dc33376ad24d0d013e417b91a5f1b6734e000000000100ffffffff02e3064c0500000000066552006a5165b86e8705000000000665ab65ab53522052eadb", "00ab53525265", 0, 776203277, "47207b48777727532f62e09afcd4104ea6687e723c7657c30504fa2081331cc8"], + ["d1b6a703038f14d41fcc5cc45455faa135a5322be4bf0f5cbcd526578fc270a236cacb853f0200000001abffffffff135aeff902fa38f202ccf5bd34437ff89c9dc57a028b62447a0a38579383e8ef0000000000ffffffffadf398d2c818d0b90bc474f540c3618a4a643482eeab73d36101987e2ec0335900000000004bd3323504e69fc10000000000055151535251790ada02000000000563ab6aab521337a704000000000963ac63abacac52656a1e9862010000000007656500ac51ab6a8f4ee672", "ab5251656565ac63", 2, 82008394, "b8f3d255549909c07588ecba10a02e55a2d6f2206d831af9da1a7dae64cfbc8b"], + ["81dadaa7011556683db3fe95262f4fdb20391b7e75b7ffcee51b176af64d83c06f85545d620200000005ab5151ab52ffffffff044805ef0300000000065353516352639702c802000000000900516351515252ab5270db08040000000009ac516aab526553abac4aabc90500000000096365ab0052636a525100000000", "6565ab6a5152", 0, -2126294159, "ad01ec9d6dbae325ec3a8e1fd98e2d03b1188378210efef093dd8b0b0ef3f19d"], + ["3b937e05032b8895d2f4945cb7e3679be2fbd15311e2414f4184706dbfc0558cf7de7b4d000000000001638b91a12668a3c3ce349788c961c26aa893c862f1e630f18d80e7843686b6e1e6fc396310000000000852635353ab65ac51eeb09dd1c9605391258ee6f74b9ae17b5e8c2ef010dc721c5433dcdc6e93a1593e3b6d1700000000085365ac6553526351ffffffff0308b18e04000000000253acb6dd00040000000008536aac5153ac516ab0a88201000000000500ac006500804e3ff2", "", 0, 416167343, "595a3c02254564634e8085283ec4ea7c23808da97ce9c5da7aecd7b553e7fd7f"], + ["a48f27ca047997470da74c8ee086ddad82f36d9c22e790bd6f8603ee6e27ad4d3174ea875403000000095153ac636aab6aacabffffffffefc936294e468d2c9a99e09909ba599978a8c0891ad47dc00ba424761627cef202000000056a51630053ffffffff304cae7ed2d3dbb4f2fbd679da442aed06221ffda9aee460a28ceec5a9399f4e0200000000f5bddf82c9c25fc29c5729274c1ff0b43934303e5f595ce86316fc66ad263b96ca46ab8d0100000003536500d7cf226b0146b00c04000000000200ac5c2014ce", "515100636563", 0, 1991799059, "9c051a7092fe17fa62b1720bc2c4cb2ffc1527d9fb0b006d2e142bb8fe07bf3c"], + ["180cd53101c5074cf0b7f089d139e837fe49932791f73fa2342bd823c6df6a2f72fe6dba1303000000076a6a63ac53acabffffffff03853bc1020000000007ac526a6a6a6a003c4a8903000000000453515163a0fbbd030000000005ab656a5253253d64cf", "ac65", 0, -1548453970, "4d8efb3b99b9064d2f6be33b194a903ffabb9d0e7baa97a48fcec038072aac06"], + ["c21ec8b60376c47e057f2c71caa90269888d0ffd5c46a471649144a920d0b409e56f190b700000000008acac6a526a536365ffffffff5d315d9da8bf643a9ba11299450b1f87272e6030fdb0c8adc04e6c1bfc87de9a0000000000ea43a9a142e5830c96b0ce827663af36b23b0277244658f8f606e95384574b91750b8e940000000007516a63ac0063acffffffff023c61be0400000000055165ab5263313cc8020000000006006a53526551ed8c3d56", "6a", 1, 1160627414, "a638cc17fd91f4b1e77877e8d82448c84b2a4e100df1373f779de7ad32695112"], + ["128cd90f04b66a4cbc78bf48748f6eec0f08d5193ee8d0a6f2e8d3e5f138ed12c2c87d01a301000000085200ab6aac00ab00ffffffff09fc88bb1851e3dfb3d30179c38e15aeb1b39929c7c74f6acd071994ed4806490300000000e7fc5ea12ec56f56c0d758ecf4bb88aa95f3b08176b336db3b9bec2f6e27336dce28adbe030000000400530051fffffffffd6ff1adcf1fbe0d883451ee46904f1b7e8820243d395559b2d4ee8190a6e891000000000080fb1ae702f85b400000000000035200ab8d9651010000000006ab6a52536aab00000000", "ab", 1, 1667598199, "c10ccc9db8a92d7d4b133a2980782dab9d9d1d633d0dde9f9612ada57771fd89"], + ["da9695a403493d3511c10e1fe1286f954db0366b7667c91ef18ae4578056c1bf752114ac5901000000035351519788d91dd1f9c62dc005d80ea54eb13f7131ca5aace3d5d29f9b58ccc5fbc9a27e779950010000000453ac6a00ffffffffe2556ff29ebe83eb42a32c7a8d93bc598043578f491b5935805a33608538845a030000000252ab65d21b3b018f26c4030000000006acab51535352e1cbcb10", "006565ab52", 2, -1550927794, "0ca673a1ee66f9625ceb9ab278ebef772c113c188112b02824570c17fdf48194"], + ["b240517501334021240427adb0b413433641555424f6d24647211e3e6bfbb22a8045cbda2f000000000071bac8630112717802000000000000000000", "6a5165abac52656551", 0, 1790414254, "2c8be597620d95abd88f9c1cf4967c1ae3ca2309f3afec8928058c9598660e9e"], + ["96bac43903044a199b4b3efeeec5d196ee23fb05495541fa2cd6fb6405a9432d1723363660010000000151ffffffffe6ce2b66ce1488918a3e880bebb0e750123f007c7bcbac8fcd67ce75cb6fbae80300000000ffffffff9c0955aa07f506455834895c0c56be5a095398f47c62a3d431fe125b161d666a0200000005520000abac7ffdbc540216f2f004000000000165a26dce010000000001ab00000000", "5151ab656a656a6a63", 0, -707123065, "26b22e18d5d9081fde9631594a4f7c49069ed2e429f3d08caf9d834f685ccab2"], + ["b8fd394001ed255f49ad491fecc990b7f38688e9c837ccbc7714ddbbf5404f42524e68c18f0000000007ab6353535363ab081e15ee02706f7d050000000008515200535351526364c7ec040000000005636a53acac9206cbe1", "655352ac", 0, -1251578838, "8e0697d8cd8a9ccea837fd798cc6c5ed29f6fbd1892ee9bcb6c944772778af19"], + ["e42a76740264677829e30ed610864160c7f97232c16528fe5610fc08814b21c34eefcea69d010000000653006a6a0052ffffffff647046cf44f217d040e6a8ff3f295312ab4dd5a0df231c66968ad1c6d8f4428000000000025352ffffffff0199a7f900000000000000000000", "655263006a005163", 1, 1122505713, "7cda43f1ff9191c646c56a4e29b1a8c6cb3f7b331da6883ef2f0480a515d0861"], + ["0f034f32027a8e094119443aa9cfe11737c6d7dda9a52b839bc073dcc0235b847b28e0fab60200000006ac53ac536a63eee63447dfdad80476994b68706e916df1bd9d7cb4f3a4f6b14369de84564bea2e8688bd030000000565636a65acf8434663020b35fe01000000000800abab655163acabb3d6a103000000000353acab345eeda0", "526a51ac63ab51", 1, 66020215, "4435e62ff6531ac73529aac9cf878a7219e0b6e6cac79af8487c5355d1ad6d43"], + ["a2dfa4690214c1ab25331815a5128f143219de51a47abdc7ce2d367e683eeb93960a31af9f010000000363636affffffff8be0628abb1861b078fcc19c236bc4cc726fa49068b88ad170adb2a97862e7460200000004ac655363ffffffff0441f11103000000000153dbab0c000000000009ab53ac5365526aab63abbb95050000000004ab52516a29a029040000000003ac526a00000000", "6a52ac63", 1, -1302210567, "913060c7454e6c80f5ba3835454b54db2188e37dc4ce72a16b37d11a430b3d23"], + ["9dbc591f04521670af83fb3bb591c5d4da99206f5d38e020289f7db95414390dddbbeb56680100000004ac5100acffffffffb6a40b5e29d5e459f8e72d39f800089529f0889006cad3d734011991da8ef09d0100000009526a5100acab536a515fc427436df97cc51dc8497642ffc868857ee245314d28b356bd70adba671bd6071301fc0000000000ffffffff487efde2f620566a9b017b2e6e6d42525e4070f73a602f85c6dfd58304518db30000000005516353006a8d8090180244904a0200000000046a65656ab1e9c203000000000451ab63aba06a5449", "", 0, -1414953913, "bae189eb3d64aedbc28a6c28f6c0ccbd58472caaf0cf45a5aabae3e031dd1fea"], + ["1345fb2c04bb21a35ae33a3f9f295bece34650308a9d8984a989dfe4c977790b0c21ff9a7f0000000006ac52ac6a0053ffffffff7baee9e8717d81d375a43b691e91579be53875350dfe23ba0058ea950029fcb7020000000753ab53ab63ab52ffffffff684b6b3828dfb4c8a92043b49b8cb15dd3a7c98b978da1d314dce5b9570dadd202000000086353ab6a5200ac63d1a8647bf667ceb2eae7ec75569ca249fbfd5d1b582acfbd7e1fcf5886121fca699c011d0100000003ac006affffffff049b1eb00300000000001e46dc0100000000080065ab6a6a630065ca95b40300000000030051520c8499010000000006ab6aac526a6500000000", "53526aac636300", 2, 1809978100, "cfeaa36790bc398783d4ca45e6354e1ea52ee74e005df7f9ebd10a680e9607bf"], + ["7d75dc8f011e5f9f7313ba6aedef8dbe10d0a471aca88bbfc0c4a448ce424a2c5580cda1560300000003ab5152ffffffff01997f8e0200000000096552ac6a65656563530d93bbcc", "00656a6563", 0, 1414485913, "ec91eda1149f75bffb97612569a78855498c5d5386d473752a2c81454f297fa7"], + ["1459179504b69f01c066e8ade5e124c748ae5652566b34ed673eea38568c483a5a4c4836ca0100000008ac5352006563656affffffff5d4e037880ab1975ce95ea378d2874dcd49d5e01e1cdbfae3343a01f383fa35800000000095251ac52ac6aac6500ffffffff7de3ae7d97373b7f2aeb4c55137b5e947b2d5fb325e892530cb589bc4f92abd503000000086563ac53ab520052ffffffffb4db36a32d6e543ef49f4bafde46053cb85b2a6c4f0e19fa0860d9083901a1190300000003ab51531bbcfe5504a6dbda040000000008536a5365abac6500d660c80300000000096565abab6a53536a6a54e84e010000000003acac52df2ccf0500000000025351220c857e", "", 2, 1879181631, "3aad18a209fab8db44954eb55fd3cc7689b5ec9c77373a4d5f4dae8f7ae58d14"], + ["d98b777f04b1b3f4de16b07a05c31d79965579d0edda05600c118908d7cf642c9cd670093f020000000953005351ac65ab5363a268caad6733b7d1718008997f249e1375eb3ab9fe68ab0fe170d8e745ea24f54ce67f9b00000000066500516a5151ffffffff7ef8040dfcc86a0651f5907e8bfd1017c940f51cf8d57e3d3fe78d57e40b1e610200000003535263ffffffff39846cfed4babc098ff465256ba3820c30d710581316afcb67cd31c623b703360300000001acffffffff03d405120100000000056300006a5201a73d050000000004ab636a6a294c8c000000000006ac65536553ac00000000", "63525351abac", 1, 2018694761, "86970af23c89b72a4f9d6281e46b9ef5220816bed71ebf1ae20df53f38fe16ff"], + ["cabb1b06045a895e6dcfc0c1e971e94130c46feace286759f69a16d298c8b0f6fd0afef8f20300000004ac006352ffffffffa299f5edac903072bfb7d29b663c1dd1345c2a33546a508ba5cf17aab911234602000000056a65515365ffffffff89a20dc2ee0524b361231092a070ace03343b162e7162479c96b757739c8394a0300000002abab92ec524daf73fabee63f95c1b79fa8b84e92d0e8bac57295e1d0adc55dc7af5534ebea410200000001534d70e79b04674f6f00000000000600abacab53517d60cc0200000000035265ab96c51d040000000004ac6300ac62a787050000000008006a516563ab63639e2e7ff7", "6551ac6351ac", 3, 1942663262, "d0c4a780e4e0bc22e2f231e23f01c9d536b09f6e5be51c123d218e906ec518be"], + ["8b96d7a30132f6005b5bd33ea82aa325e2bcb441f46f63b5fca159ac7094499f380f6b7e2e00000000076aacabac6300acffffffff0158056700000000000465005100c319e6d0", "52006a", 0, -1100733473, "fb4bd26a91b5cf225dd3f170eb09bad0eac314bc1e74503cc2a3f376833f183e"], + ["112191b7013cfbe18a175eaf09af7a43cbac2c396f3695bbe050e1e5f4250603056d60910e02000000001c8a5bba03738a22010000000005525352656a77a149010000000002510003b52302000000000351ac52722be8e6", "65ac6565", 0, -1847972737, "8e795aeef18f510d117dfa2b9f4a2bd2e2847a343205276cedd2ba14548fd63f"], + ["ce6e1a9e04b4c746318424705ea69517e5e0343357d131ad55d071562d0b6ebfedafd6cb840100000003656553ffffffff67bd2fa78e2f52d9f8900c58b84c27ef9d7679f67a0a6f78645ce61b883fb8de000000000100d699a56b9861d99be2838e8504884af4d30b909b1911639dd0c5ad47c557a0773155d4d303000000046a5151abffffffff9fdb84b77c326921a8266854f7bbd5a71305b54385e747fe41af8a397e78b7fa010000000863acac6a51ab00ac0d2e9b9d049b8173010000000007ac53526a650063ba9b7e010000000008526a00525263acac0ab3fd030000000000ea8a0303000000000200aca61a97b9", "", 1, -1276952681, "b6ed4a3721be3c3c7305a5128c9d418efa58e419580cec0d83f133a93e3a22c5"], + ["a7721d94021652d90c79aaf5022d98219337d50f836382403ed313adb1116ba507ac28b0b0010000000551ac6300ab89e6d64a7aa81fb9595368f04d1b36d7020e7adf5807535c80d015f994cce29554fe869b01000000065353ab636500ffffffff024944c90100000000046300635369df9f01000000000000000000", "656a536551ab", 0, -1740151687, "935892c6f02948f3b08bcd463b6acb769b02c1912be4450126768b055e8f183a"], + ["2f7353dd02e395b0a4d16da0f7472db618857cd3de5b9e2789232952a9b154d249102245fd030000000151617fd88f103280b85b0a198198e438e7cab1a4c92ba58409709997cc7a65a619eb9eec3c0200000003636aabffffffff0397481c0200000000045300636a0dc97803000000000009d389030000000003ac6a53134007bb", "0000536552526a", 0, -1912746174, "30c4cd4bd6b291f7e9489cc4b4440a083f93a7664ea1f93e77a9597dab8ded9c"], + ["7d95473604fd5267d0e1bb8c9b8be06d7e83ff18ad597e7a568a0aa033fa5b4e1e2b6f1007020000000465006a6affffffffaee008503bfc5708bd557c7e78d2eab4878216a9f19daa87555f175490c40aaf000000000263abffffffffabd74f0cff6e7ceb9acc2ee25e65af1abcebb50c08306e6c78fa8171c37613dd010000000552acacababffffffff54a3069393f7930fa1b331cdff0cb945ec21c11d4605d8eedba1d3e094c6ae1f01000000026300ffffffff0182edeb050000000009526353ab5153530065a247e8cd", "51516aab00", 2, -426210430, "2707ca714af09494bb4cf0794abe33c6cba5f29891d619e76070269d1fa8e690"], + ["221d4718023d9ca9fe1af178dbfce02b2b369bf823ea3f43f00891b7fef98e215c06b94fdd000000000951005153ab000051acffffffffb1c7ad1c64b7441bf5e70cd0f6eb4ec96821d67fc4997d9e6dfdceadecd36dde01000000070051536a635153ffffffff04e883cd00000000000851ab536553ab0052bbb2f70400000000002f1b2e03000000000165259fcb00000000000010dbde99", "ab", 1, 665721280, "4abce77432a86dfe608e7c1646c18b5253a373392ff962e288e3ab96bba1ba1d"], + ["6f66c0b3013e6ae6aabae9382a4326df31c981eac169b6bc4f746edaa7fc1f8c796ef4e374000000000665ab6aabac6affffffff0191c8d6030000000002525300000000", "6a5352516a635352ab", 0, -1299629906, "48411efeb133c6b7fec4e7bdbe613f827093cb06ea0dbcc2ffcfde3a9ac4356c"], + ["89e7928c04363cb520eff4465251fd8e41550cbd0d2cdf18c456a0be3d634382abcfd4a2130200000006ac516a6a656355042a796061ed72db52ae47d1607b1ceef6ca6aea3b7eea48e7e02429f382b378c4e51901000000085351ab6352ab5252ffffffff53631cbda79b40183000d6ede011c778f70147dc6fa1aed3395d4ce9f7a8e69701000000096a6553ab52516a52abad0de418d80afe059aab5da73237e0beb60af4ac490c3394c12d66665d1bac13bdf29aa8000000000153f2b59ab6027a33eb040000000007005351ac5100ac88b941030000000003ab0052e1e8a143", "63656a", 0, 1258533326, "b575a04b0bb56e38bbf26e1a396a76b99fb09db01527651673a073a75f0a7a34"], + ["ca356e2004bea08ec2dd2df203dc275765dc3f6073f55c46513a588a7abcc4cbde2ff011c7020000000553525100003aefec4860ef5d6c1c6be93e13bd2d2a40c6fb7361694136a7620b020ecbaca9413bcd2a030000000965ac00536352535100ace4289e00e97caaea741f2b89c1143060011a1f93090dc230bee3f05e34fbd8d8b6c399010000000365526affffffff48fc444238bda7a757cb6a98cb89fb44338829d3e24e46a60a36d4e24ba05d9002000000026a53ffffffff03d70b440200000000056a6a526aac853c97010000000002515335552202000000000351635300000000", "0052", 3, -528192467, "fc93cc056c70d5e033933d730965f36ad81ef64f1762e57f0bc5506c5b507e24"], + ["82d4fa65017958d53e562fac073df233ab154bd0cf6e5a18f57f4badea8200b217975e31030200000004636aab51ac0891a204227cc9050000000006635200655365bfef8802000000000865650051635252acfc2d09050000000006ab65ac51516380195e030000000007ac52525352510063d50572", "53", 0, -713567171, "e095003ca82af89738c1863f0f5488ec56a96fb81ea7df334f9344fcb1d0cf40"], + ["75f6949503e0e47dd70426ef32002d6cdb564a45abedc1575425a18a8828bf385fa8e808e600000000036aabab82f9fd14e9647d7a1b5284e6c55169c8bd228a7ea335987cef0195841e83da45ec28aa2e0300000002516350dc6fe239d150efdb1b51aa288fe85f9b9f741c72956c11d9dcd176889963d699abd63f0000000001ab429a63f502777d20010000000007abac52ac516a53d081d9020000000003acac630c3cc3a8", "535152516551510000", 1, 973814968, "c6ec1b7cb5c16a1bfd8a3790db227d2acc836300534564252b57bd66acf95092"], + ["24f24cd90132b2162f938f1c22d3ca5e7daa83515883f31a61a5177aebf99d7db6bdfc398c010000000163ffffffff01d5562d0100000000016300000000", "5265ac5165ac5252ab", 0, 1055129103, "5eeb03e03806cd7bfd44bbba69c30f84c2c5120df9e68cd8facc605fcfbc9693"], + ["5ff2cac201423064a4d87a96b88f1669b33adddc6fa9acdc840c0d8a243671e0e6de49a5b00300000005ac6353655353b91db50180db5a03000000000663535151006a047a3aff", "52ab51ab5365005163", 0, -1336626596, "b8db8d57fe40ab3a99cf2f8ed57da7a65050fcc1d34d4280e25faf10108d3110"], + ["10011f150220ad76a50ccc7bb1a015eda0ff987e64cd447f84b0afb8dc3060bdae5b36a6900200000000ffffffff1e92dd814dfafa830187bc8e5b9258de2445ec07b02c420ee5181d0b203bb334000000000565ab536a65ffffffff0124e65401000000000800ab636553ab53ac00000000", "53abab0051", 0, 440222748, "c6675bf229737e005b5c8ffa6f81d9e2c4396840921b6151316f67c4315a4270"], + ["8b95ec900456648d820a9b8df1d8f816db647df8a8dc9f6e7151ebf6079d90ee3f6861352a02000000085200ab00ac535151ffffffff039b10b845f961225ac0bcaac4f5fe1991029a051aa3d06a3811b5762977a67403000000035252abffffffff8559d65f40d5e261f45aec8aad3d2c56c6114b22b26f7ee54a06f0881be3a7f5010000000765635252536363ffffffff38f8b003b50f6412feb2322b06b270197f81ad69c36af02ca5008b94eee5f650020000000165ffffffff01ae2b00010000000001638eb153a2", "0053ab5300ac53", 2, 1266056769, "205f3653f0142b35ce3ef39625442efebae98cde8cbf0516b97b51073bb0479f"], + ["babbb7ea01ab5d584727cb44393b17cf66521606dc81e25d85273be0d57bad43e8f6b6d43501000000036a656aba83a68803fb0f4a000000000005536353ab633fcfe4020000000009ac00acab6351006a65182a0c03000000000453ac5363bee74f44", "536a6a6a6365ac51ab", 0, -799187625, "3275e98dca37243b977525a07b5d8e369d6c3bdc08cb948029a635547d0d1a4e"], + ["e86a24bc03e4fae784cdf81b24d120348cb5e52d937cd9055402fdba7e43281e482e77a1c100000000046363006affffffffa5447e9bdcdab22bd20d88b19795d4c8fb263fbbf7ce8f4f9a85f865953a6325020000000663ac53535253ffffffff9f8b693bc84e0101fc73748e0513a8cecdc264270d8a4ee1a1b6717607ee1eaa00000000026a513417bf980158d82c020000000009005253005351acac5200000000", "6353516365536a6a", 2, -563792735, "508129278ef07b43112ac32faf00170ad38a500eed97615a860fd58baaad174b"], + ["53bd749603798ed78798ef0f1861b498fc61dcee2ee0f2b37cddb115b118e73bc6a5a47a0201000000096a63656a6aab6a000007ff674a0d74f8b4be9d2e8e654840e99d533263adbdd0cf083fa1d5dd38e44d2d163d900100000007abab5251ac6a51c8b6b63f744a9b9273ccfdd47ceb05d3be6400c1ed0f7283d32b34a7f4f0889cccf06be30000000009516a52636551ab516a9ac1fe63030c677e05000000000027bc610000000000086565636a635100526e2dc60200000000015300000000", "6552536a515351ab", 1, -1617066878, "fe516df92299e995b8e6489be824c6839543071ec5e9286060b2600935bf1f20"], + ["691bf9fc028ca3099020b79184e70039cf53b3c7b3fe695d661fd62d7b433e65feda2150610000000003ac63abffffffff2c814c15b142bc944192bddccb90a392cd05b968b599c1d8cd99a55a28a243fd0100000009ab5300526a5200abac98516a5803dfd3540500000000046552ac522838120100000000040053ab6a4409a903000000000665636a5300658759621b", "65ac5165ab", 0, -359941441, "d582c442e0ecc400c7ba33a56c93ad9c8cfd45af820350a13623594b793486f0"], + ["536bc5e60232eb60954587667d6bcdd19a49048d67a027383cc0c2a29a48b960dc38c5a0370300000005ac636300abffffffff8f1cfc102f39b1c9348a2195d496e602c77d9f57e0769dabde7eaaedf9c69e250100000006acabab6a6351ffffffff0432f56f0400000000046a5365517fd54b0400000000035265539484e4050000000003536a5376dc25020000000008ac536aab6aab536ab978e686", "ac0051006a006a006a", 0, -273074082, "f151f1ec305f698d9fdce18ea292b145a58d931f1518cf2a4c83484d9a429638"], + ["74606eba01c2f98b86c29ba5a32dc7a7807c2abe6ed8d89435b3da875d87c12ae05329e6070200000003510052ffffffff02a1e2c4020000000006516563526a63c68bae04000000000952ab6363ab00006363fe19ae4f", "63ababacac5365", 0, 112323400, "d1b1d79001b4a0324962607b739972d6f39c1493c4500ce814fd3bd72d32a5a0"], + ["2ed805e20399e52b5bcc9dc075dad5cf19049ff5d7f3de1a77aee9288e59c5f4986751483f020000000165ffffffff967531a5726e7a653a9db75bd3d5208fa3e2c5e6cd5970c4d3aba84eb644c72c0300000000ffffffffd79030d20c65e5f8d3c55b5692e5bdaa2ae78cfa1935a0282efb97515feac43f030000000400006365261ab88c02bdf66a000000000003ab6351d6ad8b000000000005525152abac00000000", "630053ab5265", 0, 2072814938, "1d25d16d84d5793be1ad5cda2de9c9cf70e04a66c3dae618f1a7ca4026198e7f"], + ["fab796ee03f737f07669160d1f1c8bf0800041157e3ac7961fea33a293f976d79ce49c02ab0200000003ac5252eb097ea1a6d1a7ae9dace338505ba559e579a1ee98a2e9ad96f30696d6337adcda5a85f403000000096500abab656a6a656396d5d41a9b11f571d91e4242ddc0cf2420eca796ad4882ef1251e84e42b930398ec69dd80100000005526551ac6a8e5d0de804f763bb0400000000015288271a010000000001acf2bf2905000000000300ab51c9641500000000000952655363636365ac5100000000", "00ac536552", 0, -1854521113, "f3bbab70b759fe6cfae1bf349ce10716dbc64f6e9b32916904be4386eb461f1f"], + ["f2b539a401e4e8402869d5e1502dbc3156dbce93583f516a4947b333260d5af1a34810c6a00200000003525363ffffffff01d305e2000000000005acab535200a265fe77", "", 0, -1435650456, "41617b27321a830c712638dbb156dae23d4ef181c7a06728ccbf3153ec53d7dd"], + ["9f10b1d8033aee81ac04d84ceee0c03416a784d1017a2af8f8a34d2f56b767aea28ff88c8f02000000025352ffffffff748cb29843bea8e9c44ed5ff258df1faf55fbb9146870b8d76454786c4549de100000000016a5ba089417305424d05112c0ca445bc7107339083e7da15e430050d578f034ec0c589223b0200000007abac53ac6565abffffffff025a4ecd010000000006636563ab65ab40d2700000000000056a6553526333fa296c", "", 0, -395044364, "20fd0eee5b5716d6cbc0ddf852614b686e7a1534693570809f6719b6fcb0a626"], + ["ab81755f02b325cbd2377acd416374806aa51482f9cc5c3b72991e64f459a25d0ddb52e66703000000036a00ab8727056d48c00cc6e6222be6608c721bc2b1e69d0ffbadd51d131f05ec54bcd83003aac5000000000003f2cdb60454630e020000000007526aac63000000e9e25c040000000003516a0088c97e0000000000076a535265655263771b5805000000000851ab00ac6565515100000000", "5151ab00ac", 0, -230931127, "ba0a2c987fcdd74b6915f6462f62c3f126a0750aa70048f7aa20f70726e6a20b"], + ["7a17e0ef0378dab4c601240639139335da3b7d684600fa682f59b7346ef39386fe9abd69350000000004ac5252ab807f26fb3249326813e18260a603b9ad66f41f05eaa8146f66bcca452162a502aac4aa8b02000000026a534ea460faa7e3d7854ec6c70d7e797025697b547ec500b2c09c873b4d5517767d3f3720660300000000ffffffff01b12e7a02000000000900ab006aab65656a63991c03e2", "6aab6a", 1, -1577994103, "62cd3413d9d819fb7355336365cf8a2a997f7436cc050a7143972044343b3281"], + ["ff2ecc09041b4cf5abb7b760e910b775268abee2792c7f21cc5301dd3fecc1b4233ee70a2c0200000009acac5300006a51526affffffffeb39c195a5426afff38379fc85369771e4933587218ef4968f3f05c51d6b7c92000000000165453a5f039b8dbef7c1ffdc70ac383b481f72f99f52b0b3a5903c825c45cfa5d2c0642cd50200000001654b5038e6c49daea8c0a9ac8611cfe904fc206dad03a41fb4e5b1d6d85b1ecad73ecd4c0102000000096a51000053ab656565bdb5548302cc719200000000000452655265214a3603000000000300ab6a00000000", "52516a006a63", 1, -2113289251, "37ed6fae36fcb3360c69cac8b359daa62230fc1419b2cf992a32d8f3e079dcff"], + ["70a8577804e553e462a859375957db68cfdf724d68caeacf08995e80d7fa93db7ebc04519d02000000045352ab53619f4f2a428109c5fcf9fee634a2ab92f4a09dc01a5015e8ecb3fc0d9279c4a77fb27e900000000006ab6a51006a6affffffff3ed1a0a0d03f25c5e8d279bb5d931b7eb7e99c8203306a6c310db113419a69ad010000000565516300abffffffff6bf668d4ff5005ef73a1b0c51f32e8235e67ab31fe019bf131e1382050b39a630000000004536a6563ffffffff02faf0bb00000000000163cf2b4b05000000000752ac635363acac15ab369f", "ac", 0, -1175809030, "1c9d6816c20865849078f9777544b5ddf37c8620fe7bd1618e4b72fb72dddca1"], + ["a3604e5304caa5a6ba3c257c20b45dcd468f2c732a8ca59016e77b6476ac741ce8b16ca8360200000004acac6553ffffffff695e7006495517e0b79bd4770f955040610e74d35f01e41c9932ab8ccfa3b55d0300000007ac5253515365acffffffff6153120efc5d73cd959d72566fc829a4eb00b3ef1a5bd3559677fb5aae116e38000000000400abab52c29e7abd06ff98372a3a06227386609adc7665a602e511cadcb06377cc6ac0b8f63d4fdb03000000055100acabacffffffff04209073050000000009ab5163ac525253ab6514462e05000000000952abacab636300656a20672c0400000000025153b276990000000000056565ab6a5300000000", "5351", 0, 1460890590, "249c4513a49076c6618aabf736dfd5ae2172be4311844a62cf313950b4ba94be"], + ["c6a72ed403313b7d027f6864e705ec6b5fa52eb99169f8ea7cd884f5cdb830a150cebade870100000009ac63ab516565ab6a51ffffffff398d5838735ff43c390ca418593dbe43f3445ba69394a6d665b5dc3b4769b5d700000000075265acab515365ffffffff7ee5616a1ee105fd18189806a477300e2a9cf836bf8035464e8192a0d785eea3030000000700ac6a51516a52ffffffff018075fd0000000000015100000000", "005251acac5252", 2, -656067295, "2cc1c7514fdc512fd45ca7ba4f7be8a9fe6d3318328bc1a61ae6e7675047e654"], + ["93c12cc30270fc4370c960665b8f774e07942a627c83e58e860e38bd6b0aa2cb7a2c1e060901000000036300abffffffff4d9b618035f9175f564837f733a2b108c0f462f28818093372eec070d9f0a5440300000001acffffffff039c2137020000000001525500990100000000055265ab636a07980e0300000000005ba0e9d1", "656a5100", 1, 18954182, "6beca0e0388f824ca33bf3589087a3c8ad0857f9fe7b7609ae3704bef0eb83e2"], + ["97bddc63015f1767619d56598ad0eb5c7e9f880b24a928fea1e040e95429c930c1dc653bdb0100000008ac53acac00005152aaa94eb90235ed10040000000000287bdd0400000000016a8077673a", "acac6a536352655252", 0, -813649781, "5990b139451847343c9bb89cdba0e6daee6850b60e5b7ea505b04efba15f5d92"], + ["cc3c9dd303637839fb727270261d8e9ddb8a21b7f6cbdcf07015ba1e5cf01dc3c3a327745d0300000000d2d7804fe20a9fca9659a0e49f258800304580499e8753046276062f69dbbde85d17cd2201000000096352536a520000acabffffffffbc75dfa9b5f81f3552e4143e08f485dfb97ae6187330e6cd6752de6c21bdfd21030000000600ab53650063ffffffff0313d0140400000000096565515253526aacac167f0a040000000008acab00535263536a9a52f8030000000006abab5151ab63f75b66f2", "6a635353636a65ac65", 1, 377286607, "dbc7935d718328d23d73f8a6dc4f53a267b8d4d9816d0091f33823bd1f0233e9"], + ["236f91b702b8ffea3b890700b6f91af713480769dda5a085ae219c8737ebae90ff25915a3203000000056300ac6300811a6a10230f12c9faa28dae5be2ebe93f37c06a79e76214feba49bb017fb25305ff84eb020000000100ffffffff041e351703000000000351ac004ff53e050000000003ab53636c1460010000000000cb55f701000000000651520051ab0000000000", "acac636a6aac5300", 0, 406448919, "793a3d3c37f6494fab79ff10c16702de002f63e34be25dd8561f424b0ea938c4"], + ["22e10d2003ab4ea9849a2801921113583b7c35c3710ff49a6003489395789a7cfb1e6051900100000006526a65535151ffffffff82f21e249ec60db33831d33b9ead0d56f6496db64337dcb7f1c3327c47729c4a020000000253abffffffff138f098f0e6a4cf51dc3e7a3b749f487d1ebde71b73b731d1d02ad1180ac7b8c02000000036563acda215011027a9484020000000007635165530000ac4bf6cb0400000000066aacabab65ab3ce3f32c", "ab0052ab", 2, 1136359457, "b5bd080bbcb8cd652f440484311d7a3cb6a973cd48f03c5c00fd6beb52dfc061"], + ["c47d5ad60485cb2f7a825587b95ea665a593769191382852f3514a486d7a7a11d220b62c54000000000663655253acab8c3cf32b0285b040e50dcf6987ddf7c385b3665048ad2f9317b9e0c5ba0405d8fde4129b00000000095251ab00ac65635300ffffffff549fe963ee410d6435bb2ed3042a7c294d0c7382a83edefba8582a2064af3265000000000152fffffffff7737a85e0e94c2d19cd1cde47328ece04b3e33cd60f24a8a345da7f2a96a6d0000000000865ab6a0051656aab28ff30d5049613ea020000000005ac51000063f06df1050000000008ac63516aabac5153afef5901000000000700656500655253688bc00000000000086aab5352526a53521ff1d5ff", "51ac52", 2, -1296011911, "0c1fd44476ff28bf603ad4f306e8b6c7f0135a441dc3194a6f227cb54598642a"], + ["0b43f122032f182366541e7ee18562eb5f39bc7a8e5e0d3c398f7e306e551cdef773941918030000000863006351ac51acabffffffffae586660c8ff43355b685dfa8676a370799865fbc4b641c5a962f0849a13d8250100000005abab63acabffffffff0b2b6b800d8e77807cf130de6286b237717957658443674df047a2ab18e413860100000008ab6aac655200ab63ffffffff04f1dbca03000000000800635253ab656a52a6eefd0300000000036365655d8ca90200000000005a0d530400000000015300000000", "65ac65acac", 0, 351448685, "86f26e23822afd1bdfc9fff92840fc1e60089f12f54439e3ab9e5167d0361dcf"], + ["4b0ecc0c03ba35700d2a30a71f28e432ff6ac7e357533b49f4e97cf28f1071119ad6b97f3e0300000008acab516363ac63acffffffffcd6a2019d99b5c2d639ddca0b1aa5ea7c1326a071255ea226960bd88f45ca57d00000000085253655363005353ffffffffba257635191c9f216de3277be548cb5a2313114cb1a4c563b03b4ef6c0f4f7040300000001abda542edf0495cdc40100000000026353c049e903000000000752516a53ab65512b0f9304000000000963ab516aac65516552fa9ece050000000009acab6500005152530000000000", "65ab51525352510052", 1, -1355414590, "3cd85f84aae6d702436f3f9b8980adcc1f8f202e957759540a27da0a32fc6c87"], + ["adaac0a803f66811346271c733036d6e0d45e15a9b602092e2e04ad93564f196e7f020b088000000000600526a636a00700ec3f9db07a3a6ce910bf318c7ec87a876e1f2a3366cc69f20cde09203b99c1cb9d15800000000050000ac636a4d0de554ebe95c6cc14faf5ff6361d1deba9474b8b0fd3b93c011cd96aec783abb3f36830200000005ab65005251ffffffff0464eb10050000000007520000ab6a65ab1beaa80300000000005a2f31050000000006526aab65ac52ba7db10000000000045251ab6a0cfb46e7", "ab0051ac52636a", 1, -184733716, "961ff413850336d3987c550404fc1d923266ca36cc9ffee7113edb3a9fea7f30"], + ["af1c4ab301ec462f76ee69ba419b1b2557b7ded639f3442a3522d4f9170b2d6859765c3df402000000016affffffff01a5ca6c000000000008ab52536aab00005300000000", "6a6351", 0, 110304602, "e88ed2eea9143f2517b15c03db00767eb01a5ce12193b99b964a35700607e5f4"], + ["0bfd34210451c92cdfa02125a62ba365448e11ff1db3fb8bc84f1c7e5615da40233a8cd368010000000252ac9a070cd88dec5cf9aed1eab10d19529720e12c52d3a21b92c6fdb589d056908e43ea910e0200000009ac516a52656a6a5165ffffffffc3edcca8d2f61f34a5296c405c5f6bc58276416c720c956ff277f1fb81541ddd00000000030063abffffffff811247905cdfc973d179c03014c01e37d44e78f087233444dfdce1d1389d97c302000000065163000063ab1724a26e02ca37c902000000000851ab53525352ac529012a90100000000085200525253535353fa32575b", "5352ac6351", 1, -1087700448, "b8f1e1f35e3e1368bd17008c756e59cced216b3c699bcd7bebdb5b6c8eec4697"], + ["2c84c0640487a4a695751d3e4be48019dbaea85a6e854f796881697383ea455347d2b2769001000000055265526500ffffffff6aac176d8aa00778d496a7231eeb7d3334f20c512d3db1683276402100d98de5030000000700536a5263526ac1ee9ceb171c0c984ebaf12c234fd1487fbf3b3d73aa0756907f26837efba78d1bed33200300000001ab4d9e8ec0bed837cb929bbed76ee848959cec59de44bd7667b7631a744f880d5c71a20cfd0100000007005363515300abffffffff023753fb0000000000036565532d3873050000000009005152ab6a63acab5200000000", "ab650053ab", 0, -877941183, "c49af297dffe2d80deddf10ceea84b99f8554bd2d55bbdc34e449728c31f0835"], + ["1f7e4b1b045d3efa6cd7a11d7873a8bab886c19bd11fcb6712f0948f2db3a7be76ff76c8f100000000095265ab6a0065ac5363ffffffffdaafcfa6029336c997680a541725190f09a6f6da21e54560eca4b5b8ae987da1000000000952ac52acac52515165ffffffff825a38d3b1e5bb4d10f33653ab3ab6882c7abdaec74460257d1528ce7be3f98e0100000007526a006a656a63c14adc8f04953a5d3d3f89237f38b857dd357713896d36215f7e8b77b11d98ea3cdc93df02000000015212484f6104bfafae0300000000025263a2b0120000000000056563ab00516c4d2605000000000653ac6500655301cc93030000000002acab14643b1f", "63acac53ab", 0, 333824258, "18da6ceb011cd36f15ad7dd6c55ef07e6f6ed48881ce3bb31416d3c290d9a0e9"], + ["467a3e7602e6d1a7a531106791845ec3908a29b833598e41f610ef83d02a7da3a1900bf2960000000005ab6a636353ffffffff031db6dac6f0bafafe723b9199420217ad2c94221b6880654f2b35114f44b1df010000000965ab52636a63ac6352ffffffff02b3b95c0100000000026300703216030000000001ab3261c0aa", "6a", 0, 2110869267, "3078b1d1a7713c6d101c64afe35adfae0977a5ab4c7e07a0b170b041258adbf2"], + ["8713bc4f01b411149d575ebae575f5dd7e456198d61d238695df459dd9b86c4e3b2734b62e0300000004abac6363ffffffff03b58049050000000002ac653c714c04000000000953656a005151526a527b5a9e03000000000652ac5100525300000000", "52", 0, -647281251, "0e0bed1bf2ff255aef6e5c587f879ae0be6222ab33bd75ee365ec6fbb8acbe38"], + ["f2ba8a8701b9c401efe3dd0695d655e20532b90ac0142768cee4a3bb0a89646758f544aa8102000000036a52527899f4e4040c6f0b030000000008636565ab530051ab52b60c000000000009515200ab630053ac53a49c5f040000000008ab53ab516300ab63fa27340300000000015100000000", "ac63abab5251", 0, -1328936437, "ab61497afd39e61fe06bc5677326919716f9b20083c9f3417dcea905090e0411"], + ["b5a7df6102107beded33ae7f1dec0531d4829dff7477260925aa2cba54119b7a07d92d5a1d02000000046a516a52803b625c334c1d2107a326538a3db92c6c6ae3f7c3516cd90a09b619ec6f58d10e77bd6703000000056563006a63ffffffff0117484b03000000000853acab52526a65abc1b548a1", "ac006a525100", 0, 2074359913, "680336db57347d8183b8898cd27a83f1ba5884155aeae5ce20b4840b75e12871"], + ["278cb16204b9dadf400266106392c4aa9df01ba03af988c8139dae4c1818ac009f13fc5f1a00000000065200ac656a52ffffffffd006bbebd8cbd7bdead24cddc9badfcc6bc0c2e63c037e5c29aa858f5d0f3e7d01000000046a0051acffffffffbc62a5f57e58da0b67956003ae81ac97cb4cbd1d694c914fc41515c008c4d8fd020000000165e329c844bcc16164be64b64a81cbf4ffd41ed2934e0daa0040ccb8365bab0b2a9e401c180300000003ab52abffffffff02588460030000000000a25a12030000000005535100005300000000", "6553ab6a5300acab51", 3, 989407546, "1c29f110576f4a3b257f67454d99dfc0dee62ef5517ca702848ce4bd2ea1a1d7"], + ["49eb2178020a04fca08612c34959fd41447319c190fb7ffed9f71c235aa77bec28703aa1820200000003ac6353abaff326071f07ec6b77fb651af06e8e8bd171068ec96b52ed584de1d71437fed186aecf0300000001acffffffff03da3dbe02000000000652ac63ac6aab8f3b680400000000096a536a65636a53516a5175470100000000016500000000", "6a536365", 0, 1283691249, "c670219a93234929f662ecb9aa148a85a2d281e83f4e53d10509461cdea47979"], + ["0f96cea9019b4b3233c0485d5b1bad770c246fe8d4a58fb24c3b7dfdb3b0fd90ea4e8e947f0300000006006a5163515303571e1e01906956030000000005ab635353abadc0fbbe", "acac", 0, -1491469027, "716a8180e417228f769dcb49e0491e3fda63badf3d5ea0ceeac7970d483dd7e2"], + ["9a7d858604577171f5fe3f3fd3e5e039c4b0a06717a5381e9977d80e9f53e025e0f16d2877020000000752636565536353ffffffff5862bd028e8276e63f044be1dddcbb8d0c3fa097678308abf2b0f45104a93dbd0100000001531200667ba8fdd3b28e98a35da73d3ddfe51e210303d8eb580f923de988ee632d77793892030000000752526363526563ffffffffe9744eb44db2658f120847c77f47786d268c302120d269e6004455aa3ea5f5e20200000009ab6300636aab656551ffffffff03c61a3c020000000009ab516a6aab6aab53ab737f1a05000000000853acabab655365ab92a4a00400000000016367edf6c8", "535352ab", 3, 659348595, "d36ee79fc80db2e63e05cdc50357d186181b40ae20e3720878284228a13ee8b3"], + ["148e68480196eb52529af8e83e14127cbfdbd4a174e60a86ac2d86eac9665f46f4447cf7aa01000000045200ac538f8f871401cf240c0300000000065252ab52656a5266cf61", "", 0, -344314825, "eacc47c5a53734d6ae3aedbc6a7c0a75a1565310851b29ef0342dc4745ceb607"], + ["e2bc29d4013660631ba14ecf75c60ec5e9bed7237524d8c10f66d0675daa66d1492cb834530200000004ac510065e42d0c9e04f2b26c01000000000951525152acac65ababa35b7504000000000953ac6aac00650053ab94688c0400000000056365526553a1bced0300000000016a00000000", "65ab0063655353", 0, -888431789, "59a34b3ed3a1cce0b104de8f7d733f2d386ffc7445efae67680cd90bc915f7e0"], + ["0c8a70d70494dca6ab05b2bc941b5b431c43a292bd8f2f02eab5e240a408ca73a676044a4103000000056a51ab006affffffff84496004e54836c035821f14439149f22e1db834f315b24588ba2f031511926c0100000000ffffffffbbc5e70ed1c3060ba1bfe99c1656a3158a7307c3ce8eb362ec32c668596d2bd30000000009636563635351abab00b039344c6fc4f9bec24322e45407af271b2d3dfec5f259ee2fc7227bc5285e22b3be85b40100000009ac00ab53abac6a5352e5ddfcff02d50231020000000005006a51536ab086d9020000000006ababac51ac6a00000000", "abab636565acac6a", 3, 241546088, "643a7b4c8d832e14d5c10762e74ec84f2c3f7ed96c03053157f1bed226614911"], + ["f98f79cf0274b745e1d6f36da7cbe205a79132a7ad462bdc434cfb1dcd62a6977c3d2a5dbc010000000553516a5365ffffffff4f89f485b53cdad7fb80cc1b7e314b9735b9383bc92c1248bb0e5c6173a55c0d010000000353655293f9b014045ad96d02000000000963ac526a53ac636365f4c27904000000000952536563635152526a2788f0030000000002516aff5add01000000000863530051655351abd04716ba", "ab6552536a53", 1, -2128899945, "56d29f5e300ddfed2cd8dcce5d79826e193981d0b70dc7487772c8a0b3b8d7b1"], + ["6c7913f902aa3f5f939dd1615114ce961beda7c1e0dd195be36a2f0d9d047c28ac62738c3a020000000453abac00ffffffff477bf2c5b5c6733881447ac1ecaff3a6f80d7016eee3513f382ad7f554015b970100000007ab6563acab5152ffffffff04e58fe1040000000009ab00526aabab526553e59790010000000002ab525a834b03000000000035fdaf0200000000086551ac65515200ab00000000", "63ac53", 1, 1285478169, "1536da582a0b6de017862445e91ba14181bd6bf953f4de2f46b040d351a747c9"], + ["4624aa9204584f06a8a325c84e3b108cafb97a387af62dc9eab9afd85ae5e2c71e593a3b690200000003636a005eb2b44eabbaeca6257c442fea00107c80e32e8715a1293cc164a42e62ce14fea146220c020000000090b9ee38106e3310037bfc519fd209bdbd21c588522a0e96df5fba4e979392bc993bfe9f01000000086363636a635353ab6f1907d218ef6f3c729d9200e23c1dbff2df58b8b1282c6717b26cf760ee4c880d23f4d100000000086a516a536a525163ffffffff01d6f162050000000000ebbab208", "525365ab0053", 1, -1515409325, "6cf9cd409b7185b1f118171f0a34217af5b612ea54195ea186505b667c19337f"], + ["16562fc503f1cf9113987040c408bfd4523f1512da699a2ca6ba122dc65677a4c9bf7763830000000003636552ffffffff1ec1fab5ff099d1c8e6b068156f4e39b5543286bab53c6d61e2582d1e07c96cf02000000045163656affffffffd0ef40003524d54c08cb4d13a5ee61c84fbb28cde9eca7a6d11ba3a9335d8c620100000007635153536a6300fbb84fc2012003a601000000000363ab6a00000000", "63636a006a6aab", 0, -1310262675, "1efbf3d37a92bc03d9eb950b792f307e95504f7c4998f668aa250707ebb752ac"], + ["531665d701f86bacbdb881c317ef60d9cd1baeffb2475e57d3b282cd9225e2a3bf9cbe0ded01000000086300ac515263acabffffffff0453a8500100000000086353acab516a6565e5e9200500000000026a52a44caa00000000000453ac000065e41b0500000000076500ac0065526ab4476f4d", "006563006aab00636a", 0, 1770013777, "0898b26dd3ca08632a5131fa48eb55b44386d0c5070c24d6e329673d5e3693b8"], + ["0f1227a20140655a3da36e413b9b5d108a866f6f147eb4940f032f5a89854eae6d7c3a91600100000009525363515153515253e37a79480161ab61020000000001ab00000000", "ab65005200", 0, -1996383599, "979782dc3f36d908d37d7e4046a38d306b4b08ddc60a5eba355fe3d6da1b29a9"], + ["063ff6eb01aff98d0d2a6db224475010edb634c2f3b46257084676adeb84165a4ff8558d7601000000066353006a5165deb3262c042d109c0000000000076363ab52ac005200b9c4050000000007516300ac510063cfffc800000000000200639e815501000000000700526a52ac6365ac7b07b8", "656552abac6500", 0, -1559847112, "674a4bcb04247f8dc98780f1792cac86b8aee41a800fc1e6f5032f6e1dccde65"], + ["3320f6730132f830c4681d0cae542188e4177cad5d526fae84565c60ceb5c0118e844f90bd030000000163ffffffff0257ec5a040000000005525251ac6538344d000000000002515200000000", "5352656a53ac516a65", 0, 788050308, "3afacaca0ef6be9d39e71d7b1b118994f99e4ea5973c9107ca687d28d8eba485"], + ["c13aa4b702eedd7cde09d0416e649a890d40e675aa9b5b6d6912686e20e9b9e10dbd40abb1000000000863ab6353515351ac11d24dc4cc22ded7cdbc13edd3f87bd4b226eda3e4408853a57bcd1becf2df2a1671fd1600000000045165516affffffff01baea300100000000076aab52ab53005300000000", "0065", 0, -1195908377, "241a23e7b1982d5f78917ed97a8678087acbbffe7f624b81df78a5fe5e41e754"], + ["d9a6f20e019dd1b5fae897fb472843903f9c3c2293a0ffb59cff2b413bae6eceab574aaf9d030000000663ab006a515102f54939032df5100100000000056a51ab65530ec28f010000000004ac5100007e874905000000000651005265ac6a00000000", "abacab63acacabab", 0, 271463254, "1326a46f4c21e7619f30a992719a905aa1632aaf481a57e1cbd7d7c22139b41e"], + ["157c81bf0490432b3fcb3f9a5b79e5f91f67f05efb89fa1c8740a3fe7e9bdc18d7cb6acd2203000000026351ffffffff912e48e72bbcf8a540b693cf8b028e532a950e6e63a28801f6eaad1afcc52ad00000000000b1a4b170a2b9e60e0cad88a0085137309f6807d25d5afb5c1e1d32aa10ba1cdf7df596dd0000000009525165656a51ab65ab3674fba32a76fe09b273618d5f14124465933f4190ba4e0fd09d838daafc6223b31642ac00000000086a53536551ac6565ffffffff01fe9fb6030000000008ab51656a5165636a00000000", "ab00ab6a6551", 3, -64357617, "1ddaab7f973551d71f16bd70c4c4edbf7225e64e784a6da0ee7f7a9fe4f12a0b"], + ["a2692fff03b2387f5bacd5640c86ba7df574a0ee9ed7f66f22c73cccaef3907eae791cbd230200000004536363abffffffff4d9fe7e5b375de88ba48925d9b2005447a69ea2e00495a96eafb2f144ad475b40000000008000053000052636537259bee3cedd3dcc07c8f423739690c590dc195274a7d398fa196af37f3e9b4a1413f810000000006ac63acac52abffffffff04c65fe60200000000075151536365ab657236fc020000000009005263ab00656a6a5195b8b6030000000007ac5165636aac6a7d7b66010000000002acab00000000", "51", 2, -826546582, "925037c7dc7625f3f12dc83904755a37016560de8e1cdd153c88270a7201cf15"], + ["2c5b003201b88654ac2d02ff6762446cb5a4af77586f05e65ee5d54680cea13291efcf930d0100000005ab536a006a37423d2504100367000000000004536a515335149800000000000152166aeb03000000000452510063226c8e03000000000000000000", "635251", 0, 1060344799, "7e058ca5dd07640e4aae7dea731cfb7d7fef1bfd0d6d7b6ce109d041f4ca2a31"], + ["f981b9e104acb93b9a7e2375080f3ea0e7a94ce54cd8fb25c57992fa8042bdf4378572859f0100000002630008604febba7e4837da77084d5d1b81965e0ea0deb6d61278b6be8627b0d9a2ecd7aeb06a0300000005ac5353536a42af3ef15ce7a2cd60482fc0d191c4236e66b4b48c9018d7dbe4db820f5925aad0e8b52a0300000008ab0063510052516301863715efc8608bf69c0343f18fb81a8b0c720898a3563eca8fe630736c0440a179129d03000000086aac6a52ac6a63ac44fec4c00408320a03000000000062c21c030000000007ac6a655263006553835f0100000000015303cd60000000000005535263536558b596e0", "00", 0, -2140385880, "49870a961263354c9baf108c6979b28261f99b374e97605baa532d9fa3848797"], + ["e7416df901269b7af14a13d9d0507709b3cd751f586ce9d5da8d16a121e1bd481f5a086e1103000000056aab005200ffffffff01aa269c040000000006acac6a6a5263ee718de6", "ab525363", 0, 1309186551, "eea7d2212bda2d408fff146f9ae5e85e6b640a93b9362622bb9d5e6e36798389"], + ["402a815902193073625ab13d876190d1bbb72aecb0ea733c3330f2a4c2fe6146f322d8843a0300000008656aab0000535363fffffffff9dccdec5d8509d9297d26dfcb1e789cf02236c77dc4b90ebccbf94d1b5821150300000001510bf1f96a03c5c145000000000002ac6ae11b1c0100000000055163516a5239c8a600000000000365636300000000", "63536aacab", 0, -1811424955, "0090803a20102a778ab967a74532faee13e03b702083b090b1497bc2267ee2fe"], + ["c4b702e502f1a54f235224f0e6de961d2e53b506ab45b9a40805d1dacd35148f0acf24ca5e00000000085200ac65ac53acabf34ba6099135658460de9d9b433b84a8562032723635baf21ca1db561dce1c13a06f4407000000000851ac006a63516aabffffffff02a853a603000000000163d17a67030000000005ab63006a5200000000", "ac5363515153", 1, 480734903, "5c46f7ac3d6460af0da28468fcc5b3c87f2b9093d0f837954b7c8174b4d7b6e7"], + ["9b83f78704f492b9b353a3faad8d93f688e885030c274856e4037818848b99e490afef27770200000000ffffffff36b60675a5888c0ef4d9e11744ecd90d9fe9e6d8abb4cff5666c898fdce98d9e00000000056aab656352596370fca7a7c139752971e169a1af3e67d7656fc4fc7fd3b98408e607c2f2c836c9f27c030000000653ac51ab6300a0761de7e158947f401b3595b7dc0fe7b75fa9c833d13f1af57b9206e4012de0c41b8124030000000953656a53ab53510052242e5f5601bf83b301000000000465516a6300000000", "63515200ac656365", 3, -150879312, "9cf05990421ea853782e4a2c67118e03434629e7d52ab3f1d55c37cf7d72cdc4"], + ["f492a9da04f80b679708c01224f68203d5ea2668b1f442ebba16b1aa4301d2fe5b4e2568f3010000000953005351525263ab65ffffffff93b34c3f37d4a66df255b514419105b56d7d60c24bf395415eda3d3d8aa5cd0101000000020065ffffffff9dba34dabdc4f1643b372b6b77fdf2b482b33ed425914bb4b1a61e4fad33cf390000000002ab52ffffffffbbf3dc82f397ef3ee902c5146c8a80d9a1344fa6e38b7abce0f157be7adaefae0000000009515351005365006a51ffffffff021359ba010000000000403fea0200000000095200ac6353abac635300000000", "00ac51acacac", 0, -2115078404, "fd44fc98639ca32c927929196fc3f3594578f4c4bd248156a25c04a65bf3a9f3"], + ["2f73e0b304f154d3a00fde2fdd40e791295e28d6cb76af9c0fd8547acf3771a02e3a92ba37030000000852ac6351ab6565639aa95467b065cec61b6e7dc4d6192b5536a7c569315fb43f470078b31ed22a55dab8265f02000000080065636a6aab6a53ffffffff9e3addbff52b2aaf9fe49c67017395198a9b71f0aa668c5cb354d06c295a691a0100000000ffffffff45c2b4019abaf05c5e484df982a4a07459204d1343a6ee5badade358141f8f990300000007ac516a6aacac6308655cd601f3bc2f0000000000015200000000", "", 0, -2082053939, "9a95e692e1f78efd3e46bb98f178a1e3a0ef60bd0301d9f064c0e5703dc879c2"], + ["5a60b9b503553f3c099f775db56af3456330f1e44e67355c4ab290d22764b9144a7b5f959003000000030052acbd63e0564decc8659aa53868be48c1bfcda0a8c9857b0db32a217bc8b46d9e7323fe9649020000000553ac6551abd0ecf806211db989bead96c09c7f3ec5f73c1411d3329d47d12f9e46678f09bac0dc383e0200000000ffffffff01494bb202000000000500516551ac00000000", "ac", 0, 1169947809, "62a36c6e8da037202fa8aeae03e533665376d5a4e0a854fc4624a75ec52e4eb1"], + ["7e98d353045569c52347ca0ff2fdba608829e744f61eb779ffdb5830aae0e6d6857ab2690e03000000075365acab656352ffffffffa890dd37818776d12da8dca53d02d243ef23b4535c67016f4c58103eed85360f030000000093dbacdc25ca65d2951e047d6102c4a7da5e37f3d5e3c8b87c29b489360725dcd117ee2003000000056a6300ac53c7e99fa1dc2b8b51733034e6555f6d6de47dbbf1026effac7db80cb2080678687380dc1e02000000075352005263516affffffff04423272040000000008ab6353ab65510051e0f53b0500000000086300516552635152f74a5f04000000000853acab0053ab52ab0e8e5f00000000000951ac5363516a6aabab00000000", "6a5163ab52", 3, 890006103, "476868cecd1763c91dade98f17defa42d31049547df45acffa1cc5ae5c3d75d6"], + ["e3649aa40405e6ffe377dbb1bbbb672a40d8424c430fa6512c6165273a2b9b6afa9949ec430200000007630052ab655153a365f62f2792fa90c784efe3f0981134d72aac0b1e1578097132c7f0406671457c332b84020000000353ab6ad780f40cf51be22bb4ff755434779c7f1def4999e4f289d2bd23d142f36b66fbe5cfbb4b01000000076a5252abac52ab1430ffdc67127c9c0fc97dcd4b578dab64f4fb9550d2b59d599773962077a563e8b6732c02000000016affffffff04cb2687000000000002ab636e320904000000000252acf70e9401000000000100dc3393050000000006ab0063536aacbc231765", "65520053", 3, -2016196547, "f64f805f0ff7f237359fa6b0e58085f3c766d1859003332223444fd29144112a"], + ["1d033569040700441686672832b531ab55db89b50dc1f9fc00fb72218b652da9dcfbc83be901000000066551ac526a632b390f9ad068e5fdee6563e88e2a8e4e09763c861072713dc069893dc6bbc9db3f00e26502000000096a5363526565525252ffffffff8a36bdd0aaf38f6707592d203e14476ca9f259021e487135c7e8324244057ed90300000000ed3fb2a3dfd4d46b5f3603fe0148653911988457bd0ed7f742b07c452f5476c228ff9f600200000007526aac00525152ffffffff04b88e48030000000000c753d602000000000853510000006553518fda2603000000000853ac52acac5263534839f1030000000006ac006aacac5300000000", "516553635300ab0052", 1, 2075958316, "c2cefaec2293134acbcf6d2a8bf2b3eb42e4ec04ee8f8bf30ff23e65680677c1"], + ["4c4be7540344050e3044f0f1d628039a334a7c1f7b4573469cfea46101d6888bb6161fe9710200000000ffffffffac85a4fdad641d8e28523f78cf5b0f4dc74e6c5d903c10b358dd13a5a1fd8a06000000000163e0ae75d05616b72467b691dc207fe2e65ea35e2eadb7e06ea442b2adb9715f212c0924f10200000000ffffffff0194ddfe02000000000265ac00000000", "00006500", 1, -479922562, "d66924d49f03a6960d3ca479f3415d638c45889ce9ab05e25b65ac260b51d634"], + ["202c18eb012bc0a987e69e205aea63f0f0c089f96dd8f0e9fcde199f2f37892b1d4e6da90302000000055352ac6565ffffffff0257e5450100000000025300ad257203000000000000000000", "520052ac6a005265", 0, 168054797, "502967a6f999f7ee25610a443caf8653dda288e6d644a77537bcc115a8a29894"], + ["32fa0b0804e6ea101e137665a041cc2350b794e59bf42d9b09088b01cde806ec1bbea077df0200000008515153650000006506a11c55904258fa418e57b88b12724b81153260d3f4c9f080439789a391ab147aabb0fa0000000007000052ac51ab510986f2a15c0d5e05d20dc876dd2dafa435276d53da7b47c393f20900e55f163b97ce0b800000000008ab526a520065636a8087df7d4d9c985fb42308fb09dce704650719140aa6050e8955fa5d2ea46b464a333f870000000009636300636a6565006affffffff01994a0d040000000002536500000000", "516563530065", 2, -163068286, "f58637277d2bc42e18358dc55f7e87e7043f5e33f4ce1fc974e715ef0d3d1c2a"], + ["ae23424d040cd884ebfb9a815d8f17176980ab8015285e03fdde899449f4ae71e04275e9a80100000007ab006553530053ffffffff018e06db6af519dadc5280c07791c0fd33251500955e43fe4ac747a4df5c54df020000000251ac330e977c0fec6149a1768e0d312fdb53ed9953a3737d7b5d06aad4d86e9970346a4feeb5030000000951ab51ac6563ab526a67cabc431ee3d8111224d5ecdbb7d717aa8fe82ce4a63842c9bd1aa848f111910e5ae1eb0100000004ac515300bfb7e0d7048acddc030000000009636a5253636a655363a3428e040000000001525b99c6050000000004655265ab717e6e020000000000d99011eb", "ac6a6a516565", 1, -716251549, "b098eb9aff1bbd375c70a0cbb9497882ab51f3abfebbf4e1f8d74c0739dc7717"], + ["030f44fc01b4a9267335a95677bd190c1c12655e64df74addc53b753641259af1a54146baa020000000152e004b56c04ba11780300000000026a53f125f001000000000251acd2cc7c03000000000763536563655363c9b9e50500000000015200000000", "ac", 0, -1351818298, "19dd32190ed2a37be22f0224a9b55b91e37290577c6c346d36d32774db0219a3"], + ["c05f448f02817740b30652c5681a3b128322f9dc97d166bd4402d39c37c0b14506d8adb5890300000003536353ffffffffa188b430357055ba291c648f951cd2f9b28a2e76353bef391b71a889ba68d5fc02000000056565526a6affffffff02745f73010000000001ab3ec34c0400000000036aac5200000000", "516551510053", 0, -267877178, "3a1c6742d4c374f061b1ebe330b1e169a113a19792a1fdde979b53e094cc4a3c"], + ["163ba45703dd8c2c5a1c1f8b806afdc710a2a8fc40c0138e2d83e329e0e02a9b6c837ff6b8000000000700655151ab6a522b48b8f134eb1a7e6f5a6fa319ce9d11b36327ba427b7d65ead3b4a6a69f85cda8bbcd22030000000563656552acffffffffdbcf4955232bd11eef0cc6954f3f6279675b2956b9bcc24f08c360894027a60201000000066500006500abffffffff04d0ce9d0200000000008380650000000000015233f360040000000003006aabedcf0801000000000000000000", "000065006500ac", 0, 216965323, "9afe3f4978df6a86e9a8ebd62ef6a9d48a2203f02629349f1864ef2b8b92fd55"], + ["07f7f5530453a12ad0c7eb8fbc3f140c7ab6818144d67d2d8752600ca5d9a9358e2dff87d4000000000663526aab526a9e599c379d455e2da36d0cde88d931a863a3e97e01e93b9edb65856f3d958dc08b92b720000000000165bbc8d66dae3b1b170a6e2457f5b161465cb8706e0e6ffc6af55deb918365f14c5f40d4890100000000a7bd77c069ee4b48638e2363fcf2a86b02bea022047bd9fcb16d2b94ad068308d19b31cb00000000066aab5300ab529672aa8f01dbd8a205000000000663536353006a02e99901", "ac006351006a63ab63", 1, 119789359, "6629a1e75c6ae8f4f9d5f734246b6a71682a5ea57246040ef0584f6b97916175"], + ["fe647f950311bf8f3a4d90afd7517df306e04a344d2b2a2fea368935faf11fa6882505890d0000000005ab5100516affffffff43c140947d9778718919c49c0535667fc6cc727f5876851cb8f7b6460710c7f60100000000ffffffffce4aa5d90d7ab93cbec2e9626a435afcf2a68dd693c15b0e1ece81a9fcbe025e0300000000ffffffff02f34806020000000002515262e54403000000000965635151ac655363636de5ce24", "6a005100ac516351", 2, 989643518, "818a7ceaf963f52b5c48a7f01681ac6653c26b63a9f491856f090d9d60f2ffe3"], + ["a1050f8604d0f9d2feefcdb5051ae0052f38e21bf39daf583fd0c3900faa3eab5d431c0bbe030000000653536a005151683d27e5c6e0da8f22125823f32d5d98477d8098ef36263b9694d61d4d85d3f2ac02b7570200000007000052005165abffffffff0cad981542bcb54a87d9400aa63e514c7c6fab7158c2b1fb37821ea755eb162a0200000000b94feb5100e5ef3bf8ed8d43356c8a8d5ac6c7e80d7ff6040f4f0aa19abbe783f4f461240200000007636500000052655686fd70042be3ad02000000000465ab636a15680b000000000004acac53511277c705000000000452635252d27a0102000000000000000000", "6a6aacab65655251", 1, -982144648, "dfcf484111801989eb6df8dc2bafb944d7365ffeb36a575a08f3270d3ef24c9f"], + ["cef7316804c3e77fe67fc6207a1ea6ae6eb06b3bf1b3a4010a45ae5c7ad677bb8a4ebd16d90200000009ac536a5152ac5263005301ab8a0da2b3e0654d31a30264f9356ba1851c820a403be2948d35cafc7f9fe67a06960300000006526a63636a53ffffffffbada0d85465199fa4232c6e4222df790470c5b7afd54704595a48eedd7a4916b030000000865ab63ac006a006ab28dba4ad55e58b5375053f78b8cdf4879f723ea4068aed3dd4138766cb4d80aab0aff3d0300000003ac6a00ffffffff010f5dd6010000000006ab006aab51ab00000000", "", 1, 889284257, "d0f32a6db43378af84b063a6706d614e2d647031cf066997c48c04de3b493a94"], + ["7b3ff28004ba3c7590ed6e36f45453ebb3f16636fe716acb2418bb2963df596a50ed954d2e03000000065251515265abffffffff706ee16e32e22179400c9841013971645dabf63a3a6d2d5feb42f83aa468983e030000000653ac51ac5152ffffffffa03a16e5e5de65dfa848b9a64ee8bf8656cc1f96b06a15d35bd5f3d32629876e020000000043c1a3965448b3b46f0f0689f1368f3b2981208a368ec5c30defb35595ef9cf95ffd10e902000000036aac65253a5bbe042e907204000000000800006565656352634203b4020000000002656336b3b7010000000001ab7a063f0100000000026500a233cb76", "006551636a53ac5251", 1, -1144216171, "68c7bd717b399b1ee33a6562a916825a2fed3019cdf4920418bb72ffd7403c8c"], + ["d5c1b16f0248c60a3ddccf7ebd1b3f260360bbdf2230577d1c236891a1993725e262e1b6cb000000000363636affffffff0a32362cfe68d25b243a015fc9aa172ea9c6b087c9e231474bb01824fd6bd8bc0300000005ab52ab516affffffff0420d9a70200000000045152656a45765d0000000000055252536a5277bad100000000000252ab3f3f3803000000000463acac5200000000", "52636a52ab65", 1, 1305123906, "978dc178ecd03d403b048213d904653979d11c51730381c96c4208e3ea24243a"], + ["1be8ee5604a9937ebecffc832155d9ba7860d0ca451eaced58ca3688945a31d93420c27c460100000006abac5300535288b65458af2f17cbbf7c5fbcdcfb334ffd84c1510d5500dc7d25a43c36679b702e850f7c0200000003005300ffffffff7c237281cb859653eb5bb0a66dbb7aeb2ac11d99ba9ed0f12c766a8ae2a2157203000000086aabac526365acabfffffffff09d3d6639849f442a6a52ad10a5d0e4cb1f4a6b22a98a8f442f60280c9e5be80200000007ab00ab6565ab52ffffffff0398fe83030000000005526aababacbdd6ec010000000005535252ab6a82c1e6040000000001652b71c40c", "6563526353656351", 2, -853634888, "0d936cceda2f56c7bb87d90a7b508f6208577014ff280910a710580357df25f3"], + ["9e0f99c504fbca858c209c6d9371ddd78985be1ab52845db0720af9ae5e2664d352f5037d4010000000552ac53636affffffff0e0ce866bc3f5b0a49748f597c18fa47a2483b8a94cef1d7295d9a5d36d31ae7030000000663515263ac635bb5d1698325164cdd3f7f3f7831635a3588f26d47cc30bf0fefd56cd87dc4e84f162ab702000000036a6365ffffffff85c2b1a61de4bcbd1d5332d5f59f338dd5e8accbc466fd860f96eef1f54c28ec030000000165ffffffff04f5cabd010000000007000052ac526563c18f1502000000000465510051dc9157050000000008655363ac525253ac506bb600000000000865656a53ab63006a00000000", "006a6a0052", 0, 1186324483, "2f9b7348600336512686e7271c53015d1cb096ab1a5e0bce49acd35bceb42bc8"], + ["11ce51f90164b4b54b9278f0337d95c50d16f6828fcb641df9c7a041a2b274aa70b1250f2b0000000008ab6a6a65006551524c9fe7f604af44be050000000005525365006521f79a0300000000015306bb4e04000000000265ac99611a05000000000765acab656500006dc866d0", "", 0, -1710478768, "cfa4b7573559b3b199478880c8013fa713ca81ca8754a3fd68a6d7ee6147dc5a"], + ["86bc233e02ba3c647e356558e7252481a7769491fb46e883dd547a4ce9898fc9a1ca1b77790000000006ab5351abab51f0c1d09c37696d5c7c257788f5dff5583f4700687bcb7d4acfb48521dc953659e325fa390300000003acac5280f29523027225af03000000000963abac0065ab65acab7e59d90400000000016549dac846", "53006aac52acac", 0, 711159875, "880330ccde00991503ea598a6dfd81135c6cda9d317820352781417f89134d85"], + ["beac155d03a853bf18cd5c490bb2a245b3b2a501a3ce5967945b0bf388fec2ba9f04c03d68030000000012fe96283aec4d3aafed8f888b0f1534bd903f9cd1af86a7e64006a2fa0d2d30711af770010000000163ffffffffd963a19d19a292104b9021c535d3e302925543fb3b5ed39fb2124ee23a9db00302000000056500ac63acffffffff01ad67f503000000000300ac5189f78db2", "53536a636500", 2, 748992863, "bde3dd0575164d7ece3b5783ce0783ffddb7df98f178fe6468683230314f285a"], + ["81dab34a039c9e225ba8ef421ec8e0e9d46b5172e892058a9ade579fe0eb239f7d9c97d45b0300000009ac65655351ab526363ffffffff10c0faaf7f597fc8b00bbc67c3fd4c6b70ca6b22718d15946bf6b032e62dae570000000005536a00ab6a02cddec3acf985bbe62c96fccf17012a87026ed63fc6756fa39e286eb4c2dd79b59d37400300000002516affffffff04f18b8d03000000000753abab5152636564411c02000000000400ab6300e965750300000000001bd2cf02000000000565ab526aab00000000", "006551ab", 0, -1488174485, "a3d65a8cd0c1eea8558d01396b929520a2221c29d9f25f29035b8abae874447f"], + ["489ebbf10478e260ba88c0168bd7509a651b36aaee983e400c7063da39c93bf28100011f280100000004abab63ab2fc856f05f59b257a4445253e0d91b6dffe32302d520ac8e7f6f2467f7f6b4b65f2f59e903000000096353abacab6351656affffffff0122d9480db6c45a2c6fd68b7bc57246edffbf6330c39ccd36aa3aa45ec108fc030000000265ab9a7e78a69aadd6b030b12602dff0739bbc346b466c7c0129b34f50ae1f61e634e11e9f3d0000000006516a53525100ffffffff011271070000000000086563ab6353536352c4dd0e2c", "", 0, -293358504, "4eba3055bc2b58765593ec6e11775cea4b6493d8f785e28d01e2d5470ea71575"], + ["6911195d04f449e8eade3bc49fd09b6fb4b7b7ec86529918b8593a9f6c34c2f2d301ec378b000000000263ab49162266af054643505b572c24ff6f8e4c920e601b23b3c42095881857d00caf56b28acd030000000565525200ac3ac4d24cb59ee8cfec0950312dcdcc14d1b360ab343e834004a5628d629642422f3c5acc02000000035100accf99b663e3c74787aba1272129a34130668a877cc6516bfb7574af9fa6d07f9b4197303400000000085351ab5152635252ffffffff042b3c95000000000000ff92330200000000046a5252ab884a2402000000000853530065520063000d78be03000000000953abab52ab53ac65aba72cb34b", "6a", 2, -637739405, "6b80d74eb0e7ee59d14f06f30ba7d72a48d3a8ff2d68d3b99e770dec23e9284f"], + ["746347cf03faa548f4c0b9d2bd96504d2e780292730f690bf0475b188493fb67ca58dcca4f0000000002005336e3521bfb94c254058e852a32fc4cf50d99f9cc7215f7c632b251922104f638aa0b9d080100000008656aac5351635251ffffffff4da22a678bb5bb3ad1a29f97f6f7e5b5de11bb80bcf2f7bb96b67b9f1ac44d09030000000365ababffffffff036f02b30000000000076353ab6aac63ac50b72a050000000002acaba8abf804000000000663006a6a6353797eb999", "acac5100", 1, -1484493812, "164c32a263f357e385bd744619b91c3f9e3ce6c256d6a827d6defcbdff38fa75"], + ["e17149010239dd33f847bf1f57896db60e955117d8cf013e7553fae6baa9acd3d0f1412ad90200000006516500516500cb7b32a8a67d58dddfb6ceb5897e75ef1c1ff812d8cd73875856487826dec4a4e2d2422a0100000004ac525365196dbb69039229270400000000070000535351636a8b7596020000000006ab51ac52655131e99d040000000003516551ee437f5c", "ac656a53", 1, 1102662601, "8858bb47a042243f369f27d9ab4a9cd6216adeac1c1ac413ed0890e46f23d3f3"], + ["144971940223597a2d1dec49c7d4ec557e4f4bd207428618bafa3c96c411752d494249e1fb0100000004526a5151ffffffff340a545b1080d4f7e2225ff1c9831f283a7d4ca4d3d0a29d12e07d86d6826f7f0200000003006553ffffffff03c36965000000000000dfa9af00000000000451636aac7f7d140300000000016300000000", "", 1, -108117779, "c84fcaf9d779df736a26cc3cabd04d0e61150d4d5472dd5358d6626e610be57f"], + ["b11b6752044e650b9c4744fb9c930819227d2ac4040d8c91a133080e090b042a142e93906e0000000003650053ffffffff6b9ce7e29550d3c1676b702e5e1537567354b002c8b7bb3d3535e63ad03b50ea01000000055100516300fffffffffcf7b252fea3ad5a108af3640a9bc2cd724a7a3ce22a760fba95496e88e2f2e801000000036a00ac7c58df5efba193d33d9549547f6ca839f93e14fa0e111f780c28c60cc938f785b363941b000000000863ab51516552ac5265e51fcd0308e9830400000000036a00abab72190300000000016a63d0710000000000050051ab6a6300000000", "53005165ac51ab65", 0, 229563932, "e562579d1a2b10d1c5e45c06513456002a6bec157d7eb42511d30b118103c052"], + ["2aee6b9a02172a8288e02fac654520c9dd9ab93cf514d73163701f4788b4caeeb9297d2e250300000004ab6363008fb36695528d7482710ea2926412f877a3b20acae31e9d3091406bfa6b62ebf9d9d2a6470100000009535165536a63520065ffffffff03f7b560050000000003acab6a9a8338050000000000206ce90000000000056552516a5100000000", "5252", 1, -1102319963, "fa4676c374ae3a417124b4c970d1ed3319dc3ac91fb36efca1aa9ed981a8aa1b"], + ["9554595203ad5d687f34474685425c1919e3d2cd05cf2dac89d5f33cd3963e5bb43f8706480100000000ffffffff9de2539c2fe3000d59afbd376cb46cefa8bd01dbc43938ff6089b63d68acdc2b02000000096553655251536a6500fffffffff9695e4016cd4dfeb5f7dadf00968e6a409ef048f81922cec231efed4ac78f5d010000000763abab6a5365006caaf0070162cc640200000000045163ab5100000000", "", 0, -1105256289, "e8e10ed162b1a43bfd23bd06b74a6c2f138b8dc1ab094ffb2fa11d5b22869bee"], + ["04f51f2a0484cba53d63de1cb0efdcb222999cdf2dd9d19b3542a896ca96e23a643dfc45f00200000007acac53510063002b091fd0bfc0cfb386edf7b9e694f1927d7a3cf4e1d2ce937c1e01610313729ef6419ae7030000000165a3372a913c59b8b3da458335dc1714805c0db98992fd0d93f16a7f28c55dc747fe66a5b503000000095351ab65ab52536351ffffffff5650b318b3e236802a4e41ed9bc0a19c32b7aa3f9b2cda1178f84499963a0cde000000000165ffffffff0383954f04000000000553ac536363a8fc90030000000000a2e315000000000005acab00ab5100000000", "0053", 2, -1424653648, "a5bc0356f56b2b41a2314ec05bee7b91ef57f1074bcd2efc4da442222269d1a3"], + ["5e4fab42024a27f0544fe11abc781f46596f75086730be9d16ce948b04cc36f86db7ad50fd01000000026a00613330f4916285b5305cc2d3de6f0293946aa6362fc087727e5203e558c676b314ef8dd401000000001af590d202ba496f040000000001009e3c9604000000000351ac51943d64d3", "51acabab5100ab52", 1, -129301207, "556c3f90aa81f9b4df5b92a23399fe6432cf8fecf7bba66fd8fdb0246440036c"], + ["a115284704b88b45a5f060af429a3a8eab10b26b7c15ed421258f5320fa22f4882817d6c2b0300000003005300ffffffff4162f4d738e973e5d26991452769b2e1be4b2b5b7e8cbeab79b9cf9df2882c040000000006636aac63ac5194abc8aa22f8ddc8a7ab102a58e39671683d1891799d19bd1308d24ea6d365e571172f1e030000000700515352515153ffffffff4da7ad75ce6d8541acbb0226e9818a1784e9c97c54b7d1ff82f791df1c6578f60000000000ffffffff01b1f265040000000009ab0051ac656a516a5300000000", "51abab6352535265", 0, -1269106800, "0ef7b6e87c782fa33fe109aab157a2d9cddc4472864f629510a1c92fa1fe7fc1"], + ["f3f771ae02939752bfe309d6c652c0d271b7cab14107e98032f269d92b2a8c8853ab057da8010000000563ab6a6365670c305c38f458e30a7c0ab45ee9abd9a8dc03bae1860f965ffced879cb2e5d0bb156821020000000153ffffffff025dc619050000000002ac51ec0d250100000000076a5200636a6363333aecd8", "650053ac515100ab", 1, 1812404608, "a7aa34bf8a5644f03c6dd8801f9b15ba2e07e07256dbf1e02dad59f0d3e17ea9"], + ["fd3e267203ae7d6d3975e738ca84f12540229bb237dd228d5f688e9d5ba53fce4302b0334d01000000026353ffffffff602a3ab75af7aa951d93093e345ef0037a2863f3f580a9b1a575fffe68e677450300000000239e476d1e8f81e8b6313880d8a49b27c1b00af467f29756e76f675f084a5676539636ab030000000765ab6351acac52d9217747044d773204000000000752ac51526353acc33e45050000000005516500005115d889040000000004ab5163510cbbbd0200000000016500000000", "65ac526aac6a53ab52", 2, -886179388, "bc46f3f83058ddf5bebd9e1f2c117a673847c4dc5e31cfb24bac91adf30877cf"], + ["f380ae23033646af5dfc186f6599098015139e961919aea28502ea2d69474413d94a555ea2000000000853635265abacac5314da394b99b07733341ddba9e86022637be3b76492992fb0f58f23c915098979250a96620300000003ab6300ffffffff4bb6d1c0a0d84eac7f770d3ad0fdc5369ae42a21bbe4c06e0b5060d5990776220300000000ffffffff0486fd70020000000007ac6500635252acf3fd72010000000005656a6a6551212de90500000000096365006a63635153000fa33100000000000600535151656300000000", "ab52", 2, -740890152, "f804fc4d81f039009ed1f2cccb5c91da797543f235ac71b214c20e763a6d86d7"], + ["5c45d09801bb4d8e7679d857b86b97697472d514f8b76d862460e7421e8617b15a2df217c6010000000863acacab6565006affffffff01156dbc03000000000952ac63516551ac6aac00000000", "6aabac", 0, 1310125891, "270445ab77258ced2e5e22a6d0d8c36ac7c30fff9beefa4b3e981867b03fa0ad"], + ["4ecc6bde030ca0f83c0ed3d4b777f94c0c88708c6c933fe1df6874f296d425cac95355c23d0000000006ac6a51536a52f286a0969d6170e20f2a8000193807f5bc556770e9d82341ef8e17b0035eace89c76edd50200000007ac65525100656affffffff5bade6e462fac1927f078d69d3a981f5b4c1e59311a38efcb9a910aa436afaa80000000007ac6a006352ab52ffffffff0331e58902000000000763ac53636352abb8b3ca000000000001637a1d26040000000009535263ac6a5352ab655ae34a39", "6a65ab", 2, 2142728517, "4a3415eb1677ae4e0c939644a4cfd5dc6299780b55cd0dc735967057b6b1526a"], + ["a59484b501eb50114be0fc79e72ab9bc9f4a5f7acdf274a56d6b68684eb68cf8b07ec5d1c2000000000765abab00ab00639e09aa940141e3530200000000046500ac6500000000", "00516565ab", 0, -1561622405, "d60bbadd2cc0674100baa08d0e0493ee4248f0304b3eb778da942041f503a896"], + ["53dc1a88046531c7b57a35f4d9adf101d068bf8d63fbbedaf4741dba8bc5e92c8725def571030000000453655251fcdf116a226b3ec240739c4c7493800e4edfe67275234e371a227721eac43d3d9ecaf1b50300000003ac0052ffffffff2c9279ffeea4718d167e9499bd067600715c14484e373ef93ae4a31d2f5671ab0000000009516553ac636a6a65001977752eeba95a8f16b88c571a459c2f2a204e23d48cc7090e4f4cc35846ca7fc0a455ce00000000055165ac0063188143f80205972902000000000765ac63ac516353c7b6a50000000000036a510000000000", "655351536a", 0, 103806788, "b276584d3514e5b4e058167c41dc02915b9d97f6795936a51f40e894ed8508bc"], + ["53f8959f01ddb36afdcd20167edcbb75a63d18654fdcf10bc0004c761ab450fe236d79cb2702000000065151650063653435003a033a5e34050000000009ac52516a630000516ab86db3030000000002006344ac090500000000046363ab00f3644537", "5263abab63ac656353", 0, -218513553, "f1f2a489682e42a6fc20025dfc89584d17f150b2d7ae3ddedd2bf43d5e24f37f"], + ["5a06cb4602dcfc85f49b8d14513f33c48f67146f2ee44959bbca092788e6823b2719f3160b0200000001ab3c013f2518035b9ea635f9a1c74ec1a3fb7496a160f46aae2e09bfc5cd5111a0f20969e003000000015158c89ab7049f20d6010000000008ac6a52abac53515349765e00000000000300ab638292630100000000045351ab0086da09010000000006656a6365525300000000", "526a63", 1, 1502936586, "bdfaff8a4e775379c5dc26e024968efa805f923de53fa8272dd53ec582afa0c5"], + ["ca9d84fa0129011e1bf27d7cb71819650b59fb292b053d625c6f02b0339249b498ff7fd4b601000000025352ffffffff032173a0040000000008525253abab5152639473bb030000000009005153526a53535151d085bd0000000000086a5365ab5165655300000000", "005152ac51", 0, 580353445, "c629d93b02037f40aa110e46d903edb34107f64806aa0c418d435926feef68b8"], + ["e3cdbfb4014d90ae6a4401e85f7ac717adc2c035858bf6ff48979dd399d155bce1f150daea0300000002ac51a67a0d39017f6c71040000000005535200535200000000", "", 0, -1899950911, "c1c7df8206e661d593f6455db1d61a364a249407f88e99ecad05346e495b38d7"], + ["b2b6b9ab0283d9d73eeae3d847f41439cd88279c166aa805e44f8243adeb3b09e584efb1df00000000026300ffffffff7dfe653bd67ca094f8dab51007c6adaced09de2af745e175b9714ca1f5c68d050000000003ac6500aa8e596903fd3f3204000000000553ac6a6a533a2e210500000000075253acabab526392d0ee020000000008520065635200ab5200000000", "65acacac65005365", 0, 28298553, "39c2aaa2496212b3ab120ab7d7f37c5e852bfe38d20f5226413a2268663eeae8"], + ["f30c5c3d01a6edb9e10fafaf7e85db14e7fec558b9dca4a80b05d7c3a2944d282c5018f4680200000003005263ffffffff04aac3530300000000026551bc2419010000000009005163acab6a5100658e7085050000000000c5e4ec050000000007656a6a635365ab2d8e8882", "abac53ab005251ac52", 0, -490287546, "877e347ec7487497769e2581142276d1a8d813b652e4483cf9cc993d16354417"], + ["4314339e01de40faabcb1b970245a7f19eedbc17c507dac86cf986c2973715035cf95736ae0200000007abababababab65bde67b900151510b04000000000853ac00655200535300000000", "52", 0, 399070095, "47585dc25469d04ff3a60939d0a03779e3e81a411bf0ca18b91bb925ebd30718"], + ["2d4cf4e9031b3e175b2ff18cd933151379d9cfac4713d8bd0e63b70bd4a92277aa7af901ab000000000565515353abffffffff557666c7f3be9cdecdad44c3df206eb63a2da4ed1f159d21193882a9f0340081020000000963ab53ab5252ac63abffffffff8a8c897bdb87e93886aad5ded9d82a13101d5476554386373646ca5e23612e450300000009006a526552abab6a635ac03fc00198bb02040000000009525100526a6563636a1d052834", "ab52ac00acac6a", 0, -1469882480, "09ed6563a454814ab7e3b4c28d56d8751162b77df1825b37ba66c6147750b2a3"], + ["f063171b03e1830fdc1d685a30a377537363ccafdc68b42bf2e3acb908dac61ee24b37595c020000000765ac5100ab6aacf447bc8e037b89d6cadd62d960cc442d5ced901d188867b5122b42a862929ce45e7b628d010000000253aba009a1ba42b00f1490b0b857052820976c675f335491cda838fb7934d5eea0257684a2a202000000001e83cf2401a7f777030000000008ab6553526a53526a00000000", "", 2, 1984790332, "c19caada8e71535e29a86fa29cfd9b74a0c7412003fc722a121005e461e01636"], + ["cf7bdc250249e22cbe23baf6b648328d31773ea0e771b3b76a48b4748d7fbd390e88a004d30000000003ac536a4ab8cce0e097136c90b2037f231b7fde2063017facd40ed4e5896da7ad00e9c71dd70ae600000000096a0063516352525365ffffffff01b71e3e00000000000300536a00000000", "", 1, 546970113, "6a815ba155270af102322c882f26d22da11c5330a751f520807936b320b9af5d"], + ["ac7a125a0269d35f5dbdab9948c48674616e7507413cd10e1acebeaf85b369cd8c88301b7c030000000963656aac6a530053abffffffffed94c39a582e1a46ce4c6bffda2ccdb16cda485f3a0d94b06206066da12aecfe010000000752abab63536363ef71dcfb02ee07fa0400000000016a6908c802000000000751656a6551abac688c2c2d", "6a6351526551", 0, 858400684, "552ff97d7924f51cda6d1b94be53483153ef725cc0a3a107adbef220c753f9a6"], + ["3a1f454a03a4591e46cf1f7605a3a130b631bf4dfd81bd2443dc4fac1e0a224e74112884fe0000000005516aac6a53a87e78b55548601ffc941f91d75eab263aa79cd498c88c37fdf275a64feff89fc1710efe03000000016a39d7ef6f2a52c00378b4f8f8301853b61c54792c0f1c4e2cd18a08cb97a7668caa008d970200000002656affffffff017642b20100000000096a63535253abac6a6528271998", "51", 2, 1459585400, "e9a7f21fc2d38be7be47095fbc8f1bf8923660aa4d71df6d797ae0ba5ca4d5b0"], + ["f59366cc0114c2a18e6bd1347ed9470f2522284e9e835dd5c5f7ef243639ebea95d9b232b6020000000153474b62eb045c00170500000000096352ab516352ab5200038a520400000000086aab5253656a63005b968904000000000963536353ac0053635387106002000000000000000000", "ab52526300ab51", 0, 1834116153, "cdf51f6e3a9dc2be5a59ea4c00f5aac1e1426a5202c325e6cf2567d07d8d8de4"], + ["6269e0fa0173e76e89657ca495913f1b86af5b8f1c1586bcd6c960aede9bc759718dfd5044000000000352ac530e2c7bd90219849b000000000007ab00ab6a53006319f281000000000007ab00515165ac5200000000", "6a", 0, -2039568300, "62094f98234a05bf1b9c7078c5275ed085656856fb5bdfd1b48090e86b53dd85"], + ["eb2bc00604815b9ced1c604960d54beea4a3a74b5c0035d4a8b6bfec5d0c9108f143c0e99a0000000000ffffffff22645b6e8da5f11d90e5130fd0a0df8cf79829b2647957471d881c2372c527d8010000000263acffffffff1179dbaf17404109f706ae27ad7ba61e860346f63f0c81cb235d2b05d14f2c1003000000025300264cb23aaffdc4d6fa8ec0bb94eff3a2e50a83418a8e9473a16aaa4ef8b855625ed77ef40100000003ac51acf8414ad404dd328901000000000652526500006ab6261c000000000002526a72a4c9020000000006ac526500656586d2e7000000000006656aac00ac5279cd8908", "51", 1, -399279379, "d37532e7b2b8e7db5c7c534197600397ebcc15a750e3af07a3e2d2e4f84b024f"], + ["dc9fe6a8038b84209bbdae5d848e8c040433237f415437592907aa798bf30d9dbbddf0ff85010000000153ffffffff23269a7ea29fcf788db483b8d4c4b35669e582608644259e950ce152b0fa6e050000000003acababffffffff65de94857897ae9ea3aa0b938ba6e5adf374d48469922d2b36dbb83d3b8c8261010000000452ac5200ffffffff02856e9b0300000000026a51980c8e02000000000365ab63d2648db4", "00ab0051ac526565", 2, 1562581941, "5cef9d8e18a2d5a70448f17b465d411a19dab78f0ddf1672ffd518b188f52433"], + ["eba8b0de04ac276293c272d0d3636e81400b1aaa60db5f11561480592f99e6f6fa13ad387002000000070053acab536563bebb23d66fd17d98271b182019864a90e60a54f5a615e40b643a54f8408fa8512cfac927030000000963ac6a6aabac65ababffffffff890a72192bc01255058314f376bab1dc72b5fea104c154a15d6faee75dfa5dba020000000100592b3559b0085387ac7575c05b29b1f35d9a2c26a0c27903cc0f43e7e6e37d5a60d8305a030000000252abffffffff0126518f05000000000000000000", "005300635252635351", 1, 664344756, "26dc2cba4bd5334e5c0b3a520b44cc1640c6b923d10e576062f1197171724097"], + ["91bd040802c92f6fe97411b159df2cd60fb9571764b001f31657f2d616964637605875c2a901000000055263006a65ffffffff3651df372645f50cf4e32fdf6e61c766e912e16335db2b40c5d52fe89eefe7cd00000000040065ab65ffffffff03ca8625030000000009ab51ac63530052ab52c6bf14020000000006ab00ab52005167d270000000000007ab53525351636a00000000", "5151ab63005252ac", 1, 1983087664, "3e5aa0200248d8d86ede3b315ca1b857018b89184a4bd023bd88ab12e499f6e1"], + ["185cda1a01ecf7a8a8c28466725b60431545fc7a3367ab68e34d486e8ea85ee3128e0d8384000000000465ac63abec88b7bb031c56eb04000000000965636a51005252006a7c78d5040000000007acac63abac51ac3024a40500000000086300526a51abac51464c0e8c", "0065535265515352", 0, 1594558917, "b5280b9610c0625a65b36a8c2402a95019a7bbb9dd3de77f7c3cb1d82c3263ba"], + ["a9531f07034091668b65fea8b1a79700d586ac9e2f42ca0455a26abe41f9e1805d009a0f5702000000096365516365ac5263ab3619bac643a9e28ee47855118cf80c3a74531cdf198835d206d0fe41804e325a4f9f105e03000000016a58e3ab0d46375d98994daf0fa7c600d2bb4669e726fca0e3a3f21ea0d9e777396740328f0100000008636a5363ab526a538d3ea7700304cb66030000000007515163ab52ab510184030500000000085353636565ac0051d9cff402000000000751ab52ab5352abf0e36254", "ab5353ac5365acab", 2, 1633101834, "04c9ef72f33668ca449c0415becf62cc0b8e0c75f9c8813852d42a58acf107c8"], + ["6b5ecc7903fe0ba37ea551df92a59e12bad0a3065846ba69179a8f4a741a2b4fcf679aac810200000004535263529a3d343293b99ab425e7ef8529549d84f480bcd92472bab972ea380a302128ae14dfcd0200000000025163ffffffff24636e4545cab9bf87009119b7fc3ec4d5ee9e206b90f35d1df8a563b6cd097a010000000852abac53005153abc64467860406e832020000000009526300006a53ac6352ac1395010000000002ac53b117f300000000000863655351acab00651edf02030000000008ab51ac6353535252628ef71d", "ab63ab6a52ac526563", 2, -1559697626, "8f07ece7d65e509f1e0780584ef8d271c1c61a13b10335d5faafc7afc8b5b8ec"], + ["92c9fb780138abc472e589d5b59489303f234acc838ca66ffcdf0164517a8679bb622a4267020000000153468e373d04de03fa020000000009ac006a5265ab5163006af649050000000007515153006a00658ceb59030000000001ac36afa0020000000009ab53006351ab51000000000000", "6a", 0, 2059357502, "e2358dfb51831ee81d7b0bc602a65287d6cd2dbfacf55106e2bf597e22a4b573"], + ["6f62138301436f33a00b84a26a0457ccbfc0f82403288b9cbae39986b34357cb2ff9b889b302000000045253655335a7ff6701bac9960400000000086552ab656352635200000000", "6aac51", 0, 1444414211, "502a2435fd02898d2ff3ab08a3c19078414b32ec9b73d64a944834efc9dae10c"], + ["9981143a040a88c2484ac3abe053849e72d04862120f424f373753161997dd40505dcb4783030000000700536365536565a2e10da3f4b1c1ad049d97b33f0ae0ea48c5d7c30cc8810e144ad93be97789706a5ead180100000003636a00ffffffffbdcbac84c4bcc87f03d0ad83fbe13b369d7e42ddb3aecf40870a37e814ad8bb5010000000963536a5100636a53abffffffff883609905a80e34202101544f69b58a0b4576fb7391e12a769f890eef90ffb72020000000651656352526affffffff04243660000000000004ab5352534a9ce001000000000863656363ab6a53652df19d030000000003ac65acedc51700000000000000000000", "ac6300acac", 2, 293672388, "7ba99b289c04718a7283f150d831175ed6303081e191a0608ea81f78926c5bdf"], + ["a2bb630b01989bc5d643f2da4fb9b55c0cdf846ba06d1dbe372893024dbbe5b9b8a1900af802000000055265ac63aca7a68d2f04916c74010000000003abac007077f0040000000001007d4127010000000005ac516aac000f31e8030000000000571079c9", "65ab0051ac", 0, -1103627693, "92d53b4390262e6b288e8a32e0cfc36cd5adfdfabfe96c7bfd4a19d65e233761"], + ["49f7d0b6037bba276e910ad3cd74966c7b3bc197ffbcfefd6108d6587006947e97789835ea0300000008526a52006a650053ffffffff8d7b6c07cd10f4c4010eac7946f61aff7fb5f3920bdf3467e939e58a1d4100ab03000000076aac63ac535351ffffffff8f48c3ba2d52ad67fbcdc90d8778f3c8a3894e3c35b9730562d7176b81af23c80100000003ab5265ffffffff0301e3ef0300000000046a525353e899ac0500000000075153ab6a65abac259bea0400000000007b739972", "53516aacac6aac", 1, 955403557, "5d366a7f4346ae18aeb7c9fc4dab5af71173184aa20ed22fcb4ea8511ad25449"], + ["58a4fed801fbd8d92db9dfcb2e26b6ff10b120204243fee954d7dcb3b4b9b53380e7bb8fb60100000003006351ffffffff02a0795b050000000006536351ac6aac2718d00200000000075151acabac515354d21ba1", "005363515351", 0, -1322430665, "bbee941bbad950424bf40e3623457db47f60ed29deaa43c99dec702317cb3326"], + ["32765a0b02e455793d9ce530e9f6a44bcbc612e893a875b5da61d822dc56d8245166c398b403000000085353abac6300006a6bdee2a78d0d0b6a5ea666eed70b9bfea99d1d612ba3878f615c4da10d4a521cba27155002000000035363abffffffff043cd42401000000000551656a53653685320100000000030000511881bc0500000000065165abab636a20169f010000000007acab656aac63acdb0706a8", "65ac53ab53", 0, 1936499176, "5c5a9c3a5de7dc7a82bc171c9d3505913b8bcc450bc8b2d11772c1a1d781210b"], + ["17fad0d303da0d764fedf9f2887a91ea625331b28704940f41e39adf3903d8e75683ef6d46020000000151ffffffffff376eea4e880bcf0f03d33999104aafed2b3daf4907950bb06496af6b51720a020000000900636a63525253525196521684f3b08497bad2c660b00b43a6a517edc58217876eb5e478aa3b5fda0f29ee1bea00000000046aacab6affffffff03dde8e2050000000007ac5365ac51516a14772e000000000005630000abacbbb360010000000006ab5251ab656a50f180f0", "0053", 0, -1043701251, "a3bdf8771c8990971bff9b4e7d59b7829b067ed0b8d3ac1ec203429811384668"], + ["236c32850300045e292c84ede2b9ab5733ba08315a2bb09ab234c4b4e8894808edbdac0d3b020000000653635363abacffffffffd3f696bb31fdd18a72f3fc2bb9ae54b416a253fc37c1a0f0180b52d35bad49440100000004650053abffffffffa85c75a2406d82a93b12e555b66641c1896a4e83ae41ef1038218311e38ace060200000006abab006a51ac104b5e6701e2842c04000000000800630051ac0000ab00000000", "ab63ac6a516a", 1, -1709887524, "8c29ea8ef60c5a927fccdba8ea385db6b6b84d98e891db45f5d4ee3148d3f5a7"], + ["b78d5fd601345f3100af494cdf447e7d4076179f940035b0ebe8962587d4d0c9c6c9fc34ee0300000003516a6affffffff03dc5c890100000000085353ac53ac6a52534ac941040000000007ac63656a51ab51d4266b0100000000036aacac70731f2d", "005351ab0053", 0, -1789071265, "d5f1c1cb35956a5711d67bfb4cedbc67e77c089b912d688ad440ff735adb390d"], + ["5a2257df03554550b774e677f348939b37f8e765a212e566ce6b60b4ea8fed4c9504b7f7d1000000000653655265ab5258b67bb931df15b041177cf9599b0604160b79e30f3d7a594e7826bae2c29700f6d8f8f40300000005515300ac6a159cf8808a41f504eb5c2e0e8a9279f3801a5b5d7bc6a70515fbf1c5edc875bb4c9ffac500000000050063510052ffffffff0422a90105000000000965006a650000516a006417d2020000000006526363ab00524d969d0100000000035153acc4f077040000000005ac5200636500000000", "6a52", 1, -1482463464, "37b794b05d0687c9b93d5917ab068f6b2f0e38406ff04e7154d104fc1fb14cdc"], + ["e0032ad601269154b3fa72d3888a3151da0aed32fb2e1a15b3ae7bee57c3ddcffff76a1321010000000100110d93ae03f5bd080100000000075263516a6551002871e60100000000046a005252eaa753040000000004ab6aab526e325c71", "630052", 0, -1857873018, "ea117348e94de86381bb8ad1c7f93b8c623f0272104341701bb54e6cb433596c"], + ["014b2a5304d46764817aca180dca50f5ab25f2e0d5749f21bb74a2f8bf6b8b7b3fa8189cb7030000000965ac5165ab6a51ac6360ecd91e8abc7e700a4c36c1a708a494c94bb20cbe695c408543146566ab22be43beae9103000000045163ab00ffffffffffa48066012829629a9ec06ccd4905a05df0e2b745b966f6a269c9c8e13451fc00000000026565ffffffffc40ccadc21e65fe8a4b1e072f4994738ccaf4881ae6fede2a2844d7da4d199ab02000000065152ab536aabffffffff01b6e054030000000004515352ab3e063432", "", 0, 1056459916, "a7aff48f3b8aeb7a4bfe2e6017c80a84168487a69b69e46681e0d0d8e63a84b6"], + ["c4ef04c103c5dde65410fced19bf6a569549ecf01ceb0db4867db11f2a3a3eef0320c9e8e001000000085100536a53516aabffffffff2a0354fa5bd96f1e28835ffe30f52e19bd7d5150c687d255021a6bec03cf4cfd03000000056a006300514900c5b01d3d4ae1b97370ff1155b9dd0510e198d266c356d6168109c54c11b4c283dca00300000002ababffffffff02e19e3003000000000451655351fa5c0003000000000163ef1fc64b", "51636a51ab630065", 1, -1754709177, "0a281172d306b6a32e166e6fb2a2cc52c505c5d60ea448e9ba7029aa0a2211e1"], + ["29083fe00398bd2bb76ceb178f22c51b49b5c029336a51357442ed1bac35b67e1ae6fdf13100000000066a6500acab51ffffffffe4ca45c9dc84fd2c9c47c7281575c2ba4bf33b0b45c7eca8a2a483f9e3ebe4b3010000000200abffffffffdf47ad2b8c263fafb1e3908158b18146357c3a6e0832f718cd464518a219d18303000000096352ac656351ac0052daddfb3b0231c36f00000000000400526a5275c7e0020000000001ab00000000", "acab536aac52", 2, 300802386, "82ebc07b16cff0077e9c1a279373185b3494e39d08fd3194aae6a4a019377509"], + ["1201ab5d04f89f07c0077abd009762e59db4bb0d86048383ba9e1dad2c9c2ad96ef660e6d00200000007ab6a65ac5200652466fa5143ab13d55886b6cdc3d0f226f47ec1c3020c1c6e32602cd3428aceab544ef43e00000000086a6a6a526a6a5263ffffffffd5be0b0be13ab75001243749c839d779716f46687e2e9978bd6c9e2fe457ee48020000000365abab1e1bac0f72005cf638f71a3df2e3bbc0fa35bf00f32d9c7dc9c39a5e8909f7d53170c8ae0200000008ab6a51516363516affffffff02f0a6210500000000036300ac867356010000000009acab65ac6353536a659356d367", "ac53535252", 0, 917543338, "418acc156c2bc76a5d7baa58db29f1b4cf6c266c9222ed167ef5b4d47f0e0f41"], + ["344fa11e01c19c4dd232c77742f0dd0aeb3695f18f76da627628741d0ee362b0ea1fb3a2180200000007635151005100529bab25af01937c1f0500000000055153ab53656e7630af", "6351005163ac51", 0, -629732125, "228ca52a0a376fe0527a61cfa8da6d7baf87486bba92d49dfd3899cac8a1034f"], + ["b2fda1950191358a2b855f5626a0ebc830ab625bea7480f09f9cd3b388102e35c0f303124c030000000565ac65ab53ffffffff03f9c5ec04000000000765ab51516551650e2b9f0500000000045365525284e8f6040000000001ac00000000", "ac51655253", 0, 1433027632, "d2fa7e13c34cecda5105156bd2424c9b84ee0a07162642b0706f83243ff811a8"], + ["a4a6bbd201aa5d882957ac94f2c74d4747ae32d69fdc765add4acc2b68abd1bdb8ee333d6e0300000008516a6552515152abffffffff02c353cb040000000007ac6351ab51536588bd320500000000066552525253ac00000000", "", 0, 1702060459, "499da7d74032388f820645191ac3c8d20f9dba8e8ded7fa3a5401ea2942392a1"], + ["584e8d6c035a6b2f9dac2791b980a485994bf38e876d9dda9b77ad156eee02fa39e19224a60300000003ab636529db326cc8686a339b79ab6b6e82794a18e0aabc19d9ad13f31dee9d7aad8eff38288588020000000452530052ffffffff09a41f07755c16cea1c7e193c765807d18cadddca6ec1c2ed7f5dcdca99e90e80000000001acffffffff01cba62305000000000451ac63acccdf1f67", "ab536a6363", 2, -27393461, "1125645b49202dca2df2d76dae51877387903a096a9d3f66b5ac80e042c95788"], + ["83a583d204d926f2ee587a83dd526cf1e25a44bb668e45370798f91a2907d184f7cddcbbc7030000000700ab6565536a539f71d3776300dffdfa0cdd1c3784c9a1f773e34041ca400193612341a9c42df64e3f550e01000000050052515251ffffffff52dab2034ab0648553a1bb8fc4e924b2c89ed97c18dfc8a63e248b454035564b01000000015139ab54708c7d4d2c2886290f08a5221cf69592a810fd1979d7b63d35c271961e710424fd0300000005ac65ac5251ffffffff01168f7c030000000000a85e5fb0", "6a536353656a00", 0, 179595345, "5350a31ac954a0b49931239d0ecafbf34d035a537fd0c545816b8fdc355e9961"], + ["ffd35d51042f290108fcb6ea49a560ba0a6560f9181da7453a55dfdbdfe672dc800b39e7320200000006630065516a65f2166db2e3827f44457e86dddfd27a8af3a19074e216348daa0204717d61825f198ec0030100000006ab51abab00abffffffffdf41807adb7dff7db9f14d95fd6dc4e65f8402c002d009a3f1ddedf6f4895fc8030000000500ab006a65a5a848345052f860620abd5fcd074195548ce3bd0839fa9ad8642ed80627bf43a0d47dbd010000000765ab006a656a53b38cdd6502a186da05000000000765ab00ab006a53527c0e0100000000085365ab51acacac52534bd1b1", "6a635253ac0000", 0, 1095082149, "3c05473a816621a3613f0e903faa1a1e44891dd40862b029e41fc520776350fa"], + ["6c9a4b98013c8f1cae1b1df9f0f2de518d0c50206a0ab871603ac682155504c0e0ce946f460100000000ffffffff04e9266305000000000753535100ac6aacded39e04000000000365ac6ab93ccd010000000002515397bf3d050000000003ab636300000000", "63520052ac656353", 0, -352633155, "936eff8cdfd771be24124da87c7b24feb48da7cbc2c25fb5ba13d1a23255d902"], + ["e01dc7f0021dc07928906b2946ca3e9ac95f14ad4026887101e2d722c26982c27dc2b59fdb0000000005ac5200516ab5a31ffadcbe74957a5a3f97d7f1475cc6423fc6dbc4f96471bd44c70cc736e7dec0d1ea020000000951636a526a52abac53ffffffff04bc2edd05000000000252ab528c7b02000000000952ac51526500525353324820040000000002005380c713000000000009630065ab00ac525252451bbb48", "53ab65ac", 0, -552384418, "69c0b30f4c630a6c878fde6ea6b74dae94f4eb3bcfbde2dc3649e1a9ada00757"], + ["009046a1023f266d0113556d604931374d7932b4d6a7952d08fbd9c9b87cbd83f4f4c178b4030000000452ac526346e73b438c4516c60edd5488023131f07acb5f9ea1540b3e84de92f4e3c432289781ea4900000000046500655357dfd6da02baef910100000000026a007d101703000000000800516500abacac5100000000", "6aab6553ac", 0, -802456605, "f8757fbb4448ca34e0cd41b997685b37238d331e70316659a9cc9087d116169d"], + ["df76ec0801a3fcf3d18862c5f686b878266dd5083f16cf655facab888b4cb3123b3ce5db7e01000000010010e7ac6a0233c83803000000000365ac51faf14a040000000004ac51655100000000", "6353acab", 0, 15705861, "e7d873aa079a19ec712b269a37d2670f60d8cb334c4f97e2e3fd10eeb8ee5f5e"], + ["828fd3e0031084051ccef9cfdd97fae4d9cc50c0dae36bd22a3ff332881f17e9756c3e288e0200000004ab535363961a2ccccaf0218ec6a16ba0c1d8b5e93cfd025c95b6e72bc629ec0a3f47da7a4c396dad01000000025353ffffffff19ad28747fb32b4caf7b5dbd9b2da5a264bedb6c86d3a4805cd294ae53a86ac40200000009ab53535351ab6551abffffffff04a41650030000000005656aab6aab8331a304000000000700516365ac516a0d2a47010000000007abac516353abacdebc19040000000006ab5300636a6300000000", "51ab52ab53ac52", 0, 1866105980, "311094b4d73e31aefc77e97859ef07ca2f07a7b7e4d7def80c69d3f5d58527e5"], + ["c4b80f850323022205b3e1582f1ed097911a81be593471a8dce93d5c3a7bded92ef6c7c1260100000002006affffffff70294d62f37c3da7c5eae5d67dce6e1b28fedd7316d03f4f48e1829f78a88ae801000000096a5200530000516351f6b7b544f7c39189d3a2106ca58ce4130605328ce7795204be592a90acd81bef517d6f170200000000ffffffff012ab8080000000000075100006365006335454c1e", "53ac6a536aacac", 0, -1124103895, "06277201504e6bf8b8c94136fad81b6e3dadacb9d4a2c21a8e10017bfa929e0e"], + ["8ab69ed50351b47b6e04ac05e12320984a63801716739ed7a940b3429c9c9fed44d3398ad40300000006536a516a52638171ef3a46a2adb8025a4884b453889bc457d63499971307a7e834b0e76eec69c943038a0300000000ffffffff566bb96f94904ed8d43d9d44a4a6301073cef2c011bf5a12a89bedbaa03e4724030000000265acb606affd01edea38050000000008515252516aacac6300000000", "65000000006365ac53", 0, -1338942849, "7912573937824058103cb921a59a7f910a854bf2682f4116a393a2045045a8c3"], + ["2484991e047f1cf3cfe38eab071f915fe86ebd45d111463b315217bf9481daf0e0d10902a402000000006e71a424eb1347ffa638363604c0d5eccbc90447ff371e000bf52fc743ec832851bb564a0100000001abffffffffef7d014fad3ae7927948edbbb3afe247c1bcbe7c4c8f5d6cf97c799696412612020000000851536a5353006a001dfee0d7a0dd46ada63b925709e141863f7338f34f7aebde85d39268ae21b77c3068c01d0000000008535151ab00636563ffffffff018478070200000000095200635365ac52ab5341b08cd3", "", 3, 265623923, "24cb420a53b4f8bb477f7cbb293caabfd2fc47cc400ce37dbbab07f92d3a9575"], + ["54839ef9026f65db30fc9cfcb71f5f84d7bb3c48731ab9d63351a1b3c7bc1e7da22bbd508e0300000000442ad138f170e446d427d1f64040016032f36d8325c3b2f7a4078766bdd8fb106e52e8d20000000003656500ffffffff02219aa101000000000851ababac52ab00659646bd02000000000552acacabac24c394a5", "ac", 0, 906807497, "69264faadcd1a581f7000570a239a0a26b82f2ad40374c5b9c1f58730514de96"], + ["5036d7080434eb4eef93efda86b9131b0b4c6a0c421e1e5feb099a28ff9dd8477728639f77030000000951516aab535152ab5391429be9cce85d9f3d358c5605cf8c3666f034af42740e94d495e28b9aaa1001ba0c87580300000008006552ab00ab006affffffffd838978e10c0c78f1cd0a0830d6815f38cdcc631408649c32a25170099669daa0000000002acab8984227e804ad268b5b367285edcdf102d382d027789250a2c0641892b480c21bf84e3fb0100000000b518041e023d8653010000000001004040fb0100000000080051ac5200636a6300000000", "52ac", 0, 366357656, "bd0e88829afa6bdc1e192bb8b2d9d14db69298a4d81d464cbd34df0302c634c6"], + ["9ad5ccf503fa4facf6a27b538bc910cce83c118d6dfd82f3fb1b8ae364a1aff4dcefabd38f03000000096365655263ac655300807c48130c5937190a996105a69a8eba585e0bd32fadfc57d24029cbed6446d30ebc1f100100000004000053650f0ccfca1356768df7f9210cbf078a53c72e0712736d9a7a238e0115faac0ca383f219d0010000000600ab536552002799982b0221b8280000000000000c41320000000000086552ac6365636a6595f233a3", "6a5152", 2, 553208588, "f99c29a79f1d73d2a69c59abbb5798e987639e36d4c44125d8dc78a94ddcfb13"], + ["669538a204047214ce058aed6a07ca5ad4866c821c41ac1642c7d63ed0054f84677077a84f030000000853abacab6a655353ffffffff70c2a071c115282924e3cb678b13800c1d29b6a028b3c989a598c491bc7c76c5030000000752ac52ac5163ac80420e8a6e43d39af0163271580df6b936237f15de998e9589ec39fe717553d415ac02a4030000000463635153184ad8a5a4e69a8969f71288c331aff3c2b7d1b677d2ebafad47234840454b624bf7ac1d03000000056a63abab63df38c24a02fbc63a040000000002ab535ec3dc050000000002536500000000", "635153", 3, -190399351, "9615541884dfb1feeb08073a6a6aa73ef694bc5076e52187fdf4138a369f94d9"], + ["a7f139e502af5894be88158853b7cbea49ba08417fbbca876ca6614b5a41432be34499987b000000000765635165abac63ffffffff8b8d70e96c7f54eb70da0229b548ced438e1ca2ba5ddd648a027f72277ee1efc0100000001abffffffff044f2c4204000000000165e93f550100000000050000526a6a94550304000000000365536aadc21c0300000000016300000000", "6aacac6363ab5265ac", 1, 2143189425, "6e3f97955490d93d6a107c18d7fe402f1cada79993bb0ff0d096357261b3a724"], + ["3b94438f0366f9f53579a9989b86a95d134256ce271da63ca7cd16f7dd5e4bffa17d35133f010000000100ffffffff1aaad0c721e06ec00d07e61a84fb6dc840b9a968002ce7e142f943f06fd143a10100000008535151ac51ab0053b68b8e9c672daf66041332163e04db3f6048534bd718e1940b3fc3811c4eef5b7a56888b01000000001d58e38c012e38e700000000000852ab53ac6365536a00000000", "ab655352", 1, -935223304, "b3b336de141d4f071313a2207b2a0c7cf54a070dd8d234a511b7f1d13e23b0c4"], + ["e5dca8a20456de0a67e185fa6ea94085ceae478d2c15c73cb931a500db3a1b6735dd1649ec0200000005ab536aabab32d11bbdcb81361202681df06a6b824b12b5cb40bb1a672cf9af8f2a836e4d95b7839327030000000951005365ab65abacabb345085932939eef0c724adef8a57f9e1bf5813852d957c039b6a12d9c2f201ea520fb030000000009ac5352005165acac6a5efc6072f1a421dc7dc714fc6368f6d763a5d76d0278b95fc0503b9268ccfadb48213a2500000000026a53ffffffff039ee1c4020000000009ac5353ab6353535163184018000000000005655265526a9a4a8a050000000001ac00000000", "65ab53ab6a00ab6553", 2, 1902561212, "7928ae8e86c0b0cad1b2c120ea313087437974382ee6d46443ca5ac3f5878b88"], + ["972128b904e7b673517e96e98d80c0c8ceceae76e2f5c126d63da77ffd7893fb53308bb2da0300000006ac6552ab52acffffffff4cac767c797d297c079a93d06dc8569f016b4bf7a7d79b605c526e1d36a40e2202000000095365ab636aac6a6a6a69928d2eddc836133a690cfb72ec2d3115bf50fb3b0d10708fa5d2ebb09b4810c426a1db01000000060052526300001e8e89585da7e77b2dd2e30625887f0660accdf29e53a614d23cf698e6fc8ab03310e87700000000076a520051acac6555231ddb0330ec2d03000000000200abfaf457040000000004ab6a6352bdc42400000000000153d6dd2f04", "", 0, 209234698, "4a92fec1eb03f5bd754ee9bfd70707dc4420cc13737374f4675f48529be518e4"], + ["1fb4085b022c6cfb848f8af7ba3ba8d21bd23ffa9f0bfd181cb68bcaaf2074e66d4974a31602000000090000006a6a6500acab6c12c07d9f3dbd2d93295c3a49e3757119767097e7fd5371f7d1ba9ba32f1a67a5a426f00000000000ffffffff018fd2fc04000000000363ac5100000000", "65ab006a6aab526a", 0, 1431502299, "8b7dd0ff12ca0d8f4dbf9abf0abba00e897c2f6fd3b92c79f5f6a534e0b33b32"], + ["5374f0c603d727f63006078bd6c3dce48bd5d0a4b6ea00a47e5832292d86af258ea0825c260000000009655353636352526a6af2221067297d42a9f8933dfe07f61a574048ff9d3a44a3535cd8eb7de79fb7c45b6f47320200000003ac006affffffff153d917c447d367e75693c5591e0abf4c94bbdd88a98ab8ad7f75bfe69a08c470200000005ac65516365ffffffff037b5b7b000000000001515dc4d904000000000004bb26010000000004536a6aac00000000", "516552516352ac", 2, 328538756, "8bb7a0129eaf4b8fc23e911c531b9b7637a21ab11a246352c6c053ff6e93fcb6"], + ["c441132102cc82101b6f31c1025066ab089f28108c95f18fa67db179610247086350c163bd010000000651525263ab00ffffffff9b8d56b1f16746f075249b215bdb3516cbbe190fef6292c75b1ad8a8988897c3000000000751ab6553abab00ffffffff02f9078b000000000009ab0053ac51ac00ab51c0422105000000000651006563525200000000", "ac51", 0, -197051790, "55acd8293ed0be6792150a3d7ced6c5ccd153ca7daf09cee035c1b0dac92bb96"], + ["ab82ad3b04545bd86b3bb937eb1af304d3ef1a6d1343ed809b4346cafb79b7297c09e1648202000000086351ac5200535353ffffffff95d32795bbaaf5977a81c2128a9ec0b3c7551b9b1c3d952876fcb423b2dfb9e80000000005515363acac47a7d050ec1a603627ce6cd606b3af314fa7964abcc579d92e19c7aba00cf6c3090d6d4601000000056a516551633e794768bfe39277ebc0db18b5afb5f0c8117dde9b4dfd5697e9027210eca76a9be20d63000000000700520063ab6aacffffffff01ec2ddc050000000008ac52ac65ac65ac5100000000", "536300abab", 1, -2070209841, "b362da5634f20be7267de78b545d81773d711b82fe9310f23cd0414a8280801d"], + ["8bff9d170419fa6d556c65fa227a185fe066efc1decf8a1c490bc5cbb9f742d68da2ab7f320100000007ab000053525365a7a43a80ab9593b9e8b6130a7849603b14b5c9397a190008d89d362250c3a2257504eb810200000007acabacac00ab51ee141be418f003e75b127fd3883dbf4e8c3f6cd05ca4afcaac52edd25dd3027ae70a62a00000000008ac52526a5200536affffffffb8058f4e1d7f220a1d1fa17e96d81dfb9a304a2de4e004250c9a576963a586ae0300000005abacac5363b9bc856c039c01d804000000000951656aac53005365acb0724e00000000000565abab63acea7c7a0000000000036a00ac00000000", "6565", 1, -1349282084, "2b822737c2affeefae13451d7c9db22ff98e06490005aba57013f6b9bbc97250"], + ["0e1633b4041c50f656e882a53fde964e7f0c853b0ada0964fc89ae124a2b7ffc5bc97ea6230100000006ac6aacacabacffffffff2e35f4dfcad2d53ea1c8ada8041d13ea6c65880860d96a14835b025f76b1fbd9000000000351515121270867ef6bf63a91adbaf790a43465c61a096acc5a776b8e5215d4e5cd1492e611f761000000000600ac6aab5265ffffffff63b5fc39bcac83ca80ac36124abafc5caee608f9f63a12479b68473bd4bae769000000000965ac52acac5263acabffffffff0163153e020000000008ab005165ab65515300000000", "6a6aac00", 0, -968477862, "20732d5073805419f275c53784e78db45e53332ee618a9fcf60a3417a6e2ca69"], + ["2b052c24022369e956a8d318e38780ef73b487ba6a8f674a56bdb80a9a63634c6110fb5154010000000251acffffffff48fe138fb7fdaa014d67044bc05940f4127e70c113c6744fbd13f8d51d45143e01000000005710db3804e01aa9030000000008acac6a516a5152abfd55aa01000000000751ab510000ac636d6026010000000000b97da9000000000000fddf3b53", "006552", 0, 595461670, "685d67d84755906d67a007a7d4fa311519467b9bdc6a351913246a41e082a29f"], + ["073bc856015245f03b2ea2da62ccedc44ecb99e4250c7042f596bcb23b294c9dc92cfceb6b02000000095163abab52abab636afe292fb303b7c3f001000000000352636af3c49502000000000400ac6a535851850100000000066aac6553ab6500000000", "ab6aab53006aab52", 0, 247114317, "123916c6485cf23bfea95654a8815fbf04ce4d21a3b7f862805c241472906658"], + ["7888b71403f6d522e414d4ca2e12786247acf3e78f1918f6d727d081a79813d129ee8befce0100000009ab516a6353ab6365abffffffff4a882791bf6400fda7a8209fb2c83c6eef51831bdf0f5dacde648859090797ec030000000153ffffffffbb08957d59fa15303b681bad19ccf670d7d913697a2f4f51584bf85fcf91f1f30200000008526565ac52ac63acffffffff0227c0e8050000000001ac361dc801000000000800515165ab00ab0000000000", "656a", 2, 1869281295, "f43378a0b7822ad672773944884e866d7a46579ee34f9afc17b20afc1f6cf197"], + ["cc4dda57047bd0ca6806243a6a4b108f7ced43d8042a1acaa28083c9160911cf47eab910c40200000007526a0000ab6a63e4154e581fcf52567836c9a455e8b41b162a78c85906ccc1c2b2b300b4c69caaaa2ba0230300000008ab5152ac5100ab65ffffffff69696b523ed4bd41ecd4d65b4af73c9cf77edf0e066138712a8e60a04614ea1c0300000004ab6a000016c9045c7df7836e05ac4b2e397e2dd72a5708f4a8bf6d2bc36adc5af3cacefcf074b8b403000000065352ac5252acffffffff01d7e380050000000000cf4e699a", "525163656351", 1, -776533694, "ff18c5bffd086e00917c2234f880034d24e7ea2d1e1933a28973d134ca9e35d2"], + ["b7877f82019c832707a60cf14fba44cfa254d787501fdd676bd58c744f6e951dbba0b3b77f0200000009ac515263ac53525300a5a36e500148f89c0500000000085265ac6a6a65acab00000000", "6563", 0, -1785108415, "cb6e4322955af12eb29613c70e1a00ddbb559c887ba844df0bcdebed736dffbd"], + ["aeb14046045a28cc59f244c2347134d3434faaf980961019a084f7547218785a2bd03916f3000000000165f852e6104304955bda5fa0b75826ee176211acc4a78209816bbb4419feff984377b2352200000000003a94a5032df1e0d60390715b4b188c330e4bb7b995f07cdef11ced9d17ee0f60bb7ffc8e0100000002516513e343a5c1dc1c80cd4561e9dddad22391a2dbf9c8d2b6048e519343ca1925a9c6f0800a020000000665516365ac513180144a0290db27000000000006ab655151ab5138b187010000000007ab5363abac516a9e5cd98a", "53ac", 0, 478591320, "e8d89a302ae626898d4775d103867a8d9e81f4fd387af07212adab99946311ef"], + ["c9270fe004c7911b791a00999d108ce42f9f1b19ec59143f7b7b04a67400888808487bd59103000000066a0052ac6565b905e76687be2dd7723b22c5e8269bc0f2000a332a289cfc40bc0d617cfe3214a61a85a30300000007ac63ac00635251560871209f21eb0268f175b8b4a06edd0b04162a974cf8b5dada43e499a1f22380d35ede0300000000792213fc58b6342cc8100079f9f5f046fb89f2d92cf0a2cb6d07304d32d9da858757037c0000000008abab51636565516affffffff02c72a8b03000000000452acac530dfb9f05000000000096f94307", "5253ab536351", 3, 543688436, "0278adbcc476d135493ae9bdcd7b3c2002df17f2d81c17d631c50c73e546c264"], + ["57a5a04c0278c8c8e243d2df4bb716f81d41ac41e2df153e7096f5682380c4f441888d9d260300000004ab63ab6afdbe4203525dff42a7b1e628fe22bccaa5edbb34d8ab02faff198e085580ea5fcdb0c61b0000000002ac6affffffff03375e6c05000000000663ab516a6a513cb6260400000000007ca328020000000006516a636a52ab94701cc7", "0053ac5152", 0, -550925626, "b7ca991ab2e20d0158168df2d3dd842a57ab4a3b67cca8f45b07c4b7d1d11126"], + ["072b75a504ad2550c2e9a02614bc9b2a2f50b5b553af7b87c0ef07c64ddc8d8934c96d216401000000036aabaca1387242a5bcd21099b016ad6045bed7dce603472757d9822cc5f602caa4ae20414d378b02000000026a63e4ac816734acdc969538d6f70b8ab43a2589f55e0177a4dc471bdd0eb61d59f0f46f6bb801000000065351526aab52d9f2977be76a492c3a7617b7a16dc29a3b0a7618f328c2f7d4fd9bafe760dc427a5066ef000000000465635165ffffffff02c5793600000000000165296820050000000002ac6300000000", "53006a6aac0052ab", 2, 66084636, "437e89bb6f70fd2ed2feef33350b6f6483b891305e574da03e580b3efd81ae13"], + ["7e27c42d0279c1a05eeb9b9faedcc9be0cab6303bde351a19e5cbb26dd0d594b9d74f40d2b020000000200518c8689a08a01e862d5c4dcb294a2331912ff11c13785be7dce3092f154a005624970f84e0200000000500cf5a601e74c1f0000000000076aab52636a6a5200000000", "6500006a5351", 0, 449533391, "535ba819d74770d4d613ee19369001576f98837e18e1777b8246238ff2381dd0"], + ["11414de403d7f6c0135a9df01cb108c1359b8d4e105be50a3dcba5e6be595c8817217490b20000000003005263ffffffff0c6becb9c3ad301c8dcd92f5cbc07c8bed7973573806d1489316fc77a829da03030000000700005253535352ffffffff2346d74ff9e12e5111aa8779a2025981850d4bf788a48de72baa2e321e4bc9ca00000000056352acab63cc585b64045e0385050000000009ab5253ab516aacac00efa9cf0300000000065200635151acbe80330400000000070063635100ab000be159050000000007525300655300ac00000000", "51656a0051ab", 0, 683137826, "d4737f3b58f3e5081b35f36f91acde89dda00a6a09d447e516b523e7a99264d5"], + ["1c6b5f29033fc139338658237a42456123727c8430019ca25bd71c6168a9e35a2bf54538d80100000008536aac52ac6a6a52ffffffff3fb36be74036ff0c940a0247c451d923c65f826793d0ac2bb3f01ecbec8033290100000007ab000051ab6363ffffffff5d9eca0cf711685105bd060bf7a67321eaef95367acffab36ce8dedddd632ee2000000000652ac6a63ac517167319e032d26de040000000003516363dc38fb010000000000b37b00000000000006ab520051ac534baba51f", "636300ababac6563", 0, -2049129935, "3282a2ec6b8c87c9303e6060c17b421687db1bd35fbfa0345b48f2490e15b6cc"], + ["978b9dad0214cfc7ce392d74d9dcc507350dc34007d72e4125861c63071ebf2cc0a6fd4856020000000651ac6a6aab52ffffffff47f20734e3370e733f87a6edab95a7a268ae44db7a8974e255614836b22938720200000008635265ac51516553ffffffff0137b2560100000000035252ac2f3363e9", "006aab6352", 1, 2014249801, "55611a5fb1483bce4c14c33ed15198130e788b72cd8929b2ceef4dd68b1806bf"], + ["442f1c8703ab39876153c241ab3d69f432ba6db4732bea5002be45c8ca10c3a2356fe0e9590300000001accb2b679cab7c58a660cb6d4b3452c21cd7251a1b77a52c300f655f5baeb6fa27ff5b79880300000003005252e5ccf55712bc8ed6179f6726f8a78f3018a7a0391594b7e286ef5ee99efdcde302a102cc0200000009006352526351536a63ffffffff04443f63030000000006536a63ab63651405fb020000000009ac535351525300ab6a9f172b000000000004ab535263ad5c50050000000008656a65ab630000ac00000000", "65636aab006552", 2, 2125838294, "b3ff10f21e71ebc8b25fe058c4074c42f08617e0dcc03f9e75d20539d3242644"], + ["2b3470dd028083910117f86614cdcfb459ee56d876572510be4df24c72e8f58c70d5f5948b03000000066aab65635265da2c3aac9d42c9baafd4b655c2f3efc181784d8cba5418e053482132ee798408ba43ccf90300000000ffffffff047dda4703000000000765516a52ac53009384a603000000000651636a63ab6a8cf57a03000000000352ab6a8cf6a405000000000952636a6a6565525100661e09cb", "ac520063ac6a6a52", 1, 1405647183, "9b360c3310d55c845ef537125662b9fe56840c72136891274e9fedfef56f9bb5"], + ["d74282b501be95d3c19a5d9da3d49c8a88a7049c573f3788f2c42fc6fa594f59715560b9b00000000009655353525265ac52ac9772121f028f8303030000000003510065af5f47040000000007ac516a6551630000000000", "acab53006363ac", 0, -1113209770, "2f482b97178f17286f693796a756f4d7bd2dfcdbecd4142528eec1c7a3e5101a"], + ["3a5644a9010f199f253f858d65782d3caec0ac64c3262b56893022b9796086275c9d4d097b02000000009d168f7603a67b30050000000007ac51536a0053acd9d88a050000000007655363535263ab3cf1f403000000000352ac6a00000000", "005363536565acac6a", 0, -1383947195, "6390ab0963cf611e0cea35a71dc958b494b084e6fd71d22217fdc5524787ade6"], + ["67b3cc43049d13007485a8133b90d94648bcf30e83ba174f5486ab42c9107c69c5530c5e1f0000000003005100ffffffff9870ebb65c14263282ea8d41e4f4f40df16b565c2cf86f1d22a9494cad03a67f01000000016a5a121bee5e359da548e808ae1ad6dfccae7c67cbb8898d811638a1f455a671e822f228ef030000000151c1fcc9f9825f27c0dde27ea709da62a80a2ff9f6b1b86a5874c50d6c37d39ae31fb6c8a0030000000163553b8786020ca74a00000000000665635153ab5275c0760000000000020052e659b05d", "636aab6a6a", 0, -342795451, "f77c3322c97b1681c17b1eba461fa27b07e04c1534e8aaf735a49cab72c7c2e2"], + ["bda1ff6804a3c228b7a12799a4c20917301dd501c67847d35da497533a606701ad31bf9d5e0300000001ac16a6c5d03cf516cd7364e4cbbf5aeccd62f8fd03cb6675883a0636a7daeb650423cb1291010000000500656553ac4a63c30b6a835606909c9efbae1b2597e9db020c5ecfc0642da6dc583fba4e84167539a8020000000865525353515200acffffffff990807720a5803c305b7da08a9f24b92abe343c42ac9e917a84e1f335aad785d00000000026a52ffffffff04981f20030000000001ab8c762200000000000253ab690b9605000000000151ce88b301000000000753526a6a51006500000000", "000052ac52530000", 1, -1809193140, "5299b0fb7fc16f40a5d6b337e71fcd1eb04d2600aefd22c06fe9c71fe0b0ba54"], + ["2ead28ff0243b3ab285e5d1067f0ec8724224402b21b9cef9be962a8b0d153d401be99bbee0000000004ac635153ffffffff6985987b7c1360c9fa8406dd6e0a61141709f0d5195f946da55ed83be4e3895301000000020053ffffffff016503d20500000000085251ac6a65656a6a00000000", "51abab", 1, 1723793403, "67483ee62516be17a2431a163e96fd88a08ff2ce8634a52e42c1bc04e30f3f8a"], + ["db4904e6026b6dd8d898f278c6428a176410d1ffbde75a4fa37cda12263108ccd4ca6137440100000007656a0000515263ffffffff1db7d5005c1c40da0ed17b74cf6b2a6ee2c33c9e0bacda76c0da2017dcac2fc70200000004abab6a53ffffffff0454cf2103000000000153463aef000000000009ab6a630065ab52636387e0ed050000000000e8d16f05000000000352ac63e4521b22", "", 1, 1027042424, "48315a95e49277ab6a2d561ee4626820b7bab919eea372b6bf4e9931ab221d04"], + ["dca31ad10461ead74751e83d9a81dcee08db778d3d79ad9a6d079cfdb93919ac1b0b61871102000000086500525365ab51ac7f7e9aed78e1ef8d213d40a1c50145403d196019985c837ffe83836222fe3e5955e177e70100000006525152525300ffffffff5e98482883cc08a6fe946f674cca479822f0576a43bf4113de9cbf414ca628060100000006ac53516a5253ffffffff07490b0b898198ec16c23b75d606e14fa16aa3107ef9818594f72d5776805ec502000000036a0052ffffffff01932a2803000000000865ab6551ac6a516a2687aa06", "635300ac", 2, -1880362326, "74d6a2fa7866fd8b74b2e34693e2d6fd690410384b7afdcd6461b1ae71d265ce"], + ["e14e1a9f0442ab44dfc5f6d945ad1ff8a376bc966aad5515421e96ddbe49e529614995cafc03000000055165515165fffffffff97582b8290e5a5cfeb2b0f018882dbe1b43f60b7f45e4dd21dbd3a8b0cfca3b0200000000daa267726fe075db282d694b9fee7d6216d17a8c1f00b2229085495c5dc5b260c8f8cd5d000000000363ac6affffffffaab083d22d0465471c896a438c6ac3abf4d383ae79420617a8e0ba8b9baa872b010000000963526563ac5363ababd948b5ce022113440200000000076a636552006a53229017040000000000e6f62ac8", "526353636a65", 3, -485265025, "1bc8ad76f9b7c366c5d052dc479d6a8a2015566d3a42e93ab12f727692c89d65"], + ["720d4693025ca3d347360e219e9bc746ef8f7bc88e8795162e5e2f0b0fc99dc17116fc937100000000046353520045cb1fd79824a100d30b6946eab9b219daea2b0cdca6c86367c0c36af98f19ac64f3575002000000008a1c881003ed16f3050000000008536a63630000abac45e0e704000000000151f6551a05000000000963536565515363abab00000000", "6553ab6a6a510000ab", 1, 1249091393, "a575fa4f59a8e90cd07de012c78fe8f981183bb170b9c50fcc292b8c164cbc3b"], + ["69df842a04c1410bfca10896467ce664cfa31c681a5dac10106b34d4b9d4d6d0dc1eac01c1000000000551536a5165269835ca4ad7268667b16d0a2df154ec81e304290d5ed69e0069b43f8c89e673328005e200000000076a5153006aacabffffffffc9314bd80b176488f3d634360fcba90c3a659e74a52e100ac91d3897072e3509010000000765abac51636363ffffffff0e0768b13f10f0fbd2fa3f68e4b4841809b3b5ba0e53987c3aaffcf09eee12bf0300000008ac535263526a53ac514f4c2402da8fab0400000000001ef15201000000000451526a52d0ec9aca", "525365ac52", 1, 313967049, "a72a760b361af41832d2c667c7488dc9702091918d11e344afc234a4aea3ec44"], + ["adf2340d03af5c589cb5d28c06635ac07dd0757b884d4777ba85a6a7c410408ad5efa8b19001000000045100ab00ffffffff808dc0231c96e6667c04786865727013922bcb7db20739b686f0c17f5ba70e8f0300000000fd2332a654b580881a5e2bfec8313f5aa878ae94312f37441bf2d226e7fc953dcf0c77ab000000000163aa73dc580412f8c2050000000005636aacac63da02d502000000000153e74b52020000000001536b293d030000000009636552ababacab526500000000", "000052ab52ababab", 0, -568651175, "2c45d021db545df7167ac03c9ee56473f2398d9b2b739cf3ff3e074501d324f8"], + ["e4fec9f10378a95199c1dd23c6228732c9de0d7997bf1c83918a5cfd36012476c0c3cba24002000000085165536500ac0000ad08ab93fb49d77d12a7ccdbb596bc5110876451b53a79fdce43104ff1c316ad63501de801000000046a6352ab76af9908463444aeecd32516a04dd5803e02680ed7f16307242a794024d93287595250f4000000000089807279041a82e603000000000200521429100200000000055253636a63f20b940400000000004049ed04000000000500ab5265ab43dfaf7d", "6563526aac", 2, -1923470368, "32f3c012eca9a823bebb9b282240aec40ca65df9f38da43b1dcfa0cac0c0df7e"], + ["4000d3600100b7a3ff5b41ec8d6ccdc8b2775ad034765bad505192f05d1f55d2bc39d0cbe10100000007ab5165ac6a5163ffffffff034949150100000000026a6a92c9f6000000000008ab6553ab6aab635200e697040000000007636a5353525365237ae7d2", "52000063", 0, -880046683, "c76146f68f43037289aaeb2bacf47408cddc0fb326b350eb4f5ef6f0f8564793"], + ["eabc0aa701fe489c0e4e6222d72b52f083166b49d63ad1410fb98caed027b6a71c02ab830c03000000075253ab63530065ffffffff01a5dc0b05000000000253533e820177", "", 0, 954499283, "1d849b92eedb9bf26bd4ced52ce9cb0595164295b0526842ab1096001fcd31b1"], + ["d48d55d304aad0139783b44789a771539d052db565379f668def5084daba0dfd348f7dcf6b00000000006826f59e5ffba0dd0ccbac89c1e2d69a346531d7f995dea2ca6d7e6d9225d81aec257c6003000000096a655200ac656552acffffffffa188ffbd5365cae844c8e0dea6213c4d1b2407274ae287b769ab0bf293e049eb0300000005ac6a6aab51ad1c407c5b116ca8f65ed496b476183f85f072c5f8a0193a4273e2015b1cc288bf03e9e2030000000252abffffffff04076f44040000000006655353abab53be6500050000000003ac65ac3c15040500000000095100ab536353516a52ed3aba04000000000900ac53ab53636aabac00000000", "5253526563acac", 2, -1506108646, "bbee17c8582514744bab5df50012c94b0db4aff5984d2e13a8d09421674404e2"], + ["9746f45b039bfe723258fdb6be77eb85917af808211eb9d43b15475ee0b01253d33fc3bfc502000000065163006a655312b12562dc9c54e11299210266428632a7d0ee31d04dfc7375dcad2da6e9c11947ced0e000000000009074095a5ac4df057554566dd04740c61490e1d3826000ad9d8f777a93373c8dddc4918a00000000025351ffffffff01287564030000000004636a00ab00000000", "52", 2, -1380411075, "84af1623366c4db68d81f452b86346832344734492b9c23fbb89015e516c60b2"], + ["8731b64903d735ba16da64af537eaf487b57d73977f390baac57c7b567cb2770dfa2ef65870100000001635aedd990c42645482340eacb0bfa4a0a9e888057389c728b5b6a8691cdeb1a6a67b45e140200000008ac53526a52516551ffffffff45c4f567c47b8d999916fd49642cbc5d10d43c304b99e32d044d35091679cb860100000003006a51ffffffff0176d6c200000000000000000000", "ab6a65ab53", 2, -1221546710, "ccfdba36d9445f4451fb7cbf0752cc89c23d4fc6fff0f3930d20e116f9db0b95"], + ["f5cfc52f016209ab1385e890c2865a74e93076595d1ca77cbe8fbf2022a2f2061a90fb0f3e010000000253acffffffff027de73f0200000000085252ac510052acac49cd6a020000000000e6c2cb56", "516552535300ab63", 0, -1195302704, "5532717402a2da01a1da912d824964024185ca7e8d4ad1748659dc393a14182b"], + ["df0a32ae01c4672fd1abd0b2623aae0a1a8256028df57e532f9a472d1a9ceb194267b6ee190200000009536a6a51516a525251b545f9e803469a2302000000000465526500810631040000000000441f5b050000000006530051006aaceb183c76", "536a635252ac6a", 0, 1601138113, "9a0435996cc58bdba09643927fe48c1fc908d491a050abbef8daec87f323c58f"], + ["d102d10c028b9c721abb259fe70bc68962f6cae384dabd77477c59cbeb1fb26266e091ba3e0100000002516affffffffe8d7305a74f43e30c772109849f4cd6fb867c7216e6d92e27605e69a0818899700000000026a65ecf82d58027db4620500000000026552c28ed3010000000001ab00000000", "0051ab515365", 1, -131815460, "1d1757a782cb5860302128bcbe9398243124a2f82d671a113f74f8e582c7a182"], + ["cef930ed01c36fcb1d62ceef931bef57098f27a77a4299904cc0cbb44504802d535fb11557010000000153ffffffff02c8657403000000000863ac655253520063d593380400000000046aab536a00000000", "656a0051ab6365ab53", 0, -351313308, "e69dba3efb5c02af2ab1087d0a990678784671f4744d01ca097d71aec14dd8e9"], + ["b1c0b71804dff30812b92eefb533ac77c4b9fdb9ab2f77120a76128d7da43ad70c20bbfb990200000002536392693e6001bc59411aebf15a3dc62a6566ec71a302141b0c730a3ecc8de5d76538b30f55010000000665535252ac514b740c6271fb9fe69fdf82bf98b459a7faa8a3b62f3af34943ad55df4881e0d93d3ce0ac0200000000c4158866eb9fb73da252102d1e64a3ce611b52e873533be43e6883137d0aaa0f63966f060000000001abffffffff04a605b604000000000851006a656a630052f49a0300000000000252515a94e1050000000009abac65ab0052abab00fd8dd002000000000651535163526a2566852d", "ac5363", 0, -1718831517, "b0dc030661783dd9939e4bf1a6dfcba809da2017e1b315a6312e5942d714cf05"], + ["6a270ee404ebc8d137cfd4bb6b92aa3702213a3139a579c1fc6f56fbc7edd9574ef17b13f30100000009ab00ab656565ababacffffffffaa65b1ab6c6d87260d9e27a472edceb7dd212483e72d90f08857abf1dbfd46d10100000000fffffffff93c4c9c84c4dbbe8a912b99a2830cfe3401aebc919041de063d660e585fc9f002000000096aabacab52ac6a53acfa6dcef3f28355a8d98eee53839455445eeee83eecd2c854e784efa53cee699dbfecaebd0100000003ab6a51ffffffff04f7d71b050000000009ac6a536aac6a6365513c37650500000000065265abab6a53fa742002000000000039ed82030000000009516aac635165ab51ab2fdabd17", "ab535252526563", 1, -1326210506, "1dec0d5eb921bf5b2df39c8576e19c38d0c17254a4a0b78ac4b5422bcc426258"], + ["3657e4260304ccdc19936e47bdf058d36167ee3d4eb145c52b224eff04c9eb5d1b4e434dfc0000000001ab58aefe57707c66328d3cceef2e6f56ab6b7465e587410c5f73555a513ace2b232793a74400000000036a006522e69d3a785b61ad41a635d59b3a06b2780a92173f85f8ed428491d0aaa436619baa9c4501000000046351abab2609629902eb7793050000000000a1b967040000000003525353a34d6192", "516a", 0, -1761874713, "0a2ff41f6d155d8d0e37cd9438f3b270df9f9214cda8e95c76d5a239ca189df2"], + ["a0eb6dc402994e493c787b45d1f946d267b09c596c5edde043e620ce3d59e95b2b5b93d43002000000096a5252526aac63ab6555694287a279e29ee491c177a801cd685b8744a2eab83824255a3bcd08fc0e3ea13fb8820000000009abab6365ab52ab0063ffffffff029e424a040000000008acab53ab516a636a23830f0400000000016adf49c1f9", "ac0065ac6500005252", 1, 669294500, "e05e3d383631a7ed1b78210c13c2eb26564e5577db7ddfcea2583c7c014091d4"], + ["6e67c0d3027701ef71082204c85ed63c700ef1400c65efb62ce3580d187fb348376a23e9710200000001655b91369d3155ba916a0bc6fe4f5d94cad461d899bb8aaac3699a755838bfc229d6828920010000000765536353526a52ffffffff04c0c792000000000005650052535372f79e000000000001527fc0ee010000000005ac5300ab65d1b3e902000000000251aba942b278", "6a5151", 0, 1741407676, "e657e2c8ec4ebc769ddd3198a83267b47d4f2a419fc737e813812acefad92ff7"], + ["8f53639901f1d643e01fc631f632b7a16e831d846a0184cdcda289b8fa7767f0c292eb221a00000000046a53abacffffffff037a2daa01000000000553ac6a6a51eac349020000000005ac526552638421b3040000000007006a005100ac63048a1492", "ac65", 0, 1033685559, "da86c260d42a692358f46893d6f91563985d86eeb9ea9e21cd38c2d8ffcfcc4d"], + ["491f99cb01bdfba1aa235e5538dac081fae9ce55f9622de483afe7e65105c2b0db75d360d200000000045251636340b60f0f041421330300000000096351ac000051636553ce2822040000000005516a00ac5180c8e40300000000025100caa8570400000000020000cfdc8da6", "6a5100516aab655365", 0, -953727341, "397c68803b7ce953666830b0221a5e2bcf897aa2ded8e36a6b76c497dcb1a2e1"], + ["b3cad3a7041c2c17d90a2cd994f6c37307753fa3635e9ef05ab8b1ff121ca11239a0902e700300000009ab635300006aac5163ffffffffcec91722c7468156dce4664f3c783afef147f0e6f80739c83b5f09d5a09a57040200000004516a6552ffffffff969d1c6daf8ef53a70b7cdf1b4102fb3240055a8eaeaed2489617cd84cfd56cf020000000352ab53ffffffff46598b6579494a77b593681c33422a99559b9993d77ca2fa97833508b0c169f80200000009655300655365516351ffffffff04d7ddf800000000000853536a65ac6351ab09f3420300000000056aab65abac33589d04000000000952656a65655151acac944d6f0400000000006a8004ba", "005165", 1, 1035865506, "fe1dc9e8554deecf8f50c417c670b839cc9d650722ebaaf36572418756075d58"], + ["e1cfd73b0125add9e9d699f5a45dca458355af175a7bd4486ebef28f1928d87864384d02df02000000036a0051ffffffff0357df030100000000036a5365777e2d04000000000763ab6a00005265f434a601000000000351655100000000", "ab53ab", 0, -1936500914, "950f4b4f72ccdf8a6a0f381265d6c8842fdb7e8b3df3e9742905f643b2432b69"], + ["cf781855040a755f5ba85eef93837236b34a5d3daeb2dbbdcf58bb811828d806ed05754ab8010000000351ac53ffffffffda1e264727cf55c67f06ebcc56dfe7fa12ac2a994fecd0180ce09ee15c480f7d00000000096351516a51acac00ab53dd49ff9f334befd6d6f87f1a832cddfd826a90b78fd8cf19a52cb8287788af94e939d6020000000700525251ac526310d54a7e8900ed633f0f6f0841145aae7ee0cbbb1e2a0cae724ee4558dbabfdc58ba6855010000000552536a53abfd1b101102c51f910500000000096300656a525252656a300bee010000000009ac52005263635151abe19235c9", "53005365", 2, 1422854188, "d5981bd4467817c1330da72ddb8760d6c2556cd809264b2d85e6d274609fc3a3"], + ["fea256ce01272d125e577c0a09570a71366898280dda279b021000db1325f27edda41a53460100000002ab53c752c21c013c2b3a01000000000000000000", "65", 0, 1145543262, "076b9f844f6ae429de228a2c337c704df1652c292b6c6494882190638dad9efd"] +] diff --git a/src/test/getarg_tests.cpp b/src/test/getarg_tests.cpp index d76124885b..8cadcdd716 100644 --- a/src/test/getarg_tests.cpp +++ b/src/test/getarg_tests.cpp @@ -1,4 +1,6 @@ - +// Copyright (c) 2012-2013 The Bitcoin Core developers +// Distributed under the MIT/X11 software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. #include "util.h" diff --git a/src/test/hash_tests.cpp b/src/test/hash_tests.cpp index 28410f0fed..4568c8769b 100644 --- a/src/test/hash_tests.cpp +++ b/src/test/hash_tests.cpp @@ -1,4 +1,6 @@ - +// Copyright (c) 2013 The Bitcoin Core developers +// Distributed under the MIT/X11 software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. #include "hash.h" #include "util.h" diff --git a/src/test/hmac_tests.cpp b/src/test/hmac_tests.cpp index 68868866aa..780ce480ce 100644 --- a/src/test/hmac_tests.cpp +++ b/src/test/hmac_tests.cpp @@ -1,4 +1,6 @@ - +// Copyright (c) 2013 The Bitcoin Core developers +// Distributed under the MIT/X11 software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. #include "hash.h" #include "util.h" diff --git a/src/test/key_tests.cpp b/src/test/key_tests.cpp index 421ffeac45..864d90128c 100644 --- a/src/test/key_tests.cpp +++ b/src/test/key_tests.cpp @@ -1,3 +1,7 @@ +// Copyright (c) 2012-2013 The Bitcoin Core developers +// Distributed under the MIT/X11 software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + #include "key.h" #include "base58.h" diff --git a/src/test/main_tests.cpp b/src/test/main_tests.cpp index b7f4312cda..8863ba4004 100644 --- a/src/test/main_tests.cpp +++ b/src/test/main_tests.cpp @@ -1,3 +1,7 @@ +// Copyright (c) 2014 The Bitcoin Core developers +// Distributed under the MIT/X11 software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + #include "core.h" #include "main.h" @@ -8,7 +12,7 @@ BOOST_AUTO_TEST_SUITE(main_tests) BOOST_AUTO_TEST_CASE(subsidy_limit_test) { uint64_t nSum = 0; - for (int nHeight = 0; nHeight < 7000000; nHeight += 1000) { + for (int nHeight = 0; nHeight < 14000000; nHeight += 1000) { uint64_t nSubsidy = GetBlockValue(nHeight, 0); BOOST_CHECK(nSubsidy <= 50 * COIN); nSum += nSubsidy * 1000; diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp index d35137a663..b72ba0293f 100644 --- a/src/test/miner_tests.cpp +++ b/src/test/miner_tests.cpp @@ -1,4 +1,6 @@ - +// Copyright (c) 2011-2014 The Bitcoin Core developers +// Distributed under the MIT/X11 software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. #include "main.h" #include "miner.h" diff --git a/src/test/mruset_tests.cpp b/src/test/mruset_tests.cpp index 638c88fabe..60f11c147a 100644 --- a/src/test/mruset_tests.cpp +++ b/src/test/mruset_tests.cpp @@ -1,3 +1,7 @@ +// Copyright (c) 2012-2013 The Bitcoin Core developers +// Distributed under the MIT/X11 software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + #include "mruset.h" #include "util.h" diff --git a/src/test/multisig_tests.cpp b/src/test/multisig_tests.cpp index 772217b888..3775abd633 100644 --- a/src/test/multisig_tests.cpp +++ b/src/test/multisig_tests.cpp @@ -1,4 +1,6 @@ - +// Copyright (c) 2011-2013 The Bitcoin Core developers +// Distributed under the MIT/X11 software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. #include "key.h" #include "keystore.h" diff --git a/src/test/netbase_tests.cpp b/src/test/netbase_tests.cpp index 412ba04910..4321852d11 100644 --- a/src/test/netbase_tests.cpp +++ b/src/test/netbase_tests.cpp @@ -1,3 +1,7 @@ +// Copyright (c) 2012-2013 The Bitcoin Core developers +// Distributed under the MIT/X11 software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + #include "netbase.h" #include <string> @@ -89,7 +93,7 @@ BOOST_AUTO_TEST_CASE(netbase_lookupnumeric) BOOST_AUTO_TEST_CASE(onioncat_test) { - // values from http://www.cypherpunk.at/onioncat/wiki/OnionCat + // values from https://web.archive.org/web/20121122003543/http://www.cypherpunk.at/onioncat/wiki/OnionCat CNetAddr addr1("5wyqrzbvrdsumnok.onion"); CNetAddr addr2("FD87:D87E:EB43:edb1:8e4:3588:e546:35ca"); BOOST_CHECK(addr1 == addr2); diff --git a/src/test/pmt_tests.cpp b/src/test/pmt_tests.cpp index dea5e1b824..7d7e6681df 100644 --- a/src/test/pmt_tests.cpp +++ b/src/test/pmt_tests.cpp @@ -1,4 +1,6 @@ - +// Copyright (c) 2012-2013 The Bitcoin Core developers +// Distributed under the MIT/X11 software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. #include "main.h" #include "serialize.h" diff --git a/src/test/rpc_tests.cpp b/src/test/rpc_tests.cpp index 29195545da..5bc38ce2de 100644 --- a/src/test/rpc_tests.cpp +++ b/src/test/rpc_tests.cpp @@ -1,3 +1,7 @@ +// Copyright (c) 2012-2013 The Bitcoin Core developers +// Distributed under the MIT/X11 software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + #include "rpcserver.h" #include "rpcclient.h" diff --git a/src/test/rpc_wallet_tests.cpp b/src/test/rpc_wallet_tests.cpp index 628ba95067..af34e496e2 100644 --- a/src/test/rpc_wallet_tests.cpp +++ b/src/test/rpc_wallet_tests.cpp @@ -1,3 +1,7 @@ +// Copyright (c) 2013-2014 The Bitcoin Core developers +// Distributed under the MIT/X11 software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + #include "rpcserver.h" #include "rpcclient.h" diff --git a/src/test/script_P2SH_tests.cpp b/src/test/script_P2SH_tests.cpp index e57dc9bbba..03dbdde57b 100644 --- a/src/test/script_P2SH_tests.cpp +++ b/src/test/script_P2SH_tests.cpp @@ -1,3 +1,7 @@ +// Copyright (c) 2012-2013 The Bitcoin Core developers +// Distributed under the MIT/X11 software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + #include "script.h" #include "key.h" diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp index dd1b613047..7bc2bfb6dd 100644 --- a/src/test/script_tests.cpp +++ b/src/test/script_tests.cpp @@ -1,3 +1,7 @@ +// Copyright (c) 2011-2013 The Bitcoin Core developers +// Distributed under the MIT/X11 software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + #include "script.h" #include "data/script_invalid.json.h" diff --git a/src/test/serialize_tests.cpp b/src/test/serialize_tests.cpp index 415f957811..867a7df888 100644 --- a/src/test/serialize_tests.cpp +++ b/src/test/serialize_tests.cpp @@ -1,3 +1,7 @@ +// Copyright (c) 2012-2013 The Bitcoin Core developers +// Distributed under the MIT/X11 software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + #include "serialize.h" #include <stdint.h> diff --git a/src/test/sighash_tests.cpp b/src/test/sighash_tests.cpp index f098d46186..353fd60f7b 100644 --- a/src/test/sighash_tests.cpp +++ b/src/test/sighash_tests.cpp @@ -1,7 +1,22 @@ +// Copyright (c) 2013 The Bitcoin Core developers +// Distributed under the MIT/X11 software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + #include <boost/test/unit_test.hpp> +#include <iostream> #include "main.h" #include "util.h" +#include "serialize.h" +#include "version.h" +#include "data/sighash.json.h" + +#include "json/json_spirit_reader_template.h" +#include "json/json_spirit_utils.h" +#include "json/json_spirit_writer_template.h" + +using namespace json_spirit; +extern Array read_json(const std::string& jsondata); extern uint256 SignatureHash(const CScript &scriptCode, const CTransaction& txTo, unsigned int nIn, int nHashType); @@ -103,18 +118,97 @@ BOOST_AUTO_TEST_SUITE(sighash_tests) BOOST_AUTO_TEST_CASE(sighash_test) { seed_insecure_rand(false); - - for (int i=0; i<50000; i++) { + + #if defined(PRINT_SIGHASH_JSON) + std::cout << "[\n"; + std::cout << "\t[\"raw_transaction, script, input_index, hashType, signature_hash (result)\"],\n"; + #endif + int nRandomTests = 50000; + + #if defined(PRINT_SIGHASH_JSON) + nRandomTests = 500; + #endif + for (int i=0; i<nRandomTests; i++) { int nHashType = insecure_rand(); CTransaction txTo; RandomTransaction(txTo, (nHashType & 0x1f) == SIGHASH_SINGLE); CScript scriptCode; RandomScript(scriptCode); int nIn = insecure_rand() % txTo.vin.size(); - BOOST_CHECK(SignatureHash(scriptCode, txTo, nIn, nHashType) == - SignatureHashOld(scriptCode, txTo, nIn, nHashType)); + + uint256 sh, sho; + sho = SignatureHashOld(scriptCode, txTo, nIn, nHashType); + sh = SignatureHash(scriptCode, txTo, nIn, nHashType); + #if defined(PRINT_SIGHASH_JSON) + CDataStream ss(SER_NETWORK, PROTOCOL_VERSION); + ss << txTo; + + std::cout << "\t[\"" ; + std::cout << HexStr(ss.begin(), ss.end()) << "\", \""; + std::cout << HexStr(scriptCode) << "\", "; + std::cout << nIn << ", "; + std::cout << nHashType << ", \""; + std::cout << sho.GetHex() << "\"]"; + if (i+1 != nRandomTests) { + std::cout << ","; + } + std::cout << "\n"; + #endif + BOOST_CHECK(sh == sho); } + #if defined(PRINT_SIGHASH_JSON) + std::cout << "]\n"; + #endif } +// Goal: check that SignatureHash generates correct hash +BOOST_AUTO_TEST_CASE(sighash_from_data) +{ + Array tests = read_json(std::string(json_tests::sighash, json_tests::sighash + sizeof(json_tests::sighash))); + + BOOST_FOREACH(Value& tv, tests) + { + Array test = tv.get_array(); + std::string strTest = write_string(tv, false); + if (test.size() < 1) // Allow for extra stuff (useful for comments) + { + BOOST_ERROR("Bad test: " << strTest); + continue; + } + if (test.size() == 1) continue; // comment + + std::string raw_tx, raw_script, sigHashHex; + int nIn, nHashType; + uint256 sh; + CTransaction tx; + CScript scriptCode = CScript(); + + try { + // deserialize test data + raw_tx = test[0].get_str(); + raw_script = test[1].get_str(); + nIn = test[2].get_int(); + nHashType = test[3].get_int(); + sigHashHex = test[4].get_str(); + + uint256 sh; + CDataStream stream(ParseHex(raw_tx), SER_NETWORK, PROTOCOL_VERSION); + stream >> tx; + + CValidationState state; + BOOST_CHECK_MESSAGE(CheckTransaction(tx, state), strTest); + BOOST_CHECK(state.IsValid()); + + std::vector<unsigned char> raw = ParseHex(raw_script); + scriptCode.insert(scriptCode.end(), raw.begin(), raw.end()); + } catch (...) { + BOOST_ERROR("Bad test, couldn't deserialize data: " << strTest); + continue; + } + + sh = SignatureHash(scriptCode, tx, nIn, nHashType); + BOOST_CHECK_MESSAGE(sh.GetHex() == sigHashHex, strTest); + } +} BOOST_AUTO_TEST_SUITE_END() diff --git a/src/test/sigopcount_tests.cpp b/src/test/sigopcount_tests.cpp index 96f663ccef..722f14a989 100644 --- a/src/test/sigopcount_tests.cpp +++ b/src/test/sigopcount_tests.cpp @@ -1,4 +1,6 @@ - +// Copyright (c) 2012-2013 The Bitcoin Core developers +// Distributed under the MIT/X11 software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. #include "key.h" #include "script.h" diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp index 96d0712403..2d993e24db 100644 --- a/src/test/test_bitcoin.cpp +++ b/src/test/test_bitcoin.cpp @@ -1,3 +1,7 @@ +// Copyright (c) 2011-2013 The Bitcoin Core developers +// Distributed under the MIT/X11 software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + #define BOOST_TEST_MODULE Bitcoin Test Suite @@ -80,3 +84,8 @@ void StartShutdown() exit(0); } +bool ShutdownRequested() +{ + return false; +} + diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp index 588c8013c7..2ebb652f00 100644 --- a/src/test/transaction_tests.cpp +++ b/src/test/transaction_tests.cpp @@ -1,4 +1,6 @@ - +// Copyright (c) 2011-2014 The Bitcoin Core developers +// Distributed under the MIT/X11 software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. #include "data/tx_invalid.json.h" #include "data/tx_valid.json.h" diff --git a/src/test/uint256_tests.cpp b/src/test/uint256_tests.cpp index 368484fdff..815babf107 100644 --- a/src/test/uint256_tests.cpp +++ b/src/test/uint256_tests.cpp @@ -1,3 +1,7 @@ +// Copyright (c) 2011-2013 The Bitcoin Core developers +// Distributed under the MIT/X11 software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + #include <boost/test/unit_test.hpp> #include <stdint.h> #include <sstream> diff --git a/src/test/util_tests.cpp b/src/test/util_tests.cpp index 706737b115..b8f107f644 100644 --- a/src/test/util_tests.cpp +++ b/src/test/util_tests.cpp @@ -1,3 +1,7 @@ +// Copyright (c) 2011-2014 The Bitcoin Core developers +// Distributed under the MIT/X11 software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + #include "util.h" #include "sync.h" diff --git a/src/test/wallet_tests.cpp b/src/test/wallet_tests.cpp index bd0517ae08..1993358826 100644 --- a/src/test/wallet_tests.cpp +++ b/src/test/wallet_tests.cpp @@ -1,3 +1,7 @@ +// Copyright (c) 2012-2014 The Bitcoin Core developers +// Distributed under the MIT/X11 software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + #include "wallet.h" #include <set> diff --git a/src/ui_interface.h b/src/ui_interface.h index 677d097fa4..7b655ac951 100644 --- a/src/ui_interface.h +++ b/src/ui_interface.h @@ -91,6 +91,9 @@ public: * @note called with lock cs_mapAlerts held. */ boost::signals2::signal<void (const uint256 &hash, ChangeType status)> NotifyAlertChanged; + + /** A wallet has been loaded. */ + boost::signals2::signal<void (CWallet* wallet)> LoadWallet; }; extern CClientUIInterface uiInterface; diff --git a/src/util.cpp b/src/util.cpp index 36dfd8ab79..a919b4b854 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -976,7 +976,7 @@ boost::filesystem::path GetDefaultDataDir() #ifdef MAC_OSX // Mac pathRet /= "Library/Application Support"; - fs::create_directory(pathRet); + TryCreateDirectory(pathRet); return pathRet / "Bitcoin"; #else // Unix @@ -1090,6 +1090,23 @@ bool RenameOver(boost::filesystem::path src, boost::filesystem::path dest) #endif /* WIN32 */ } + +// Ignores exceptions thrown by boost's create_directory if the requested directory exists. +// Specifically handles case where path p exists, but it wasn't possible for the user to write to the parent directory. +bool TryCreateDirectory(const boost::filesystem::path& p) +{ + try + { + return boost::filesystem::create_directory(p); + } catch (boost::filesystem::filesystem_error) { + if (!boost::filesystem::exists(p) || !boost::filesystem::is_directory(p)) + throw; + } + + // create_directory didn't create the directory, it had to have existed already + return false; +} + void FileCommit(FILE *fileout) { fflush(fileout); // harmless if redundantly called @@ -1107,16 +1124,6 @@ void FileCommit(FILE *fileout) #endif } -int GetFilesize(FILE* file) -{ - int nSavePos = ftell(file); - int nFilesize = -1; - if (fseek(file, 0, SEEK_END) == 0) - nFilesize = ftell(file); - fseek(file, nSavePos, SEEK_SET); - return nFilesize; -} - bool TruncateFile(FILE *file, unsigned int length) { #if defined(WIN32) return _chsize(_fileno(file), length) == 0; @@ -1195,7 +1202,7 @@ void ShrinkDebugFile() // Scroll debug.log if it's getting too big boost::filesystem::path pathLog = GetDataDir() / "debug.log"; FILE* file = fopen(pathLog.string().c_str(), "r"); - if (file && GetFilesize(file) > 10 * 1000000) + if (file && boost::filesystem::file_size(pathLog) > 10 * 1000000) { // Restart the file with some of the end char pch[200000]; @@ -1214,13 +1221,6 @@ void ShrinkDebugFile() fclose(file); } - - - - - - - // // "Never go to sea with two chronometers; take one or three." // Our three time sources are: diff --git a/src/util.h b/src/util.h index 32bc050369..fbd841f7a8 100644 --- a/src/util.h +++ b/src/util.h @@ -185,11 +185,11 @@ void ParseParameters(int argc, const char*const argv[]); bool WildcardMatch(const char* psz, const char* mask); bool WildcardMatch(const std::string& str, const std::string& mask); void FileCommit(FILE *fileout); -int GetFilesize(FILE* file); bool TruncateFile(FILE *file, unsigned int length); int RaiseFileDescriptorLimit(int nMinFD); void AllocateFileRange(FILE *file, unsigned int offset, unsigned int length); bool RenameOver(boost::filesystem::path src, boost::filesystem::path dest); +bool TryCreateDirectory(const boost::filesystem::path& p); boost::filesystem::path GetDefaultDataDir(); const boost::filesystem::path &GetDataDir(bool fNetSpecific = true); boost::filesystem::path GetConfigFile(); diff --git a/src/version.cpp b/src/version.cpp index 904451ac59..51e34aa9c9 100644 --- a/src/version.cpp +++ b/src/version.cpp @@ -40,6 +40,9 @@ const std::string CLIENT_NAME("Satoshi"); # define GIT_COMMIT_DATE "$Format:%cD$" #endif +#define BUILD_DESC_WITH_SUFFIX(maj,min,rev,build,suffix) \ + "v" DO_STRINGIZE(maj) "." DO_STRINGIZE(min) "." DO_STRINGIZE(rev) "." DO_STRINGIZE(build) "-" DO_STRINGIZE(suffix) + #define BUILD_DESC_FROM_COMMIT(maj,min,rev,build,commit) \ "v" DO_STRINGIZE(maj) "." DO_STRINGIZE(min) "." DO_STRINGIZE(rev) "." DO_STRINGIZE(build) "-g" commit @@ -47,7 +50,9 @@ const std::string CLIENT_NAME("Satoshi"); "v" DO_STRINGIZE(maj) "." DO_STRINGIZE(min) "." DO_STRINGIZE(rev) "." DO_STRINGIZE(build) "-unk" #ifndef BUILD_DESC -# ifdef GIT_COMMIT_ID +# ifdef BUILD_SUFFIX +# define BUILD_DESC BUILD_DESC_WITH_SUFFIX(CLIENT_VERSION_MAJOR, CLIENT_VERSION_MINOR, CLIENT_VERSION_REVISION, CLIENT_VERSION_BUILD, BUILD_SUFFIX) +# elif defined(GIT_COMMIT_ID) # define BUILD_DESC BUILD_DESC_FROM_COMMIT(CLIENT_VERSION_MAJOR, CLIENT_VERSION_MINOR, CLIENT_VERSION_REVISION, CLIENT_VERSION_BUILD, GIT_COMMIT_ID) # else # define BUILD_DESC BUILD_DESC_FROM_UNKNOWN(CLIENT_VERSION_MAJOR, CLIENT_VERSION_MINOR, CLIENT_VERSION_REVISION, CLIENT_VERSION_BUILD) diff --git a/src/wallet.cpp b/src/wallet.cpp index 352e2a776e..03a699a69c 100644 --- a/src/wallet.cpp +++ b/src/wallet.cpp @@ -8,6 +8,7 @@ #include "base58.h" #include "coincontrol.h" #include "net.h" +#include "checkpoints.h" #include <boost/algorithm/string/replace.hpp> #include <openssl/rand.h> @@ -589,7 +590,7 @@ bool CWallet::AddToWallet(const CWalletTx& wtxIn, bool fFromLoadWallet) bool CWallet::AddToWalletIfInvolvingMe(const uint256 &hash, const CTransaction& tx, const CBlock* pblock, bool fUpdate) { { - LOCK(cs_wallet); + AssertLockHeld(cs_wallet); bool fExisted = mapWallet.count(hash); if (fExisted && !fUpdate) return false; if (fExisted || IsMine(tx) || IsFromMe(tx)) @@ -606,9 +607,8 @@ bool CWallet::AddToWalletIfInvolvingMe(const uint256 &hash, const CTransaction& void CWallet::SyncTransaction(const uint256 &hash, const CTransaction& tx, const CBlock* pblock) { - AddToWalletIfInvolvingMe(hash, tx, pblock, true); - - if (mapWallet.count(hash) == 0) + LOCK(cs_wallet); + if (!AddToWalletIfInvolvingMe(hash, tx, pblock, true)) return; // Not one of ours // If a transaction changes 'conflicted' state, that changes the balance @@ -831,18 +831,24 @@ bool CWalletTx::WriteToDisk() int CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, bool fUpdate) { int ret = 0; + int64_t nNow = GetTime(); CBlockIndex* pindex = pindexStart; { LOCK(cs_wallet); + + // no need to read and scan block, if block was created before + // our wallet birthday (as adjusted for block time variability) + while (pindex && nTimeFirstKey && (pindex->nTime < (nTimeFirstKey - 7200))) + pindex = chainActive.Next(pindex); + + ShowProgress(_("Rescanning..."), 0); // show rescan progress in GUI as dialog or on splashscreen, if -rescan on startup + double dProgressStart = Checkpoints::GuessVerificationProgress(pindex, false); + double dProgressTip = Checkpoints::GuessVerificationProgress(chainActive.Tip(), false); while (pindex) { - // no need to read and scan block, if block was created before - // our wallet birthday (as adjusted for block time variability) - if (nTimeFirstKey && (pindex->nTime < (nTimeFirstKey - 7200))) { - pindex = chainActive.Next(pindex); - continue; - } + if (pindex->nHeight % 100 == 0 && dProgressTip - dProgressStart > 0.0) + ShowProgress(_("Rescanning..."), std::max(1, std::min(99, (int)((Checkpoints::GuessVerificationProgress(pindex, false) - dProgressStart) / (dProgressTip - dProgressStart) * 100)))); CBlock block; ReadBlockFromDisk(block, pindex); @@ -852,7 +858,12 @@ int CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, bool fUpdate) ret++; } pindex = chainActive.Next(pindex); + if (GetTime() >= nNow + 60) { + nNow = GetTime(); + LogPrintf("Still rescanning. At block %d. Progress=%f\n", pindex->nHeight, Checkpoints::GuessVerificationProgress(pindex)); + } } + ShowProgress(_("Rescanning..."), 100); // hide progress dialog in GUI } return ret; } @@ -1488,6 +1499,8 @@ DBErrors CWallet::LoadWallet(bool& fFirstRunRet) return nLoadWalletRet; fFirstRunRet = !vchDefaultKey.IsValid(); + uiInterface.LoadWallet(this); + return DB_LOAD_OK; } diff --git a/src/wallet.h b/src/wallet.h index e2e89fffe7..5fd56d0af6 100644 --- a/src/wallet.h +++ b/src/wallet.h @@ -27,6 +27,9 @@ extern int64_t nTransactionFee; extern bool bSpendZeroConfChange; +// -paytxfee will warn if called with a higher fee than this amount (in satoshis) per KB +static const int nHighTransactionFeeWarning = 0.01 * COIN; + class CAccountingEntry; class CCoinControl; class COutput; @@ -388,6 +391,9 @@ public: */ boost::signals2::signal<void (CWallet *wallet, const uint256 &hashTx, ChangeType status)> NotifyTransactionChanged; + + /** Show progress e.g. for rescan */ + boost::signals2::signal<void (const std::string &title, int nProgress)> ShowProgress; }; /** A key allocated from the key pool. */ @@ -620,9 +626,10 @@ public: return nAvailableCreditCached; int64_t nCredit = 0; + uint256 hashTx = GetHash(); for (unsigned int i = 0; i < vout.size(); i++) { - if (!pwallet->IsSpent(GetHash(), i)) + if (!pwallet->IsSpent(hashTx, i)) { const CTxOut &txout = vout[i]; nCredit += pwallet->GetCredit(txout); |
