diff options
Diffstat (limited to 'src')
142 files changed, 32239 insertions, 9441 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 62dd63abef..9917be2481 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,7 +3,10 @@ include Makefile.include AM_CPPFLAGS += -I$(top_srcdir)/src/leveldb/helpers/memenv \ -I$(builddir) -noinst_LIBRARIES = libbitcoin_server.a libbitcoin_common.a libbitcoin_cli.a +noinst_LIBRARIES = \ + libbitcoin_server.a \ + libbitcoin_common.a \ + libbitcoin_cli.a if ENABLE_WALLET noinst_LIBRARIES += libbitcoin_wallet.a endif @@ -14,20 +17,60 @@ SUBDIRS = . $(BUILD_QT) $(BUILD_TEST) DIST_SUBDIRS = . qt test .PHONY: FORCE # bitcoin core # -BITCOIN_CORE_H = addrman.h alert.h allocators.h base58.h bignum.h \ +BITCOIN_CORE_H = \ + addrman.h \ + alert.h \ + allocators.h \ + base58.h bignum.h \ + bloom.h \ + chainparams.h \ + checkpoints.h \ + checkqueue.h \ + clientversion.h \ + coincontrol.h \ + coins.h \ + compat.h \ + core.h \ + crypter.h \ + db.h \ + hash.h \ + init.h \ + key.h \ + keystore.h \ + leveldbwrapper.h \ + limitedmap.h \ + main.h \ + miner.h \ + mruset.h \ + netbase.h \ + net.h \ + noui.h \ + protocol.h \ rpcclient.h \ rpcprotocol.h \ rpcserver.h \ - bloom.h chainparams.h checkpoints.h checkqueue.h \ - clientversion.h coincontrol.h compat.h core.h coins.h crypter.h db.h hash.h init.h \ - key.h keystore.h leveldbwrapper.h limitedmap.h main.h miner.h mruset.h \ - netbase.h net.h noui.h protocol.h script.h serialize.h sync.h threadsafety.h \ - txdb.h txmempool.h ui_interface.h uint256.h util.h version.h walletdb.h wallet.h - -JSON_H = json/json_spirit.h json/json_spirit_error_position.h \ - json/json_spirit_reader.h json/json_spirit_reader_template.h \ - json/json_spirit_stream_reader.h json/json_spirit_utils.h \ - json/json_spirit_value.h json/json_spirit_writer.h \ + script.h \ + serialize.h \ + sync.h \ + threadsafety.h \ + txdb.h \ + txmempool.h \ + ui_interface.h \ + uint256.h \ + util.h \ + version.h \ + walletdb.h \ + wallet.h + +JSON_H = \ + json/json_spirit.h \ + json/json_spirit_error_position.h \ + json/json_spirit_reader.h \ + json/json_spirit_reader_template.h \ + json/json_spirit_stream_reader.h \ + json/json_spirit_utils.h \ + json/json_spirit_value.h \ + json/json_spirit_writer.h \ json/json_spirit_writer_template.h obj/build.h: FORCE @@ -53,6 +96,7 @@ libbitcoin_server_a_SOURCES = \ noui.cpp \ rpcblockchain.cpp \ rpcmining.cpp \ + rpcmisc.cpp \ rpcnet.cpp \ rpcrawtransaction.cpp \ txdb.cpp \ @@ -92,8 +136,12 @@ nodist_libbitcoin_common_a_SOURCES = $(top_srcdir)/src/obj/build.h # # bitcoind binary # -bitcoind_LDADD = libbitcoin_server.a libbitcoin_cli.a libbitcoin_common.a leveldb/libleveldb.a leveldb/libmemenv.a \ - $(BOOST_LIBS) +bitcoind_LDADD = \ + libbitcoin_server.a \ + libbitcoin_cli.a \ + libbitcoin_common.a \ + leveldb/libleveldb.a \ + leveldb/libmemenv.a if ENABLE_WALLET bitcoind_LDADD += libbitcoin_wallet.a endif @@ -105,10 +153,13 @@ bitcoind_SOURCES += bitcoind-res.rc endif AM_CPPFLAGS += $(BDB_CPPFLAGS) -bitcoind_LDADD += $(BDB_LIBS) +bitcoind_LDADD += $(BOOST_LIBS) $(BDB_LIBS) # bitcoin-cli binary # -bitcoin_cli_LDADD = libbitcoin_cli.a libbitcoin_common.a $(BOOST_LIBS) +bitcoin_cli_LDADD = \ + libbitcoin_cli.a \ + libbitcoin_common.a \ + $(BOOST_LIBS) bitcoin_cli_SOURCES = bitcoin-cli.cpp # diff --git a/src/Makefile.include b/src/Makefile.include index 13cffd29bc..b9e6c262ca 100644 --- a/src/Makefile.include +++ b/src/Makefile.include @@ -32,23 +32,23 @@ $(LIBBITCOINQT): ui_%.h: %.ui @test -d $(abs_builddir)/$(@D) || $(MKDIR_P) $(abs_builddir)/$(@D) - @test -f $(UIC) && $(UIC) -o $(abs_builddir)/$@ $(abs_srcdir)/$< || echo error: could not build $(abs_builddir)/$@ + @test -f $(UIC) && QT_SELECT=$(QT_SELECT) $(UIC) -o $(abs_builddir)/$@ $(abs_srcdir)/$< || echo error: could not build $(abs_builddir)/$@ $(SED) -i.bak -e '/^\*\*.*Created:/d' $(abs_builddir)/$@ && rm $(abs_builddir)/$@.bak $(SED) -i.bak -e '/^\*\*.*by:/d' $(abs_builddir)/$@ && rm $(abs_builddir)/$@.bak %.moc: %.cpp - $(MOC) $(QT_INCLUDES) $(MOC_DEFS) -o $@ $< + QT_SELECT=$(QT_SELECT) $(MOC) $(QT_INCLUDES) $(MOC_DEFS) -o $@ $< $(SED) -i.bak -e '/^\*\*.*Created:/d' $@ && rm $@.bak $(SED) -i.bak -e '/^\*\*.*by:/d' $@ && rm $@.bak moc_%.cpp: %.h - $(MOC) $(QT_INCLUDES) $(MOC_DEFS) -o $@ $< + QT_SELECT=$(QT_SELECT) $(MOC) $(QT_INCLUDES) $(MOC_DEFS) -o $@ $< $(SED) -i.bak -e '/^\*\*.*Created:/d' $@ && rm $@.bak $(SED) -i.bak -e '/^\*\*.*by:/d' $@ && rm $@.bak %.qm: %.ts @test -d $(abs_builddir)/$(@D) || $(MKDIR_P) $(abs_builddir)/$(@D) - @test -f $(LRELEASE) && $(LRELEASE) $(abs_srcdir)/$< -qm $(abs_builddir)/$@ || \ + @test -f $(LRELEASE) && QT_SELECT=$(QT_SELECT) $(LRELEASE) $(abs_srcdir)/$< -qm $(abs_builddir)/$@ || \ echo error: could not build $(abs_builddir)/$@ %.pb.cc %.pb.h: %.proto diff --git a/src/addrman.cpp b/src/addrman.cpp index 815da07c9b..46b4a94938 100644 --- a/src/addrman.cpp +++ b/src/addrman.cpp @@ -14,12 +14,12 @@ int CAddrInfo::GetTriedBucket(const std::vector<unsigned char> &nKey) const CDataStream ss1(SER_GETHASH, 0); std::vector<unsigned char> vchKey = GetKey(); ss1 << nKey << vchKey; - uint64_t hash1 = Hash(ss1.begin(), ss1.end()).Get64(); + uint64_t hash1 = Hash(ss1.begin(), ss1.end()).GetLow64(); CDataStream ss2(SER_GETHASH, 0); std::vector<unsigned char> vchGroupKey = GetGroup(); ss2 << nKey << vchGroupKey << (hash1 % ADDRMAN_TRIED_BUCKETS_PER_GROUP); - uint64_t hash2 = Hash(ss2.begin(), ss2.end()).Get64(); + uint64_t hash2 = Hash(ss2.begin(), ss2.end()).GetLow64(); return hash2 % ADDRMAN_TRIED_BUCKET_COUNT; } @@ -29,11 +29,11 @@ int CAddrInfo::GetNewBucket(const std::vector<unsigned char> &nKey, const CNetAd std::vector<unsigned char> vchGroupKey = GetGroup(); std::vector<unsigned char> vchSourceGroupKey = src.GetGroup(); ss1 << nKey << vchGroupKey << vchSourceGroupKey; - uint64_t hash1 = Hash(ss1.begin(), ss1.end()).Get64(); + uint64_t hash1 = Hash(ss1.begin(), ss1.end()).GetLow64(); CDataStream ss2(SER_GETHASH, 0); ss2 << nKey << vchSourceGroupKey << (hash1 % ADDRMAN_NEW_BUCKETS_PER_SOURCE_GROUP); - uint64_t hash2 = Hash(ss2.begin(), ss2.end()).Get64(); + uint64_t hash2 = Hash(ss2.begin(), ss2.end()).GetLow64(); return hash2 % ADDRMAN_NEW_BUCKET_COUNT; } diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp index e13d688158..5d87218844 100644 --- a/src/bitcoind.cpp +++ b/src/bitcoind.cpp @@ -30,6 +30,8 @@ * Use the buttons <code>Namespaces</code>, <code>Classes</code> or <code>Files</code> at the top of the page to start navigating the code. */ +static bool fDaemon; + void DetectShutdownThread(boost::thread_group* threadGroup) { bool fShutdown = ShutdownRequested(); @@ -78,7 +80,7 @@ bool AppInit(int argc, char* argv[]) if (mapArgs.count("-?") || mapArgs.count("--help")) { // First part of help message is specific to bitcoind / RPC client - std::string strUsage = _("Bitcoin version") + " " + FormatFullVersion() + "\n\n" + + std::string strUsage = _("Bitcoin Core Daemon") + " " + _("version") + " " + FormatFullVersion() + "\n\n" + _("Usage:") + "\n" + " bitcoind [options] " + _("Start Bitcoin server") + "\n" + _("Usage (deprecated, use bitcoin-cli):") + "\n" + @@ -108,6 +110,8 @@ bool AppInit(int argc, char* argv[]) fDaemon = GetBoolArg("-daemon", false); if (fDaemon) { + fprintf(stdout, "Bitcoin server starting\n"); + // Daemonize pid_t pid = fork(); if (pid < 0) @@ -127,9 +131,10 @@ bool AppInit(int argc, char* argv[]) fprintf(stderr, "Error: setsid() returned %d errno %d\n", sid, errno); } #endif + SoftSetBoolArg("-server", true); detectShutdownThread = new boost::thread(boost::bind(&DetectShutdownThread, &threadGroup)); - fRet = AppInit2(threadGroup, true); + fRet = AppInit2(threadGroup); } catch (std::exception& e) { PrintExceptionContinue(&e, "AppInit()"); diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 14da3860ad..d3d6b98d80 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -143,6 +143,7 @@ public: vSeeds.push_back(CDNSSeedData("bitcoin.sipa.be", "seed.bitcoin.sipa.be")); 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("xf2.org", "bitseed.xf2.org")); base58Prefixes[PUBKEY_ADDRESS] = list_of(0); diff --git a/src/init.cpp b/src/init.cpp index b835911df3..20279bf733 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -10,15 +10,16 @@ #include "init.h" #include "addrman.h" -#include "db.h" -#include "rpcserver.h" #include "checkpoints.h" +#include "main.h" #include "miner.h" #include "net.h" +#include "rpcserver.h" #include "txdb.h" #include "ui_interface.h" #include "util.h" #ifdef ENABLE_WALLET +#include "db.h" #include "wallet.h" #include "walletdb.h" #endif @@ -163,13 +164,13 @@ void HandleSIGHUP(int) bool static InitError(const std::string &str) { - uiInterface.ThreadSafeMessageBox(str, "", CClientUIInterface::MSG_ERROR); + uiInterface.ThreadSafeMessageBox(str, "", CClientUIInterface::MSG_ERROR | CClientUIInterface::NOSHOWGUI); return false; } bool static InitWarning(const std::string &str) { - uiInterface.ThreadSafeMessageBox(str, "", CClientUIInterface::MSG_WARNING); + uiInterface.ThreadSafeMessageBox(str, "", CClientUIInterface::MSG_WARNING | CClientUIInterface::NOSHOWGUI); return true; } @@ -193,15 +194,13 @@ std::string HelpMessage(HelpMessageMode hmm) strUsage += " -conf=<file> " + _("Specify configuration file (default: bitcoin.conf)") + "\n"; 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 += " -wallet=<file> " + _("Specify wallet file (within data directory)") + "\n"; strUsage += " -dbcache=<n> " + _("Set database cache size in megabytes (default: 25)") + "\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 the version of socks proxy to use (4-5, default: 5)") + "\n"; - strUsage += " -onion=<ip:port> " + _("Use proxy to reach tor hidden services (default: same as -proxy)") + "\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"; @@ -226,10 +225,9 @@ std::string HelpMessage(HelpMessageMode hmm) strUsage += " -upnp " + _("Use UPnP to map the listening port (default: 0)") + "\n"; #endif #endif - strUsage += " -paytxfee=<amt> " + _("Fee per KB to add to transactions you send") + "\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 += " " + _("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) { @@ -242,16 +240,9 @@ std::string HelpMessage(HelpMessageMode hmm) 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. This is intended for regression testing tools and app development.") + "\n"; -#ifdef WIN32 - strUsage += " -printtodebugger " + _("Send trace/debug info to debugger") + "\n"; -#endif - - if (hmm == HMM_BITCOIN_QT) - { - strUsage += " -server " + _("Accept command line and JSON-RPC commands") + "\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"; if (hmm == HMM_BITCOIND) { @@ -263,27 +254,31 @@ std::string HelpMessage(HelpMessageMode hmm) 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 += " -walletnotify=<cmd> " + _("Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)") + "\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 += " -upgradewallet " + _("Upgrade wallet to latest format") + "\n"; strUsage += " -keypool=<n> " + _("Set key pool size to <n> (default: 100)") + "\n"; - strUsage += " -rescan " + _("Rescan the block chain for missing wallet transactions") + "\n"; - strUsage += " -salvagewallet " + _("Attempt to recover private keys from a corrupt wallet.dat") + "\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 += " -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"; +#endif strUsage += "\n" + _("Block creation options:") + "\n"; - strUsage += " -blockminsize=<n> " + _("Set minimum block size in bytes (default: 0)") + "\n"; - strUsage += " -blockmaxsize=<n> " + _("Set maximum block size in bytes (default: 250000)") + "\n"; - strUsage += " -blockprioritysize=<n> " + _("Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)") + "\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 += " -rpcssl " + _("Use OpenSSL (https) for JSON-RPC connections") + "\n"; @@ -358,7 +353,7 @@ void ThreadImport(std::vector<boost::filesystem::path> vImportFiles) /** Initialize bitcoin. * @pre Parameters should be parsed and config file should be read. */ -bool AppInit2(boost::thread_group& threadGroup, bool fForceServer) +bool AppInit2(boost::thread_group& threadGroup) { // ********************************************************* Step 1: setup #ifdef _MSC_VER @@ -485,13 +480,8 @@ bool AppInit2(boost::thread_group& threadGroup, bool fForceServer) else if (nScriptCheckThreads > MAX_SCRIPTCHECK_THREADS) nScriptCheckThreads = MAX_SCRIPTCHECK_THREADS; - if (fDaemon || fForceServer) - fServer = true; - else - fServer = GetBoolArg("-server", false); - + fServer = GetBoolArg("-server", false); fPrintToConsole = GetBoolArg("-printtoconsole", false); - fPrintToDebugger = GetBoolArg("-printtodebugger", false); fLogTimestamps = GetBoolArg("-logtimestamps", true); #ifdef ENABLE_WALLET bool fDisableWallet = GetBoolArg("-disablewallet", false); @@ -533,6 +523,7 @@ bool AppInit2(boost::thread_group& threadGroup, bool fForceServer) return InitError(strprintf(_("Invalid amount for -minrelaytxfee=<amount>: '%s'"), mapArgs["-minrelaytxfee"].c_str())); } +#ifdef ENABLE_WALLET if (mapArgs.count("-paytxfee")) { if (!ParseMoney(mapArgs["-paytxfee"], nTransactionFee)) @@ -541,7 +532,6 @@ bool AppInit2(boost::thread_group& threadGroup, bool fForceServer) InitWarning(_("Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.")); } -#ifdef ENABLE_WALLET strWalletFile = GetArg("-wallet", "wallet.dat"); #endif // ********************************************************* Step 4: application initialization: dir lock, daemonize, pidfile, debug log @@ -572,9 +562,6 @@ bool AppInit2(boost::thread_group& threadGroup, bool fForceServer) LogPrintf("Using at most %i connections (%i file descriptors available)\n", nMaxConnections, nFD); std::ostringstream strErrors; - if (fDaemon) - fprintf(stdout, "Bitcoin server starting\n"); - if (nScriptCheckThreads) { LogPrintf("Using %u threads for script verification\n", nScriptCheckThreads); for (int i=0; i<nScriptCheckThreads-1; i++) @@ -857,8 +844,8 @@ bool AppInit2(boost::thread_group& threadGroup, bool fForceServer) } } - // as LoadBlockIndex can take several minutes, it's possible the user - // requested to kill bitcoin-qt during the last operation. If so, exit. + // As LoadBlockIndex can take several minutes, it's possible the user + // requested to kill the GUI during the last operation. If so, exit. // As the program has not fully started yet, Shutdown() is possibly overkill. if (fRequestShutdown) { diff --git a/src/init.h b/src/init.h index 018d2d5ea3..2f56923055 100644 --- a/src/init.h +++ b/src/init.h @@ -20,7 +20,7 @@ extern CWallet* pwalletMain; void StartShutdown(); bool ShutdownRequested(); void Shutdown(); -bool AppInit2(boost::thread_group& threadGroup, bool fForceServer); +bool AppInit2(boost::thread_group& threadGroup); /* The help message mode determines what help message to show */ enum HelpMessageMode diff --git a/src/leveldb/AUTHORS b/src/leveldb/AUTHORS index fc40194ab9..2439d7a452 100644 --- a/src/leveldb/AUTHORS +++ b/src/leveldb/AUTHORS @@ -9,3 +9,4 @@ Sanjay Ghemawat <sanjay@google.com> # Partial list of contributors: Kevin Regan <kevin.d.regan@gmail.com> +Johan Bilien <jobi@litl.com> diff --git a/src/leveldb/Makefile b/src/leveldb/Makefile index 20c9c4f287..344ff2972a 100644 --- a/src/leveldb/Makefile +++ b/src/leveldb/Makefile @@ -44,6 +44,7 @@ TESTS = \ filename_test \ filter_block_test \ issue178_test \ + issue200_test \ log_test \ memenv_test \ skiplist_test \ @@ -71,7 +72,7 @@ SHARED = $(SHARED1) else # Update db.h if you change these. SHARED_MAJOR = 1 -SHARED_MINOR = 13 +SHARED_MINOR = 15 SHARED1 = libleveldb.$(PLATFORM_SHARED_EXT) SHARED2 = $(SHARED1).$(SHARED_MAJOR) SHARED3 = $(SHARED1).$(SHARED_MAJOR).$(SHARED_MINOR) @@ -154,6 +155,9 @@ filter_block_test: table/filter_block_test.o $(LIBOBJECTS) $(TESTHARNESS) issue178_test: issues/issue178_test.o $(LIBOBJECTS) $(TESTHARNESS) $(CXX) $(LDFLAGS) issues/issue178_test.o $(LIBOBJECTS) $(TESTHARNESS) -o $@ $(LIBS) +issue200_test: issues/issue200_test.o $(LIBOBJECTS) $(TESTHARNESS) + $(CXX) $(LDFLAGS) issues/issue200_test.o $(LIBOBJECTS) $(TESTHARNESS) -o $@ $(LIBS) + log_test: db/log_test.o $(LIBOBJECTS) $(TESTHARNESS) $(CXX) $(LDFLAGS) db/log_test.o $(LIBOBJECTS) $(TESTHARNESS) -o $@ $(LIBS) @@ -191,14 +195,14 @@ IOSVERSION=$(shell defaults read $(PLATFORMSROOT)/iPhoneOS.platform/version CFBu mkdir -p ios-x86/$(dir $@) $(CXX) $(CXXFLAGS) -isysroot $(SIMULATORROOT)/SDKs/iPhoneSimulator$(IOSVERSION).sdk -arch i686 -c $< -o ios-x86/$@ mkdir -p ios-arm/$(dir $@) - $(DEVICEROOT)/usr/bin/$(CXX) $(CXXFLAGS) -isysroot $(DEVICEROOT)/SDKs/iPhoneOS$(IOSVERSION).sdk -arch armv6 -arch armv7 -c $< -o ios-arm/$@ + xcrun -sdk iphoneos $(CXX) $(CXXFLAGS) -isysroot $(DEVICEROOT)/SDKs/iPhoneOS$(IOSVERSION).sdk -arch armv6 -arch armv7 -c $< -o ios-arm/$@ lipo ios-x86/$@ ios-arm/$@ -create -output $@ .c.o: mkdir -p ios-x86/$(dir $@) $(CC) $(CFLAGS) -isysroot $(SIMULATORROOT)/SDKs/iPhoneSimulator$(IOSVERSION).sdk -arch i686 -c $< -o ios-x86/$@ mkdir -p ios-arm/$(dir $@) - $(DEVICEROOT)/usr/bin/$(CC) $(CFLAGS) -isysroot $(DEVICEROOT)/SDKs/iPhoneOS$(IOSVERSION).sdk -arch armv6 -arch armv7 -c $< -o ios-arm/$@ + xcrun -sdk iphoneos $(CC) $(CFLAGS) -isysroot $(DEVICEROOT)/SDKs/iPhoneOS$(IOSVERSION).sdk -arch armv6 -arch armv7 -c $< -o ios-arm/$@ lipo ios-x86/$@ ios-arm/$@ -create -output $@ else diff --git a/src/leveldb/build_detect_platform b/src/leveldb/build_detect_platform index bdfd64172c..85b1ce0224 100755 --- a/src/leveldb/build_detect_platform +++ b/src/leveldb/build_detect_platform @@ -137,6 +137,16 @@ case "$TARGET_OS" in # man ld: +h internal_name PLATFORM_SHARED_LDFLAGS="-shared -Wl,+h -Wl," ;; + IOS) + PLATFORM=IOS + COMMON_FLAGS="$MEMCMP_FLAG -DOS_MACOSX" + [ -z "$INSTALL_PATH" ] && INSTALL_PATH=`pwd` + PORT_FILE=port/port_posix.cc + PLATFORM_SHARED_EXT= + PLATFORM_SHARED_LDFLAGS= + PLATFORM_SHARED_CFLAGS= + PLATFORM_SHARED_VERSIONED= + ;; OS_WINDOWS_CROSSCOMPILE | NATIVE_WINDOWS) PLATFORM=OS_WINDOWS COMMON_FLAGS="-fno-builtin-memcmp -D_REENTRANT -DOS_WINDOWS -DLEVELDB_PLATFORM_WINDOWS -DWINVER=0x0500 -D__USE_MINGW_ANSI_STDIO=1" diff --git a/src/leveldb/db/corruption_test.cc b/src/leveldb/db/corruption_test.cc index b37ffdfe64..96afc68913 100644 --- a/src/leveldb/db/corruption_test.cc +++ b/src/leveldb/db/corruption_test.cc @@ -75,7 +75,13 @@ class CorruptionTest { Slice key = Key(i, &key_space); batch.Clear(); batch.Put(key, Value(i, &value_space)); - ASSERT_OK(db_->Write(WriteOptions(), &batch)); + WriteOptions options; + // Corrupt() doesn't work without this sync on windows; stat reports 0 for + // the file size. + if (i == n - 1) { + options.sync = true; + } + ASSERT_OK(db_->Write(options, &batch)); } } @@ -125,7 +131,7 @@ class CorruptionTest { FileType type; std::string fname; int picked_number = -1; - for (int i = 0; i < filenames.size(); i++) { + for (size_t i = 0; i < filenames.size(); i++) { if (ParseFileName(filenames[i], &number, &type) && type == filetype && int(number) > picked_number) { // Pick latest file @@ -238,6 +244,22 @@ TEST(CorruptionTest, TableFile) { Check(90, 99); } +TEST(CorruptionTest, TableFileRepair) { + options_.block_size = 2 * kValueSize; // Limit scope of corruption + options_.paranoid_checks = true; + Reopen(); + Build(100); + DBImpl* dbi = reinterpret_cast<DBImpl*>(db_); + dbi->TEST_CompactMemTable(); + dbi->TEST_CompactRange(0, NULL, NULL); + dbi->TEST_CompactRange(1, NULL, NULL); + + Corrupt(kTableFile, 100, 1); + RepairDB(); + Reopen(); + Check(95, 99); +} + TEST(CorruptionTest, TableFileIndexData) { Build(10000); // Enough to build multiple Tables DBImpl* dbi = reinterpret_cast<DBImpl*>(db_); diff --git a/src/leveldb/db/db_bench.cc b/src/leveldb/db/db_bench.cc index 7abdf87587..fc46d89693 100644 --- a/src/leveldb/db/db_bench.cc +++ b/src/leveldb/db/db_bench.cc @@ -128,7 +128,7 @@ class RandomGenerator { pos_ = 0; } - Slice Generate(int len) { + Slice Generate(size_t len) { if (pos_ + len > data_.size()) { pos_ = 0; assert(len < data_.size()); @@ -139,11 +139,11 @@ class RandomGenerator { }; static Slice TrimSpace(Slice s) { - int start = 0; + size_t start = 0; while (start < s.size() && isspace(s[start])) { start++; } - int limit = s.size(); + size_t limit = s.size(); while (limit > start && isspace(s[limit-1])) { limit--; } @@ -399,7 +399,7 @@ class Benchmark { heap_counter_(0) { std::vector<std::string> files; Env::Default()->GetChildren(FLAGS_db, &files); - for (int i = 0; i < files.size(); i++) { + for (size_t i = 0; i < files.size(); i++) { if (Slice(files[i]).starts_with("heap-")) { Env::Default()->DeleteFile(std::string(FLAGS_db) + "/" + files[i]); } diff --git a/src/leveldb/db/db_impl.cc b/src/leveldb/db/db_impl.cc index fa1351038b..faf5e7d7ba 100644 --- a/src/leveldb/db/db_impl.cc +++ b/src/leveldb/db/db_impl.cc @@ -133,8 +133,7 @@ DBImpl::DBImpl(const Options& raw_options, const std::string& dbname) seed_(0), tmp_batch_(new WriteBatch), bg_compaction_scheduled_(false), - manual_compaction_(NULL), - consecutive_compaction_errors_(0) { + manual_compaction_(NULL) { mem_->Ref(); has_imm_.Release_Store(NULL); @@ -217,6 +216,12 @@ void DBImpl::MaybeIgnoreError(Status* s) const { } void DBImpl::DeleteObsoleteFiles() { + if (!bg_error_.ok()) { + // After a background error, we don't know whether a new version may + // or may not have been committed, so we cannot safely garbage collect. + return; + } + // Make a set of all of the live files std::set<uint64_t> live = pending_outputs_; versions_->AddLiveFiles(&live); @@ -495,7 +500,7 @@ Status DBImpl::WriteLevel0Table(MemTable* mem, VersionEdit* edit, return s; } -Status DBImpl::CompactMemTable() { +void DBImpl::CompactMemTable() { mutex_.AssertHeld(); assert(imm_ != NULL); @@ -523,9 +528,9 @@ Status DBImpl::CompactMemTable() { imm_ = NULL; has_imm_.Release_Store(NULL); DeleteObsoleteFiles(); + } else { + RecordBackgroundError(s); } - - return s; } void DBImpl::CompactRange(const Slice* begin, const Slice* end) { @@ -568,16 +573,18 @@ void DBImpl::TEST_CompactRange(int level, const Slice* begin,const Slice* end) { } MutexLock l(&mutex_); - while (!manual.done) { - while (manual_compaction_ != NULL) { - bg_cv_.Wait(); - } - manual_compaction_ = &manual; - MaybeScheduleCompaction(); - while (manual_compaction_ == &manual) { + while (!manual.done && !shutting_down_.Acquire_Load() && bg_error_.ok()) { + if (manual_compaction_ == NULL) { // Idle + manual_compaction_ = &manual; + MaybeScheduleCompaction(); + } else { // Running either my compaction or another compaction. bg_cv_.Wait(); } } + if (manual_compaction_ == &manual) { + // Cancel my manual compaction since we aborted early for some reason. + manual_compaction_ = NULL; + } } Status DBImpl::TEST_CompactMemTable() { @@ -596,12 +603,22 @@ Status DBImpl::TEST_CompactMemTable() { return s; } +void DBImpl::RecordBackgroundError(const Status& s) { + mutex_.AssertHeld(); + if (bg_error_.ok()) { + bg_error_ = s; + bg_cv_.SignalAll(); + } +} + void DBImpl::MaybeScheduleCompaction() { mutex_.AssertHeld(); if (bg_compaction_scheduled_) { // Already scheduled } else if (shutting_down_.Acquire_Load()) { // DB is being deleted; no more background compactions + } else if (!bg_error_.ok()) { + // Already got an error; no more changes } else if (imm_ == NULL && manual_compaction_ == NULL && !versions_->NeedsCompaction()) { @@ -619,30 +636,12 @@ void DBImpl::BGWork(void* db) { void DBImpl::BackgroundCall() { MutexLock l(&mutex_); assert(bg_compaction_scheduled_); - if (!shutting_down_.Acquire_Load()) { - Status s = BackgroundCompaction(); - if (s.ok()) { - // Success - consecutive_compaction_errors_ = 0; - } else if (shutting_down_.Acquire_Load()) { - // Error most likely due to shutdown; do not wait - } else { - // Wait a little bit before retrying background compaction in - // case this is an environmental problem and we do not want to - // chew up resources for failed compactions for the duration of - // the problem. - bg_cv_.SignalAll(); // In case a waiter can proceed despite the error - Log(options_.info_log, "Waiting after background compaction error: %s", - s.ToString().c_str()); - mutex_.Unlock(); - ++consecutive_compaction_errors_; - int seconds_to_sleep = 1; - for (int i = 0; i < 3 && i < consecutive_compaction_errors_ - 1; ++i) { - seconds_to_sleep *= 2; - } - env_->SleepForMicroseconds(seconds_to_sleep * 1000000); - mutex_.Lock(); - } + if (shutting_down_.Acquire_Load()) { + // No more background work when shutting down. + } else if (!bg_error_.ok()) { + // No more background work after a background error. + } else { + BackgroundCompaction(); } bg_compaction_scheduled_ = false; @@ -653,11 +652,12 @@ void DBImpl::BackgroundCall() { bg_cv_.SignalAll(); } -Status DBImpl::BackgroundCompaction() { +void DBImpl::BackgroundCompaction() { mutex_.AssertHeld(); if (imm_ != NULL) { - return CompactMemTable(); + CompactMemTable(); + return; } Compaction* c; @@ -691,6 +691,9 @@ Status DBImpl::BackgroundCompaction() { c->edit()->AddFile(c->level() + 1, f->number, f->file_size, f->smallest, f->largest); status = versions_->LogAndApply(c->edit(), &mutex_); + if (!status.ok()) { + RecordBackgroundError(status); + } VersionSet::LevelSummaryStorage tmp; Log(options_.info_log, "Moved #%lld to level-%d %lld bytes %s: %s\n", static_cast<unsigned long long>(f->number), @@ -701,6 +704,9 @@ Status DBImpl::BackgroundCompaction() { } else { CompactionState* compact = new CompactionState(c); status = DoCompactionWork(compact); + if (!status.ok()) { + RecordBackgroundError(status); + } CleanupCompaction(compact); c->ReleaseInputs(); DeleteObsoleteFiles(); @@ -714,9 +720,6 @@ Status DBImpl::BackgroundCompaction() { } else { Log(options_.info_log, "Compaction error: %s", status.ToString().c_str()); - if (options_.paranoid_checks && bg_error_.ok()) { - bg_error_ = status; - } } if (is_manual) { @@ -732,7 +735,6 @@ Status DBImpl::BackgroundCompaction() { } manual_compaction_ = NULL; } - return status; } void DBImpl::CleanupCompaction(CompactionState* compact) { @@ -1002,6 +1004,9 @@ Status DBImpl::DoCompactionWork(CompactionState* compact) { if (status.ok()) { status = InstallCompactionResults(compact); } + if (!status.ok()) { + RecordBackgroundError(status); + } VersionSet::LevelSummaryStorage tmp; Log(options_.info_log, "compacted to: %s", versions_->LevelSummary(&tmp)); @@ -1185,13 +1190,23 @@ Status DBImpl::Write(const WriteOptions& options, WriteBatch* my_batch) { { mutex_.Unlock(); status = log_->AddRecord(WriteBatchInternal::Contents(updates)); + bool sync_error = false; if (status.ok() && options.sync) { status = logfile_->Sync(); + if (!status.ok()) { + sync_error = true; + } } if (status.ok()) { status = WriteBatchInternal::InsertInto(updates, mem_); } mutex_.Lock(); + if (sync_error) { + // The state of the log file is indeterminate: the log record we + // just added may or may not show up when the DB is re-opened. + // So we force the DB into a mode where all future writes fail. + RecordBackgroundError(status); + } } if (updates == tmp_batch_) tmp_batch_->Clear(); diff --git a/src/leveldb/db/db_impl.h b/src/leveldb/db/db_impl.h index 75fd30abe9..cfc998164a 100644 --- a/src/leveldb/db/db_impl.h +++ b/src/leveldb/db/db_impl.h @@ -87,8 +87,8 @@ class DBImpl : public DB { // Compact the in-memory write buffer to disk. Switches to a new // log-file/memtable and writes a new descriptor iff successful. - Status CompactMemTable() - EXCLUSIVE_LOCKS_REQUIRED(mutex_); + // Errors are recorded in bg_error_. + void CompactMemTable() EXCLUSIVE_LOCKS_REQUIRED(mutex_); Status RecoverLogFile(uint64_t log_number, VersionEdit* edit, @@ -102,10 +102,12 @@ class DBImpl : public DB { EXCLUSIVE_LOCKS_REQUIRED(mutex_); WriteBatch* BuildBatchGroup(Writer** last_writer); + void RecordBackgroundError(const Status& s); + void MaybeScheduleCompaction() EXCLUSIVE_LOCKS_REQUIRED(mutex_); static void BGWork(void* db); void BackgroundCall(); - Status BackgroundCompaction() EXCLUSIVE_LOCKS_REQUIRED(mutex_); + void BackgroundCompaction() EXCLUSIVE_LOCKS_REQUIRED(mutex_); void CleanupCompaction(CompactionState* compact) EXCLUSIVE_LOCKS_REQUIRED(mutex_); Status DoCompactionWork(CompactionState* compact) @@ -170,7 +172,6 @@ class DBImpl : public DB { // Have we encountered a background error in paranoid mode? Status bg_error_; - int consecutive_compaction_errors_; // Per level compaction stats. stats_[level] stores the stats for // compactions that produced data for the specified "level". diff --git a/src/leveldb/db/db_iter.cc b/src/leveldb/db/db_iter.cc index 071a54e3f4..3b2035e9e3 100644 --- a/src/leveldb/db/db_iter.cc +++ b/src/leveldb/db/db_iter.cc @@ -161,12 +161,13 @@ void DBIter::Next() { saved_key_.clear(); return; } + // saved_key_ already contains the key to skip past. + } else { + // Store in saved_key_ the current key so we skip it below. + SaveKey(ExtractUserKey(iter_->key()), &saved_key_); } - // Temporarily use saved_key_ as storage for key to skip. - std::string* skip = &saved_key_; - SaveKey(ExtractUserKey(iter_->key()), skip); - FindNextUserEntry(true, skip); + FindNextUserEntry(true, &saved_key_); } void DBIter::FindNextUserEntry(bool skipping, std::string* skip) { diff --git a/src/leveldb/db/db_test.cc b/src/leveldb/db/db_test.cc index 49aae04dbd..280b01c14b 100644 --- a/src/leveldb/db/db_test.cc +++ b/src/leveldb/db/db_test.cc @@ -57,8 +57,11 @@ void DelayMilliseconds(int millis) { // Special Env used to delay background operations class SpecialEnv : public EnvWrapper { public: - // sstable Sync() calls are blocked while this pointer is non-NULL. - port::AtomicPointer delay_sstable_sync_; + // sstable/log Sync() calls are blocked while this pointer is non-NULL. + port::AtomicPointer delay_data_sync_; + + // sstable/log Sync() calls return an error. + port::AtomicPointer data_sync_error_; // Simulate no-space errors while this pointer is non-NULL. port::AtomicPointer no_space_; @@ -75,11 +78,9 @@ class SpecialEnv : public EnvWrapper { bool count_random_reads_; AtomicCounter random_read_counter_; - AtomicCounter sleep_counter_; - AtomicCounter sleep_time_counter_; - explicit SpecialEnv(Env* base) : EnvWrapper(base) { - delay_sstable_sync_.Release_Store(NULL); + delay_data_sync_.Release_Store(NULL); + data_sync_error_.Release_Store(NULL); no_space_.Release_Store(NULL); non_writable_.Release_Store(NULL); count_random_reads_ = false; @@ -88,17 +89,17 @@ class SpecialEnv : public EnvWrapper { } Status NewWritableFile(const std::string& f, WritableFile** r) { - class SSTableFile : public WritableFile { + class DataFile : public WritableFile { private: SpecialEnv* env_; WritableFile* base_; public: - SSTableFile(SpecialEnv* env, WritableFile* base) + DataFile(SpecialEnv* env, WritableFile* base) : env_(env), base_(base) { } - ~SSTableFile() { delete base_; } + ~DataFile() { delete base_; } Status Append(const Slice& data) { if (env_->no_space_.Acquire_Load() != NULL) { // Drop writes on the floor @@ -110,7 +111,10 @@ class SpecialEnv : public EnvWrapper { Status Close() { return base_->Close(); } Status Flush() { return base_->Flush(); } Status Sync() { - while (env_->delay_sstable_sync_.Acquire_Load() != NULL) { + if (env_->data_sync_error_.Acquire_Load() != NULL) { + return Status::IOError("simulated data sync error"); + } + while (env_->delay_data_sync_.Acquire_Load() != NULL) { DelayMilliseconds(100); } return base_->Sync(); @@ -147,8 +151,9 @@ class SpecialEnv : public EnvWrapper { Status s = target()->NewWritableFile(f, r); if (s.ok()) { - if (strstr(f.c_str(), ".sst") != NULL) { - *r = new SSTableFile(this, *r); + if (strstr(f.c_str(), ".ldb") != NULL || + strstr(f.c_str(), ".log") != NULL) { + *r = new DataFile(this, *r); } else if (strstr(f.c_str(), "MANIFEST") != NULL) { *r = new ManifestFile(this, *r); } @@ -179,12 +184,6 @@ class SpecialEnv : public EnvWrapper { } return s; } - - virtual void SleepForMicroseconds(int micros) { - sleep_counter_.Increment(); - sleep_time_counter_.IncrementBy(micros); - } - }; class DBTest { @@ -322,7 +321,7 @@ class DBTest { } // Check reverse iteration results are the reverse of forward results - int matched = 0; + size_t matched = 0; for (iter->SeekToLast(); iter->Valid(); iter->Prev()) { ASSERT_LT(matched, forward.size()); ASSERT_EQ(IterStatus(iter), forward[forward.size() - matched - 1]); @@ -484,6 +483,24 @@ class DBTest { } return false; } + + // Returns number of files renamed. + int RenameLDBToSST() { + std::vector<std::string> filenames; + ASSERT_OK(env_->GetChildren(dbname_, &filenames)); + uint64_t number; + FileType type; + int files_renamed = 0; + for (size_t i = 0; i < filenames.size(); i++) { + if (ParseFileName(filenames[i], &number, &type) && type == kTableFile) { + const std::string from = TableFileName(dbname_, number); + const std::string to = SSTTableFileName(dbname_, number); + ASSERT_OK(env_->RenameFile(from, to)); + files_renamed++; + } + } + return files_renamed; + } }; TEST(DBTest, Empty) { @@ -525,11 +542,11 @@ TEST(DBTest, GetFromImmutableLayer) { ASSERT_OK(Put("foo", "v1")); ASSERT_EQ("v1", Get("foo")); - env_->delay_sstable_sync_.Release_Store(env_); // Block sync calls + env_->delay_data_sync_.Release_Store(env_); // Block sync calls Put("k1", std::string(100000, 'x')); // Fill memtable Put("k2", std::string(100000, 'y')); // Trigger compaction ASSERT_EQ("v1", Get("foo")); - env_->delay_sstable_sync_.Release_Store(NULL); // Release sync calls + env_->delay_data_sync_.Release_Store(NULL); // Release sync calls } while (ChangeOptions()); } @@ -1516,41 +1533,13 @@ TEST(DBTest, NoSpace) { Compact("a", "z"); const int num_files = CountFiles(); env_->no_space_.Release_Store(env_); // Force out-of-space errors - env_->sleep_counter_.Reset(); - for (int i = 0; i < 5; i++) { + for (int i = 0; i < 10; i++) { for (int level = 0; level < config::kNumLevels-1; level++) { dbfull()->TEST_CompactRange(level, NULL, NULL); } } env_->no_space_.Release_Store(NULL); ASSERT_LT(CountFiles(), num_files + 3); - - // Check that compaction attempts slept after errors - ASSERT_GE(env_->sleep_counter_.Read(), 5); -} - -TEST(DBTest, ExponentialBackoff) { - Options options = CurrentOptions(); - options.env = env_; - Reopen(&options); - - ASSERT_OK(Put("foo", "v1")); - ASSERT_EQ("v1", Get("foo")); - Compact("a", "z"); - env_->non_writable_.Release_Store(env_); // Force errors for new files - env_->sleep_counter_.Reset(); - env_->sleep_time_counter_.Reset(); - for (int i = 0; i < 5; i++) { - dbfull()->TEST_CompactRange(2, NULL, NULL); - } - env_->non_writable_.Release_Store(NULL); - - // Wait for compaction to finish - DelayMilliseconds(1000); - - ASSERT_GE(env_->sleep_counter_.Read(), 5); - ASSERT_LT(env_->sleep_counter_.Read(), 10); - ASSERT_GE(env_->sleep_time_counter_.Read(), 10e6); } TEST(DBTest, NonWritableFileSystem) { @@ -1573,6 +1562,37 @@ TEST(DBTest, NonWritableFileSystem) { env_->non_writable_.Release_Store(NULL); } +TEST(DBTest, WriteSyncError) { + // Check that log sync errors cause the DB to disallow future writes. + + // (a) Cause log sync calls to fail + Options options = CurrentOptions(); + options.env = env_; + Reopen(&options); + env_->data_sync_error_.Release_Store(env_); + + // (b) Normal write should succeed + WriteOptions w; + ASSERT_OK(db_->Put(w, "k1", "v1")); + ASSERT_EQ("v1", Get("k1")); + + // (c) Do a sync write; should fail + w.sync = true; + ASSERT_TRUE(!db_->Put(w, "k2", "v2").ok()); + ASSERT_EQ("v1", Get("k1")); + ASSERT_EQ("NOT_FOUND", Get("k2")); + + // (d) make sync behave normally + env_->data_sync_error_.Release_Store(NULL); + + // (e) Do a non-sync write; should fail + w.sync = false; + ASSERT_TRUE(!db_->Put(w, "k3", "v3").ok()); + ASSERT_EQ("v1", Get("k1")); + ASSERT_EQ("NOT_FOUND", Get("k2")); + ASSERT_EQ("NOT_FOUND", Get("k3")); +} + TEST(DBTest, ManifestWriteError) { // Test for the following problem: // (a) Compaction produces file F @@ -1632,6 +1652,22 @@ TEST(DBTest, MissingSSTFile) { << s.ToString(); } +TEST(DBTest, StillReadSST) { + ASSERT_OK(Put("foo", "bar")); + ASSERT_EQ("bar", Get("foo")); + + // Dump the memtable to disk. + dbfull()->TEST_CompactMemTable(); + ASSERT_EQ("bar", Get("foo")); + Close(); + ASSERT_GT(RenameLDBToSST(), 0); + Options options = CurrentOptions(); + options.paranoid_checks = true; + Status s = TryReopen(&options); + ASSERT_TRUE(s.ok()); + ASSERT_EQ("bar", Get("foo")); +} + TEST(DBTest, FilesDeletedAfterCompaction) { ASSERT_OK(Put("foo", "v2")); Compact("a", "z"); @@ -1663,7 +1699,7 @@ TEST(DBTest, BloomFilter) { dbfull()->TEST_CompactMemTable(); // Prevent auto compactions triggered by seeks - env_->delay_sstable_sync_.Release_Store(env_); + env_->delay_data_sync_.Release_Store(env_); // Lookup present keys. Should rarely read from small sstable. env_->random_read_counter_.Reset(); @@ -1684,7 +1720,7 @@ TEST(DBTest, BloomFilter) { fprintf(stderr, "%d missing => %d reads\n", N, reads); ASSERT_LE(reads, 3*N/100); - env_->delay_sstable_sync_.Release_Store(NULL); + env_->delay_data_sync_.Release_Store(NULL); Close(); delete options.block_cache; delete options.filter_policy; @@ -1744,7 +1780,7 @@ static void MTThreadBody(void* arg) { ASSERT_EQ(k, key); ASSERT_GE(w, 0); ASSERT_LT(w, kNumThreads); - ASSERT_LE(c, reinterpret_cast<uintptr_t>( + ASSERT_LE(static_cast<uintptr_t>(c), reinterpret_cast<uintptr_t>( t->state->counter[w].Acquire_Load())); } } diff --git a/src/leveldb/db/filename.cc b/src/leveldb/db/filename.cc index 3c4d49f64e..da32946d99 100644 --- a/src/leveldb/db/filename.cc +++ b/src/leveldb/db/filename.cc @@ -31,6 +31,11 @@ std::string LogFileName(const std::string& name, uint64_t number) { std::string TableFileName(const std::string& name, uint64_t number) { assert(number > 0); + return MakeFileName(name, number, "ldb"); +} + +std::string SSTTableFileName(const std::string& name, uint64_t number) { + assert(number > 0); return MakeFileName(name, number, "sst"); } @@ -71,7 +76,7 @@ std::string OldInfoLogFileName(const std::string& dbname) { // dbname/LOG // dbname/LOG.old // dbname/MANIFEST-[0-9]+ -// dbname/[0-9]+.(log|sst) +// dbname/[0-9]+.(log|sst|ldb) bool ParseFileName(const std::string& fname, uint64_t* number, FileType* type) { @@ -106,7 +111,7 @@ bool ParseFileName(const std::string& fname, Slice suffix = rest; if (suffix == Slice(".log")) { *type = kLogFile; - } else if (suffix == Slice(".sst")) { + } else if (suffix == Slice(".sst") || suffix == Slice(".ldb")) { *type = kTableFile; } else if (suffix == Slice(".dbtmp")) { *type = kTempFile; diff --git a/src/leveldb/db/filename.h b/src/leveldb/db/filename.h index d5d09b1146..87a752605d 100644 --- a/src/leveldb/db/filename.h +++ b/src/leveldb/db/filename.h @@ -37,6 +37,11 @@ extern std::string LogFileName(const std::string& dbname, uint64_t number); // "dbname". extern std::string TableFileName(const std::string& dbname, uint64_t number); +// Return the legacy file name for an sstable with the specified number +// in the db named by "dbname". The result will be prefixed with +// "dbname". +extern std::string SSTTableFileName(const std::string& dbname, uint64_t number); + // Return the name of the descriptor file for the db named by // "dbname" and the specified incarnation number. The result will be // prefixed with "dbname". diff --git a/src/leveldb/db/filename_test.cc b/src/leveldb/db/filename_test.cc index 5a26da4728..a32556deaf 100644 --- a/src/leveldb/db/filename_test.cc +++ b/src/leveldb/db/filename_test.cc @@ -27,6 +27,7 @@ TEST(FileNameTest, Parse) { { "100.log", 100, kLogFile }, { "0.log", 0, kLogFile }, { "0.sst", 0, kTableFile }, + { "0.ldb", 0, kTableFile }, { "CURRENT", 0, kCurrentFile }, { "LOCK", 0, kDBLockFile }, { "MANIFEST-2", 2, kDescriptorFile }, diff --git a/src/leveldb/db/repair.cc b/src/leveldb/db/repair.cc index 022d52f3de..96c9b37af1 100644 --- a/src/leveldb/db/repair.cc +++ b/src/leveldb/db/repair.cc @@ -244,60 +244,133 @@ class Repairer { void ExtractMetaData() { std::vector<TableInfo> kept; for (size_t i = 0; i < table_numbers_.size(); i++) { - TableInfo t; - t.meta.number = table_numbers_[i]; - Status status = ScanTable(&t); - if (!status.ok()) { - std::string fname = TableFileName(dbname_, table_numbers_[i]); - Log(options_.info_log, "Table #%llu: ignoring %s", - (unsigned long long) table_numbers_[i], - status.ToString().c_str()); - ArchiveFile(fname); - } else { - tables_.push_back(t); - } + ScanTable(table_numbers_[i]); } } - Status ScanTable(TableInfo* t) { - std::string fname = TableFileName(dbname_, t->meta.number); + Iterator* NewTableIterator(const FileMetaData& meta) { + // Same as compaction iterators: if paranoid_checks are on, turn + // on checksum verification. + ReadOptions r; + r.verify_checksums = options_.paranoid_checks; + return table_cache_->NewIterator(r, meta.number, meta.file_size); + } + + void ScanTable(uint64_t number) { + TableInfo t; + t.meta.number = number; + std::string fname = TableFileName(dbname_, number); + Status status = env_->GetFileSize(fname, &t.meta.file_size); + if (!status.ok()) { + // Try alternate file name. + fname = SSTTableFileName(dbname_, number); + Status s2 = env_->GetFileSize(fname, &t.meta.file_size); + if (s2.ok()) { + status = Status::OK(); + } + } + if (!status.ok()) { + ArchiveFile(TableFileName(dbname_, number)); + ArchiveFile(SSTTableFileName(dbname_, number)); + Log(options_.info_log, "Table #%llu: dropped: %s", + (unsigned long long) t.meta.number, + status.ToString().c_str()); + return; + } + + // Extract metadata by scanning through table. int counter = 0; - Status status = env_->GetFileSize(fname, &t->meta.file_size); - if (status.ok()) { - Iterator* iter = table_cache_->NewIterator( - ReadOptions(), t->meta.number, t->meta.file_size); - bool empty = true; - ParsedInternalKey parsed; - t->max_sequence = 0; - for (iter->SeekToFirst(); iter->Valid(); iter->Next()) { - Slice key = iter->key(); - if (!ParseInternalKey(key, &parsed)) { - Log(options_.info_log, "Table #%llu: unparsable key %s", - (unsigned long long) t->meta.number, - EscapeString(key).c_str()); - continue; - } + Iterator* iter = NewTableIterator(t.meta); + bool empty = true; + ParsedInternalKey parsed; + t.max_sequence = 0; + for (iter->SeekToFirst(); iter->Valid(); iter->Next()) { + Slice key = iter->key(); + if (!ParseInternalKey(key, &parsed)) { + Log(options_.info_log, "Table #%llu: unparsable key %s", + (unsigned long long) t.meta.number, + EscapeString(key).c_str()); + continue; + } - counter++; - if (empty) { - empty = false; - t->meta.smallest.DecodeFrom(key); - } - t->meta.largest.DecodeFrom(key); - if (parsed.sequence > t->max_sequence) { - t->max_sequence = parsed.sequence; - } + counter++; + if (empty) { + empty = false; + t.meta.smallest.DecodeFrom(key); } - if (!iter->status().ok()) { - status = iter->status(); + t.meta.largest.DecodeFrom(key); + if (parsed.sequence > t.max_sequence) { + t.max_sequence = parsed.sequence; } - delete iter; } + if (!iter->status().ok()) { + status = iter->status(); + } + delete iter; Log(options_.info_log, "Table #%llu: %d entries %s", - (unsigned long long) t->meta.number, + (unsigned long long) t.meta.number, counter, status.ToString().c_str()); - return status; + + if (status.ok()) { + tables_.push_back(t); + } else { + RepairTable(fname, t); // RepairTable archives input file. + } + } + + void RepairTable(const std::string& src, TableInfo t) { + // We will copy src contents to a new table and then rename the + // new table over the source. + + // Create builder. + std::string copy = TableFileName(dbname_, next_file_number_++); + WritableFile* file; + Status s = env_->NewWritableFile(copy, &file); + if (!s.ok()) { + return; + } + TableBuilder* builder = new TableBuilder(options_, file); + + // Copy data. + Iterator* iter = NewTableIterator(t.meta); + int counter = 0; + for (iter->SeekToFirst(); iter->Valid(); iter->Next()) { + builder->Add(iter->key(), iter->value()); + counter++; + } + delete iter; + + ArchiveFile(src); + if (counter == 0) { + builder->Abandon(); // Nothing to save + } else { + s = builder->Finish(); + if (s.ok()) { + t.meta.file_size = builder->FileSize(); + } + } + delete builder; + builder = NULL; + + if (s.ok()) { + s = file->Close(); + } + delete file; + file = NULL; + + if (counter > 0 && s.ok()) { + std::string orig = TableFileName(dbname_, t.meta.number); + s = env_->RenameFile(copy, orig); + if (s.ok()) { + Log(options_.info_log, "Table #%llu: %d entries repaired", + (unsigned long long) t.meta.number, counter); + tables_.push_back(t); + } + } + if (!s.ok()) { + env_->DeleteFile(copy); + } } Status WriteDescriptor() { diff --git a/src/leveldb/db/table_cache.cc b/src/leveldb/db/table_cache.cc index 497db27076..e3d82cd3ea 100644 --- a/src/leveldb/db/table_cache.cc +++ b/src/leveldb/db/table_cache.cc @@ -54,6 +54,12 @@ Status TableCache::FindTable(uint64_t file_number, uint64_t file_size, RandomAccessFile* file = NULL; Table* table = NULL; s = env_->NewRandomAccessFile(fname, &file); + if (!s.ok()) { + std::string old_fname = SSTTableFileName(dbname_, file_number); + if (env_->NewRandomAccessFile(old_fname, &file).ok()) { + s = Status::OK(); + } + } if (s.ok()) { s = Table::Open(*options_, file, file_size, &table); } diff --git a/src/leveldb/db/version_set.cc b/src/leveldb/db/version_set.cc index 66d73be71f..517edd3b18 100644 --- a/src/leveldb/db/version_set.cc +++ b/src/leveldb/db/version_set.cc @@ -876,12 +876,6 @@ Status VersionSet::LogAndApply(VersionEdit* edit, port::Mutex* mu) { } if (!s.ok()) { Log(options_->info_log, "MANIFEST write: %s\n", s.ToString().c_str()); - if (ManifestContains(record)) { - Log(options_->info_log, - "MANIFEST contains log record despite error; advancing to new " - "version to prevent mismatch between in-memory and logged state"); - s = Status::OK(); - } } } @@ -889,8 +883,6 @@ Status VersionSet::LogAndApply(VersionEdit* edit, port::Mutex* mu) { // new CURRENT file that points to it. if (s.ok() && !new_manifest_file.empty()) { s = SetCurrentFile(env_, dbname_, manifest_file_number_); - // No need to double-check MANIFEST in case of error since it - // will be discarded below. } mu->Lock(); @@ -1124,31 +1116,6 @@ const char* VersionSet::LevelSummary(LevelSummaryStorage* scratch) const { return scratch->buffer; } -// Return true iff the manifest contains the specified record. -bool VersionSet::ManifestContains(const std::string& record) const { - std::string fname = DescriptorFileName(dbname_, manifest_file_number_); - Log(options_->info_log, "ManifestContains: checking %s\n", fname.c_str()); - SequentialFile* file = NULL; - Status s = env_->NewSequentialFile(fname, &file); - if (!s.ok()) { - Log(options_->info_log, "ManifestContains: %s\n", s.ToString().c_str()); - return false; - } - log::Reader reader(file, NULL, true/*checksum*/, 0); - Slice r; - std::string scratch; - bool result = false; - while (reader.ReadRecord(&r, &scratch)) { - if (r == Slice(record)) { - result = true; - break; - } - } - delete file; - Log(options_->info_log, "ManifestContains: result = %d\n", result ? 1 : 0); - return result; -} - uint64_t VersionSet::ApproximateOffsetOf(Version* v, const InternalKey& ikey) { uint64_t result = 0; for (int level = 0; level < config::kNumLevels; level++) { diff --git a/src/leveldb/db/version_set.h b/src/leveldb/db/version_set.h index 20de0e2629..8dc14b8e01 100644 --- a/src/leveldb/db/version_set.h +++ b/src/leveldb/db/version_set.h @@ -292,8 +292,6 @@ class VersionSet { void AppendVersion(Version* v); - bool ManifestContains(const std::string& record) const; - Env* const env_; const std::string dbname_; const Options* const options_; diff --git a/src/leveldb/doc/impl.html b/src/leveldb/doc/impl.html index e870795d23..28817fe0da 100644 --- a/src/leveldb/doc/impl.html +++ b/src/leveldb/doc/impl.html @@ -11,7 +11,7 @@ The implementation of leveldb is similar in spirit to the representation of a single -<a href="http://labs.google.com/papers/bigtable.html"> +<a href="http://research.google.com/archive/bigtable.html"> Bigtable tablet (section 5.3)</a>. However the organization of the files that make up the representation is somewhat different and is explained below. diff --git a/src/leveldb/include/leveldb/db.h b/src/leveldb/include/leveldb/db.h index 57c00a5da0..5ffb29d526 100644 --- a/src/leveldb/include/leveldb/db.h +++ b/src/leveldb/include/leveldb/db.h @@ -14,7 +14,7 @@ namespace leveldb { // Update Makefile if you change these static const int kMajorVersion = 1; -static const int kMinorVersion = 13; +static const int kMinorVersion = 15; struct Options; struct ReadOptions; diff --git a/src/leveldb/include/leveldb/env.h b/src/leveldb/include/leveldb/env.h index fa32289f58..b2072d02c1 100644 --- a/src/leveldb/include/leveldb/env.h +++ b/src/leveldb/include/leveldb/env.h @@ -13,9 +13,9 @@ #ifndef STORAGE_LEVELDB_INCLUDE_ENV_H_ #define STORAGE_LEVELDB_INCLUDE_ENV_H_ -#include <cstdarg> #include <string> #include <vector> +#include <stdarg.h> #include <stdint.h> #include "leveldb/status.h" diff --git a/src/leveldb/issues/issue200_test.cc b/src/leveldb/issues/issue200_test.cc new file mode 100644 index 0000000000..1cec79f443 --- /dev/null +++ b/src/leveldb/issues/issue200_test.cc @@ -0,0 +1,59 @@ +// Copyright (c) 2013 The LevelDB Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. See the AUTHORS file for names of contributors. + +// Test for issue 200: when iterator switches direction from backward +// to forward, the current key can be yielded unexpectedly if a new +// mutation has been added just before the current key. + +#include "leveldb/db.h" +#include "util/testharness.h" + +namespace leveldb { + +class Issue200 { }; + +TEST(Issue200, Test) { + // Get rid of any state from an old run. + std::string dbpath = test::TmpDir() + "/leveldb_issue200_test"; + DestroyDB(dbpath, Options()); + + DB *db; + Options options; + options.create_if_missing = true; + ASSERT_OK(DB::Open(options, dbpath, &db)); + + WriteOptions write_options; + ASSERT_OK(db->Put(write_options, "1", "b")); + ASSERT_OK(db->Put(write_options, "2", "c")); + ASSERT_OK(db->Put(write_options, "3", "d")); + ASSERT_OK(db->Put(write_options, "4", "e")); + ASSERT_OK(db->Put(write_options, "5", "f")); + + ReadOptions read_options; + Iterator *iter = db->NewIterator(read_options); + + // Add an element that should not be reflected in the iterator. + ASSERT_OK(db->Put(write_options, "25", "cd")); + + iter->Seek("5"); + ASSERT_EQ(iter->key().ToString(), "5"); + iter->Prev(); + ASSERT_EQ(iter->key().ToString(), "4"); + iter->Prev(); + ASSERT_EQ(iter->key().ToString(), "3"); + iter->Next(); + ASSERT_EQ(iter->key().ToString(), "4"); + iter->Next(); + ASSERT_EQ(iter->key().ToString(), "5"); + + delete iter; + delete db; + DestroyDB(dbpath, options); +} + +} // namespace leveldb + +int main(int argc, char** argv) { + return leveldb::test::RunAllTests(); +} diff --git a/src/leveldb/port/atomic_pointer.h b/src/leveldb/port/atomic_pointer.h index e17bf435ea..a9866b2302 100644 --- a/src/leveldb/port/atomic_pointer.h +++ b/src/leveldb/port/atomic_pointer.h @@ -50,6 +50,13 @@ namespace port { // http://msdn.microsoft.com/en-us/library/ms684208(v=vs.85).aspx #define LEVELDB_HAVE_MEMORY_BARRIER +// Mac OS +#elif defined(OS_MACOSX) +inline void MemoryBarrier() { + OSMemoryBarrier(); +} +#define LEVELDB_HAVE_MEMORY_BARRIER + // Gcc on x86 #elif defined(ARCH_CPU_X86_FAMILY) && defined(__GNUC__) inline void MemoryBarrier() { @@ -68,13 +75,6 @@ inline void MemoryBarrier() { } #define LEVELDB_HAVE_MEMORY_BARRIER -// Mac OS -#elif defined(OS_MACOSX) -inline void MemoryBarrier() { - OSMemoryBarrier(); -} -#define LEVELDB_HAVE_MEMORY_BARRIER - // ARM Linux #elif defined(ARCH_CPU_ARM_FAMILY) && defined(__linux__) typedef void (*LinuxKernelMemoryBarrierFunc)(void); diff --git a/src/leveldb/table/filter_block_test.cc b/src/leveldb/table/filter_block_test.cc index 3a2a07cf53..8c4a4741f2 100644 --- a/src/leveldb/table/filter_block_test.cc +++ b/src/leveldb/table/filter_block_test.cc @@ -29,7 +29,7 @@ class TestHashFilter : public FilterPolicy { virtual bool KeyMayMatch(const Slice& key, const Slice& filter) const { uint32_t h = Hash(key.data(), key.size(), 1); - for (int i = 0; i + 4 <= filter.size(); i += 4) { + for (size_t i = 0; i + 4 <= filter.size(); i += 4) { if (h == DecodeFixed32(filter.data() + i)) { return true; } diff --git a/src/leveldb/util/arena.cc b/src/leveldb/util/arena.cc index 9551d6a3a2..9367f71492 100644 --- a/src/leveldb/util/arena.cc +++ b/src/leveldb/util/arena.cc @@ -40,7 +40,7 @@ char* Arena::AllocateFallback(size_t bytes) { } char* Arena::AllocateAligned(size_t bytes) { - const int align = sizeof(void*); // We'll align to pointer size + const int align = (sizeof(void*) > 8) ? sizeof(void*) : 8; assert((align & (align-1)) == 0); // Pointer size should be a power of 2 size_t current_mod = reinterpret_cast<uintptr_t>(alloc_ptr_) & (align-1); size_t slop = (current_mod == 0 ? 0 : align - current_mod); diff --git a/src/leveldb/util/arena.h b/src/leveldb/util/arena.h index 8f7dde226c..73bbf1cb9b 100644 --- a/src/leveldb/util/arena.h +++ b/src/leveldb/util/arena.h @@ -5,9 +5,9 @@ #ifndef STORAGE_LEVELDB_UTIL_ARENA_H_ #define STORAGE_LEVELDB_UTIL_ARENA_H_ -#include <cstddef> #include <vector> #include <assert.h> +#include <stddef.h> #include <stdint.h> namespace leveldb { diff --git a/src/leveldb/util/arena_test.cc b/src/leveldb/util/arena_test.cc index 63d1778034..58e870ec44 100644 --- a/src/leveldb/util/arena_test.cc +++ b/src/leveldb/util/arena_test.cc @@ -40,7 +40,7 @@ TEST(ArenaTest, Simple) { r = arena.Allocate(s); } - for (int b = 0; b < s; b++) { + for (size_t b = 0; b < s; b++) { // Fill the "i"th allocation with a known bit pattern r[b] = i % 256; } @@ -51,10 +51,10 @@ TEST(ArenaTest, Simple) { ASSERT_LE(arena.MemoryUsage(), bytes * 1.10); } } - for (int i = 0; i < allocated.size(); i++) { + for (size_t i = 0; i < allocated.size(); i++) { size_t num_bytes = allocated[i].first; const char* p = allocated[i].second; - for (int b = 0; b < num_bytes; b++) { + for (size_t b = 0; b < num_bytes; b++) { // Check the "i"th allocation for the known bit pattern ASSERT_EQ(int(p[b]) & 0xff, i % 256); } diff --git a/src/leveldb/util/bloom_test.cc b/src/leveldb/util/bloom_test.cc index 0bf8e8d6eb..77fb1b3159 100644 --- a/src/leveldb/util/bloom_test.cc +++ b/src/leveldb/util/bloom_test.cc @@ -126,7 +126,8 @@ TEST(BloomTest, VaryingLengths) { } Build(); - ASSERT_LE(FilterSize(), (length * 10 / 8) + 40) << length; + ASSERT_LE(FilterSize(), static_cast<size_t>((length * 10 / 8) + 40)) + << length; // All added keys must match for (int i = 0; i < length; i++) { diff --git a/src/leveldb/util/coding_test.cc b/src/leveldb/util/coding_test.cc index fb5726e335..521541ea61 100644 --- a/src/leveldb/util/coding_test.cc +++ b/src/leveldb/util/coding_test.cc @@ -112,13 +112,13 @@ TEST(Coding, Varint64) { } std::string s; - for (int i = 0; i < values.size(); i++) { + for (size_t i = 0; i < values.size(); i++) { PutVarint64(&s, values[i]); } const char* p = s.data(); const char* limit = p + s.size(); - for (int i = 0; i < values.size(); i++) { + for (size_t i = 0; i < values.size(); i++) { ASSERT_TRUE(p < limit); uint64_t actual; const char* start = p; @@ -143,7 +143,7 @@ TEST(Coding, Varint32Truncation) { std::string s; PutVarint32(&s, large_value); uint32_t result; - for (int len = 0; len < s.size() - 1; len++) { + for (size_t len = 0; len < s.size() - 1; len++) { ASSERT_TRUE(GetVarint32Ptr(s.data(), s.data() + len, &result) == NULL); } ASSERT_TRUE(GetVarint32Ptr(s.data(), s.data() + s.size(), &result) != NULL); @@ -162,7 +162,7 @@ TEST(Coding, Varint64Truncation) { std::string s; PutVarint64(&s, large_value); uint64_t result; - for (int len = 0; len < s.size() - 1; len++) { + for (size_t len = 0; len < s.size() - 1; len++) { ASSERT_TRUE(GetVarint64Ptr(s.data(), s.data() + len, &result) == NULL); } ASSERT_TRUE(GetVarint64Ptr(s.data(), s.data() + s.size(), &result) != NULL); diff --git a/src/leveldb/util/env_posix.cc b/src/leveldb/util/env_posix.cc index 0f5dcfac5a..93eadb1a4f 100644 --- a/src/leveldb/util/env_posix.cc +++ b/src/leveldb/util/env_posix.cc @@ -176,147 +176,43 @@ class PosixMmapReadableFile: public RandomAccessFile { } }; -// We preallocate up to an extra megabyte and use memcpy to append new -// data to the file. This is safe since we either properly close the -// file before reading from it, or for log files, the reading code -// knows enough to skip zero suffixes. -class PosixMmapFile : public WritableFile { +class PosixWritableFile : public WritableFile { private: std::string filename_; - int fd_; - size_t page_size_; - size_t map_size_; // How much extra memory to map at a time - char* base_; // The mapped region - char* limit_; // Limit of the mapped region - char* dst_; // Where to write next (in range [base_,limit_]) - char* last_sync_; // Where have we synced up to - uint64_t file_offset_; // Offset of base_ in file - - // Have we done an munmap of unsynced data? - bool pending_sync_; - - // Roundup x to a multiple of y - static size_t Roundup(size_t x, size_t y) { - return ((x + y - 1) / y) * y; - } - - size_t TruncateToPageBoundary(size_t s) { - s -= (s & (page_size_ - 1)); - assert((s % page_size_) == 0); - return s; - } - - bool UnmapCurrentRegion() { - bool result = true; - if (base_ != NULL) { - if (last_sync_ < limit_) { - // Defer syncing this data until next Sync() call, if any - pending_sync_ = true; - } - if (munmap(base_, limit_ - base_) != 0) { - result = false; - } - file_offset_ += limit_ - base_; - base_ = NULL; - limit_ = NULL; - last_sync_ = NULL; - dst_ = NULL; - - // Increase the amount we map the next time, but capped at 1MB - if (map_size_ < (1<<20)) { - map_size_ *= 2; - } - } - return result; - } - - bool MapNewRegion() { - assert(base_ == NULL); - if (ftruncate(fd_, file_offset_ + map_size_) < 0) { - return false; - } - void* ptr = mmap(NULL, map_size_, PROT_READ | PROT_WRITE, MAP_SHARED, - fd_, file_offset_); - if (ptr == MAP_FAILED) { - return false; - } - base_ = reinterpret_cast<char*>(ptr); - limit_ = base_ + map_size_; - dst_ = base_; - last_sync_ = base_; - return true; - } + FILE* file_; public: - PosixMmapFile(const std::string& fname, int fd, size_t page_size) - : filename_(fname), - fd_(fd), - page_size_(page_size), - map_size_(Roundup(65536, page_size)), - base_(NULL), - limit_(NULL), - dst_(NULL), - last_sync_(NULL), - file_offset_(0), - pending_sync_(false) { - assert((page_size & (page_size - 1)) == 0); - } - - - ~PosixMmapFile() { - if (fd_ >= 0) { - PosixMmapFile::Close(); + PosixWritableFile(const std::string& fname, FILE* f) + : filename_(fname), file_(f) { } + + ~PosixWritableFile() { + if (file_ != NULL) { + // Ignoring any potential errors + fclose(file_); } } virtual Status Append(const Slice& data) { - const char* src = data.data(); - size_t left = data.size(); - while (left > 0) { - assert(base_ <= dst_); - assert(dst_ <= limit_); - size_t avail = limit_ - dst_; - if (avail == 0) { - if (!UnmapCurrentRegion() || - !MapNewRegion()) { - return IOError(filename_, errno); - } - } - - size_t n = (left <= avail) ? left : avail; - memcpy(dst_, src, n); - dst_ += n; - src += n; - left -= n; + size_t r = fwrite_unlocked(data.data(), 1, data.size(), file_); + if (r != data.size()) { + return IOError(filename_, errno); } return Status::OK(); } virtual Status Close() { - Status s; - size_t unused = limit_ - dst_; - if (!UnmapCurrentRegion()) { - s = IOError(filename_, errno); - } else if (unused > 0) { - // Trim the extra space at the end of the file - if (ftruncate(fd_, file_offset_ - unused) < 0) { - s = IOError(filename_, errno); - } - } - - if (close(fd_) < 0) { - if (s.ok()) { - s = IOError(filename_, errno); - } + Status result; + if (fclose(file_) != 0) { + result = IOError(filename_, errno); } - - fd_ = -1; - base_ = NULL; - limit_ = NULL; - return s; + file_ = NULL; + return result; } virtual Status Flush() { + if (fflush_unlocked(file_) != 0) { + return IOError(filename_, errno); + } return Status::OK(); } @@ -353,26 +249,10 @@ class PosixMmapFile : public WritableFile { if (!s.ok()) { return s; } - - if (pending_sync_) { - // Some unmapped data was not synced - pending_sync_ = false; - if (fdatasync(fd_) < 0) { - s = IOError(filename_, errno); - } + if (fflush_unlocked(file_) != 0 || + fdatasync(fileno(file_)) != 0) { + s = Status::IOError(filename_, strerror(errno)); } - - if (dst_ > last_sync_) { - // Find the beginnings of the pages that contain the first and last - // bytes to be synced. - size_t p1 = TruncateToPageBoundary(last_sync_ - base_); - size_t p2 = TruncateToPageBoundary(dst_ - base_ - 1); - last_sync_ = dst_; - if (msync(base_ + p1, p2 - p1 + page_size_, MS_SYNC) < 0) { - s = IOError(filename_, errno); - } - } - return s; } }; @@ -463,12 +343,12 @@ class PosixEnv : public Env { virtual Status NewWritableFile(const std::string& fname, WritableFile** result) { Status s; - const int fd = open(fname.c_str(), O_CREAT | O_RDWR | O_TRUNC, 0644); - if (fd < 0) { + FILE* f = fopen(fname.c_str(), "w"); + if (f == NULL) { *result = NULL; s = IOError(fname, errno); } else { - *result = new PosixMmapFile(fname, fd, page_size_); + *result = new PosixWritableFile(fname, f); } return s; } @@ -631,7 +511,6 @@ class PosixEnv : public Env { return NULL; } - size_t page_size_; pthread_mutex_t mu_; pthread_cond_t bgsignal_; pthread_t bgthread_; @@ -646,8 +525,7 @@ class PosixEnv : public Env { MmapLimiter mmap_limit_; }; -PosixEnv::PosixEnv() : page_size_(getpagesize()), - started_bgthread_(false) { +PosixEnv::PosixEnv() : started_bgthread_(false) { PthreadCall("mutex_init", pthread_mutex_init(&mu_, NULL)); PthreadCall("cvar_init", pthread_cond_init(&bgsignal_, NULL)); } diff --git a/src/leveldb/util/testharness.cc b/src/leveldb/util/testharness.cc index eb1bdd554a..402fab34d7 100644 --- a/src/leveldb/util/testharness.cc +++ b/src/leveldb/util/testharness.cc @@ -38,7 +38,7 @@ int RunAllTests() { int num = 0; if (tests != NULL) { - for (int i = 0; i < tests->size(); i++) { + for (size_t i = 0; i < tests->size(); i++) { const Test& t = (*tests)[i]; if (matcher != NULL) { std::string name = t.base; diff --git a/src/leveldb/util/testutil.cc b/src/leveldb/util/testutil.cc index 538d09516d..bee56bf75f 100644 --- a/src/leveldb/util/testutil.cc +++ b/src/leveldb/util/testutil.cc @@ -32,7 +32,7 @@ std::string RandomKey(Random* rnd, int len) { extern Slice CompressibleString(Random* rnd, double compressed_fraction, - int len, std::string* dst) { + size_t len, std::string* dst) { int raw = static_cast<int>(len * compressed_fraction); if (raw < 1) raw = 1; std::string raw_data; diff --git a/src/leveldb/util/testutil.h b/src/leveldb/util/testutil.h index 824e655bd2..adad3fc1ea 100644 --- a/src/leveldb/util/testutil.h +++ b/src/leveldb/util/testutil.h @@ -24,7 +24,7 @@ extern std::string RandomKey(Random* rnd, int len); // "N*compressed_fraction" bytes and return a Slice that references // the generated data. extern Slice CompressibleString(Random* rnd, double compressed_fraction, - int len, std::string* dst); + size_t len, std::string* dst); // A wrapper that allows injection of errors. class ErrorEnv : public EnvWrapper { diff --git a/src/m4/ax_boost_base.m4 b/src/m4/ax_boost_base.m4 index 57d14fe48d..c675f12d84 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 21 +#serial 22 AC_DEFUN([AX_BOOST_BASE], [ @@ -97,6 +97,12 @@ if test "x$want_boost" = "xyes"; then ;; esac + dnl allow for real multi-arch paths e.g. /usr/lib/x86_64-linux-gnu. Give + dnl them priority over the other paths since, if libs are found there, they + dnl are almost assuredly the ones desired. + AC_REQUIRE([AC_CANONICAL_HOST]) + libsubdirs="lib/${host_cpu}-${host_os} $libsubdirs" + 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/bitcoin_qt.m4 b/src/m4/bitcoin_qt.m4 new file mode 100644 index 0000000000..4ae6e4159f --- /dev/null +++ b/src/m4/bitcoin_qt.m4 @@ -0,0 +1,381 @@ +dnl Helper for cases where a qt dependency is not met. +dnl Output: If qt version is auto, set bitcoin_enable_qt to false. Else, exit. +AC_DEFUN([BITCOIN_QT_FAIL],[ + if test "x$bitcoin_qt_want_version" = "xauto" && test x$bitcoin_qt_force != xyes; then + if test x$bitcoin_enable_qt != xno; then + AC_MSG_WARN([$1; bitcoin-qt frontend will not be built]) + fi + bitcoin_enable_qt=no + else + AC_MSG_ERROR([$1]) + fi +]) + +AC_DEFUN([BITCOIN_QT_CHECK],[ + if test "x$bitcoin_enable_qt" != "xno" && test x$bitcoin_qt_want_version != xno; then + true + $1 + else + true + $2 + fi +]) + +dnl BITCOIN_QT_PATH_PROGS([FOO], [foo foo2], [/path/to/search/first], [continue if missing]) +dnl Helper for finding the path of programs needed for QT. +dnl Inputs: $1: Variable to be set +dnl Inputs: $2: List of programs to search for +dnl Inputs: $3: Look for $2 here before $PATH +dnl Inputs: $4: If "yes", don't fail if $2 is not found. +dnl Output: $1 is set to the path of $2 if found. $2 are searched in order. +AC_DEFUN([BITCOIN_QT_PATH_PROGS],[ + BITCOIN_QT_CHECK([ + if test "x$3" != "x"; then + AC_PATH_PROGS($1,$2,,$3) + else + AC_PATH_PROGS($1,$2) + fi + if test "x$$1" = "x" && test "x$4" != "xyes"; then + BITCOIN_QT_FAIL([$1 not found]) + fi + ]) +]) + +dnl Initialize qt input. +dnl This must be called before any other BITCOIN_QT* macros to ensure that +dnl input variables are set correctly. +dnl CAUTION: Do not use this inside of a conditional. +AC_DEFUN([BITCOIN_QT_INIT],[ + dnl enable qt support + AC_ARG_WITH([qt], + [AS_HELP_STRING([--with-qt], + [with qt (no|qt4|qt5|auto. default is auto, qt4 tried first.)])], + [ + bitcoin_qt_want_version=$withval + if test x$bitcoin_qt_want_version = xyes; then + bitcoin_qt_force=yes + bitcoin_qt_want_version=auto + fi + ], + [bitcoin_qt_want_version=auto]) + + AC_ARG_WITH([qt-incdir],[AS_HELP_STRING([--with-qt-incdir=INC_DIR],[specify qt include path (overridden by pkgconfig)])], [qt_include_path=$withval], []) + AC_ARG_WITH([qt-libdir],[AS_HELP_STRING([--with-qt-libdir=LIB_DIR],[specify qt lib path (overridden by pkgconfig)])], [qt_lib_path=$withval], []) + AC_ARG_WITH([qt-plugindir],[AS_HELP_STRING([--with-qt-plugindir=PLUGIN_DIR],[specify qt plugin path (overridden by pkgconfig)])], [qt_plugin_path=$withval], []) + AC_ARG_WITH([qt-bindir],[AS_HELP_STRING([--with-qt-bindir=BIN_DIR],[specify qt bin path])], [qt_bin_path=$withval], []) + + AC_ARG_WITH([qtdbus], + [AS_HELP_STRING([--with-qtdbus], + [enable DBus support (default is yes if qt is enabled and QtDBus is found)])], + [use_dbus=$withval], + [use_dbus=auto]) +]) + +dnl Find the appropriate version of Qt libraries and includes. +dnl Inputs: $1: Whether or not pkg-config should be used. yes|no. Default: yes. +dnl Inputs: $2: If $1 is "yes" and --with-qt=auto, which qt version should be +dnl tried first. +dnl Outputs: See _BITCOIN_QT_FIND_LIBS_* +dnl Outputs: Sets variables for all qt-related tools. +dnl Outputs: bitcoin_enable_qt, bitcoin_enable_qt_dbus, bitcoin_enable_qt_test +AC_DEFUN([BITCOIN_QT_CONFIGURE],[ + use_pkgconfig=$1 + + if test x$use_pkgconfig == x; then + use_pkgconfig=yes + fi + + if test x$use_pkgconfig = xyes; then + if test x$PKG_CONFIG == x; then + AC_MSG_ERROR(pkg-config not found.) + fi + BITCOIN_QT_CHECK([_BITCOIN_QT_FIND_LIBS_WITH_PKGCONFIG([$2])]) + else + BITCOIN_QT_CHECK([_BITCOIN_QT_FIND_LIBS_WITHOUT_PKGCONFIG]) + fi + + BITCOIN_QT_PATH_PROGS([MOC], [moc-qt${bitcoin_qt_got_major_vers} moc${bitcoin_qt_got_major_vers} moc], $qt_bin_path) + BITCOIN_QT_PATH_PROGS([UIC], [uic-qt${bitcoin_qt_got_major_vers} uic${bitcoin_qt_got_major_vers} uic], $qt_bin_path) + BITCOIN_QT_PATH_PROGS([RCC], [rcc-qt${bitcoin_qt_got_major_vers} rcc${bitcoin_qt_got_major_vers} rcc], $qt_bin_path) + BITCOIN_QT_PATH_PROGS([LRELEASE], [lrelease-qt${bitcoin_qt_got_major_vers} lrelease${bitcoin_qt_got_major_vers} lrelease], $qt_bin_path) + BITCOIN_QT_PATH_PROGS([LUPDATE], [lupdate-qt${bitcoin_qt_got_major_vers} lupdate${bitcoin_qt_got_major_vers} lupdate],$qt_bin_path, yes) + + MOC_DEFS='-DHAVE_CONFIG_H -I$(top_srcdir)/src' + case $host in + *darwin*) + BITCOIN_QT_CHECK([ + MOC_DEFS="${MOC_DEFS} -DQ_OS_MAC" + base_frameworks="-framework Foundation -framework ApplicationServices -framework AppKit" + AX_CHECK_LINK_FLAG([[$base_frameworks]],[QT_LIBS="$QT_LIBS $base_frameworks"],[AC_MSG_ERROR(could not find base frameworks)]) + ]) + ;; + esac + + + dnl enable qt support + AC_MSG_CHECKING(if QT should be enabled) + BITCOIN_QT_CHECK([ + bitcoin_enable_qt=yes + bitcoin_enable_qt_test=yes + 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 + fi + if test x$LUPDATE == x; then + AC_MSG_WARN("lupdate is required to update qt translations") + fi + ],[ + bitcoin_enable_qt=no + ]) + AC_MSG_RESULT([$bitcoin_enable_qt (Qt${bitcoin_qt_got_major_vers})]) + + AC_SUBST(QT_INCLUDES) + AC_SUBST(QT_LIBS) + AC_SUBST(QT_DBUS_INCLUDES) + AC_SUBST(QT_DBUS_LIBS) + AC_SUBST(QT_TEST_INCLUDES) + AC_SUBST(QT_TEST_LIBS) + AC_SUBST(QT_SELECT, qt${bitcoin_qt_got_major_vers}) + AC_SUBST(MOC_DEFS) +]) + +dnl All macros below are internal and should _not_ be used from the main +dnl configure.ac. +dnl ---- + +dnl Internal. Check if the included version of QT is Qt5. +dnl Requires: INCLUDES must be populated as necessary. +dnl Output: bitcoin_cv_qt5=yes|no +AC_DEFUN([_BITCOIN_QT_CHECK_QT5],[ + AC_CACHE_CHECK(for QT 5, bitcoin_cv_qt5,[ + AC_TRY_COMPILE( + [#include <QtCore>], + [ + #if QT_VERSION < 0x050000 + choke me + #else + return 0; + #endif + ], + bitcoin_cv_qt5=yes, + bitcoin_cv_qt5=no) +])]) + +dnl Internal. Check if the linked version of QT was built as static libs. +dnl Requires: Qt5. This check cannot determine if Qt4 is static. +dnl Requires: INCLUDES and LIBS must be populated as necessary. +dnl Output: bitcoin_cv_static_qt=yes|no +dnl Output: Defines QT_STATICPLUGIN if plugins are static. +AC_DEFUN([_BITCOIN_QT_IS_STATIC],[ + AC_CACHE_CHECK(for static QT, bitcoin_cv_static_qt,[ + AC_TRY_COMPILE( + [#include <QtCore>], + [ + #if defined(QT_STATIC) + return 0; + #else + choke me + #endif + ], + [bitcoin_cv_static_qt=yes], + [bitcoin_cv_static_qt=no]) + ]) + if test xbitcoin_cv_static_qt = xyes; then + AC_DEFINE(QT_STATICPLUGIN, 1, [Define this symbol for static QT plugins]) + fi +]) + +dnl Internal. Check if the link-requirements for static plugins are met. +dnl Requires: INCLUDES and LIBS must be populated as necessary. +dnl Inputs: $1: A series of Q_IMPORT_PLUGIN(). +dnl Inputs: $2: The libraries that resolve $1. +dnl Output: QT_LIBS is prepended or configure exits. +AC_DEFUN([_BITCOIN_QT_CHECK_STATIC_PLUGINS],[ + AC_MSG_CHECKING(for static QT plugins: $2) + CHECK_STATIC_PLUGINS_TEMP_LIBS="$LIBS" + LIBS="$2 $QT_LIBS $LIBS" + AC_TRY_LINK([ + #define QT_STATICPLUGIN + #include <QtPlugin> + $1], + [return 0;], + [AC_MSG_RESULT(yes); QT_LIBS="$2 $QT_LIBS"], + [AC_MSG_RESULT(no)]; BITCOIN_QT_FAIL(Could not resolve: $2)) + LIBS="$CHECK_STATIC_PLUGINS_TEMP_LIBS" +]) + +dnl Internal. Find Qt libraries using pkg-config. +dnl Inputs: bitcoin_qt_want_version (from --with-qt=). The version to check +dnl first. +dnl Inputs: $1: If bitcoin_qt_want_version is "auto", check for this version +dnl first. +dnl Outputs: All necessary QT_* variables are set. +dnl Outputs: bitcoin_qt_got_major_vers is set to "4" or "5". +dnl Outputs: have_qt_test and have_qt_dbus are set (if applicable) to yes|no. +AC_DEFUN([_BITCOIN_QT_FIND_LIBS_WITH_PKGCONFIG],[ + m4_ifdef([PKG_CHECK_MODULES],[ + auto_priority_version=$1 + if test x$auto_priority_version == x; then + auto_priority_version=qt5 + fi + if test x$bitcoin_qt_want_version == xqt5 || ( test x$bitcoin_qt_want_version == xauto && test x$auto_priority_version == xqt5 ); then + QT_LIB_PREFIX=Qt5 + bitcoin_qt_got_major_vers=5 + else + QT_LIB_PREFIX=Qt + bitcoin_qt_got_major_vers=4 + fi + qt5_modules="Qt5Core Qt5Gui Qt5Network Qt5Widgets" + qt4_modules="QtCore QtGui QtNetwork" + BITCOIN_QT_CHECK([ + if test x$bitcoin_qt_want_version == xqt5 || ( test x$bitcoin_qt_want_version == xauto && test x$auto_priority_version == xqt5 ); then + PKG_CHECK_MODULES([QT], [$qt5_modules], [QT_INCLUDES="$QT_CFLAGS"; have_qt=yes],[have_qt=no]) + elif test x$bitcoin_qt_want_version == xqt4 || ( test x$bitcoin_qt_want_version == xauto && test x$auto_priority_version == xqt4 ); then + PKG_CHECK_MODULES([QT], [$qt4_modules], [QT_INCLUDES="$QT_CFLAGS"; have_qt=yes], [have_qt=no]) + fi + + dnl qt version is set to 'auto' and the preferred version wasn't found. Now try the other. + if test x$have_qt == xno && test x$bitcoin_qt_want_version == xauto; then + if test x$auto_priority_version = x$qt5; then + PKG_CHECK_MODULES([QT], [$qt4_modules], [QT_INCLUDES="$QT_CFLAGS"; have_qt=yes; QT_LIB_PREFIX=Qt; bitcoin_qt_got_major_vers=4], [have_qt=no]) + else + PKG_CHECK_MODULES([QT], [$qt5_modules], [QT_INCLUDES="$QT_CFLAGS"; have_qt=yes; QT_LIB_PREFIX=Qt5; bitcoin_qt_got_major_vers=5], [have_qt=no]) + fi + fi + if test x$have_qt != xyes; then + have_qt=no + BITCOIN_QT_FAIL([Qt dependencies not found]) + fi + ]) + BITCOIN_QT_CHECK([ + PKG_CHECK_MODULES([QT_TEST], [${QT_LIB_PREFIX}Test], [QT_TEST_INCLUDES="$QT_TEST_CFLAGS"; have_qt_test=yes], [have_qt_test=no]) + if test x$use_dbus != xno; then + PKG_CHECK_MODULES([QT_DBUS], [${QT_LIB_PREFIX}DBus], [QT_DBUS_INCLUDES="$QT_DBUS_CFLAGS"; have_qt_dbus=yes], [have_qt_dbus=no]) + fi + ]) + ]) + true; dnl +]) + +dnl Internal. Find Qt libraries without using pkg-config. Version is deduced +dnl from the discovered headers. +dnl Inputs: bitcoin_qt_want_version (from --with-qt=). The version to use. +dnl If "auto", the version will be discovered by _BITCOIN_QT_CHECK_QT5. +dnl Outputs: All necessary QT_* variables are set. +dnl Outputs: bitcoin_qt_got_major_vers is set to "4" or "5". +dnl Outputs: have_qt_test and have_qt_dbus are set (if applicable) to yes|no. +AC_DEFUN([_BITCOIN_QT_FIND_LIBS_WITHOUT_PKGCONFIG],[ + TEMP_CPPFLAGS="$CPPFLAGS" + TEMP_LIBS="$LIBS" + BITCOIN_QT_CHECK([ + if test x$qt_include_path != x; then + QT_INCLUDES="-I$qt_include_path -I$qt_include_path/QtCore -I$qt_include_path/QtGui -I$qt_include_path/QtWidgets -I$qt_include_path/QtNetwork -I$qt_include_path/QtTest -I$qt_include_path/QtDBus" + CPPFLAGS="$QT_INCLUDES $CPPFLAGS" + fi + ]) + + BITCOIN_QT_CHECK([AC_CHECK_HEADER([QtPlugin],,BITCOIN_QT_FAIL(QtCore headers missing))]) + BITCOIN_QT_CHECK([AC_CHECK_HEADER([QApplication],, BITCOIN_QT_FAIL(QtGui headers missing))]) + BITCOIN_QT_CHECK([AC_CHECK_HEADER([QLocalSocket],, BITCOIN_QT_FAIL(QtNetwork headers missing))]) + + BITCOIN_QT_CHECK([ + if test x$bitcoin_qt_want_version = xauto; then + _BITCOIN_QT_CHECK_QT5 + fi + if test x$bitcoin_cv_qt5 == xyes || test x$bitcoin_qt_want_version = xqt5; then + QT_LIB_PREFIX=Qt5 + bitcoin_qt_got_major_vers=5 + else + QT_LIB_PREFIX=Qt + bitcoin_qt_got_major_vers=4 + fi + ]) + + BITCOIN_QT_CHECK([ + LIBS= + if test x$qt_lib_path != x; then + LIBS="$LIBS -L$qt_lib_path" + fi + if test x$qt_plugin_path != x; then + LIBS="$LIBS -L$qt_plugin_path/accessible" + if test x$bitcoin_qt_got_major_vers == x5; then + LIBS="$LIBS -L$qt_plugin_path/platforms" + else + LIBS="$LIBS -L$qt_plugin_path/codecs" + fi + fi + + if test x$TARGET_OS == xwindows; then + AC_CHECK_LIB([imm32], [main],, BITCOIN_QT_FAIL(libimm32 not found)) + fi + ]) + + BITCOIN_QT_CHECK(AC_CHECK_LIB([z] ,[main],,BITCOIN_QT_FAIL(zlib not found))) + BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}Core] ,[main],,BITCOIN_QT_FAIL(lib$QT_LIB_PREFIXCore not found))) + BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}Gui] ,[main],,BITCOIN_QT_FAIL(lib$QT_LIB_PREFIXGui not found))) + BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}Network],[main],,BITCOIN_QT_FAIL(lib$QT_LIB_PREFIXNetwork not found))) + if test x$bitcoin_qt_got_major_vers == x5; then + BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}Widgets],[main],,BITCOIN_QT_FAIL(lib$QT_LIB_PREFIXWidgets not found))) + fi + QT_LIBS="$LIBS" + LIBS="$TEMP_LIBS" + + dnl This is ugly and complicated. Yuck. Works as follows: + dnl We can't discern whether Qt4 builds are static or not. For Qt5, we can + dnl check a header to find out. When Qt is built statically, some plugins must + dnl be linked into the final binary as well. These plugins have changed between + dnl Qt4 and Qt5. With Qt5, languages moved into core and the WindowsIntegration + dnl plugin was added. Since we can't tell if Qt4 is static or not, it is + dnl assumed for all non-pkg-config builds. + dnl _BITCOIN_QT_CHECK_STATIC_PLUGINS does a quick link-check and appends the + dnl results to QT_LIBS. + BITCOIN_QT_CHECK([ + if test x$bitcoin_qt_got_major_vers == x5; then + _BITCOIN_QT_IS_STATIC + if test x$bitcoin_cv_static_qt == xyes; then + AC_DEFINE(QT_STATICPLUGIN, 1, [Define this symbol if qt plugins are static]) + _BITCOIN_QT_CHECK_STATIC_PLUGINS([Q_IMPORT_PLUGIN(AccessibleFactory)], [-lqtaccessiblewidgets]) + if test x$TARGET_OS == xwindows; then + _BITCOIN_QT_CHECK_STATIC_PLUGINS([Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin)],[-lqwindows]) + fi + fi + else + AC_DEFINE(QT_STATICPLUGIN, 1, [Define this symbol if qt plugins are static]) + _BITCOIN_QT_CHECK_STATIC_PLUGINS([ + Q_IMPORT_PLUGIN(qcncodecs) + Q_IMPORT_PLUGIN(qjpcodecs) + Q_IMPORT_PLUGIN(qtwcodecs) + Q_IMPORT_PLUGIN(qkrcodecs) + Q_IMPORT_PLUGIN(AccessibleFactory)], + [-lqcncodecs -lqjpcodecs -lqtwcodecs -lqkrcodecs -lqtaccessiblewidgets]) + fi + ]) + + BITCOIN_QT_CHECK([ + LIBS= + if test x$qt_lib_path != x; then + LIBS="-L$qt_lib_path" + fi + AC_CHECK_LIB([${QT_LIB_PREFIX}Test], [main],, have_qt_test=no) + AC_CHECK_HEADER([QTest],, have_qt_test=no) + QT_TEST_LIBS="$LIBS" + if test x$use_dbus != xno; then + LIBS= + if test x$qt_lib_path != x; then + LIBS="-L$qt_lib_path" + fi + AC_CHECK_LIB([${QT_LIB_PREFIX}DBus], [main],, have_qt_dbus=no) + AC_CHECK_HEADER([QtDBus],, have_qt_dbus=no) + QT_DBUS_LIBS="$LIBS" + fi + ]) + CPPFLAGS="$TEMP_CPPFLAGS" + LIBS="$TEMP_LIBS" +]) + diff --git a/src/main.cpp b/src/main.cpp index d130e9705e..017a0768d5 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -67,9 +67,6 @@ CScript COINBASE_FLAGS; const string strMessageMagic = "Bitcoin Signed Message:\n"; -// Settings -int64_t nTransactionFee = 0; - // Internal stuff namespace { struct CBlockIndexWorkComparator @@ -2238,7 +2235,7 @@ void PushGetBlocks(CNode* pnode, CBlockIndex* pindexBegin, uint256 hashEnd) bool ProcessBlock(CValidationState &state, CNode* pfrom, CBlock* pblock, CDiskBlockPos *dbp) { - AssertLockHeld("cs_main"); + AssertLockHeld(cs_main); // Check for duplicate uint256 hash = pblock->GetHash(); diff --git a/src/main.h b/src/main.h index c52f37cc87..f3f9acb639 100644 --- a/src/main.h +++ b/src/main.h @@ -35,10 +35,12 @@ class CInv; /** The maximum allowed size for a serialized block, in bytes (network rule) */ static const unsigned int MAX_BLOCK_SIZE = 1000000; -/** The maximum size for mined blocks */ -static const unsigned int MAX_BLOCK_SIZE_GEN = MAX_BLOCK_SIZE/2; +/** Default for -blockmaxsize, maximum size for mined blocks **/ +static const unsigned int DEFAULT_BLOCK_MAX_SIZE = 750000; +/** 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 */ -static const unsigned int MAX_STANDARD_TX_SIZE = MAX_BLOCK_SIZE_GEN/5; +static const unsigned int MAX_STANDARD_TX_SIZE = 100000; /** The maximum allowed number of signature check operations in a block (network rule) */ static const unsigned int MAX_BLOCK_SIGOPS = MAX_BLOCK_SIZE/50; /** The maximum number of orphan transactions kept in memory */ @@ -55,8 +57,6 @@ 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; -/** Default amount of block size reserved for high-priority transactions (in bytes) */ -static const int DEFAULT_BLOCK_PRIORITY_SIZE = 27000; #ifdef USE_UPNP static const int fHaveUPnP = true; #else @@ -96,9 +96,6 @@ extern bool fTxIndex; extern unsigned int nCoinCacheSize; extern bool fHaveGUI; -// Settings -extern int64_t nTransactionFee; - // Minimum disk space required - used in CheckDiskSpace() static const uint64_t nMinDiskSpace = 52428800; diff --git a/src/miner.cpp b/src/miner.cpp index 49f6ec6b95..21a9fa256b 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -8,8 +8,9 @@ #include "core.h" #include "main.h" #include "net.h" +#ifdef ENABLE_WALLET #include "wallet.h" - +#endif ////////////////////////////////////////////////////////////////////////////// // // BitcoinMiner @@ -124,7 +125,7 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn) pblocktemplate->vTxSigOps.push_back(-1); // updated at end // Largest block you're willing to create: - unsigned int nBlockMaxSize = GetArg("-blockmaxsize", MAX_BLOCK_SIZE_GEN/2); + unsigned int nBlockMaxSize = GetArg("-blockmaxsize", DEFAULT_BLOCK_MAX_SIZE); // Limit to betweeen 1K and MAX_BLOCK_SIZE-1K for sanity: nBlockMaxSize = std::max((unsigned int)1000, std::min((unsigned int)(MAX_BLOCK_SIZE-1000), nBlockMaxSize)); diff --git a/src/net.cpp b/src/net.cpp index 6ae749c657..ab39be60b5 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -12,7 +12,6 @@ #include "addrman.h" #include "chainparams.h" #include "core.h" -#include "db.h" #include "ui_interface.h" #ifdef WIN32 @@ -209,7 +209,7 @@ public: std::string addrName; CService addrLocal; int nVersion; - // strSubVer is whatever byte array we read from the wire. However, this field is intended + // strSubVer is whatever byte array we read from the wire. However, this field is intended // to be printed out, displayed to humans in various forms and so on. So we sanitize it and // store the sanitized version in cleanSubVer. The original should be used when dealing with // the network or wire types and the cleaned string used when displayed or logged. @@ -264,7 +264,7 @@ public: int64_t nPingUsecStart; int64_t nPingUsecTime; bool fPingQueued; - + CNode(SOCKET hSocketIn, CAddress addrIn, std::string addrNameIn = "", bool fInboundIn=false) : ssSend(SER_NETWORK, INIT_PROTO_VERSION) { nServices = 0; diff --git a/src/noui.cpp b/src/noui.cpp index fd285c5719..86954f3c34 100644 --- a/src/noui.cpp +++ b/src/noui.cpp @@ -34,11 +34,6 @@ static bool noui_ThreadSafeMessageBox(const std::string& message, const std::str return false; } -static bool noui_ThreadSafeAskFee(int64_t /*nFeeRequired*/) -{ - return true; -} - static void noui_InitMessage(const std::string &message) { LogPrintf("init message: %s\n", message.c_str()); @@ -48,6 +43,5 @@ void noui_connect() { // Connect bitcoind signal handlers uiInterface.ThreadSafeMessageBox.connect(noui_ThreadSafeMessageBox); - uiInterface.ThreadSafeAskFee.connect(noui_ThreadSafeAskFee); uiInterface.InitMessage.connect(noui_InitMessage); } diff --git a/src/qt/Makefile.am b/src/qt/Makefile.am index 434373da29..deed59bebd 100644 --- a/src/qt/Makefile.am +++ b/src/qt/Makefile.am @@ -11,7 +11,8 @@ SUBDIRS = $(BUILD_TEST_QT) DIST_SUBDIRS = test # bitcoin qt core # -QT_TS = locale/bitcoin_ach.ts \ +QT_TS = \ + locale/bitcoin_ach.ts \ locale/bitcoin_af_ZA.ts \ locale/bitcoin_ar.ts \ locale/bitcoin_be_BY.ts \ @@ -22,12 +23,13 @@ QT_TS = locale/bitcoin_ach.ts \ locale/bitcoin_cs.ts \ locale/bitcoin_cy.ts \ locale/bitcoin_da.ts \ - locale/bitcoin_de.ts \ locale/bitcoin_de_AT.ts \ + locale/bitcoin_de.ts \ locale/bitcoin_el_GR.ts \ locale/bitcoin_en.ts \ locale/bitcoin_eo.ts \ locale/bitcoin_es_CL.ts \ + locale/bitcoin_es_MX.ts \ locale/bitcoin_es.ts \ locale/bitcoin_et.ts \ locale/bitcoin_eu_ES.ts \ @@ -53,6 +55,7 @@ QT_TS = locale/bitcoin_ach.ts \ locale/bitcoin_ms_MY.ts \ locale/bitcoin_nb.ts \ locale/bitcoin_nl.ts \ + locale/bitcoin_pam.ts \ locale/bitcoin_pl.ts \ locale/bitcoin_pt_BR.ts \ locale/bitcoin_pt_PT.ts \ @@ -71,41 +74,78 @@ QT_TS = locale/bitcoin_ach.ts \ locale/bitcoin_zh_CN.ts \ locale/bitcoin_zh_TW.ts -QT_FORMS_UI = forms/aboutdialog.ui forms/addressbookpage.ui \ +QT_FORMS_UI = \ + forms/aboutdialog.ui \ + forms/addressbookpage.ui \ forms/askpassphrasedialog.ui \ forms/coincontroldialog.ui \ forms/editaddressdialog.ui \ forms/intro.ui \ forms/openuridialog.ui \ - forms/optionsdialog.ui forms/overviewpage.ui forms/receiverequestdialog.ui \ + forms/optionsdialog.ui \ + forms/overviewpage.ui \ forms/receivecoinsdialog.ui \ - forms/rpcconsole.ui forms/sendcoinsdialog.ui forms/sendcoinsentry.ui \ - forms/signverifymessagedialog.ui forms/transactiondescdialog.ui + forms/receiverequestdialog.ui \ + forms/rpcconsole.ui \ + forms/sendcoinsdialog.ui \ + forms/sendcoinsentry.ui \ + forms/signverifymessagedialog.ui \ + forms/transactiondescdialog.ui -QT_MOC_CPP = moc_aboutdialog.cpp moc_addressbookpage.cpp \ - moc_addresstablemodel.cpp moc_askpassphrasedialog.cpp \ - moc_bitcoinaddressvalidator.cpp moc_bitcoinamountfield.cpp \ - moc_bitcoingui.cpp moc_bitcoinunits.cpp moc_clientmodel.cpp \ +QT_MOC_CPP = \ + moc_aboutdialog.cpp \ + moc_addressbookpage.cpp \ + moc_addresstablemodel.cpp \ + moc_askpassphrasedialog.cpp \ + moc_bitcoinaddressvalidator.cpp \ + moc_bitcoinamountfield.cpp \ + moc_bitcoingui.cpp \ + moc_bitcoinunits.cpp \ + moc_clientmodel.cpp \ moc_coincontroldialog.cpp \ moc_coincontroltreewidget.cpp \ - moc_csvmodelwriter.cpp moc_editaddressdialog.cpp moc_guiutil.cpp \ - moc_intro.cpp moc_macdockiconhandler.cpp moc_macnotificationhandler.cpp \ - moc_monitoreddatamapper.cpp moc_notificator.cpp \ + moc_csvmodelwriter.cpp \ + moc_editaddressdialog.cpp \ + moc_guiutil.cpp \ + moc_intro.cpp \ + moc_macdockiconhandler.cpp \ + moc_macnotificationhandler.cpp \ + moc_monitoreddatamapper.cpp \ + moc_notificator.cpp \ moc_openuridialog.cpp \ moc_optionsdialog.cpp \ - moc_optionsmodel.cpp moc_overviewpage.cpp moc_paymentserver.cpp \ - moc_receiverequestdialog.cpp moc_qvalidatedlineedit.cpp moc_qvaluecombobox.cpp \ + moc_optionsmodel.cpp \ + moc_overviewpage.cpp \ + moc_paymentserver.cpp \ + moc_qvalidatedlineedit.cpp \ + moc_qvaluecombobox.cpp \ moc_receivecoinsdialog.cpp \ + moc_receiverequestdialog.cpp \ moc_recentrequeststablemodel.cpp \ - moc_rpcconsole.cpp moc_sendcoinsdialog.cpp moc_sendcoinsentry.cpp \ - moc_signverifymessagedialog.cpp moc_splashscreen.cpp moc_trafficgraphwidget.cpp moc_transactiondesc.cpp \ - moc_transactiondescdialog.cpp moc_transactionfilterproxy.cpp \ - moc_transactiontablemodel.cpp moc_transactionview.cpp moc_walletframe.cpp \ - moc_walletmodel.cpp moc_walletview.cpp + moc_rpcconsole.cpp \ + moc_sendcoinsdialog.cpp \ + moc_sendcoinsentry.cpp \ + moc_signverifymessagedialog.cpp \ + moc_splashscreen.cpp \ + moc_trafficgraphwidget.cpp \ + moc_transactiondesc.cpp \ + moc_transactiondescdialog.cpp \ + moc_transactionfilterproxy.cpp \ + moc_transactiontablemodel.cpp \ + moc_transactionview.cpp \ + moc_walletframe.cpp \ + moc_walletmodel.cpp \ + moc_walletview.cpp -BITCOIN_MM = macdockiconhandler.mm macnotificationhandler.mm +BITCOIN_MM = \ + macdockiconhandler.mm \ + macnotificationhandler.mm -QT_MOC = intro.moc overviewpage.moc rpcconsole.moc +QT_MOC = \ + bitcoin.moc \ + intro.moc \ + overviewpage.moc \ + rpcconsole.moc QT_QRC_CPP = qrc_bitcoin.cpp QT_QRC = bitcoin.qrc @@ -114,59 +154,153 @@ PROTOBUF_CC = paymentrequest.pb.cc PROTOBUF_H = paymentrequest.pb.h PROTOBUF_PROTO = paymentrequest.proto -BITCOIN_QT_H = aboutdialog.h addressbookpage.h addresstablemodel.h \ - askpassphrasedialog.h bitcoinaddressvalidator.h bitcoinamountfield.h \ - bitcoingui.h bitcoinunits.h clientmodel.h coincontroldialog.h coincontroltreewidget.h csvmodelwriter.h \ - editaddressdialog.h guiconstants.h guiutil.h intro.h macdockiconhandler.h \ - macnotificationhandler.h monitoreddatamapper.h notificator.h \ +BITCOIN_QT_H = \ + aboutdialog.h \ + addressbookpage.h \ + addresstablemodel.h \ + askpassphrasedialog.h \ + bitcoinaddressvalidator.h \ + bitcoinamountfield.h \ + bitcoingui.h \ + bitcoinunits.h \ + clientmodel.h \ + coincontroldialog.h \ + coincontroltreewidget.h \ + csvmodelwriter.h \ + editaddressdialog.h \ + guiconstants.h \ + guiutil.h \ + intro.h \ + macdockiconhandler.h \ + macnotificationhandler.h \ + monitoreddatamapper.h \ + notificator.h \ openuridialog.h \ optionsdialog.h \ - optionsmodel.h overviewpage.h paymentrequestplus.h paymentserver.h \ + optionsmodel.h \ + overviewpage.h \ + paymentrequestplus.h \ + paymentserver.h \ + qvalidatedlineedit.h \ + qvaluecombobox.h \ receivecoinsdialog.h \ + receiverequestdialog.h \ recentrequeststablemodel.h \ - receiverequestdialog.h qvalidatedlineedit.h qvaluecombobox.h rpcconsole.h \ - sendcoinsdialog.h sendcoinsentry.h signverifymessagedialog.h splashscreen.h \ - trafficgraphwidget.h transactiondescdialog.h transactiondesc.h transactionfilterproxy.h \ - transactionrecord.h transactiontablemodel.h transactionview.h walletframe.h \ - walletmodel.h walletmodeltransaction.h walletview.h - -RES_ICONS = res/icons/bitcoin.png res/icons/address-book.png \ - res/icons/quit.png res/icons/send.png res/icons/toolbar.png \ - res/icons/connect0_16.png res/icons/connect1_16.png \ - res/icons/connect2_16.png res/icons/connect3_16.png \ - res/icons/connect4_16.png res/icons/transaction0.png \ - res/icons/transaction2.png res/icons/clock1.png res/icons/clock2.png \ - res/icons/clock3.png res/icons/clock4.png res/icons/clock5.png \ - res/icons/configure.png res/icons/receive.png res/icons/editpaste.png \ - res/icons/editcopy.png res/icons/add.png res/icons/bitcoin_testnet.png \ - res/icons/toolbar_testnet.png res/icons/edit.png res/icons/history.png \ - res/icons/overview.png res/icons/export.png res/icons/synced.png \ - res/icons/remove.png res/icons/tx_mined.png res/icons/tx_input.png \ - res/icons/tx_output.png res/icons/tx_inout.png res/icons/lock_closed.png \ - res/icons/lock_open.png res/icons/key.png res/icons/filesave.png \ - res/icons/qrcode.png res/icons/debugwindow.png res/icons/bitcoin.ico \ - res/icons/bitcoin_testnet.ico - -BITCOIN_QT_CPP = aboutdialog.cpp addressbookpage.cpp \ - addresstablemodel.cpp askpassphrasedialog.cpp bitcoinaddressvalidator.cpp \ - bitcoinamountfield.cpp bitcoin.cpp bitcoingui.cpp \ - bitcoinunits.cpp clientmodel.cpp \ + rpcconsole.h \ + sendcoinsdialog.h \ + sendcoinsentry.h \ + signverifymessagedialog.h \ + splashscreen.h \ + trafficgraphwidget.h \ + transactiondesc.h \ + transactiondescdialog.h \ + transactionfilterproxy.h \ + transactionrecord.h \ + transactiontablemodel.h \ + transactionview.h \ + walletframe.h \ + walletmodel.h \ + walletmodeltransaction.h \ + walletview.h + +RES_ICONS = \ + res/icons/add.png \ + res/icons/address-book.png \ + res/icons/bitcoin.ico \ + res/icons/bitcoin.png \ + res/icons/bitcoin_testnet.ico \ + res/icons/bitcoin_testnet.png \ + res/icons/clock1.png \ + res/icons/clock2.png \ + res/icons/clock3.png \ + res/icons/clock4.png \ + res/icons/clock5.png \ + res/icons/configure.png \ + res/icons/connect0_16.png \ + res/icons/connect1_16.png \ + res/icons/connect2_16.png \ + res/icons/connect3_16.png \ + res/icons/connect4_16.png \ + res/icons/debugwindow.png \ + res/icons/edit.png \ + res/icons/editcopy.png \ + res/icons/editpaste.png \ + res/icons/export.png \ + res/icons/filesave.png \ + res/icons/history.png \ + res/icons/key.png \ + res/icons/lock_closed.png \ + res/icons/lock_open.png \ + res/icons/overview.png \ + res/icons/qrcode.png \ + res/icons/quit.png \ + res/icons/receive.png \ + res/icons/remove.png \ + res/icons/send.png \ + res/icons/synced.png \ + res/icons/toolbar.png \ + res/icons/toolbar_testnet.png \ + res/icons/transaction0.png \ + res/icons/transaction2.png \ + res/icons/tx_inout.png \ + res/icons/tx_input.png \ + res/icons/tx_output.png \ + res/icons/tx_mined.png + +BITCOIN_QT_CPP = \ + aboutdialog.cpp \ + bitcoin.cpp \ + bitcoinaddressvalidator.cpp \ + bitcoinamountfield.cpp \ + bitcoingui.cpp \ + bitcoinunits.cpp \ + clientmodel.cpp \ + csvmodelwriter.cpp \ + guiutil.cpp \ + intro.cpp \ + monitoreddatamapper.cpp \ + notificator.cpp \ + optionsdialog.cpp \ + optionsmodel.cpp \ + qvalidatedlineedit.cpp \ + qvaluecombobox.cpp \ + rpcconsole.cpp \ + signverifymessagedialog.cpp \ + splashscreen.cpp \ + trafficgraphwidget.cpp + +if ENABLE_WALLET +BITCOIN_QT_CPP += \ + addressbookpage.cpp \ + addresstablemodel.cpp \ + askpassphrasedialog.cpp \ coincontroldialog.cpp \ coincontroltreewidget.cpp \ - csvmodelwriter.cpp editaddressdialog.cpp \ - guiutil.cpp intro.cpp monitoreddatamapper.cpp notificator.cpp \ + editaddressdialog.cpp \ openuridialog.cpp \ - optionsdialog.cpp optionsmodel.cpp overviewpage.cpp paymentrequestplus.cpp \ - paymentserver.cpp qvalidatedlineedit.cpp qvaluecombobox.cpp \ - receivecoinsdialog.cpp receiverequestdialog.cpp \ + overviewpage.cpp \ + paymentrequestplus.cpp \ + paymentserver.cpp \ + receivecoinsdialog.cpp \ + receiverequestdialog.cpp \ recentrequeststablemodel.cpp \ - rpcconsole.cpp sendcoinsdialog.cpp sendcoinsentry.cpp \ - signverifymessagedialog.cpp splashscreen.cpp trafficgraphwidget.cpp transactiondesc.cpp \ - transactiondescdialog.cpp transactionfilterproxy.cpp transactionrecord.cpp \ - transactiontablemodel.cpp transactionview.cpp walletframe.cpp \ - walletmodel.cpp walletmodeltransaction.cpp walletview.cpp + sendcoinsdialog.cpp \ + sendcoinsentry.cpp \ + transactiondesc.cpp \ + transactiondescdialog.cpp \ + transactionfilterproxy.cpp \ + transactionrecord.cpp \ + transactiontablemodel.cpp \ + transactionview.cpp \ + walletframe.cpp \ + walletmodel.cpp \ + walletmodeltransaction.cpp \ + walletview.cpp +endif -RES_IMAGES = res/images/about.png res/images/splash.png \ +RES_IMAGES = \ + res/images/about.png \ + res/images/splash.png \ res/images/splash_testnet.png RES_MOVIES = res/movies/update_spinner.mng @@ -200,7 +334,11 @@ endif bitcoin_qt_CPPFLAGS = $(AM_CPPFLAGS) $(QT_INCLUDES) \ -I$(top_srcdir)/src/qt/forms bitcoin_qt_SOURCES = bitcoin.cpp -bitcoin_qt_LDADD = libbitcoinqt.a $(LIBBITCOIN_SERVER) $(LIBBITCOIN_WALLET) $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBLEVELDB) $(LIBMEMENV) \ +bitcoin_qt_LDADD = libbitcoinqt.a $(LIBBITCOIN_SERVER) +if ENABLE_WALLET +bitcoin_qt_LDADD += $(LIBBITCOIN_WALLET) +endif +bitcoin_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBLEVELDB) $(LIBMEMENV) \ $(BOOST_LIBS) $(QT_LIBS) $(QT_DBUS_LIBS) $(QR_LIBS) $(PROTOBUF_LIBS) $(BDB_LIBS) # forms/foo.h -> forms/ui_foo.h @@ -217,10 +355,10 @@ bitcoinstrings.cpp: FORCE translate: bitcoinstrings.cpp $(QT_FORMS_UI) $(QT_FORMS_UI) $(BITCOIN_QT_CPP) $(BITCOIN_QT_H) $(BITCOIN_MM) @test -n $(LUPDATE) || echo "lupdate is required for updating translations" - @$(LUPDATE) $^ -locations relative -no-obsolete -ts locale/bitcoin_en.ts + @QT_SELECT=$(QT_SELECT) $(LUPDATE) $^ -locations relative -no-obsolete -ts locale/bitcoin_en.ts $(QT_QRC_CPP): $(QT_QRC) $(QT_QM) $(QT_FORMS_H) $(RES_ICONS) $(RES_IMAGES) $(RES_MOVIES) $(PROTOBUF_H) - @cd $(abs_srcdir); test -f $(RCC) && $(RCC) -name bitcoin -o $(abs_builddir)/$@ $< || \ + @cd $(abs_srcdir); test -f $(RCC) && QT_SELECT=$(QT_SELECT) $(RCC) -name bitcoin -o $(abs_builddir)/$@ $< || \ echo error: could not build $@ $(SED) -i.bak -e '/^\*\*.*Created:/d' $@ && rm $@.bak $(SED) -i.bak -e '/^\*\*.*by:/d' $@ && rm $@.bak diff --git a/src/qt/addresstablemodel.cpp b/src/qt/addresstablemodel.cpp index 5e7d8e6178..2987e5fdda 100644 --- a/src/qt/addresstablemodel.cpp +++ b/src/qt/addresstablemodel.cpp @@ -244,33 +244,34 @@ bool AddressTableModel::setData(const QModelIndex &index, const QVariant &value, if(role == Qt::EditRole) { - switch(index.column()) + LOCK(wallet->cs_wallet); /* For SetAddressBook / DelAddressBook */ + CTxDestination curAddress = CBitcoinAddress(rec->address.toStdString()).Get(); + if(index.column() == Label) { - case Label: // Do nothing, if old label == new label if(rec->label == value.toString()) { editStatus = NO_CHANGES; return false; } - wallet->SetAddressBook(CBitcoinAddress(rec->address.toStdString()).Get(), value.toString().toStdString(), strPurpose); - break; - case Address: - // Do nothing, if old address == new address - if(CBitcoinAddress(rec->address.toStdString()) == CBitcoinAddress(value.toString().toStdString())) + wallet->SetAddressBook(curAddress, value.toString().toStdString(), strPurpose); + } else if(index.column() == Address) { + CTxDestination newAddress = CBitcoinAddress(value.toString().toStdString()).Get(); + // Refuse to set invalid address, set error status and return false + if(boost::get<CNoDestination>(&newAddress)) { - editStatus = NO_CHANGES; + editStatus = INVALID_ADDRESS; return false; } - // Refuse to set invalid address, set error status and return false - else if(!walletModel->validateAddress(value.toString())) + // Do nothing, if old address == new address + else if(newAddress == curAddress) { - editStatus = INVALID_ADDRESS; + editStatus = NO_CHANGES; return false; } // Check for duplicate addresses to prevent accidental deletion of addresses, if you try // to paste an existing address over another address (with a different label) - else if(wallet->mapAddressBook.count(CBitcoinAddress(value.toString().toStdString()).Get())) + else if(wallet->mapAddressBook.count(newAddress)) { editStatus = DUPLICATE_ADDRESS; return false; @@ -278,15 +279,11 @@ bool AddressTableModel::setData(const QModelIndex &index, const QVariant &value, // Double-check that we're not overwriting a receiving address else if(rec->type == AddressTableEntry::Sending) { - { - LOCK(wallet->cs_wallet); - // Remove old entry - wallet->DelAddressBook(CBitcoinAddress(rec->address.toStdString()).Get()); - // Add new entry with new address - wallet->SetAddressBook(CBitcoinAddress(value.toString().toStdString()).Get(), rec->label.toStdString(), strPurpose); - } + // Remove old entry + wallet->DelAddressBook(curAddress); + // Add new entry with new address + wallet->SetAddressBook(newAddress, rec->label.toStdString(), strPurpose); } - break; } return true; } diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index 2b3bf3bfb5..b8342b5a99 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -2,6 +2,10 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. +#if defined(HAVE_CONFIG_H) +#include "bitcoin-config.h" +#endif + #include "bitcoingui.h" #include "clientmodel.h" @@ -9,14 +13,17 @@ #include "guiutil.h" #include "intro.h" #include "optionsmodel.h" -#include "paymentserver.h" #include "splashscreen.h" +#ifdef ENABLE_WALLET +#include "paymentserver.h" #include "walletmodel.h" +#endif #include "init.h" #include "main.h" #include "ui_interface.h" #include "util.h" +#include "wallet.h" #include <stdint.h> @@ -28,75 +35,33 @@ #include <QSettings> #include <QTimer> #include <QTranslator> +#include <QThread> +#include <QVBoxLayout> +#include <QLabel> -#if QT_VERSION < 0x050000 -#include <QTextCodec> -#endif - -#if defined(BITCOIN_NEED_QT_PLUGINS) && !defined(_BITCOIN_QT_PLUGINS_INCLUDED) -#define _BITCOIN_QT_PLUGINS_INCLUDED -#define __INSURE__ +#if defined(QT_STATICPLUGIN) #include <QtPlugin> +#if QT_VERSION < 0x050000 Q_IMPORT_PLUGIN(qcncodecs) Q_IMPORT_PLUGIN(qjpcodecs) Q_IMPORT_PLUGIN(qtwcodecs) Q_IMPORT_PLUGIN(qkrcodecs) Q_IMPORT_PLUGIN(qtaccessiblewidgets) +#else +Q_IMPORT_PLUGIN(AccessibleFactory) +Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin); +#endif +#endif + +#if QT_VERSION < 0x050000 +#include <QTextCodec> #endif // Declare meta types used for QMetaObject::invokeMethod Q_DECLARE_METATYPE(bool*) -// Need a global reference for the notifications to find the GUI -static BitcoinGUI *guiref; -static SplashScreen *splashref; - -static bool ThreadSafeMessageBox(const std::string& message, const std::string& caption, unsigned int style) -{ - if(guiref) - { - bool modal = (style & CClientUIInterface::MODAL); - bool ret = false; - // In case of modal message, use blocking connection to wait for user to click a button - QMetaObject::invokeMethod(guiref, "message", - modal ? GUIUtil::blockingGUIThreadConnection() : Qt::QueuedConnection, - Q_ARG(QString, QString::fromStdString(caption)), - Q_ARG(QString, QString::fromStdString(message)), - Q_ARG(unsigned int, style), - Q_ARG(bool*, &ret)); - return ret; - } - else - { - LogPrintf("%s: %s\n", caption.c_str(), message.c_str()); - fprintf(stderr, "%s: %s\n", caption.c_str(), message.c_str()); - return false; - } -} - -static bool ThreadSafeAskFee(int64_t nFeeRequired) -{ - if(!guiref) - return false; - if(nFeeRequired < CTransaction::nMinTxFee || nFeeRequired <= nTransactionFee || fDaemon) - return true; - - bool payFee = false; - - QMetaObject::invokeMethod(guiref, "askFee", GUIUtil::blockingGUIThreadConnection(), - Q_ARG(qint64, nFeeRequired), - Q_ARG(bool*, &payFee)); - - return payFee; -} - static void InitMessage(const std::string &message) { - if(splashref) - { - splashref->showMessage(QString::fromStdString(message), Qt::AlignBottom|Qt::AlignHCenter, QColor(55,55,55)); - qApp->processEvents(); - } LogPrintf("init message: %s\n", message.c_str()); } @@ -108,15 +73,6 @@ static std::string Translate(const char* psz) return QCoreApplication::translate("bitcoin-core", psz).toStdString(); } -/* Handle runaway exceptions. Shows a message box with the problem and quits the program. - */ -static void handleRunawayException(std::exception *e) -{ - PrintExceptionContinue(e, "Runaway exception"); - QMessageBox::critical(0, "Runaway exception", BitcoinGUI::tr("A fatal error occurred. Bitcoin can no longer continue safely and will quit.") + QString("\n\n") + QString::fromStdString(strMiscWarning)); - exit(1); -} - /** Set up translations */ static void initTranslations(QTranslator &qtTranslatorBase, QTranslator &qtTranslator, QTranslator &translatorBase, QTranslator &translator) { @@ -162,36 +118,352 @@ static void initTranslations(QTranslator &qtTranslatorBase, QTranslator &qtTrans void DebugMessageHandler(QtMsgType type, const char *msg) { Q_UNUSED(type); - LogPrint("qt", "Bitcoin-Qt: %s\n", msg); + LogPrint("qt", "GUI: %s\n", msg); } #else void DebugMessageHandler(QtMsgType type, const QMessageLogContext& context, const QString &msg) { Q_UNUSED(type); Q_UNUSED(context); - LogPrint("qt", "Bitcoin-Qt: %s\n", qPrintable(msg)); + LogPrint("qt", "GUI: %s\n", qPrintable(msg)); +} +#endif + +/** Class encapsulating Bitcoin Core startup and shutdown. + * Allows running startup and shutdown in a different thread from the UI thread. + */ +class BitcoinCore: public QObject +{ + Q_OBJECT +public: + explicit BitcoinCore(); + +public slots: + void initialize(); + void shutdown(); + +signals: + void initializeResult(int retval); + void shutdownResult(int retval); + void runawayException(const QString &message); + +private: + boost::thread_group threadGroup; + + /// Pass fatal exception message to UI thread + void handleRunawayException(std::exception *e); +}; + +/** Main Bitcoin application object */ +class BitcoinApplication: public QApplication +{ + Q_OBJECT +public: + explicit BitcoinApplication(int &argc, char **argv); + ~BitcoinApplication(); + +#ifdef ENABLE_WALLET + /// Create payment server + void createPaymentServer(); +#endif + /// Create options model + void createOptionsModel(); + /// Create main window + void createWindow(bool isaTestNet); + /// Create splash screen + void createSplashScreen(bool isaTestNet); + + /// Request core initialization + void requestInitialize(); + /// Request core shutdown + void requestShutdown(); + + /// Get process return value + int getReturnValue() { return returnValue; } + +public slots: + void initializeResult(int retval); + void shutdownResult(int retval); + /// Handle runaway exceptions. Shows a message box with the problem and quits the program. + void handleRunawayException(const QString &message); + +signals: + void requestedInitialize(); + void requestedShutdown(); + void stopThread(); + void splashFinished(QWidget *window); + +private: + QThread *coreThread; + OptionsModel *optionsModel; + ClientModel *clientModel; + BitcoinGUI *window; + QTimer *pollShutdownTimer; +#ifdef ENABLE_WALLET + PaymentServer* paymentServer; + WalletModel *walletModel; +#endif + int returnValue; + + void startThread(); +}; + +#include "bitcoin.moc" + +BitcoinCore::BitcoinCore(): + QObject() +{ +} + +void BitcoinCore::handleRunawayException(std::exception *e) +{ + PrintExceptionContinue(e, "Runaway exception"); + emit runawayException(QString::fromStdString(strMiscWarning)); +} + +void BitcoinCore::initialize() +{ + try + { + LogPrintf("Running AppInit2 in thread\n"); + int rv = AppInit2(threadGroup); + emit initializeResult(rv); + } catch (std::exception& e) { + handleRunawayException(&e); + } catch (...) { + handleRunawayException(NULL); + } +} + +void BitcoinCore::shutdown() +{ + try + { + LogPrintf("Running Shutdown in thread\n"); + threadGroup.interrupt_all(); + threadGroup.join_all(); + Shutdown(); + LogPrintf("Shutdown finished\n"); + emit shutdownResult(1); + } catch (std::exception& e) { + handleRunawayException(&e); + } catch (...) { + handleRunawayException(NULL); + } +} + +BitcoinApplication::BitcoinApplication(int &argc, char **argv): + QApplication(argc, argv), + coreThread(0), + optionsModel(0), + clientModel(0), + window(0), + pollShutdownTimer(0), +#ifdef ENABLE_WALLET + paymentServer(0), + walletModel(0), +#endif + returnValue(0) +{ + setQuitOnLastWindowClosed(false); + startThread(); +} + +BitcoinApplication::~BitcoinApplication() +{ + LogPrintf("Stopping thread\n"); + emit stopThread(); + coreThread->wait(); + LogPrintf("Stopped thread\n"); + + delete window; + window = 0; +#ifdef ENABLE_WALLET + delete paymentServer; + paymentServer = 0; +#endif + delete optionsModel; + optionsModel = 0; +} + +#ifdef ENABLE_WALLET +void BitcoinApplication::createPaymentServer() +{ + paymentServer = new PaymentServer(this); +} +#endif + +void BitcoinApplication::createOptionsModel() +{ + optionsModel = new OptionsModel(); +} + +void BitcoinApplication::createWindow(bool isaTestNet) +{ + window = new BitcoinGUI(isaTestNet, 0); + + pollShutdownTimer = new QTimer(window); + connect(pollShutdownTimer, SIGNAL(timeout()), window, SLOT(detectShutdown())); + pollShutdownTimer->start(200); } + +void BitcoinApplication::createSplashScreen(bool isaTestNet) +{ + SplashScreen *splash = new SplashScreen(QPixmap(), 0, isaTestNet); + splash->setAttribute(Qt::WA_DeleteOnClose); + splash->show(); + connect(this, SIGNAL(splashFinished(QWidget*)), splash, SLOT(slotFinish(QWidget*))); +} + +void BitcoinApplication::startThread() +{ + coreThread = new QThread(this); + BitcoinCore *executor = new BitcoinCore(); + executor->moveToThread(coreThread); + + /* communication to and from thread */ + connect(executor, SIGNAL(initializeResult(int)), this, SLOT(initializeResult(int))); + connect(executor, SIGNAL(shutdownResult(int)), this, SLOT(shutdownResult(int))); + connect(executor, SIGNAL(runawayException(QString)), this, SLOT(handleRunawayException(QString))); + connect(this, SIGNAL(requestedInitialize()), executor, SLOT(initialize())); + connect(this, SIGNAL(requestedShutdown()), executor, SLOT(shutdown())); + /* make sure executor object is deleted in its own thread */ + connect(this, SIGNAL(stopThread()), executor, SLOT(deleteLater())); + connect(this, SIGNAL(stopThread()), coreThread, SLOT(quit())); + + coreThread->start(); +} + +void BitcoinApplication::requestInitialize() +{ + LogPrintf("Requesting initialize\n"); + emit requestedInitialize(); +} + +void BitcoinApplication::requestShutdown() +{ + LogPrintf("Requesting shutdown\n"); + window->hide(); + window->setClientModel(0); + pollShutdownTimer->stop(); + +#ifdef ENABLE_WALLET + window->removeAllWallets(); + delete walletModel; + walletModel = 0; +#endif + delete clientModel; + clientModel = 0; + + // Show a simple window indicating shutdown status + QWidget *shutdownWindow = new QWidget(); + QVBoxLayout *layout = new QVBoxLayout(); + layout->addWidget(new QLabel( + tr("Bitcoin Core is shutting down...\n") + + tr("Do not shut down the computer until this window disappears."))); + shutdownWindow->setLayout(layout); + + // Center shutdown window at where main window was + const QPoint global = window->mapToGlobal(window->rect().center()); + shutdownWindow->move(global.x() - shutdownWindow->width() / 2, global.y() - shutdownWindow->height() / 2); + shutdownWindow->show(); + + // Request shutdown from core thread + emit requestedShutdown(); +} + +void BitcoinApplication::initializeResult(int retval) +{ + LogPrintf("Initialization result: %i\n", retval); + // Set exit result: 0 if successful, 1 if failure + returnValue = retval ? 0 : 1; + if(retval) + { + // Miscellaneous initialization after core is initialized + optionsModel->Upgrade(); // Must be done after AppInit2 + +#ifdef ENABLE_WALLET + PaymentServer::LoadRootCAs(); + paymentServer->setOptionsModel(optionsModel); +#endif + + emit splashFinished(window); + + clientModel = new ClientModel(optionsModel); + window->setClientModel(clientModel); + +#ifdef ENABLE_WALLET + if(pwalletMain) + { + walletModel = new WalletModel(pwalletMain, optionsModel); + + window->addWallet("~Default", walletModel); + window->setCurrentWallet("~Default"); + + connect(walletModel, SIGNAL(coinsSent(CWallet*,SendCoinsRecipient,QByteArray)), + paymentServer, SLOT(fetchPaymentACK(CWallet*,const SendCoinsRecipient&,QByteArray))); + } #endif + // If -min option passed, start window minimized. + if(GetBoolArg("-min", false)) + { + window->showMinimized(); + } + else + { + window->show(); + } +#ifdef ENABLE_WALLET + // Now that initialization/startup is done, process any command-line + // bitcoin: URIs or payment requests: + connect(paymentServer, SIGNAL(receivedPaymentRequest(SendCoinsRecipient)), + window, SLOT(handlePaymentRequest(SendCoinsRecipient))); + connect(window, SIGNAL(receivedURI(QString)), + paymentServer, SLOT(handleURIOrFile(QString))); + connect(paymentServer, SIGNAL(message(QString,QString,unsigned int)), + window, SLOT(message(QString,QString,unsigned int))); + QTimer::singleShot(100, paymentServer, SLOT(uiReady())); +#endif + } else { + quit(); // Exit main loop + } +} + +void BitcoinApplication::shutdownResult(int retval) +{ + LogPrintf("Shutdown result: %i\n", retval); + quit(); // Exit main loop after shutdown finished +} + +void BitcoinApplication::handleRunawayException(const QString &message) +{ + QMessageBox::critical(0, "Runaway exception", BitcoinGUI::tr("A fatal error occurred. Bitcoin can no longer continue safely and will quit.") + QString("\n\n") + message); + ::exit(1); +} + #ifndef BITCOIN_QT_TEST int main(int argc, char *argv[]) { - bool fMissingDatadir = false; bool fSelParFromCLFailed = false; - + /// 1. Parse command-line options. These take precedence over anything else. // Command-line options take precedence: ParseParameters(argc, argv); - // ... then bitcoin.conf: - if (!boost::filesystem::is_directory(GetDataDir(false))) { - fMissingDatadir = true; - } else { - ReadConfigFile(mapArgs, mapMultiArgs); - } // 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 + + /// 2. Basic Qt initialization (not dependent on parameters or configuration) #if QT_VERSION < 0x050000 // Internal string conversion is all UTF-8 QTextCodec::setCodecForTr(QTextCodec::codecForName("UTF-8")); @@ -199,7 +471,7 @@ int main(int argc, char *argv[]) #endif Q_INIT_RESOURCE(bitcoin); - QApplication app(argc, argv); + BitcoinApplication app(argc, argv); #if QT_VERSION > 0x050100 // Generate high-dpi pixmaps QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); @@ -211,43 +483,65 @@ int main(int argc, char *argv[]) // Register meta types used for QMetaObject::invokeMethod qRegisterMetaType< bool* >(); - // Application identification (must be set before OptionsModel is initialized, - // as it is used to locate QSettings) + /// 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 (TestNet()) // Separate UI settings for testnet + if (isaTestNet) // Separate UI settings for testnets QApplication::setApplicationName("Bitcoin-Qt-testnet"); else QApplication::setApplicationName("Bitcoin-Qt"); + /// 4. Initialization of translations, so that intro dialog is in user's language // Now that QSettings are accessible, initialize translations QTranslator qtTranslatorBase, qtTranslator, translatorBase, translator; initTranslations(qtTranslatorBase, qtTranslator, translatorBase, translator); + uiInterface.Translate.connect(Translate); - // Do this early as we don't want to bother initializing if we are just calling IPC - // ... but do it after creating app and setting up translations, so errors are - // translated properly. - if (PaymentServer::ipcSendCommandLine(argc, argv)) - exit(0); - - // Now that translations are initialized check for errors and allow a translatable error message - if (fMissingDatadir) { - QMessageBox::critical(0, QObject::tr("Bitcoin"), - QObject::tr("Error: Specified data directory \"%1\" does not exist.").arg(QString::fromStdString(mapArgs["-datadir"]))); + // Show help message immediately after parsing command-line options (for "-lang") and setting locale, + // but before showing splash screen. + if (mapArgs.count("-?") || mapArgs.count("--help")) + { + GUIUtil::HelpMessageBox help; + help.showOrPrint(); return 1; } - else if (fSelParFromCLFailed) { + // 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); + + /// 6. Determine availability of data directory and parse bitcoin.conf + 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); + +#ifdef ENABLE_WALLET + /// 7. 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. + // - Do this after creating app and setting up translations, so errors are + // translated properly. + if (PaymentServer::ipcSendCommandLine()) + exit(0); + // Start up the payment server early, too, so impatient users that click on // bitcoin: links repeatedly have their payment requests routed to this process: - PaymentServer* paymentServer = new PaymentServer(&app); - - // User language is set up: pick a data directory - Intro::pickDataDirectory(TestNet()); + app.createPaymentServer(); +#endif + /// 8. 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 @@ -256,35 +550,14 @@ int main(int argc, char *argv[]) #else qInstallMessageHandler(DebugMessageHandler); #endif - - // ... now GUI settings: - OptionsModel optionsModel; + // Load GUI settings from QSettings + app.createOptionsModel(); // Subscribe to global signals from core - uiInterface.ThreadSafeMessageBox.connect(ThreadSafeMessageBox); - uiInterface.ThreadSafeAskFee.connect(ThreadSafeAskFee); uiInterface.InitMessage.connect(InitMessage); - uiInterface.Translate.connect(Translate); - - // Show help message immediately after parsing command-line options (for "-lang") and setting locale, - // but before showing splash screen. - if (mapArgs.count("-?") || mapArgs.count("--help")) - { - GUIUtil::HelpMessageBox help; - help.showOrPrint(); - return 1; - } - SplashScreen splash(QPixmap(), 0); if (GetBoolArg("-splash", true) && !GetBoolArg("-min", false)) - { - splash.show(); - splash.setAutoFillBackground(true); - splashref = &splash; - } - - app.processEvents(); - app.setQuitOnLastWindowClosed(false); + app.createSplashScreen(isaTestNet); try { @@ -294,93 +567,18 @@ int main(int argc, char *argv[]) if (GUIUtil::GetStartOnSystemStartup()) GUIUtil::SetStartOnSystemStartup(true); #endif - - boost::thread_group threadGroup; - - BitcoinGUI window(TestNet(), 0); - guiref = &window; - - QTimer* pollShutdownTimer = new QTimer(guiref); - QObject::connect(pollShutdownTimer, SIGNAL(timeout()), guiref, SLOT(detectShutdown())); - pollShutdownTimer->start(200); - - if(AppInit2(threadGroup, false)) - { - { - // Put this in a block, so that the Model objects are cleaned up before - // calling Shutdown(). - - optionsModel.Upgrade(); // Must be done after AppInit2 - - PaymentServer::LoadRootCAs(); - paymentServer->setOptionsModel(&optionsModel); - - if (splashref) - splash.finish(&window); - - ClientModel clientModel(&optionsModel); - window.setClientModel(&clientModel); - - WalletModel *walletModel = 0; - if(pwalletMain) - walletModel = new WalletModel(pwalletMain, &optionsModel); - - if(walletModel) - { - window.addWallet("~Default", walletModel); - window.setCurrentWallet("~Default"); - } - - // If -min option passed, start window minimized. - if(GetBoolArg("-min", false)) - { - window.showMinimized(); - } - else - { - window.show(); - } - - // Now that initialization/startup is done, process any command-line - // bitcoin: URIs or payment requests: - QObject::connect(paymentServer, SIGNAL(receivedPaymentRequest(SendCoinsRecipient)), - &window, SLOT(handlePaymentRequest(SendCoinsRecipient))); - QObject::connect(&window, SIGNAL(receivedURI(QString)), - paymentServer, SLOT(handleURIOrFile(QString))); - if(walletModel) - { - QObject::connect(walletModel, SIGNAL(coinsSent(CWallet*,SendCoinsRecipient,QByteArray)), - paymentServer, SLOT(fetchPaymentACK(CWallet*,const SendCoinsRecipient&,QByteArray))); - } - QObject::connect(paymentServer, SIGNAL(message(QString,QString,unsigned int)), - guiref, SLOT(message(QString,QString,unsigned int))); - QTimer::singleShot(100, paymentServer, SLOT(uiReady())); - - app.exec(); - - window.hide(); - window.setClientModel(0); - window.removeAllWallets(); - guiref = 0; - delete walletModel; - } - // Shutdown the core and its threads, but don't exit Bitcoin-Qt here - threadGroup.interrupt_all(); - threadGroup.join_all(); - Shutdown(); - } - else - { - threadGroup.interrupt_all(); - threadGroup.join_all(); - Shutdown(); - return 1; - } + app.createWindow(isaTestNet); + app.requestInitialize(); + app.exec(); + app.requestShutdown(); + app.exec(); } catch (std::exception& e) { - handleRunawayException(&e); + PrintExceptionContinue(&e, "Runaway exception"); + app.handleRunawayException(QString::fromStdString(strMiscWarning)); } catch (...) { - handleRunawayException(NULL); + PrintExceptionContinue(NULL, "Runaway exception"); + app.handleRunawayException(QString::fromStdString(strMiscWarning)); } - return 0; + return app.getReturnValue(); } #endif // BITCOIN_QT_TEST diff --git a/src/qt/bitcoin.qrc b/src/qt/bitcoin.qrc index 3fac7dd0e3..3c3220c2b3 100644 --- a/src/qt/bitcoin.qrc +++ b/src/qt/bitcoin.qrc @@ -56,24 +56,27 @@ <file alias="be_BY">locale/bitcoin_be_BY.qm</file> <file alias="bg">locale/bitcoin_bg.qm</file> <file alias="bs">locale/bitcoin_bs.qm</file> - <file alias="ca">locale/bitcoin_ca.qm</file> <file alias="ca_ES">locale/bitcoin_ca_ES.qm</file> + <file alias="ca">locale/bitcoin_ca.qm</file> <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> <file alias="eo">locale/bitcoin_eo.qm</file> - <file alias="es">locale/bitcoin_es.qm</file> <file alias="es_CL">locale/bitcoin_es_CL.qm</file> + <file alias="es_MX">locale/bitcoin_es_MX.qm</file> + <file alias="es">locale/bitcoin_es.qm</file> <file alias="et">locale/bitcoin_et.qm</file> <file alias="eu_ES">locale/bitcoin_eu_ES.qm</file> - <file alias="fa">locale/bitcoin_fa.qm</file> <file alias="fa_IR">locale/bitcoin_fa_IR.qm</file> + <file alias="fa">locale/bitcoin_fa.qm</file> <file alias="fi">locale/bitcoin_fi.qm</file> - <file alias="fr">locale/bitcoin_fr.qm</file> <file alias="fr_CA">locale/bitcoin_fr_CA.qm</file> + <file alias="fr">locale/bitcoin_fr.qm</file> + <file alias="gl">locale/bitcoin_gl.qm</file> <file alias="gu_IN">locale/bitcoin_gu_IN.qm</file> <file alias="he">locale/bitcoin_he.qm</file> <file alias="hi_IN">locale/bitcoin_hi_IN.qm</file> @@ -90,12 +93,14 @@ <file alias="ms_MY">locale/bitcoin_ms_MY.qm</file> <file alias="nb">locale/bitcoin_nb.qm</file> <file alias="nl">locale/bitcoin_nl.qm</file> + <file alias="pam">locale/bitcoin_pam.qm</file> <file alias="pl">locale/bitcoin_pl.qm</file> <file alias="pt_BR">locale/bitcoin_pt_BR.qm</file> <file alias="pt_PT">locale/bitcoin_pt_PT.qm</file> <file alias="ro_RO">locale/bitcoin_ro_RO.qm</file> <file alias="ru">locale/bitcoin_ru.qm</file> <file alias="sk">locale/bitcoin_sk.qm</file> + <file alias="sl_SI">locale/bitcoin_sl_SI.qm</file> <file alias="sq">locale/bitcoin_sq.qm</file> <file alias="sr">locale/bitcoin_sr.qm</file> <file alias="sv">locale/bitcoin_sv.qm</file> diff --git a/src/qt/bitcoinamountfield.cpp b/src/qt/bitcoinamountfield.cpp index 6b083331d3..1698595188 100644 --- a/src/qt/bitcoinamountfield.cpp +++ b/src/qt/bitcoinamountfield.cpp @@ -14,8 +14,10 @@ #include <QKeyEvent> #include <qmath.h> // for qPow() -BitcoinAmountField::BitcoinAmountField(QWidget *parent): - QWidget(parent), amount(0), currentUnit(-1) +BitcoinAmountField::BitcoinAmountField(QWidget *parent) : + QWidget(parent), + amount(0), + currentUnit(-1) { amount = new QDoubleSpinBox(this); amount->setLocale(QLocale::c()); diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index b1daba5cba..22c41a6201 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -14,8 +14,10 @@ #include "optionsdialog.h" #include "optionsmodel.h" #include "rpcconsole.h" +#ifdef ENABLE_WALLET #include "walletframe.h" #include "walletmodel.h" +#endif #ifdef Q_OS_MAC #include "macdockiconhandler.h" @@ -59,6 +61,7 @@ const QString BitcoinGUI::DEFAULT_WALLET = "~Default"; BitcoinGUI::BitcoinGUI(bool fIsTestnet, QWidget *parent) : QMainWindow(parent), clientModel(0), + walletFrame(0), encryptWalletAction(0), changePassphraseAction(0), aboutQtAction(0), @@ -69,9 +72,22 @@ BitcoinGUI::BitcoinGUI(bool fIsTestnet, QWidget *parent) : { GUIUtil::restoreWindowGeometry("nWindow", QSize(850, 550), this); + QString windowTitle = tr("Bitcoin Core") + " - "; +#ifdef ENABLE_WALLET + /* if compiled with wallet support, -disablewallet can still disable the wallet */ + bool enableWallet = !GetBoolArg("-disablewallet", false); +#else + bool enableWallet = false; +#endif + if(enableWallet) + { + windowTitle += tr("Wallet"); + } else { + windowTitle += tr("Node"); + } + if (!fIsTestnet) { - setWindowTitle(tr("Bitcoin") + " - " + tr("Wallet")); #ifndef Q_OS_MAC QApplication::setWindowIcon(QIcon(":icons/bitcoin")); setWindowIcon(QIcon(":icons/bitcoin")); @@ -81,7 +97,7 @@ BitcoinGUI::BitcoinGUI(bool fIsTestnet, QWidget *parent) : } else { - setWindowTitle(tr("Bitcoin") + " - " + tr("Wallet") + " " + tr("[testnet]")); + windowTitle += " " + tr("[testnet]"); #ifndef Q_OS_MAC QApplication::setWindowIcon(QIcon(":icons/bitcoin_testnet")); setWindowIcon(QIcon(":icons/bitcoin_testnet")); @@ -89,6 +105,7 @@ BitcoinGUI::BitcoinGUI(bool fIsTestnet, QWidget *parent) : MacDockIconHandler::instance()->setIcon(QIcon(":icons/bitcoin_testnet")); #endif } + setWindowTitle(windowTitle); #if defined(Q_OS_MAC) && QT_VERSION < 0x050000 // This property is not implemented in Qt 5. Setting it has no effect. @@ -96,9 +113,21 @@ BitcoinGUI::BitcoinGUI(bool fIsTestnet, QWidget *parent) : setUnifiedTitleAndToolBarOnMac(true); #endif - // Create wallet frame and make it the central widget - walletFrame = new WalletFrame(this); - setCentralWidget(walletFrame); + rpcConsole = new RPCConsole(enableWallet ? this : 0); +#ifdef ENABLE_WALLET + if(enableWallet) + { + /** Create wallet frame and make it the central widget */ + walletFrame = new WalletFrame(this); + setCentralWidget(walletFrame); + } else +#endif + { + /* When compiled without wallet or -disablewallet is provided, + * the central widget is the rpc console. + */ + setCentralWidget(rpcConsole); + } // Accept D&D of URIs setAcceptDrops(true); @@ -160,8 +189,8 @@ BitcoinGUI::BitcoinGUI(bool fIsTestnet, QWidget *parent) : syncIconMovie = new QMovie(":/movies/update_spinner", "mng", this); - rpcConsole = new RPCConsole(this); connect(openRPCConsoleAction, SIGNAL(triggered()), rpcConsole, SLOT(show())); + // prevents an oben debug window from becoming stuck/unusable on client shutdown connect(quitAction, SIGNAL(triggered()), rpcConsole, SLOT(hide())); @@ -170,10 +199,16 @@ BitcoinGUI::BitcoinGUI(bool fIsTestnet, QWidget *parent) : // Initially wallet actions should be disabled setWalletActionsEnabled(false); + + // Subscribe to notifications from core + subscribeToCoreSignals(); } BitcoinGUI::~BitcoinGUI() { + // Unsubscribe from notifications from core + unsubscribeFromCoreSignals(); + GUIUtil::saveWindowGeometry("nWindow", this); if(trayIcon) // Hide tray icon, as deleting will let it linger until quit (on Ubuntu) trayIcon->hide(); @@ -215,6 +250,8 @@ void BitcoinGUI::createActions(bool fIsTestnet) historyAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_4)); tabGroup->addAction(historyAction); + // These showNormalIfMinimized are needed because Send Coins and Receive Coins + // can be triggered from the tray menu, and need to show the GUI to be useful. connect(overviewAction, SIGNAL(triggered()), this, SLOT(showNormalIfMinimized())); connect(overviewAction, SIGNAL(triggered()), this, SLOT(gotoOverviewPage())); connect(sendCoinsAction, SIGNAL(triggered()), this, SLOT(showNormalIfMinimized())); @@ -229,9 +266,9 @@ void BitcoinGUI::createActions(bool fIsTestnet) quitAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Q)); quitAction->setMenuRole(QAction::QuitRole); if (!fIsTestnet) - aboutAction = new QAction(QIcon(":/icons/bitcoin"), tr("&About Bitcoin"), this); + aboutAction = new QAction(QIcon(":/icons/bitcoin"), tr("&About Bitcoin Core"), this); else - aboutAction = new QAction(QIcon(":/icons/bitcoin_testnet"), tr("&About Bitcoin"), this); + aboutAction = new QAction(QIcon(":/icons/bitcoin_testnet"), tr("&About Bitcoin Core"), this); aboutAction->setStatusTip(tr("Show information about Bitcoin")); aboutAction->setMenuRole(QAction::AboutRole); #if QT_VERSION < 0x050000 @@ -278,14 +315,19 @@ void BitcoinGUI::createActions(bool fIsTestnet) connect(aboutQtAction, SIGNAL(triggered()), qApp, SLOT(aboutQt())); connect(optionsAction, SIGNAL(triggered()), this, SLOT(optionsClicked())); connect(toggleHideAction, SIGNAL(triggered()), this, SLOT(toggleHidden())); - connect(encryptWalletAction, SIGNAL(triggered(bool)), walletFrame, SLOT(encryptWallet(bool))); - connect(backupWalletAction, SIGNAL(triggered()), walletFrame, SLOT(backupWallet())); - connect(changePassphraseAction, SIGNAL(triggered()), walletFrame, SLOT(changePassphrase())); - connect(signMessageAction, SIGNAL(triggered()), this, SLOT(gotoSignMessageTab())); - connect(verifyMessageAction, SIGNAL(triggered()), this, SLOT(gotoVerifyMessageTab())); - connect(usedSendingAddressesAction, SIGNAL(triggered()), walletFrame, SLOT(usedSendingAddresses())); - connect(usedReceivingAddressesAction, SIGNAL(triggered()), walletFrame, SLOT(usedReceivingAddresses())); - connect(openAction, SIGNAL(triggered()), this, SLOT(openClicked())); +#ifdef ENABLE_WALLET + if(walletFrame) + { + connect(encryptWalletAction, SIGNAL(triggered(bool)), walletFrame, SLOT(encryptWallet(bool))); + connect(backupWalletAction, SIGNAL(triggered()), walletFrame, SLOT(backupWallet())); + connect(changePassphraseAction, SIGNAL(triggered()), walletFrame, SLOT(changePassphrase())); + connect(signMessageAction, SIGNAL(triggered()), this, SLOT(gotoSignMessageTab())); + connect(verifyMessageAction, SIGNAL(triggered()), this, SLOT(gotoVerifyMessageTab())); + connect(usedSendingAddressesAction, SIGNAL(triggered()), walletFrame, SLOT(usedSendingAddresses())); + connect(usedReceivingAddressesAction, SIGNAL(triggered()), walletFrame, SLOT(usedReceivingAddresses())); + connect(openAction, SIGNAL(triggered()), this, SLOT(openClicked())); + } +#endif } void BitcoinGUI::createMenuBar() @@ -300,37 +342,50 @@ void BitcoinGUI::createMenuBar() // Configure the menus QMenu *file = appMenuBar->addMenu(tr("&File")); - file->addAction(openAction); - file->addAction(backupWalletAction); - file->addAction(signMessageAction); - file->addAction(verifyMessageAction); - file->addSeparator(); - file->addAction(usedSendingAddressesAction); - file->addAction(usedReceivingAddressesAction); - file->addSeparator(); + if(walletFrame) + { + file->addAction(openAction); + file->addAction(backupWalletAction); + file->addAction(signMessageAction); + file->addAction(verifyMessageAction); + file->addSeparator(); + file->addAction(usedSendingAddressesAction); + file->addAction(usedReceivingAddressesAction); + file->addSeparator(); + } file->addAction(quitAction); QMenu *settings = appMenuBar->addMenu(tr("&Settings")); - settings->addAction(encryptWalletAction); - settings->addAction(changePassphraseAction); - settings->addSeparator(); + if(walletFrame) + { + settings->addAction(encryptWalletAction); + settings->addAction(changePassphraseAction); + settings->addSeparator(); + } settings->addAction(optionsAction); QMenu *help = appMenuBar->addMenu(tr("&Help")); - help->addAction(openRPCConsoleAction); - help->addSeparator(); + if(walletFrame) + { + help->addAction(openRPCConsoleAction); + help->addSeparator(); + } help->addAction(aboutAction); help->addAction(aboutQtAction); } void BitcoinGUI::createToolBars() { - QToolBar *toolbar = addToolBar(tr("Tabs toolbar")); - toolbar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); - toolbar->addAction(overviewAction); - toolbar->addAction(sendCoinsAction); - toolbar->addAction(receiveCoinsAction); - toolbar->addAction(historyAction); + if(walletFrame) + { + QToolBar *toolbar = addToolBar(tr("Tabs toolbar")); + toolbar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); + toolbar->addAction(overviewAction); + toolbar->addAction(sendCoinsAction); + toolbar->addAction(receiveCoinsAction); + toolbar->addAction(historyAction); + overviewAction->setChecked(true); + } } void BitcoinGUI::setClientModel(ClientModel *clientModel) @@ -353,26 +408,39 @@ void BitcoinGUI::setClientModel(ClientModel *clientModel) connect(clientModel, SIGNAL(message(QString,QString,unsigned int)), this, SLOT(message(QString,QString,unsigned int))); rpcConsole->setClientModel(clientModel); - walletFrame->setClientModel(clientModel); +#ifdef ENABLE_WALLET + if(walletFrame) + { + walletFrame->setClientModel(clientModel); + } +#endif } } +#ifdef ENABLE_WALLET bool BitcoinGUI::addWallet(const QString& name, WalletModel *walletModel) { + if(!walletFrame) + return false; setWalletActionsEnabled(true); return walletFrame->addWallet(name, walletModel); } bool BitcoinGUI::setCurrentWallet(const QString& name) { + if(!walletFrame) + return false; return walletFrame->setCurrentWallet(name); } void BitcoinGUI::removeAllWallets() { + if(!walletFrame) + return; setWalletActionsEnabled(false); walletFrame->removeAllWallets(); } +#endif void BitcoinGUI::setWalletActionsEnabled(bool enabled) { @@ -480,6 +548,7 @@ void BitcoinGUI::aboutClicked() dlg.exec(); } +#ifdef ENABLE_WALLET void BitcoinGUI::openClicked() { OpenURIDialog dlg(this); @@ -522,6 +591,7 @@ void BitcoinGUI::gotoVerifyMessageTab(QString addr) { if (walletFrame) walletFrame->gotoVerifyMessageTab(addr); } +#endif void BitcoinGUI::setNumConnections(int count) { @@ -582,7 +652,10 @@ void BitcoinGUI::setNumBlocks(int count, int nTotalBlocks) tooltip = tr("Up to date") + QString(".<br>") + tooltip; labelBlocksIcon->setPixmap(QIcon(":/icons/synced").pixmap(STATUSBAR_ICONSIZE, STATUSBAR_ICONSIZE)); - walletFrame->showOutOfSyncWarning(false); +#ifdef ENABLE_WALLET + if(walletFrame) + walletFrame->showOutOfSyncWarning(false); +#endif progressBarLabel->setVisible(false); progressBar->setVisible(false); @@ -616,7 +689,10 @@ void BitcoinGUI::setNumBlocks(int count, int nTotalBlocks) syncIconMovie->jumpToNextFrame(); prevBlocks = count; - walletFrame->showOutOfSyncWarning(true); +#ifdef ENABLE_WALLET + if(walletFrame) + walletFrame->showOutOfSyncWarning(true); +#endif tooltip += QString("<br>"); tooltip += tr("Last received block was generated %1 ago.").arg(timeBehindText); @@ -681,8 +757,11 @@ void BitcoinGUI::message(const QString &title, const QString &message, unsigned if (!(buttons = (QMessageBox::StandardButton)(style & CClientUIInterface::BTN_MASK))) buttons = QMessageBox::Ok; - // Ensure we get users attention - showNormalIfMinimized(); + // Ensure we get users attention, but only if main window is visible + // as we don't want to pop up the main window for messages that happen before + // initialization is finished. + if(!(style & CClientUIInterface::NOSHOWGUI)) + showNormalIfMinimized(); QMessageBox mBox((QMessageBox::Icon)nMBoxIcon, strTitle, message, buttons, this); int r = mBox.exec(); if (ret != NULL) @@ -726,19 +805,7 @@ void BitcoinGUI::closeEvent(QCloseEvent *event) QMainWindow::closeEvent(event); } -void BitcoinGUI::askFee(qint64 nFeeRequired, bool *payFee) -{ - if (!clientModel || !clientModel->getOptionsModel()) - return; - - QString strMessage = tr("This transaction is over the size limit. You can still send it for a fee of %1, " - "which goes to the nodes that process your transaction and helps to support the network. " - "Do you want to pay the fee?").arg(BitcoinUnits::formatWithUnit(clientModel->getOptionsModel()->getDisplayUnit(), nFeeRequired)); - QMessageBox::StandardButton retval = QMessageBox::question(this, tr("Confirm transaction fee"), strMessage, - QMessageBox::Yes | QMessageBox::Cancel, QMessageBox::Yes); - *payFee = (retval == QMessageBox::Yes); -} - +#ifdef ENABLE_WALLET void BitcoinGUI::incomingTransaction(const QString& date, int unit, qint64 amount, const QString& type, const QString& address) { // On new transaction, make an info balloon @@ -752,6 +819,7 @@ void BitcoinGUI::incomingTransaction(const QString& date, int unit, qint64 amoun .arg(type) .arg(address), CClientUIInterface::MSG_INFORMATION); } +#endif void BitcoinGUI::dragEnterEvent(QDragEnterEvent *event) { @@ -784,10 +852,11 @@ bool BitcoinGUI::eventFilter(QObject *object, QEvent *event) return QMainWindow::eventFilter(object, event); } +#ifdef ENABLE_WALLET bool BitcoinGUI::handlePaymentRequest(const SendCoinsRecipient& recipient) { // URI has to be valid - if (walletFrame->handlePaymentRequest(recipient)) + if (walletFrame && walletFrame->handlePaymentRequest(recipient)) { showNormalIfMinimized(); gotoSendCoinsPage(); @@ -825,6 +894,7 @@ void BitcoinGUI::setEncryptionStatus(int status) break; } } +#endif void BitcoinGUI::showNormalIfMinimized(bool fToggleHidden) { @@ -856,5 +926,35 @@ void BitcoinGUI::toggleHidden() void BitcoinGUI::detectShutdown() { if (ShutdownRequested()) - QMetaObject::invokeMethod(QCoreApplication::instance(), "quit", Qt::QueuedConnection); + { + if(rpcConsole) + rpcConsole->hide(); + qApp->quit(); + } +} + +static bool ThreadSafeMessageBox(BitcoinGUI *gui, const std::string& message, const std::string& caption, unsigned int style) +{ + bool modal = (style & CClientUIInterface::MODAL); + bool ret = false; + // In case of modal message, use blocking connection to wait for user to click a button + QMetaObject::invokeMethod(gui, "message", + modal ? GUIUtil::blockingGUIThreadConnection() : Qt::QueuedConnection, + Q_ARG(QString, QString::fromStdString(caption)), + Q_ARG(QString, QString::fromStdString(message)), + Q_ARG(unsigned int, style), + Q_ARG(bool*, &ret)); + return ret; +} + +void BitcoinGUI::subscribeToCoreSignals() +{ + // Connect signals to client + uiInterface.ThreadSafeMessageBox.connect(boost::bind(ThreadSafeMessageBox, this, _1, _2, _3)); +} + +void BitcoinGUI::unsubscribeFromCoreSignals() +{ + // Disconnect signals from client + uiInterface.ThreadSafeMessageBox.disconnect(boost::bind(ThreadSafeMessageBox, this, _1, _2, _3)); } diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h index b9a8a03139..1038e2739c 100644 --- a/src/qt/bitcoingui.h +++ b/src/qt/bitcoingui.h @@ -5,6 +5,10 @@ #ifndef BITCOINGUI_H #define BITCOINGUI_H +#if defined(HAVE_CONFIG_H) +#include "bitcoin-config.h" +#endif + #include <QMainWindow> #include <QMap> #include <QSystemTrayIcon> @@ -43,14 +47,15 @@ public: */ void setClientModel(ClientModel *clientModel); +#ifdef ENABLE_WALLET /** Set the wallet model. The wallet model represents a bitcoin wallet, and offers access to the list of transactions, address book and sending functionality. */ bool addWallet(const QString& name, WalletModel *walletModel); bool setCurrentWallet(const QString& name); - void removeAllWallets(); +#endif protected: void changeEvent(QEvent *e); @@ -111,6 +116,11 @@ private: /** Enable or disable all wallet-related actions */ void setWalletActionsEnabled(bool enabled); + /** Connect core signals to GUI client */ + void subscribeToCoreSignals(); + /** Disconnect core signals from GUI client */ + void unsubscribeFromCoreSignals(); + signals: /** Signal raised when a URI was entered or dragged to the GUI */ void receivedURI(const QString &uri); @@ -120,11 +130,6 @@ public slots: void setNumConnections(int count); /** Set number of blocks shown in the UI */ void setNumBlocks(int count, int nTotalBlocks); - /** Set the encryption status as shown in the UI. - @param[in] status current encryption status - @see WalletModel::EncryptionStatus - */ - void setEncryptionStatus(int status); /** Notify the user of an event from the core network or transaction handling code. @param[in] title the message box / notification title @@ -135,22 +140,21 @@ public slots: */ void message(const QString &title, const QString &message, unsigned int style, bool *ret = NULL); - /** Asks the user whether to pay the transaction fee or to cancel the transaction. - It is currently not possible to pass a return value to another thread through - BlockingQueuedConnection, so an indirected pointer is used. - https://bugreports.qt-project.org/browse/QTBUG-10440 - - @param[in] nFeeRequired the required fee - @param[out] payFee true to pay the fee, false to not pay the fee +#ifdef ENABLE_WALLET + /** Set the encryption status as shown in the UI. + @param[in] status current encryption status + @see WalletModel::EncryptionStatus */ - void askFee(qint64 nFeeRequired, bool *payFee); + void setEncryptionStatus(int status); bool handlePaymentRequest(const SendCoinsRecipient& recipient); /** Show incoming transaction notification for new transactions. */ void incomingTransaction(const QString& date, int unit, qint64 amount, const QString& type, const QString& address); +#endif private slots: +#ifdef ENABLE_WALLET /** Switch to overview (home) page */ void gotoOverviewPage(); /** Switch to history (transactions) page */ @@ -165,6 +169,9 @@ private slots: /** Show Sign/Verify Message dialog and switch to verify message tab */ void gotoVerifyMessageTab(QString addr = ""); + /** Show open dialog */ + void openClicked(); +#endif /** Show configuration dialog */ void optionsClicked(); /** Show about dialog */ @@ -173,8 +180,6 @@ private slots: /** Handle tray icon clicked */ void trayIconActivated(QSystemTrayIcon::ActivationReason reason); #endif - /** Show open dialog */ - void openClicked(); /** Show window if hidden, unminimize when minimized, rise when obscured or show if hidden and fToggleHidden is true */ void showNormalIfMinimized(bool fToggleHidden = false); diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp index 45a9bf6a41..183a98061d 100644 --- a/src/qt/bitcoinstrings.cpp +++ b/src/qt/bitcoinstrings.cpp @@ -61,8 +61,9 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" "Number of seconds to keep misbehaving peers from reconnecting (default: " "86400)"), QT_TRANSLATE_NOOP("bitcoin-core", "" -"Set maximum size of high-priority/low-fee transactions in bytes (default: " -"27000)"), +"Output debugging information (default: 0, supplying <category> is optional)"), +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)"), @@ -72,6 +73,9 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" QT_TRANSLATE_NOOP("bitcoin-core", "" "Unable to bind to %s on this computer. Bitcoin is probably already running."), QT_TRANSLATE_NOOP("bitcoin-core", "" +"Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -" +"proxy)"), +QT_TRANSLATE_NOOP("bitcoin-core", "" "Warning: -paytxfee is set very high! This is the transaction fee you will " "pay if you send a transaction."), QT_TRANSLATE_NOOP("bitcoin-core", "" @@ -95,21 +99,22 @@ 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", "<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)"), QT_TRANSLATE_NOOP("bitcoin-core", "Add a node to connect to and attempt to keep the connection open"), QT_TRANSLATE_NOOP("bitcoin-core", "Allow DNS lookups for -addnode, -seednode and -connect"), 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 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'"), QT_TRANSLATE_NOOP("bitcoin-core", "Cannot resolve -externalip address: '%s'"), QT_TRANSLATE_NOOP("bitcoin-core", "Cannot write default address"), QT_TRANSLATE_NOOP("bitcoin-core", "Connect only to the specified node(s)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Connect through socks proxy"), +QT_TRANSLATE_NOOP("bitcoin-core", "Connect 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", "Corrupted block database detected"), @@ -138,12 +143,13 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Failed to write file info"), 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", "Fee per kB to add to transactions you send"), QT_TRANSLATE_NOOP("bitcoin-core", "Find peers using DNS lookup (default: 1 unless -connect)"), QT_TRANSLATE_NOOP("bitcoin-core", "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?"), QT_TRANSLATE_NOOP("bitcoin-core", "Information"), @@ -167,16 +173,15 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Not enough file descriptors available."), QT_TRANSLATE_NOOP("bitcoin-core", "Only accept block chain matching built-in checkpoints (default: 1)"), QT_TRANSLATE_NOOP("bitcoin-core", "Only connect to nodes in network <net> (IPv4, IPv6 or Tor)"), QT_TRANSLATE_NOOP("bitcoin-core", "Options:"), -QT_TRANSLATE_NOOP("bitcoin-core", "Output extra debugging information. Implies all other -debug* options"), -QT_TRANSLATE_NOOP("bitcoin-core", "Output extra network debugging information"), QT_TRANSLATE_NOOP("bitcoin-core", "Password for JSON-RPC connections"), -QT_TRANSLATE_NOOP("bitcoin-core", "Prepend debug output with timestamp"), +QT_TRANSLATE_NOOP("bitcoin-core", "Prepend debug output with timestamp (default: 1)"), +QT_TRANSLATE_NOOP("bitcoin-core", "RPC client options:"), QT_TRANSLATE_NOOP("bitcoin-core", "Rebuild block chain index from current blk000??.dat files"), QT_TRANSLATE_NOOP("bitcoin-core", "Rescan the block chain for missing wallet transactions"), QT_TRANSLATE_NOOP("bitcoin-core", "Rescanning..."), QT_TRANSLATE_NOOP("bitcoin-core", "Run in the background as a daemon and accept commands"), QT_TRANSLATE_NOOP("bitcoin-core", "SSL options: (see the Bitcoin Wiki for SSL setup instructions)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Select the version of socks proxy to use (4-5, default: 5)"), +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 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"), @@ -185,7 +190,7 @@ 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 key pool size to <n> (default: 100)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Set maximum block size in bytes (default: 250000)"), +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", "Shrink debug.log file on client startup (default: 1 when no -debug)"), @@ -213,15 +218,17 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Usage:"), QT_TRANSLATE_NOOP("bitcoin-core", "Use OpenSSL (https) for JSON-RPC connections"), QT_TRANSLATE_NOOP("bitcoin-core", "Use UPnP to map the listening port (default: 0)"), QT_TRANSLATE_NOOP("bitcoin-core", "Use UPnP to map the listening port (default: 1 when listening)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Use proxy to reach tor hidden services (default: same as -proxy)"), QT_TRANSLATE_NOOP("bitcoin-core", "Use the test network"), QT_TRANSLATE_NOOP("bitcoin-core", "Username for JSON-RPC connections"), QT_TRANSLATE_NOOP("bitcoin-core", "Verifying blocks..."), QT_TRANSLATE_NOOP("bitcoin-core", "Verifying wallet..."), +QT_TRANSLATE_NOOP("bitcoin-core", "Wait for RPC server to start"), QT_TRANSLATE_NOOP("bitcoin-core", "Wallet %s resides outside data directory %s"), QT_TRANSLATE_NOOP("bitcoin-core", "Wallet needed to be rewritten: restart Bitcoin to complete"), QT_TRANSLATE_NOOP("bitcoin-core", "Warning"), +QT_TRANSLATE_NOOP("bitcoin-core", "Warning: Deprecated argument -debugnet ignored, use -debug=net"), 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", "version"), QT_TRANSLATE_NOOP("bitcoin-core", "wallet.dat corrupt, salvage failed"), }; diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp index c64e411bca..f273b9ea46 100644 --- a/src/qt/clientmodel.cpp +++ b/src/qt/clientmodel.cpp @@ -123,9 +123,12 @@ void ClientModel::updateAlert(const QString &hash, int status) emit alertsChanged(getStatusBarWarnings()); } -bool ClientModel::isTestNet() const +QString ClientModel::getNetworkName() const { - return TestNet(); + QString netname(QString::fromStdString(Params().DataDir())); + if(netname.isEmpty()) + netname = "main"; + return netname; } bool ClientModel::inInitialBlockDownload() const diff --git a/src/qt/clientmodel.h b/src/qt/clientmodel.h index 05e8412528..ca735f14ce 100644 --- a/src/qt/clientmodel.h +++ b/src/qt/clientmodel.h @@ -46,8 +46,8 @@ public: double getVerificationProgress() const; QDateTime getLastBlockDate() const; - //! Return true if client connected to testnet - bool isTestNet() const; + //! Return network (main, testnet3, regtest) + QString getNetworkName() const; //! Return true if core is doing initial block download bool inInitialBlockDownload() const; //! Return true if core is importing blocks diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp index 14e5b07133..e1a9140f45 100644 --- a/src/qt/coincontroldialog.cpp +++ b/src/qt/coincontroldialog.cpp @@ -20,7 +20,6 @@ #include <QCheckBox> #include <QColor> #include <QCursor> -#include <QDateTime> #include <QDialogButtonBox> #include <QFlags> #include <QIcon> @@ -450,7 +449,7 @@ void CoinControlDialog::updateLabels(WalletModel *model, QDialog* dialog) } } - QString sPriorityLabel = ""; + QString sPriorityLabel = tr("none"); int64_t nAmount = 0; int64_t nPayFee = 0; int64_t nAfterFee = 0; @@ -594,10 +593,10 @@ void CoinControlDialog::updateLabels(WalletModel *model, QDialog* dialog) l8->setText(BitcoinUnits::formatWithUnit(nDisplayUnit, nChange)); // Change // turn labels "red" - l5->setStyleSheet((nBytes >= 1000) ? "color:red;" : ""); // Bytes >= 1000 - l6->setStyleSheet((!AllowFree(dPriority)) ? "color:red;" : ""); // Priority < "medium" - l7->setStyleSheet((fLowOutput) ? "color:red;" : ""); // Low Output = "yes" - l8->setStyleSheet((nChange > 0 && nChange < CENT) ? "color:red;" : ""); // Change < 0.01BTC + l5->setStyleSheet((nBytes >= 1000) ? "color:red;" : ""); // Bytes >= 1000 + l6->setStyleSheet((dPriority > 0 && !AllowFree(dPriority)) ? "color:red;" : ""); // Priority < "medium" + l7->setStyleSheet((fLowOutput) ? "color:red;" : ""); // Low Output = "yes" + l8->setStyleSheet((nChange > 0 && nChange < CENT) ? "color:red;" : ""); // Change < 0.01BTC // tool tips QString toolTip1 = tr("This label turns red, if the transaction size is greater than 1000 bytes.") + "<br /><br />"; @@ -605,7 +604,7 @@ void CoinControlDialog::updateLabels(WalletModel *model, QDialog* dialog) toolTip1 += tr("Can vary +/- 1 byte per input."); QString toolTip2 = tr("Transactions with higher priority are more likely to get included into a block.") + "<br /><br />"; - toolTip2 += tr("This label turns red, if the priority is smaller than \"medium\"") + "<br /><br />"; + toolTip2 += tr("This label turns red, if the priority is smaller than \"medium\".") + "<br /><br />"; toolTip2 += tr("This means a fee of at least %1 per kB is required.").arg(BitcoinUnits::formatWithUnit(nDisplayUnit, CTransaction::nMinTxFee)); QString toolTip3 = tr("This label turns red, if any recipient receives an amount smaller than %1.").arg(BitcoinUnits::formatWithUnit(nDisplayUnit, CENT)) + "<br /><br />"; @@ -730,7 +729,7 @@ void CoinControlDialog::updateView() itemOutput->setText(COLUMN_AMOUNT_INT64, strPad(QString::number(out.tx->vout[out.i].nValue), 15, " ")); // padding so that sorting works correctly // date - itemOutput->setText(COLUMN_DATE, QDateTime::fromTime_t(out.tx->GetTxTime()).toString("yy-MM-dd hh:mm")); + itemOutput->setText(COLUMN_DATE, GUIUtil::dateTimeStr(out.tx->GetTxTime())); // confirmations itemOutput->setText(COLUMN_CONFIRMATIONS, strPad(QString::number(out.nDepth), 8, " ")); diff --git a/src/qt/editaddressdialog.cpp b/src/qt/editaddressdialog.cpp index 618567218f..46982cc339 100644 --- a/src/qt/editaddressdialog.cpp +++ b/src/qt/editaddressdialog.cpp @@ -13,7 +13,10 @@ EditAddressDialog::EditAddressDialog(Mode mode, QWidget *parent) : QDialog(parent), - ui(new Ui::EditAddressDialog), mapper(0), mode(mode), model(0) + ui(new Ui::EditAddressDialog), + mapper(0), + mode(mode), + model(0) { ui->setupUi(this); diff --git a/src/qt/forms/aboutdialog.ui b/src/qt/forms/aboutdialog.ui index 80768f89b0..10a5857cab 100644 --- a/src/qt/forms/aboutdialog.ui +++ b/src/qt/forms/aboutdialog.ui @@ -11,7 +11,7 @@ </rect> </property> <property name="windowTitle"> - <string>About Bitcoin</string> + <string>About Bitcoin Core</string> </property> <layout class="QHBoxLayout" name="horizontalLayout_2"> <item> @@ -50,7 +50,7 @@ <cursorShape>IBeamCursor</cursorShape> </property> <property name="text"> - <string><b>Bitcoin</b> version</string> + <string><b>Bitcoin Core</b> version</string> </property> <property name="textInteractionFlags"> <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set> @@ -91,7 +91,7 @@ <cursorShape>IBeamCursor</cursorShape> </property> <property name="text"> - <string notr="true">Copyright &copy; 2009-YYYY The Bitcoin developers</string> + <string notr="true">Copyright &copy; 2009-YYYY The Bitcoin Core developers</string> </property> <property name="textFormat"> <enum>Qt::RichText</enum> diff --git a/src/qt/forms/intro.ui b/src/qt/forms/intro.ui index 0f6ae5a7d0..05ee9466c4 100644 --- a/src/qt/forms/intro.ui +++ b/src/qt/forms/intro.ui @@ -20,7 +20,7 @@ <string notr="true">QLabel { font-style:italic; }</string> </property> <property name="text"> - <string>Welcome to Bitcoin-Qt.</string> + <string>Welcome to Bitcoin Core.</string> </property> <property name="wordWrap"> <bool>true</bool> @@ -46,7 +46,7 @@ <item> <widget class="QLabel" name="label_4"> <property name="text"> - <string>As this is the first time the program is launched, you can choose where Bitcoin-Qt will store its data.</string> + <string>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</string> </property> <property name="wordWrap"> <bool>true</bool> @@ -56,7 +56,7 @@ <item> <widget class="QLabel" name="sizeWarningLabel"> <property name="text"> - <string>Bitcoin-Qt will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</string> + <string>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.</string> </property> <property name="wordWrap"> <bool>true</bool> diff --git a/src/qt/forms/optionsdialog.ui b/src/qt/forms/optionsdialog.ui index 28b629b38c..9056ab7696 100644 --- a/src/qt/forms/optionsdialog.ui +++ b/src/qt/forms/optionsdialog.ui @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>540</width> - <height>380</height> + <width>560</width> + <height>400</height> </rect> </property> <property name="windowTitle"> @@ -19,9 +19,6 @@ <layout class="QVBoxLayout" name="verticalLayout"> <item> <widget class="QTabWidget" name="tabWidget"> - <property name="tabPosition"> - <enum>QTabWidget::North</enum> - </property> <property name="currentIndex"> <number>0</number> </property> @@ -87,21 +84,44 @@ </widget> </item> <item> - <spacer name="verticalSpacer_Main"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> - <item> <layout class="QHBoxLayout" name="horizontalLayout_2_Main"> <item> + <widget class="QLabel" name="databaseCacheLabel"> + <property name="text"> + <string>Size of &database cache</string> + </property> + <property name="textFormat"> + <enum>Qt::PlainText</enum> + </property> + <property name="buddy"> + <cstring>databaseCache</cstring> + </property> + </widget> + </item> + <item> + <widget class="QSpinBox" name="databaseCache"> + <property name="toolTip"> + <string>Set database cache size in megabytes (default: 25)</string> + </property> + <property name="maximum"> + <number>1024</number> + </property> + <property name="value"> + <number>25</number> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="databaseCacheUnitLabel"> + <property name="text"> + <string>MB</string> + </property> + <property name="textFormat"> + <enum>Qt::PlainText</enum> + </property> + </widget> + </item> + <item> <spacer name="horizontalSpacer_2_Main"> <property name="orientation"> <enum>Qt::Horizontal</enum> @@ -114,21 +134,64 @@ </property> </spacer> </item> + </layout> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_3_Main"> + <item> + <widget class="QLabel" name="threadsScriptVerifLabel"> + <property name="text"> + <string>Number of script &verification threads</string> + </property> + <property name="textFormat"> + <enum>Qt::PlainText</enum> + </property> + <property name="buddy"> + <cstring>threadsScriptVerif</cstring> + </property> + </widget> + </item> <item> - <widget class="QPushButton" name="resetButton"> + <widget class="QSpinBox" name="threadsScriptVerif"> <property name="toolTip"> - <string>Reset all client options to default.</string> + <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="text"> - <string>&Reset Options</string> + <property name="minimum"> + <number>-16</number> </property> - <property name="autoDefault"> - <bool>false</bool> + <property name="maximum"> + <number>16</number> </property> </widget> </item> + <item> + <spacer name="horizontalSpacer_3_Main"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> </layout> </item> + <item> + <spacer name="verticalSpacer_Main"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> </layout> </widget> <widget class="QWidget" name="tabNetwork"> @@ -149,15 +212,15 @@ <item> <widget class="QCheckBox" name="connectSocks"> <property name="toolTip"> - <string>Connect to the Bitcoin network through a SOCKS proxy (e.g. when connecting through Tor).</string> + <string>Connect to the Bitcoin network through a SOCKS proxy.</string> </property> <property name="text"> - <string>&Connect through SOCKS proxy:</string> + <string>&Connect through SOCKS proxy (default proxy):</string> </property> </widget> </item> <item> - <layout class="QHBoxLayout" name="horizontalLayout_Network"> + <layout class="QHBoxLayout" name="horizontalLayout_1_Network"> <item> <widget class="QLabel" name="proxyIpLabel"> <property name="text"> @@ -173,6 +236,12 @@ </item> <item> <widget class="QValidatedLineEdit" name="proxyIp"> + <property name="minimumSize"> + <size> + <width>140</width> + <height>0</height> + </size> + </property> <property name="maximumSize"> <size> <width>140</width> @@ -180,7 +249,7 @@ </size> </property> <property name="toolTip"> - <string>IP address of the proxy (e.g. 127.0.0.1)</string> + <string>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</string> </property> </widget> </item> @@ -199,6 +268,12 @@ </item> <item> <widget class="QLineEdit" name="proxyPort"> + <property name="minimumSize"> + <size> + <width>55</width> + <height>0</height> + </size> + </property> <property name="maximumSize"> <size> <width>55</width> @@ -231,7 +306,7 @@ </widget> </item> <item> - <spacer name="horizontalSpacer_Network"> + <spacer name="horizontalSpacer_1_Network"> <property name="orientation"> <enum>Qt::Horizontal</enum> </property> @@ -391,8 +466,67 @@ </widget> </item> <item> + <widget class="QFrame" name="frame"> + <layout class="QVBoxLayout" name="verticalLayout_Bottom"> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_Bottom"> + <item> + <widget class="QLabel" name="overriddenByCommandLineInfoLabel"> + <property name="text"> + <string>Active command-line options that override above options: </string> + </property> + <property name="textFormat"> + <enum>Qt::PlainText</enum> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer_Bottom"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + <item> + <widget class="QLabel" name="overriddenByCommandLineLabel"> + <property name="text"> + <string/> + </property> + <property name="textFormat"> + <enum>Qt::PlainText</enum> + </property> + <property name="wordWrap"> + <bool>true</bool> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> <layout class="QHBoxLayout" name="horizontalLayout_Buttons"> <item> + <widget class="QPushButton" name="resetButton"> + <property name="toolTip"> + <string>Reset all client options to default.</string> + </property> + <property name="text"> + <string>&Reset Options</string> + </property> + <property name="autoDefault"> + <bool>false</bool> + </property> + </widget> + </item> + <item> <spacer name="horizontalSpacer_1"> <property name="orientation"> <enum>Qt::Horizontal</enum> @@ -407,6 +541,12 @@ </item> <item> <widget class="QLabel" name="statusLabel"> + <property name="minimumSize"> + <size> + <width>200</width> + <height>0</height> + </size> + </property> <property name="font"> <font> <weight>75</weight> @@ -454,16 +594,6 @@ </property> </widget> </item> - <item> - <widget class="QPushButton" name="applyButton"> - <property name="text"> - <string>&Apply</string> - </property> - <property name="autoDefault"> - <bool>false</bool> - </property> - </widget> - </item> </layout> </item> </layout> @@ -473,17 +603,18 @@ <class>BitcoinAmountField</class> <extends>QLineEdit</extends> <header>bitcoinamountfield.h</header> - </customwidget> - <customwidget> - <class>QValueComboBox</class> - <extends>QComboBox</extends> - <header>qvaluecombobox.h</header> + <container>1</container> </customwidget> <customwidget> <class>QValidatedLineEdit</class> <extends>QLineEdit</extends> <header>qvalidatedlineedit.h</header> </customwidget> + <customwidget> + <class>QValueComboBox</class> + <extends>QComboBox</extends> + <header>qvaluecombobox.h</header> + </customwidget> </customwidgets> <resources/> <connections/> diff --git a/src/qt/forms/overviewpage.ui b/src/qt/forms/overviewpage.ui index 9d0d838daa..d1ca969431 100644 --- a/src/qt/forms/overviewpage.ui +++ b/src/qt/forms/overviewpage.ui @@ -90,6 +90,8 @@ </layout> </item> <item> + <layout class="QHBoxLayout" name="horizontalLayout_3"> + <item> <layout class="QFormLayout" name="formLayout_2"> <property name="fieldGrowthPolicy"> <enum>QFormLayout::AllNonFixedFieldsGrow</enum> @@ -234,6 +236,21 @@ </item> </layout> </item> + <item> + <spacer name="horizontalSpacer_3"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> </layout> </widget> </item> diff --git a/src/qt/forms/rpcconsole.ui b/src/qt/forms/rpcconsole.ui index c77c5a384c..69504f3159 100644 --- a/src/qt/forms/rpcconsole.ui +++ b/src/qt/forms/rpcconsole.ui @@ -36,7 +36,7 @@ </font> </property> <property name="text"> - <string>Bitcoin Core</string> + <string>General</string> </property> </widget> </item> @@ -172,14 +172,14 @@ </widget> </item> <item row="7" column="0"> - <widget class="QLabel" name="label_7"> + <widget class="QLabel" name="label_8"> <property name="text"> - <string>Number of connections</string> + <string>Name</string> </property> </widget> </item> <item row="7" column="1"> - <widget class="QLabel" name="numberOfConnections"> + <widget class="QLabel" name="networkName"> <property name="cursor"> <cursorShape>IBeamCursor</cursorShape> </property> @@ -195,19 +195,25 @@ </widget> </item> <item row="8" column="0"> - <widget class="QLabel" name="label_8"> + <widget class="QLabel" name="label_7"> <property name="text"> - <string>On testnet</string> + <string>Number of connections</string> </property> </widget> </item> <item row="8" column="1"> - <widget class="QCheckBox" name="isTestNet"> - <property name="enabled"> - <bool>false</bool> + <widget class="QLabel" name="numberOfConnections"> + <property name="cursor"> + <cursorShape>IBeamCursor</cursorShape> </property> <property name="text"> - <string/> + <string>N/A</string> + </property> + <property name="textFormat"> + <enum>Qt::PlainText</enum> + </property> + <property name="textInteractionFlags"> + <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set> </property> </widget> </item> @@ -348,7 +354,7 @@ <item row="17" column="0"> <widget class="QPushButton" name="showCLOptionsButton"> <property name="toolTip"> - <string>Show the Bitcoin-Qt help message to get a list with possible Bitcoin command-line options.</string> + <string>Show the Bitcoin-Core help message to get a list with possible Bitcoin command-line options.</string> </property> <property name="text"> <string>&Show</string> diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp index 8f8d67dc58..b87498402d 100644 --- a/src/qt/guiutil.cpp +++ b/src/qt/guiutil.cpp @@ -594,7 +594,7 @@ void restoreWindowGeometry(const QString& strSetting, const QSize& defaultSize, HelpMessageBox::HelpMessageBox(QWidget *parent) : QMessageBox(parent) { - header = tr("Bitcoin-Qt") + " " + tr("version") + " " + + header = tr("Bitcoin Core") + " " + tr("version") + " " + QString::fromStdString(FormatFullVersion()) + "\n\n" + tr("Usage:") + "\n" + " bitcoin-qt [" + tr("command-line options") + "] " + "\n"; @@ -607,7 +607,7 @@ HelpMessageBox::HelpMessageBox(QWidget *parent) : " -splash " + tr("Show splash screen on startup (default: 1)") + "\n" + " -choosedatadir " + tr("Choose data directory on startup (default: 0)") + "\n"; - setWindowTitle(tr("Bitcoin-Qt")); + setWindowTitle(tr("Bitcoin Core")); setTextFormat(Qt::PlainText); // setMinimumWidth is ignored for QMessageBox so put in non-breaking spaces to make it wider. setText(header + QString(QChar(0x2003)).repeated(50)); diff --git a/src/qt/intro.cpp b/src/qt/intro.cpp index 3ecd96cc42..453bbdf374 100644 --- a/src/qt/intro.cpp +++ b/src/qt/intro.cpp @@ -148,7 +148,7 @@ QString Intro::getDefaultDataDirectory() void Intro::pickDataDirectory(bool fIsTestnet) { - namespace fs = boost::filesystem;; + namespace fs = boost::filesystem; QSettings settings; /* If data directory provided on command line, no need to look at settings or show a picking dialog */ @@ -233,7 +233,7 @@ void Intro::on_dataDirectory_textChanged(const QString &dataDirStr) void Intro::on_ellipsisButton_clicked() { - QString dir = QFileDialog::getExistingDirectory(0, "Choose data directory", ui->dataDirectory->text()); + QString dir = QDir::toNativeSeparators(QFileDialog::getExistingDirectory(0, "Choose data directory", ui->dataDirectory->text())); if(!dir.isEmpty()) ui->dataDirectory->setText(dir); } diff --git a/src/qt/locale/bitcoin_af_ZA.ts b/src/qt/locale/bitcoin_af_ZA.ts index 3975732f9f..0c44a90bc2 100644 --- a/src/qt/locale/bitcoin_af_ZA.ts +++ b/src/qt/locale/bitcoin_af_ZA.ts @@ -3,13 +3,13 @@ <name>AboutDialog</name> <message> <location filename="../forms/aboutdialog.ui" line="+14"/> - <source>About Bitcoin</source> + <source>About Bitcoin Core</source> <translation type="unfinished"/> </message> <message> <location line="+39"/> - <source><b>Bitcoin</b> version</source> - <translation><b>Bitcoin</b> weergawe</translation> + <source><b>Bitcoin Core</b> version</source> + <translation type="unfinished"/> </message> <message> <location line="+57"/> @@ -22,7 +22,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="+14"/> + <location filename="../aboutdialog.cpp" line="+19"/> <source>Copyright</source> <translation type="unfinished"/> </message> @@ -65,7 +65,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location filename="../addressbookpage.cpp" line="+72"/> + <location filename="../addressbookpage.cpp" line="+74"/> <source>&Copy Address</source> <translation type="unfinished"/> </message> @@ -135,7 +135,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+197"/> + <location line="+194"/> <source>Export Address List</source> <translation type="unfinished"/> </message> @@ -158,7 +158,7 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>AddressTableModel</name> <message> - <location filename="../addresstablemodel.cpp" line="+164"/> + <location filename="../addresstablemodel.cpp" line="+168"/> <source>Label</source> <translation>Etiket</translation> </message> @@ -196,7 +196,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Herhaal nuwe wagwoord</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="+34"/> + <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>Tik die nuwe wagwoord vir die beursie in.<br/>Gebruik asseblief 'n wagwoord van <b>ten minste 10 ewekansige karakters</b>, of <b>agt (8) of meer woorde.</b></translation> </message> @@ -317,17 +317,17 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+250"/> + <location filename="../bitcoingui.cpp" line="+260"/> <source>Sign &message...</source> <translation type="unfinished"/> </message> <message> - <location line="+254"/> + <location line="+290"/> <source>Synchronizing with network...</source> <translation>Sinchroniseer met die netwerk ...</translation> </message> <message> - <location line="-324"/> + <location line="-360"/> <source>&Overview</source> <translation>&Oorsig</translation> </message> @@ -393,7 +393,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+259"/> + <location line="+295"/> <source>Importing blocks from disk...</source> <translation type="unfinished"/> </message> @@ -403,7 +403,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-322"/> + <location line="-358"/> <source>Send coins to a Bitcoin address</source> <translation type="unfinished"/> </message> @@ -438,20 +438,18 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-180"/> - <location line="+6"/> - <location line="+513"/> + <location line="+375"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-519"/> - <location line="+6"/> + <location line="-563"/> + <location line="+10"/> <source>Wallet</source> <translation>Beursie</translation> </message> <message> - <location line="+109"/> + <location line="+113"/> <source>&Send</source> <translation type="unfinished"/> </message> @@ -461,13 +459,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+28"/> - <location line="+2"/> - <source>&About Bitcoin</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+14"/> + <location line="+44"/> <location line="+2"/> <source>&Show / Hide</source> <translation type="unfinished"/> @@ -493,12 +485,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+35"/> + <location line="+39"/> <source>&File</source> <translation>&Lêer</translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>&Settings</source> <translation>&Instellings</translation> </message> @@ -513,18 +505,30 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Blad nutsbalk</translation> </message> <message> - <location line="-235"/> - <location line="+294"/> + <location line="-244"/> + <location line="+321"/> <source>[testnet]</source> <translation type="unfinished"/> </message> <message> - <location line="-177"/> + <location line="-331"/> + <location line="+10"/> + <source>Bitcoin Core</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+121"/> <source>Request payments (generates QR codes and bitcoin: URIs)</source> <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+27"/> + <location line="+2"/> + <source>&About Bitcoin Core</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+34"/> <source>&Used sending addresses...</source> <translation type="unfinished"/> </message> @@ -544,13 +548,23 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+106"/> + <location line="+2"/> + <source>Open URI...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Open a bitcoin: URI or payment request</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+126"/> <location line="+5"/> <source>Bitcoin client</source> <translation>Bitcoin klient</translation> </message> <message numerus="yes"> - <location line="+120"/> + <location line="+133"/> <source>%n active connection(s) to Bitcoin network</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> @@ -654,17 +668,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+34"/> - <source>URI handling</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+0"/> - <source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+45"/> + <location line="+67"/> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation type="unfinished"/> </message> @@ -674,7 +678,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../bitcoin.cpp" line="+110"/> + <location filename="../bitcoin.cpp" line="+116"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -682,12 +686,299 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+115"/> + <location filename="../clientmodel.cpp" line="+119"/> <source>Network Alert</source> <translation type="unfinished"/> </message> </context> <context> + <name>CoinControlDialog</name> + <message> + <location filename="../forms/coincontroldialog.ui" line="+14"/> + <source>Coin Control Address Selection</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+34"/> + <source>Quantity:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+29"/> + <source>Bytes:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+45"/> + <source>Amount:</source> + <translation>Bedrag:</translation> + </message> + <message> + <location line="+29"/> + <source>Priority:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+45"/> + <source>Fee:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+32"/> + <source>Low Output:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+48"/> + <source>After Fee:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+32"/> + <source>Change:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+63"/> + <source>(un)select all</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+13"/> + <source>Tree mode</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> + <source>List mode</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+52"/> + <source>Amount</source> + <translation>Bedrag</translation> + </message> + <message> + <location line="+10"/> + <source>Address</source> + <translation>Adres</translation> + </message> + <message> + <location line="+5"/> + <source>Date</source> + <translation>Datum</translation> + </message> + <message> + <location line="+5"/> + <source>Confirmations</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Confirmed</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+5"/> + <source>Priority</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../coincontroldialog.cpp" line="+42"/> + <source>Copy address</source> + <translation>Maak kopie van adres</translation> + </message> + <message> + <location line="+1"/> + <source>Copy label</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <location line="+26"/> + <source>Copy amount</source> + <translation>Kopieer bedrag</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="+171"/> + <source>Dust</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>yes</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>no</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+10"/> + <source>This label turns red, if the transaction size is greater than 1000 bytes.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <location line="+5"/> + <source>This means a fee of at least %1 per kB is required.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-4"/> + <source>Can vary +/- 1 byte per input.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>Transactions with higher priority are more likely to get included into a block.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>This label turns red, if the priority is smaller than "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>(geen etiket)</translation> + </message> + <message> + <location line="-9"/> + <source>change from %1 (%2)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>(change)</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>EditAddressDialog</name> <message> <location filename="../forms/editaddressdialog.ui" line="+14"/> @@ -715,7 +1006,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../editaddressdialog.cpp" line="+21"/> + <location filename="../editaddressdialog.cpp" line="+25"/> <source>New receiving address</source> <translation>Nuwe ontvangende adres</translation> </message> @@ -758,7 +1049,7 @@ Address: %4 <context> <name>FreespaceChecker</name> <message> - <location filename="../intro.cpp" line="+61"/> + <location filename="../intro.cpp" line="+65"/> <source>A new data directory will be created.</source> <translation type="unfinished"/> </message> @@ -786,18 +1077,18 @@ Address: %4 <context> <name>GUIUtil::HelpMessageBox</name> <message> - <location filename="../guiutil.cpp" line="+558"/> - <location line="+13"/> - <source>Bitcoin-Qt</source> + <location filename="../guiutil.cpp" line="+597"/> + <source>version</source> <translation type="unfinished"/> </message> <message> - <location line="-13"/> - <source>version</source> + <location line="+0"/> + <location line="+13"/> + <source>Bitcoin Core</source> <translation type="unfinished"/> </message> <message> - <location line="+2"/> + <location line="-11"/> <source>Usage:</source> <translation>Gebruik:</translation> </message> @@ -841,17 +1132,17 @@ Address: %4 </message> <message> <location line="+9"/> - <source>Welcome to Bitcoin-Qt.</source> + <source>Welcome to Bitcoin Core.</source> <translation type="unfinished"/> </message> <message> <location line="+26"/> - <source>As this is the first time the program is launched, you can choose where Bitcoin-Qt will store its data.</source> + <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source> <translation type="unfinished"/> </message> <message> <location line="+10"/> - <source>Bitcoin-Qt will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source> + <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source> <translation type="unfinished"/> </message> <message> @@ -865,7 +1156,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../intro.cpp" line="+105"/> + <location filename="../intro.cpp" line="+85"/> + <source>Bitcoin</source> + <translation>Bitcoin</translation> + </message> + <message> + <location line="+1"/> + <source>Error: Specified data directory "%1" can not be created.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+19"/> <source>Error</source> <translation type="unfinished"/> </message> @@ -881,6 +1182,34 @@ Address: %4 </message> </context> <context> + <name>OpenURIDialog</name> + <message> + <location filename="../forms/openuridialog.ui" line="+14"/> + <source>Open URI</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Open payment request from URI or file</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+9"/> + <source>URI:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+11"/> + <source>Select payment request file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../openuridialog.cpp" line="+47"/> + <source>Select payment request file to open</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OptionsDialog</name> <message> <location filename="../forms/optionsdialog.ui" line="+14"/> @@ -1038,6 +1367,16 @@ Address: %4 <translation type="unfinished"/> </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="+71"/> <source>&OK</source> <translation type="unfinished"/> @@ -1053,12 +1392,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../optionsdialog.cpp" line="+58"/> + <location filename="../optionsdialog.cpp" line="+63"/> <source>default</source> <translation type="unfinished"/> </message> <message> - <location line="+130"/> + <location line="+131"/> <source>Confirm options reset</source> <translation type="unfinished"/> </message> @@ -1099,17 +1438,17 @@ Address: %4 </message> <message> <location line="+50"/> - <location line="+202"/> + <location line="+214"/> <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source> <translation type="unfinished"/> </message> <message> - <location line="-131"/> + <location line="-140"/> <source>Unconfirmed:</source> <translation type="unfinished"/> </message> <message> - <location line="-78"/> + <location line="-81"/> <source>Wallet</source> <translation>Beursie</translation> </message> @@ -1124,12 +1463,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+29"/> + <location line="+32"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation type="unfinished"/> </message> <message> - <location line="+13"/> + <location line="+16"/> <source>Immature:</source> <translation type="unfinished"/> </message> @@ -1139,7 +1478,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+13"/> + <location line="+16"/> <source>Total:</source> <translation type="unfinished"/> </message> @@ -1149,12 +1488,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+53"/> + <location line="+56"/> <source><b>Recent transactions</b></source> <translation><b>Onlangse transaksies</b></translation> </message> <message> - <location filename="../overviewpage.cpp" line="+116"/> + <location filename="../overviewpage.cpp" line="+120"/> <location line="+1"/> <source>out of sync</source> <translation type="unfinished"/> @@ -1163,7 +1502,7 @@ Address: %4 <context> <name>PaymentServer</name> <message> - <location filename="../paymentserver.cpp" line="+392"/> + <location filename="../paymentserver.cpp" line="+397"/> <source>URI handling</source> <translation type="unfinished"/> </message> @@ -1173,23 +1512,29 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+69"/> + <location line="+91"/> <source>Requested payment amount of %1 is too small (considered dust).</source> <translation type="unfinished"/> </message> <message> - <location line="+4"/> - <location line="+37"/> + <location line="-204"/> + <location line="+195"/> + <location line="+13"/> <source>Payment request error</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Insecure requests to custom payment scripts unsupported</source> + <location line="-207"/> + <source>Cannot start bitcoin: click-to-pay handler</source> <translation type="unfinished"/> </message> <message> - <location line="+38"/> + <location line="+195"/> + <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> @@ -1199,7 +1544,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>Bad response from server %1</source> <translation type="unfinished"/> </message> @@ -1209,8 +1554,8 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-58"/> - <location line="+30"/> + <location line="-55"/> + <location line="+27"/> <location line="+17"/> <source>Network request error</source> <translation type="unfinished"/> @@ -1219,11 +1564,10 @@ Address: %4 <context> <name>QObject</name> <message> - <location filename="../bitcoin.cpp" line="+114"/> + <location filename="../bitcoin.cpp" line="+119"/> <location line="+5"/> - <location filename="../intro.cpp" line="-32"/> <source>Bitcoin</source> - <translation type="unfinished"/> + <translation>Bitcoin</translation> </message> <message> <location line="-4"/> @@ -1235,16 +1579,11 @@ Address: %4 <source>Error: Invalid combination of -regtest and -testnet.</source> <translation type="unfinished"/> </message> - <message> - <location filename="../intro.cpp" line="+1"/> - <source>Error: Specified data directory "%1" can not be created.</source> - <translation type="unfinished"/> - </message> </context> <context> <name>QRImageWidget</name> <message> - <location filename="../receiverequestdialog.cpp" line="+32"/> + <location filename="../receiverequestdialog.cpp" line="+36"/> <source>&Save Image...</source> <translation type="unfinished"/> </message> @@ -1260,7 +1599,7 @@ Address: %4 </message> <message> <location line="+0"/> - <source>PNG Images (*.png)</source> + <source>PNG Image (*.png)</source> <translation type="unfinished"/> </message> </context> @@ -1281,7 +1620,7 @@ Address: %4 <location line="+53"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+352"/> + <location filename="../rpcconsole.cpp" line="+360"/> <source>N/A</source> <translation type="unfinished"/> </message> @@ -1296,7 +1635,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+68"/> + <location line="-10"/> + <source>Debug window</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+78"/> <source>Using OpenSSL version</source> <translation type="unfinished"/> </message> @@ -1351,12 +1695,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+7"/> - <source>Show the Bitcoin-Qt help message to get a list with possible Bitcoin command-line options.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> + <location line="+10"/> <source>&Show</source> <translation type="unfinished"/> </message> @@ -1396,12 +1735,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-104"/> - <source>Bitcoin - Debug window</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+25"/> + <location line="-79"/> <source>Bitcoin Core</source> <translation type="unfinished"/> </message> @@ -1416,7 +1750,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+102"/> + <location line="+26"/> + <source>Show the Bitcoin-Core help message to get a list with possible Bitcoin command-line options.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+76"/> <source>Clear console</source> <translation type="unfinished"/> </message> @@ -1474,37 +1813,32 @@ Address: %4 <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+22"/> + <location filename="../forms/receivecoinsdialog.ui" line="+83"/> <source>&Amount:</source> <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+19"/> <source>The amount to request</source> <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="-32"/> <source>&Label:</source> <translation type="unfinished"/> </message> <message> - <location line="+10"/> - <source>The label to associate with the receiving address</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+7"/> + <location line="-34"/> <source>&Message:</source> <translation type="unfinished"/> </message> <message> - <location line="+10"/> + <location line="+20"/> <source>The message to attach to payment request</source> <translation type="unfinished"/> </message> <message> - <location line="+14"/> + <location line="-37"/> <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> @@ -1514,12 +1848,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="+27"/> + <source>The label to associate with the new receiving address</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+14"/> <source>Use this form to request payments. All fields are optional.</source> <translation type="unfinished"/> </message> <message> - <location line="+17"/> + <location line="+56"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -1533,6 +1872,31 @@ Address: %4 <source>&Request payment</source> <translation type="unfinished"/> </message> + <message> + <location line="+47"/> + <source>Previously requested payments</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> + <source>Show the selected request (does the same as double clicking an entry)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Show</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+11"/> + <source>Remove the selected entries from the list</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Remove</source> + <translation type="unfinished"/> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -1553,16 +1917,11 @@ Address: %4 </message> <message> <location line="+7"/> - <source>&Copy Image</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+7"/> <source>&Save Image...</source> <translation type="unfinished"/> </message> <message> - <location filename="../receiverequestdialog.cpp" line="+58"/> + <location filename="../receiverequestdialog.cpp" line="+56"/> <source>Request payment to %1</source> <translation type="unfinished"/> </message> @@ -1608,16 +1967,119 @@ Address: %4 </message> </context> <context> + <name>RecentRequestsTableModel</name> + <message> + <location filename="../recentrequeststablemodel.cpp" line="+14"/> + <source>Date</source> + <translation>Datum</translation> + </message> + <message> + <location line="+0"/> + <source>Label</source> + <translation>Etiket</translation> + </message> + <message> + <location line="+0"/> + <source>Message</source> + <translation>Boodskap</translation> + </message> + <message> + <location line="+0"/> + <source>Amount</source> + <translation>Bedrag</translation> + </message> + <message> + <location line="+36"/> + <source>(no label)</source> + <translation>(geen etiket)</translation> + </message> + <message> + <location line="+9"/> + <source>(no message)</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="+14"/> - <location filename="../sendcoinsdialog.cpp" line="+140"/> - <location line="+213"/> + <location filename="../sendcoinsdialog.cpp" line="+381"/> + <location line="+81"/> <source>Send Coins</source> <translation>Stuur Munstukke</translation> </message> <message> - <location line="+50"/> + <location line="+76"/> + <source>Coin Control Features</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+20"/> + <source>Inputs...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> + <source>automatically selected</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+19"/> + <source>Insufficient funds!</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+89"/> + <source>Quantity:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+35"/> + <source>Bytes:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+48"/> + <source>Amount:</source> + <translation>Bedrag:</translation> + </message> + <message> + <location line="+32"/> + <source>Priority:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+48"/> + <source>Fee:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+32"/> + <source>Low Output:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+48"/> + <source>After Fee:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+32"/> + <source>Change:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+44"/> + <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Custom change address</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+115"/> <source>Send to multiple recipients at once</source> <translation>Stuur aan vele ontvangers op eens</translation> </message> @@ -1642,12 +2104,7 @@ Address: %4 <translation>Balans:</translation> </message> <message> - <location line="+10"/> - <source>123.456 BTC</source> - <translation>123.456 BTC</translation> - </message> - <message> - <location line="+31"/> + <location line="+41"/> <source>Confirm the send action</source> <translation type="unfinished"/> </message> @@ -1657,69 +2114,135 @@ Address: %4 <translation>S&tuur</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-154"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation type="unfinished"/> </message> <message> - <location line="-90"/> + <location line="-74"/> <location line="+5"/> <location line="+5"/> + <location line="+4"/> <source>%1 to %2</source> <translation type="unfinished"/> </message> <message> - <location line="+26"/> + <location line="-136"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>Die adres waarheen die betaling gestuur moet word (b.v. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> + <message> + <location line="+15"/> + <source>Copy quantity</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation>Kopieer bedrag</translation> + </message> + <message> + <location line="+1"/> + <source>Copy fee</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy after fee</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy bytes</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy priority</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy low output</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy change</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+170"/> + <source>Total Amount %1 (= %2)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>or</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+202"/> <source>The recipient address is not valid, please recheck.</source> <translation type="unfinished"/> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>The amount to pay must be larger than 0.</source> <translation type="unfinished"/> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>The amount exceeds your balance.</source> <translation type="unfinished"/> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>The total exceeds your balance when the %1 transaction fee is included.</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+3"/> <source>Duplicate address found, can only send to each address once per send operation.</source> <translation type="unfinished"/> </message> <message> + <location line="+3"/> + <source>Transaction creation failed!</source> + <translation type="unfinished"/> + </message> + <message> <location line="+4"/> - <source>Error: Transaction creation failed!</source> + <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation type="unfinished"/> </message> <message> - <location line="+15"/> - <source>Are you sure you want to send?</source> + <location line="+113"/> + <source>Warning: Invalid Bitcoin address</source> <translation type="unfinished"/> </message> <message> - <location line="+9"/> - <source>added as transaction fee</source> + <location line="+13"/> + <source>(no label)</source> + <translation>(geen etiket)</translation> + </message> + <message> + <location line="+8"/> + <source>Warning: Unknown change address</source> <translation type="unfinished"/> </message> <message> - <location line="+6"/> - <source>Total Amount %1</source> + <location line="-378"/> + <source>Are you sure you want to send?</source> <translation type="unfinished"/> </message> <message> - <location line="+20"/> - <source>Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> + <location line="+9"/> + <source>added as transaction fee</source> <translation type="unfinished"/> </message> <message> - <location line="+144"/> + <location line="+170"/> <source>Payment request expired</source> <translation type="unfinished"/> </message> @@ -1732,39 +2255,44 @@ Address: %4 <context> <name>SendCoinsEntry</name> <message> - <location filename="../forms/sendcoinsentry.ui" line="+33"/> - <location line="+585"/> + <location filename="../forms/sendcoinsentry.ui" line="+131"/> + <location line="+501"/> + <location line="+536"/> <source>A&mount:</source> <translation type="unfinished"/> </message> <message> - <location line="-572"/> - <location line="+585"/> + <location line="-1132"/> <source>Pay &To:</source> <translation type="unfinished"/> </message> <message> - <location line="-551"/> + <location line="+18"/> <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation>Die adres waarheen die betaling gestuur moet word (b.v. 1H7wyVL5HCNoVFyyBJSDojwyxcCChU7TPA)</translation> </message> <message> - <location filename="../sendcoinsentry.cpp" line="+28"/> + <location filename="../sendcoinsentry.cpp" line="+30"/> <source>Enter a label for this address to add it to your address book</source> <translation type="unfinished"/> </message> <message> - <location filename="../forms/sendcoinsentry.ui" line="-18"/> + <location filename="../forms/sendcoinsentry.ui" line="+57"/> <source>&Label:</source> <translation type="unfinished"/> </message> <message> - <location line="+28"/> + <location line="-50"/> <source>Choose previously used address</source> <translation type="unfinished"/> </message> <message> - <location line="+10"/> + <location line="-40"/> + <source>This is a normal payment.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+50"/> <source>Alt+A</source> <translation type="unfinished"/> </message> @@ -1780,16 +2308,35 @@ Address: %4 </message> <message> <location line="+7"/> - <source>Remove this recipient</source> - <translation>Verwyder die ontvanger</translation> + <location line="+504"/> + <location line="+536"/> + <source>Remove this entry</source> + <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="-40"/> + <source>This is a verified payment request.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-971"/> <source>Enter a label for this address to add it to the list of used addresses</source> <translation type="unfinished"/> </message> <message> - <location line="+465"/> + <location line="+439"/> + <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> @@ -1910,7 +2457,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../signverifymessagedialog.cpp" line="+27"/> + <location filename="../signverifymessagedialog.cpp" line="+29"/> <location line="+3"/> <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation>Die adres waarheen die betaling gestuur moet word (b.v. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> @@ -1926,7 +2473,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+85"/> + <location line="+84"/> <location line="+81"/> <source>The entered address is invalid.</source> <translation type="unfinished"/> @@ -1995,8 +2542,13 @@ Address: %4 <context> <name>SplashScreen</name> <message> - <location filename="../splashscreen.cpp" line="+23"/> - <source>The Bitcoin developers</source> + <location filename="../splashscreen.cpp" line="+26"/> + <source>Bitcoin Core</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>The Bitcoin Core developers</source> <translation type="unfinished"/> </message> <message> @@ -2008,7 +2560,7 @@ Address: %4 <context> <name>TrafficGraphWidget</name> <message> - <location filename="../trafficgraphwidget.cpp" line="+75"/> + <location filename="../trafficgraphwidget.cpp" line="+79"/> <source>KB/s</source> <translation type="unfinished"/> </message> @@ -2016,7 +2568,7 @@ Address: %4 <context> <name>TransactionDesc</name> <message> - <location filename="../transactiondesc.cpp" line="+22"/> + <location filename="../transactiondesc.cpp" line="+28"/> <source>Open until %1</source> <translation type="unfinished"/> </message> @@ -2208,7 +2760,7 @@ Address: %4 <context> <name>TransactionTableModel</name> <message> - <location filename="../transactiontablemodel.cpp" line="+227"/> + <location filename="../transactiontablemodel.cpp" line="+234"/> <source>Date</source> <translation>Datum</translation> </message> @@ -2285,7 +2837,7 @@ Address: %4 <message> <location line="+2"/> <source>Payment to yourself</source> - <translation type="unfinished"/> + <translation>Betalings Aan/na jouself</translation> </message> <message> <location line="+2"/> @@ -2326,7 +2878,7 @@ Address: %4 <context> <name>TransactionView</name> <message> - <location filename="../transactionview.cpp" line="+52"/> + <location filename="../transactionview.cpp" line="+57"/> <location line="+16"/> <source>All</source> <translation>Alles</translation> @@ -2387,12 +2939,12 @@ Address: %4 <translation>Ander</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>Enter address or label to search</source> <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>Min amount</source> <translation>Min bedrag</translation> </message> @@ -2427,17 +2979,37 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+143"/> - <source>Export Transaction Data</source> + <location line="+142"/> + <source>Export Transaction History</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+19"/> + <source>Exporting Failed</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>There was an error trying to save the transaction history to %1.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+4"/> + <source>Exporting Successful</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>The transaction history was successfully saved to %1.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-22"/> <source>Comma separated file (*.csv)</source> <translation type="unfinished"/> </message> <message> - <location line="+8"/> + <location line="+9"/> <source>Confirmed</source> <translation type="unfinished"/> </message> @@ -2472,17 +3044,7 @@ Address: %4 <translation>ID</translation> </message> <message> - <location line="+4"/> - <source>Error exporting</source> - <translation>Fout uitvoering</translation> - </message> - <message> - <location line="+0"/> - <source>Could not write to file %1.</source> - <translation>Kon nie na die %1 lêer skryf nie</translation> - </message> - <message> - <location line="+100"/> + <location line="+107"/> <source>Range:</source> <translation>Reeks:</translation> </message> @@ -2493,9 +3055,17 @@ Address: %4 </message> </context> <context> + <name>WalletFrame</name> + <message> + <location filename="../walletframe.cpp" line="+26"/> + <source>No wallet has been loaded.</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>WalletModel</name> <message> - <location filename="../walletmodel.cpp" line="+218"/> + <location filename="../walletmodel.cpp" line="+245"/> <source>Send Coins</source> <translation>Stuur Munstukke</translation> </message> @@ -2503,7 +3073,7 @@ Address: %4 <context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+46"/> + <location filename="../walletview.cpp" line="+43"/> <source>&Export</source> <translation type="unfinished"/> </message> @@ -2513,65 +3083,60 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+183"/> + <location line="+181"/> <source>Backup Wallet</source> <translation type="unfinished"/> </message> <message> - <location line="+0"/> + <location line="+1"/> <source>Wallet Data (*.dat)</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Backup Failed</source> <translation type="unfinished"/> </message> <message> <location line="+0"/> - <source>There was an error trying to save the wallet data to the new location.</source> + <source>There was an error trying to save the wallet data to %1.</source> <translation type="unfinished"/> </message> <message> <location line="+4"/> - <source>Backup Successful</source> + <source>The wallet data was successfully saved to %1.</source> <translation type="unfinished"/> </message> <message> <location line="+0"/> - <source>The wallet data was successfully saved to the new location.</source> + <source>Backup Successful</source> <translation type="unfinished"/> </message> </context> <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+102"/> - <source>Bitcoin version</source> - <translation>Bitcoin weergawe</translation> - </message> - <message> - <location line="+107"/> + <location filename="../bitcoinstrings.cpp" line="+217"/> <source>Usage:</source> <translation>Gebruik:</translation> </message> <message> - <location line="-55"/> + <location line="-54"/> <source>List commands</source> <translation type="unfinished"/> </message> <message> - <location line="-13"/> + <location line="-14"/> <source>Get help for a command</source> <translation type="unfinished"/> </message> <message> - <location line="+25"/> + <location line="+26"/> <source>Options:</source> <translation>Opsies:</translation> </message> <message> - <location line="+24"/> + <location line="+23"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation type="unfinished"/> </message> @@ -2591,7 +3156,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-28"/> + <location line="-27"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>Luister vir konneksies op <port> (standaard: 8333 of testnet: 18333)</translation> </message> @@ -2601,7 +3166,7 @@ Address: %4 <translation>Onderhou op die meeste <n> konneksies na eweknieë (standaard: 125)</translation> </message> <message> - <location line="-49"/> + <location line="-50"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation type="unfinished"/> </message> @@ -2616,7 +3181,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-142"/> + <location line="-147"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"/> </message> @@ -2631,7 +3196,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+40"/> + <location line="+45"/> <source>Accept command line and JSON-RPC commands</source> <translation type="unfinished"/> </message> @@ -2641,17 +3206,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+40"/> + <location line="+39"/> <source>Use the test network</source> <translation>Gebruik die toets netwerk</translation> </message> <message> - <location line="-118"/> + <location line="-117"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> <message> - <location line="-87"/> + <location line="-92"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2706,17 +3271,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+11"/> - <source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source> + <location line="+18"/> + <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation type="unfinished"/> </message> <message> - <location line="+6"/> - <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> + <location line="+5"/> + <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+3"/> <source>Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source> <translation type="unfinished"/> </message> @@ -2746,17 +3311,27 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+14"/> + <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="+2"/> + <location line="+1"/> <source>Block creation options:</source> <translation type="unfinished"/> </message> @@ -2766,7 +3341,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+2"/> + <location line="+1"/> + <source>Connect through SOCKS proxy</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Connect to JSON-RPC on <port> (default: 8332 or testnet: 18332)</source> <translation type="unfinished"/> </message> @@ -2876,7 +3456,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+2"/> + <location line="+1"/> + <source>Fee per kB to add to transactions you send</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Find peers using DNS lookup (default: 1 unless -connect)</source> <translation type="unfinished"/> </message> @@ -2896,6 +3481,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <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"/> @@ -2911,17 +3501,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+8"/> + <location line="+5"/> + <source>Prepend debug output with timestamp (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>RPC client options:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+5"/> + <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Send command to Bitcoin server</source> <translation type="unfinished"/> </message> <message> - <location line="+10"/> + <location line="+8"/> + <source>Set maximum block size in bytes (default: %d)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>Set the number of threads to service RPC calls (default: 4)</source> <translation type="unfinished"/> </message> @@ -2941,7 +3551,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>Verifying blocks...</source> <translation type="unfinished"/> </message> @@ -2952,11 +3562,21 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> + <source>Wait for RPC server to start</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Wallet %s resides outside data directory %s</source> <translation type="unfinished"/> </message> <message> - <location line="+4"/> + <location line="+3"/> + <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> @@ -2966,17 +3586,27 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-98"/> + <location line="-104"/> <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> <translation type="unfinished"/> </message> <message> - <location line="+17"/> + <location line="+14"/> + <source>Output debugging information (default: 0, supplying <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="+83"/> + <location line="+88"/> <source>Information</source> <translation>Informasie</translation> </message> @@ -3016,32 +3646,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+2"/> - <source>Output extra debugging information. Implies all other -debug* options</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Output extra network debugging information</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> - <source>Prepend debug output with timestamp</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+5"/> + <location line="+9"/> <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Select the version of socks proxy to use (4-5, default: 5)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> + <location line="+4"/> <source>Send trace/debug info to console instead of debug.log file</source> <translation type="unfinished"/> </message> @@ -3051,12 +3661,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+5"/> - <source>Set maximum block size in bytes (default: 250000)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> + <location line="+6"/> <source>Set minimum block size in bytes (default: 0)</source> <translation type="unfinished"/> </message> @@ -3106,37 +3711,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Use proxy to reach tor hidden services (default: same as -proxy)</source> - <translation type="unfinished"/> - </message> - <message> <location line="+2"/> <source>Username for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Warning</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Warning: This version is obsolete, upgrade required!</source> <translation type="unfinished"/> </message> <message> <location line="+2"/> + <source>version</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>wallet.dat corrupt, salvage failed</source> <translation type="unfinished"/> </message> <message> - <location line="-54"/> + <location line="-57"/> <source>Password for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-70"/> + <location line="-69"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation type="unfinished"/> </message> @@ -3146,12 +3751,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-126"/> + <location line="-131"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+155"/> + <location line="+160"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"/> </message> @@ -3191,22 +3796,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-95"/> - <source>Connect through socks proxy</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-11"/> + <location line="-106"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation type="unfinished"/> </message> <message> - <location line="+58"/> + <location line="+59"/> <source>Loading addresses...</source> <translation>Laai adresse...</translation> </message> <message> - <location line="-36"/> + <location line="-37"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation type="unfinished"/> </message> @@ -3226,12 +3826,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+30"/> + <location line="+31"/> <source>Invalid -proxy address: '%s'</source> <translation type="unfinished"/> </message> <message> - <location line="+57"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation type="unfinished"/> </message> @@ -3251,7 +3851,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+46"/> + <location line="+47"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation type="unfinished"/> </message> @@ -3271,27 +3871,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Laai blok indeks...</translation> </message> <message> - <location line="-60"/> + <location line="-61"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"/> </message> <message> - <location line="-28"/> + <location line="-32"/> <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source> <translation type="unfinished"/> </message> <message> - <location line="+69"/> - <source>Fee per KB to add to transactions you send</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+20"/> + <location line="+94"/> <source>Loading wallet...</source> <translation>Laai beursie...</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> @@ -3321,7 +3916,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Fout</translation> </message> <message> - <location line="-33"/> + <location line="-34"/> <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 2da3819de3..b1b9f7f4b5 100644 --- a/src/qt/locale/bitcoin_be_BY.ts +++ b/src/qt/locale/bitcoin_be_BY.ts @@ -3,13 +3,13 @@ <name>AboutDialog</name> <message> <location filename="../forms/aboutdialog.ui" line="+14"/> - <source>About Bitcoin</source> - <translation>Аб Біткойн</translation> + <source>About Bitcoin Core</source> + <translation type="unfinished"/> </message> <message> <location line="+39"/> - <source><b>Bitcoin</b> version</source> - <translation>Версія <b>Bitcoin</b></translation> + <source><b>Bitcoin Core</b> version</source> + <translation type="unfinished"/> </message> <message> <location line="+57"/> @@ -22,7 +22,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="+14"/> + <location filename="../aboutdialog.cpp" line="+19"/> <source>Copyright</source> <translation type="unfinished"/> </message> @@ -65,7 +65,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location filename="../addressbookpage.cpp" line="+72"/> + <location filename="../addressbookpage.cpp" line="+74"/> <source>&Copy Address</source> <translation type="unfinished"/> </message> @@ -82,7 +82,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>Экспарт</translation> </message> <message> <location line="-27"/> @@ -135,7 +135,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+197"/> + <location line="+194"/> <source>Export Address List</source> <translation type="unfinished"/> </message> @@ -158,7 +158,7 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>AddressTableModel</name> <message> - <location filename="../addresstablemodel.cpp" line="+164"/> + <location filename="../addresstablemodel.cpp" line="+168"/> <source>Label</source> <translation>Пазнака</translation> </message> @@ -196,7 +196,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Паўтарыце новую кодавую фразу</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="+34"/> + <location filename="../askpassphrasedialog.cpp" line="+40"/> <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>10 or more random characters</b>, or <b>eight or more words</b>.</source> <translation>Увядзіце новую кодавую фразу для гаманца. <br/>Калі ласка, ўжывайце пароль <b>не меньша за 10 адвольных сімвалаў</b>, ці <b>болей васьмі слоў</b>.</translation> </message> @@ -228,7 +228,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+3"/> <source>Change passphrase</source> - <translation>Змяніць парольную фразу</translation> + <translation>Змяніць пароль</translation> </message> <message> <location line="+1"/> @@ -270,7 +270,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="-56"/> <source>Bitcoin will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> - <translation type="unfinished"/> + <translation>Bitcoin зачыняецца дзеля завяршэння працэсса шыфравання. Памятайце, што шыфраванне гаманца цалкам абараняе вашыя сродкі ад скрадання шкоднымі праграмамі якія могуць пранікнуць у ваш камп'ютар.</translation> </message> <message> <location line="+13"/> @@ -283,7 +283,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="-54"/> <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> - <translation>Шыфраванне гаманца не адбылося з-за унутранай памылкі. Гаманец незашыфраваны.</translation> + <translation>Шыфраванне гаманца не адбылося з-за ўнутранай памылкі. Гаманец незашыфраваны.</translation> </message> <message> <location line="+7"/> @@ -317,17 +317,17 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+250"/> + <location filename="../bitcoingui.cpp" line="+260"/> <source>Sign &message...</source> <translation type="unfinished"/> </message> <message> - <location line="+254"/> + <location line="+290"/> <source>Synchronizing with network...</source> - <translation>Сінхранізацыя з сецівам</translation> + <translation>Сінхранізацыя з сецівам...</translation> </message> <message> - <location line="-324"/> + <location line="-360"/> <source>&Overview</source> <translation>Агляд</translation> </message> @@ -365,12 +365,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>Аб Qt</translation> </message> <message> <location line="+2"/> <source>Show information about Qt</source> - <translation type="unfinished"/> + <translation>Паказаць інфармацыю аб Qt</translation> </message> <message> <location line="+2"/> @@ -393,7 +393,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+259"/> + <location line="+295"/> <source>Importing blocks from disk...</source> <translation type="unfinished"/> </message> @@ -403,7 +403,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-322"/> + <location line="-358"/> <source>Send coins to a Bitcoin address</source> <translation type="unfinished"/> </message> @@ -415,7 +415,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"/> @@ -438,20 +438,18 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-180"/> - <location line="+6"/> - <location line="+513"/> + <location line="+375"/> <source>Bitcoin</source> <translation type="unfinished"/> </message> <message> - <location line="-519"/> - <location line="+6"/> + <location line="-563"/> + <location line="+10"/> <source>Wallet</source> <translation type="unfinished"/> </message> <message> - <location line="+109"/> + <location line="+113"/> <source>&Send</source> <translation>Даслаць</translation> </message> @@ -461,13 +459,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Атрымаць</translation> </message> <message> - <location line="+28"/> - <location line="+2"/> - <source>&About Bitcoin</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+14"/> + <location line="+44"/> <location line="+2"/> <source>&Show / Hide</source> <translation type="unfinished"/> @@ -493,12 +485,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+35"/> + <location line="+39"/> <source>&File</source> <translation>Ф&айл</translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>&Settings</source> <translation>Наладкі</translation> </message> @@ -513,18 +505,30 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-235"/> - <location line="+294"/> + <location line="-244"/> + <location line="+321"/> <source>[testnet]</source> <translation>[testnet]</translation> </message> <message> - <location line="-177"/> + <location line="-331"/> + <location line="+10"/> + <source>Bitcoin Core</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+121"/> <source>Request payments (generates QR codes and bitcoin: URIs)</source> <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+27"/> + <location line="+2"/> + <source>&About Bitcoin Core</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+34"/> <source>&Used sending addresses...</source> <translation type="unfinished"/> </message> @@ -544,13 +548,23 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+106"/> + <location line="+2"/> + <source>Open URI...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Open a bitcoin: URI or payment request</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+126"/> <location line="+5"/> <source>Bitcoin client</source> - <translation type="unfinished"/> + <translation>Bitcoin кліент</translation> </message> <message numerus="yes"> - <location line="+120"/> + <location line="+133"/> <source>%n active connection(s) to Bitcoin network</source> <translation><numerusform>%n актыўнае злучэнне з Bitcoin-сецівам</numerusform><numerusform>%n актыўных злучэнняў з Bitcoin-сецівам</numerusform></translation> </message> @@ -602,7 +616,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"/> @@ -642,7 +656,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+0"/> <source>Incoming transaction</source> - <translation>Уваходныя транзакцыі</translation> + <translation>Прынятыя транзакцыі</translation> </message> <message> <location line="+1"/> @@ -651,20 +665,14 @@ Amount: %2 Type: %3 Address: %4 </source> - <translation type="unfinished"/> - </message> - <message> - <location line="+34"/> - <source>URI handling</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+0"/> - <source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source> - <translation type="unfinished"/> + <translation>Дата: %1 +Колькасць: %2 +Тып: %3 +Адрас: %4 +</translation> </message> <message> - <location line="+45"/> + <location line="+67"/> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>Гаманец <b>зашыфраваны</b> і зараз <b>разблакаваны</b></translation> </message> @@ -674,7 +682,7 @@ Address: %4 <translation>Гаманец <b>зашыфраваны</b> і зараз <b>заблакаваны</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+110"/> + <location filename="../bitcoin.cpp" line="+116"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -682,12 +690,299 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+115"/> + <location filename="../clientmodel.cpp" line="+119"/> <source>Network Alert</source> <translation type="unfinished"/> </message> </context> <context> + <name>CoinControlDialog</name> + <message> + <location filename="../forms/coincontroldialog.ui" line="+14"/> + <source>Coin Control Address Selection</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+34"/> + <source>Quantity:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+29"/> + <source>Bytes:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+45"/> + <source>Amount:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+29"/> + <source>Priority:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+45"/> + <source>Fee:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+32"/> + <source>Low Output:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+48"/> + <source>After Fee:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+32"/> + <source>Change:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+63"/> + <source>(un)select all</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+13"/> + <source>Tree mode</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> + <source>List mode</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+52"/> + <source>Amount</source> + <translation>Колькасць</translation> + </message> + <message> + <location line="+10"/> + <source>Address</source> + <translation>Адрас</translation> + </message> + <message> + <location line="+5"/> + <source>Date</source> + <translation>Дата</translation> + </message> + <message> + <location line="+5"/> + <source>Confirmations</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Confirmed</source> + <translation>Пацверджана</translation> + </message> + <message> + <location line="+5"/> + <source>Priority</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../coincontroldialog.cpp" line="+42"/> + <source>Copy address</source> + <translation>Капіяваць адрас</translation> + </message> + <message> + <location line="+1"/> + <source>Copy label</source> + <translation>Капіяваць пазнаку</translation> + </message> + <message> + <location line="+1"/> + <location line="+26"/> + <source>Copy amount</source> + <translation>Капіяваць колькасць</translation> + </message> + <message> + <location line="-25"/> + <source>Copy transaction ID</source> + <translation>Капіяваць ID транзакцыі</translation> + </message> + <message> + <location line="+1"/> + <source>Lock unspent</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Unlock unspent</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+22"/> + <source>Copy quantity</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>Copy fee</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy after fee</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy bytes</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy priority</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy low output</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy change</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+323"/> + <source>highest</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>higher</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>high</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>medium-high</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>medium</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+4"/> + <source>low-medium</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>low</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>lower</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>lowest</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+11"/> + <source>(%1 locked)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+171"/> + <source>Dust</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>yes</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>no</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+10"/> + <source>This label turns red, if the transaction size is greater than 1000 bytes.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <location line="+5"/> + <source>This means a fee of at least %1 per kB is required.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-4"/> + <source>Can vary +/- 1 byte per input.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>Transactions with higher priority are more likely to get included into a block.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>This label turns red, if the priority is smaller than "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>непазначаны</translation> + </message> + <message> + <location line="-9"/> + <source>change from %1 (%2)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>(change)</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>EditAddressDialog</name> <message> <location filename="../forms/editaddressdialog.ui" line="+14"/> @@ -715,7 +1010,7 @@ Address: %4 <translation>Адрас</translation> </message> <message> - <location filename="../editaddressdialog.cpp" line="+21"/> + <location filename="../editaddressdialog.cpp" line="+25"/> <source>New receiving address</source> <translation>Новы адрас для атрымання</translation> </message> @@ -758,7 +1053,7 @@ Address: %4 <context> <name>FreespaceChecker</name> <message> - <location filename="../intro.cpp" line="+61"/> + <location filename="../intro.cpp" line="+65"/> <source>A new data directory will be created.</source> <translation type="unfinished"/> </message> @@ -786,18 +1081,18 @@ Address: %4 <context> <name>GUIUtil::HelpMessageBox</name> <message> - <location filename="../guiutil.cpp" line="+558"/> - <location line="+13"/> - <source>Bitcoin-Qt</source> + <location filename="../guiutil.cpp" line="+597"/> + <source>version</source> <translation type="unfinished"/> </message> <message> - <location line="-13"/> - <source>version</source> + <location line="+0"/> + <location line="+13"/> + <source>Bitcoin Core</source> <translation type="unfinished"/> </message> <message> - <location line="+2"/> + <location line="-11"/> <source>Usage:</source> <translation>Ужыванне:</translation> </message> @@ -841,17 +1136,17 @@ Address: %4 </message> <message> <location line="+9"/> - <source>Welcome to Bitcoin-Qt.</source> + <source>Welcome to Bitcoin Core.</source> <translation type="unfinished"/> </message> <message> <location line="+26"/> - <source>As this is the first time the program is launched, you can choose where Bitcoin-Qt will store its data.</source> + <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source> <translation type="unfinished"/> </message> <message> <location line="+10"/> - <source>Bitcoin-Qt will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source> + <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source> <translation type="unfinished"/> </message> <message> @@ -865,11 +1160,21 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../intro.cpp" line="+105"/> - <source>Error</source> + <location filename="../intro.cpp" line="+85"/> + <source>Bitcoin</source> <translation type="unfinished"/> </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>Памылка</translation> + </message> + <message> <location line="+9"/> <source>GB of free space available</source> <translation type="unfinished"/> @@ -881,6 +1186,34 @@ Address: %4 </message> </context> <context> + <name>OpenURIDialog</name> + <message> + <location filename="../forms/openuridialog.ui" line="+14"/> + <source>Open URI</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Open payment request from URI or file</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+9"/> + <source>URI:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+11"/> + <source>Select payment request file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../openuridialog.cpp" line="+47"/> + <source>Select payment request file to open</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OptionsDialog</name> <message> <location filename="../forms/optionsdialog.ui" line="+14"/> @@ -1038,6 +1371,16 @@ Address: %4 <translation type="unfinished"/> </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="+71"/> <source>&OK</source> <translation type="unfinished"/> @@ -1053,12 +1396,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../optionsdialog.cpp" line="+58"/> + <location filename="../optionsdialog.cpp" line="+63"/> <source>default</source> <translation type="unfinished"/> </message> <message> - <location line="+130"/> + <location line="+131"/> <source>Confirm options reset</source> <translation type="unfinished"/> </message> @@ -1099,17 +1442,17 @@ Address: %4 </message> <message> <location line="+50"/> - <location line="+202"/> + <location line="+214"/> <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source> <translation type="unfinished"/> </message> <message> - <location line="-131"/> + <location line="-140"/> <source>Unconfirmed:</source> <translation>Непацверджана:</translation> </message> <message> - <location line="-78"/> + <location line="-81"/> <source>Wallet</source> <translation type="unfinished"/> </message> @@ -1124,12 +1467,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+29"/> + <location line="+32"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation type="unfinished"/> </message> <message> - <location line="+13"/> + <location line="+16"/> <source>Immature:</source> <translation type="unfinished"/> </message> @@ -1139,7 +1482,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+13"/> + <location line="+16"/> <source>Total:</source> <translation type="unfinished"/> </message> @@ -1149,12 +1492,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+53"/> + <location line="+56"/> <source><b>Recent transactions</b></source> <translation><b>Нядаўнія транзаццыі</b></translation> </message> <message> - <location filename="../overviewpage.cpp" line="+116"/> + <location filename="../overviewpage.cpp" line="+120"/> <location line="+1"/> <source>out of sync</source> <translation type="unfinished"/> @@ -1163,7 +1506,7 @@ Address: %4 <context> <name>PaymentServer</name> <message> - <location filename="../paymentserver.cpp" line="+392"/> + <location filename="../paymentserver.cpp" line="+397"/> <source>URI handling</source> <translation type="unfinished"/> </message> @@ -1173,23 +1516,29 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+69"/> + <location line="+91"/> <source>Requested payment amount of %1 is too small (considered dust).</source> <translation type="unfinished"/> </message> <message> - <location line="+4"/> - <location line="+37"/> + <location line="-204"/> + <location line="+195"/> + <location line="+13"/> <source>Payment request error</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Insecure requests to custom payment scripts unsupported</source> + <location line="-207"/> + <source>Cannot start bitcoin: click-to-pay handler</source> <translation type="unfinished"/> </message> <message> - <location line="+38"/> + <location line="+195"/> + <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> @@ -1199,7 +1548,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>Bad response from server %1</source> <translation type="unfinished"/> </message> @@ -1209,8 +1558,8 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-58"/> - <location line="+30"/> + <location line="-55"/> + <location line="+27"/> <location line="+17"/> <source>Network request error</source> <translation type="unfinished"/> @@ -1219,9 +1568,8 @@ Address: %4 <context> <name>QObject</name> <message> - <location filename="../bitcoin.cpp" line="+114"/> + <location filename="../bitcoin.cpp" line="+119"/> <location line="+5"/> - <location filename="../intro.cpp" line="-32"/> <source>Bitcoin</source> <translation type="unfinished"/> </message> @@ -1235,16 +1583,11 @@ Address: %4 <source>Error: Invalid combination of -regtest and -testnet.</source> <translation type="unfinished"/> </message> - <message> - <location filename="../intro.cpp" line="+1"/> - <source>Error: Specified data directory "%1" can not be created.</source> - <translation type="unfinished"/> - </message> </context> <context> <name>QRImageWidget</name> <message> - <location filename="../receiverequestdialog.cpp" line="+32"/> + <location filename="../receiverequestdialog.cpp" line="+36"/> <source>&Save Image...</source> <translation type="unfinished"/> </message> @@ -1260,7 +1603,7 @@ Address: %4 </message> <message> <location line="+0"/> - <source>PNG Images (*.png)</source> + <source>PNG Image (*.png)</source> <translation type="unfinished"/> </message> </context> @@ -1281,7 +1624,7 @@ Address: %4 <location line="+53"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+352"/> + <location filename="../rpcconsole.cpp" line="+360"/> <source>N/A</source> <translation type="unfinished"/> </message> @@ -1296,7 +1639,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+68"/> + <location line="-10"/> + <source>Debug window</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+78"/> <source>Using OpenSSL version</source> <translation type="unfinished"/> </message> @@ -1351,12 +1699,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+7"/> - <source>Show the Bitcoin-Qt help message to get a list with possible Bitcoin command-line options.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> + <location line="+10"/> <source>&Show</source> <translation type="unfinished"/> </message> @@ -1396,12 +1739,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-104"/> - <source>Bitcoin - Debug window</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+25"/> + <location line="-79"/> <source>Bitcoin Core</source> <translation type="unfinished"/> </message> @@ -1416,7 +1754,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+102"/> + <location line="+26"/> + <source>Show the Bitcoin-Core help message to get a list with possible Bitcoin command-line options.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+76"/> <source>Clear console</source> <translation type="unfinished"/> </message> @@ -1474,37 +1817,32 @@ Address: %4 <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+22"/> + <location filename="../forms/receivecoinsdialog.ui" line="+83"/> <source>&Amount:</source> <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+19"/> <source>The amount to request</source> <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="-32"/> <source>&Label:</source> <translation>Пазнака:</translation> </message> <message> - <location line="+10"/> - <source>The label to associate with the receiving address</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+7"/> + <location line="-34"/> <source>&Message:</source> <translation type="unfinished"/> </message> <message> - <location line="+10"/> + <location line="+20"/> <source>The message to attach to payment request</source> <translation type="unfinished"/> </message> <message> - <location line="+14"/> + <location line="-37"/> <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> @@ -1514,12 +1852,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="+27"/> + <source>The label to associate with the new receiving address</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+14"/> <source>Use this form to request payments. All fields are optional.</source> <translation type="unfinished"/> </message> <message> - <location line="+17"/> + <location line="+56"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -1533,6 +1876,31 @@ Address: %4 <source>&Request payment</source> <translation type="unfinished"/> </message> + <message> + <location line="+47"/> + <source>Previously requested payments</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> + <source>Show the selected request (does the same as double clicking an entry)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Show</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+11"/> + <source>Remove the selected entries from the list</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Remove</source> + <translation type="unfinished"/> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -1553,16 +1921,11 @@ Address: %4 </message> <message> <location line="+7"/> - <source>&Copy Image</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+7"/> <source>&Save Image...</source> <translation type="unfinished"/> </message> <message> - <location filename="../receiverequestdialog.cpp" line="+58"/> + <location filename="../receiverequestdialog.cpp" line="+56"/> <source>Request payment to %1</source> <translation type="unfinished"/> </message> @@ -1608,18 +1971,121 @@ Address: %4 </message> </context> <context> + <name>RecentRequestsTableModel</name> + <message> + <location filename="../recentrequeststablemodel.cpp" line="+14"/> + <source>Date</source> + <translation>Дата</translation> + </message> + <message> + <location line="+0"/> + <source>Label</source> + <translation>Пазнака</translation> + </message> + <message> + <location line="+0"/> + <source>Message</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>Amount</source> + <translation>Колькасць</translation> + </message> + <message> + <location line="+36"/> + <source>(no label)</source> + <translation>непазначаны</translation> + </message> + <message> + <location line="+9"/> + <source>(no message)</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="+14"/> - <location filename="../sendcoinsdialog.cpp" line="+140"/> - <location line="+213"/> + <location filename="../sendcoinsdialog.cpp" line="+381"/> + <location line="+81"/> <source>Send Coins</source> <translation>Даслаць Манеты</translation> </message> <message> - <location line="+50"/> + <location line="+76"/> + <source>Coin Control Features</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+20"/> + <source>Inputs...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> + <source>automatically selected</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+19"/> + <source>Insufficient funds!</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+89"/> + <source>Quantity:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+35"/> + <source>Bytes:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+48"/> + <source>Amount:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+32"/> + <source>Priority:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+48"/> + <source>Fee:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+32"/> + <source>Low Output:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+48"/> + <source>After Fee:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+32"/> + <source>Change:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+44"/> + <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Custom change address</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+115"/> <source>Send to multiple recipients at once</source> - <translation>Даслаць некалькім атрымальнікам адразу</translation> + <translation>Даслаць адразу некалькім атрымальнікам</translation> </message> <message> <location line="+3"/> @@ -1642,12 +2108,7 @@ Address: %4 <translation>Баланс:</translation> </message> <message> - <location line="+10"/> - <source>123.456 BTC</source> - <translation>123.456 BTC</translation> - </message> - <message> - <location line="+31"/> + <location line="+41"/> <source>Confirm the send action</source> <translation>Пацвердзіць дасыланне</translation> </message> @@ -1657,69 +2118,135 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-154"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation>Пацвердзіць дасыланне манет</translation> </message> <message> - <location line="-90"/> + <location line="-74"/> <location line="+5"/> <location line="+5"/> + <location line="+4"/> <source>%1 to %2</source> <translation type="unfinished"/> </message> <message> - <location line="+26"/> + <location line="-136"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>Увядзіце Біткойн-адрас (ўзор 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> + <message> + <location line="+15"/> + <source>Copy quantity</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation>Капіяваць колькасць</translation> + </message> + <message> + <location line="+1"/> + <source>Copy fee</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy after fee</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy bytes</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy priority</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy low output</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy change</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+170"/> + <source>Total Amount %1 (= %2)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>or</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+202"/> <source>The recipient address is not valid, please recheck.</source> <translation type="unfinished"/> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>The amount to pay must be larger than 0.</source> - <translation>Колькасць мае быць больш за 0.</translation> + <translation>Велічыня плацяжу мае быць больш за 0.</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>The amount exceeds your balance.</source> <translation type="unfinished"/> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>The total exceeds your balance when the %1 transaction fee is included.</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+3"/> <source>Duplicate address found, can only send to each address once per send operation.</source> <translation type="unfinished"/> </message> <message> + <location line="+3"/> + <source>Transaction creation failed!</source> + <translation type="unfinished"/> + </message> + <message> <location line="+4"/> - <source>Error: Transaction creation failed!</source> + <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation type="unfinished"/> </message> <message> - <location line="+15"/> - <source>Are you sure you want to send?</source> + <location line="+113"/> + <source>Warning: Invalid Bitcoin address</source> <translation type="unfinished"/> </message> <message> - <location line="+9"/> - <source>added as transaction fee</source> + <location line="+13"/> + <source>(no label)</source> + <translation>непазначаны</translation> + </message> + <message> + <location line="+8"/> + <source>Warning: Unknown change address</source> <translation type="unfinished"/> </message> <message> - <location line="+6"/> - <source>Total Amount %1</source> + <location line="-378"/> + <source>Are you sure you want to send?</source> <translation type="unfinished"/> </message> <message> - <location line="+20"/> - <source>Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> + <location line="+9"/> + <source>added as transaction fee</source> <translation type="unfinished"/> </message> <message> - <location line="+144"/> + <location line="+170"/> <source>Payment request expired</source> <translation type="unfinished"/> </message> @@ -1732,39 +2259,44 @@ Address: %4 <context> <name>SendCoinsEntry</name> <message> - <location filename="../forms/sendcoinsentry.ui" line="+33"/> - <location line="+585"/> + <location filename="../forms/sendcoinsentry.ui" line="+131"/> + <location line="+501"/> + <location line="+536"/> <source>A&mount:</source> <translation>Колькасць:</translation> </message> <message> - <location line="-572"/> - <location line="+585"/> + <location line="-1132"/> <source>Pay &To:</source> <translation>Заплаціць да:</translation> </message> <message> - <location line="-551"/> + <location line="+18"/> <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation type="unfinished"/> </message> <message> - <location filename="../sendcoinsentry.cpp" line="+28"/> + <location filename="../sendcoinsentry.cpp" line="+30"/> <source>Enter a label for this address to add it to your address book</source> <translation>Увядзіце пазнаку гэтаму адрасу, каб дадаць яго ў адрасную кнігу</translation> </message> <message> - <location filename="../forms/sendcoinsentry.ui" line="-18"/> + <location filename="../forms/sendcoinsentry.ui" line="+57"/> <source>&Label:</source> <translation>Пазнака:</translation> </message> <message> - <location line="+28"/> + <location line="-50"/> <source>Choose previously used address</source> <translation type="unfinished"/> </message> <message> - <location line="+10"/> + <location line="-40"/> + <source>This is a normal payment.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+50"/> <source>Alt+A</source> <translation>Alt+A</translation> </message> @@ -1780,16 +2312,35 @@ Address: %4 </message> <message> <location line="+7"/> - <source>Remove this recipient</source> - <translation>Выдаліць гэтага атымальніка</translation> + <location line="+504"/> + <location line="+536"/> + <source>Remove this entry</source> + <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="-40"/> + <source>This is a verified payment request.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-971"/> <source>Enter a label for this address to add it to the list of used addresses</source> <translation type="unfinished"/> </message> <message> - <location line="+465"/> + <location line="+439"/> + <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> @@ -1910,7 +2461,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../signverifymessagedialog.cpp" line="+27"/> + <location filename="../signverifymessagedialog.cpp" line="+29"/> <location line="+3"/> <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation>Увядзіце Біткойн-адрас (ўзор 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> @@ -1926,7 +2477,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+85"/> + <location line="+84"/> <location line="+81"/> <source>The entered address is invalid.</source> <translation type="unfinished"/> @@ -1995,8 +2546,13 @@ Address: %4 <context> <name>SplashScreen</name> <message> - <location filename="../splashscreen.cpp" line="+23"/> - <source>The Bitcoin developers</source> + <location filename="../splashscreen.cpp" line="+26"/> + <source>Bitcoin Core</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>The Bitcoin Core developers</source> <translation type="unfinished"/> </message> <message> @@ -2008,7 +2564,7 @@ Address: %4 <context> <name>TrafficGraphWidget</name> <message> - <location filename="../trafficgraphwidget.cpp" line="+75"/> + <location filename="../trafficgraphwidget.cpp" line="+79"/> <source>KB/s</source> <translation type="unfinished"/> </message> @@ -2016,7 +2572,7 @@ Address: %4 <context> <name>TransactionDesc</name> <message> - <location filename="../transactiondesc.cpp" line="+22"/> + <location filename="../transactiondesc.cpp" line="+28"/> <source>Open until %1</source> <translation type="unfinished"/> </message> @@ -2208,7 +2764,7 @@ Address: %4 <context> <name>TransactionTableModel</name> <message> - <location filename="../transactiontablemodel.cpp" line="+227"/> + <location filename="../transactiontablemodel.cpp" line="+234"/> <source>Date</source> <translation>Дата</translation> </message> @@ -2260,7 +2816,7 @@ Address: %4 <message> <location line="+5"/> <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"/> @@ -2275,12 +2831,12 @@ Address: %4 <message> <location line="+2"/> <source>Received from</source> - <translation type="unfinished"/> + <translation>Прынята ад</translation> </message> <message> <location line="+3"/> <source>Sent to</source> - <translation>Даслаць да</translation> + <translation>Даслана да</translation> </message> <message> <location line="+2"/> @@ -2326,7 +2882,7 @@ Address: %4 <context> <name>TransactionView</name> <message> - <location filename="../transactionview.cpp" line="+52"/> + <location filename="../transactionview.cpp" line="+57"/> <location line="+16"/> <source>All</source> <translation>Усё</translation> @@ -2369,7 +2925,7 @@ Address: %4 <message> <location line="+2"/> <source>Sent to</source> - <translation>Даслаць да</translation> + <translation>Даслана да</translation> </message> <message> <location line="+2"/> @@ -2387,12 +2943,12 @@ Address: %4 <translation>Іншыя</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>Enter address or label to search</source> <translation>Увядзіце адрас ці пазнаку для пошуку</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>Min amount</source> <translation>Мін. колькасць</translation> </message> @@ -2409,7 +2965,7 @@ Address: %4 <message> <location line="+1"/> <source>Copy amount</source> - <translation type="unfinished"/> + <translation>Капіяваць колькасць</translation> </message> <message> <location line="+1"/> @@ -2427,19 +2983,39 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+143"/> - <source>Export Transaction Data</source> - <translation>Экспартаваць Звесткі Транзакцыі</translation> + <location line="+142"/> + <source>Export Transaction History</source> + <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+19"/> + <source>Exporting Failed</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>There was an error trying to save the transaction history to %1.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+4"/> + <source>Exporting Successful</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>The transaction history was successfully saved to %1.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-22"/> <source>Comma separated file (*.csv)</source> <translation>Коскамі падзелены файл (*.csv)</translation> </message> <message> - <location line="+8"/> + <location line="+9"/> <source>Confirmed</source> - <translation>Пцверджана</translation> + <translation>Пацверджана</translation> </message> <message> <location line="+1"/> @@ -2472,17 +3048,7 @@ Address: %4 <translation>ID</translation> </message> <message> - <location line="+4"/> - <source>Error exporting</source> - <translation>Памылка экспартавання</translation> - </message> - <message> - <location line="+0"/> - <source>Could not write to file %1.</source> - <translation>Немагчыма запісаць у файл %1</translation> - </message> - <message> - <location line="+100"/> + <location line="+107"/> <source>Range:</source> <translation>Прамежак:</translation> </message> @@ -2493,9 +3059,17 @@ Address: %4 </message> </context> <context> + <name>WalletFrame</name> + <message> + <location filename="../walletframe.cpp" line="+26"/> + <source>No wallet has been loaded.</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>WalletModel</name> <message> - <location filename="../walletmodel.cpp" line="+218"/> + <location filename="../walletmodel.cpp" line="+245"/> <source>Send Coins</source> <translation>Даслаць Манеты</translation> </message> @@ -2503,9 +3077,9 @@ Address: %4 <context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+46"/> + <location filename="../walletview.cpp" line="+43"/> <source>&Export</source> - <translation type="unfinished"/> + <translation>Экспарт</translation> </message> <message> <location line="+1"/> @@ -2513,65 +3087,60 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+183"/> + <location line="+181"/> <source>Backup Wallet</source> <translation type="unfinished"/> </message> <message> - <location line="+0"/> + <location line="+1"/> <source>Wallet Data (*.dat)</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Backup Failed</source> <translation type="unfinished"/> </message> <message> <location line="+0"/> - <source>There was an error trying to save the wallet data to the new location.</source> + <source>There was an error trying to save the wallet data to %1.</source> <translation type="unfinished"/> </message> <message> <location line="+4"/> - <source>Backup Successful</source> + <source>The wallet data was successfully saved to %1.</source> <translation type="unfinished"/> </message> <message> <location line="+0"/> - <source>The wallet data was successfully saved to the new location.</source> + <source>Backup Successful</source> <translation type="unfinished"/> </message> </context> <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+102"/> - <source>Bitcoin version</source> - <translation>Версія Біткойн</translation> - </message> - <message> - <location line="+107"/> + <location filename="../bitcoinstrings.cpp" line="+217"/> <source>Usage:</source> <translation>Ужыванне:</translation> </message> <message> - <location line="-55"/> + <location line="-54"/> <source>List commands</source> <translation>Спіс каманд</translation> </message> <message> - <location line="-13"/> + <location line="-14"/> <source>Get help for a command</source> <translation>Атрымаць дапамогу для каманды</translation> </message> <message> - <location line="+25"/> + <location line="+26"/> <source>Options:</source> - <translation>Опцыі</translation> + <translation>Опцыі:</translation> </message> <message> - <location line="+24"/> + <location line="+23"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Вызначыць канфігурацыйны файл (зыходна: bitcoin.conf)</translation> </message> @@ -2588,20 +3157,20 @@ 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="-28"/> + <location line="-27"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> - <translation type="unfinished"/> + <translation>Слухаць злучэнні на <port> (зыходна: 8333 ці testnet: 18333)</translation> </message> <message> <location line="+5"/> <source>Maintain at most <n> connections to peers (default: 125)</source> - <translation type="unfinished"/> + <translation>Трымаць не больш за <n> злучэнняў на асобу (зыходна: 125)</translation> </message> <message> - <location line="-49"/> + <location line="-50"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation type="unfinished"/> </message> @@ -2613,12 +3182,12 @@ Address: %4 <message> <location line="+4"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> - <translation type="unfinished"/> + <translation>Парог для адлучэння злаўмысных карыстальнікаў (тыпова: 100)</translation> </message> <message> - <location line="-142"/> + <location line="-147"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> - <translation type="unfinished"/> + <translation>Колькасць секунд для ўстрымання асобаў да перадалучэння (заходна: 86400)</translation> </message> <message> <location line="-33"/> @@ -2631,7 +3200,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+40"/> + <location line="+45"/> <source>Accept command line and JSON-RPC commands</source> <translation>Прымаць камандны радок і JSON-RPC каманды</translation> </message> @@ -2641,17 +3210,17 @@ Address: %4 <translation>Запусціць у фоне як дэман і прымаць каманды</translation> </message> <message> - <location line="+40"/> + <location line="+39"/> <source>Use the test network</source> <translation>Ужываць тэставае сеціва</translation> </message> <message> - <location line="-118"/> + <location line="-117"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> <message> - <location line="-87"/> + <location line="-92"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2706,17 +3275,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+11"/> - <source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source> + <location line="+18"/> + <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation type="unfinished"/> </message> <message> - <location line="+6"/> - <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> + <location line="+5"/> + <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+3"/> <source>Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source> <translation type="unfinished"/> </message> @@ -2746,17 +3315,27 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+14"/> + <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="+2"/> + <location line="+1"/> <source>Block creation options:</source> <translation type="unfinished"/> </message> @@ -2766,7 +3345,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+2"/> + <location line="+1"/> + <source>Connect through SOCKS proxy</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Connect to JSON-RPC on <port> (default: 8332 or testnet: 18332)</source> <translation type="unfinished"/> </message> @@ -2876,7 +3460,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+2"/> + <location line="+1"/> + <source>Fee per kB to add to transactions you send</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Find peers using DNS lookup (default: 1 unless -connect)</source> <translation type="unfinished"/> </message> @@ -2896,6 +3485,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <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"/> @@ -2911,17 +3505,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+8"/> + <location line="+5"/> + <source>Prepend debug output with timestamp (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>RPC client options:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+5"/> + <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Send command to Bitcoin server</source> <translation type="unfinished"/> </message> <message> - <location line="+10"/> + <location line="+8"/> + <source>Set maximum block size in bytes (default: %d)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>Set the number of threads to service RPC calls (default: 4)</source> <translation type="unfinished"/> </message> @@ -2941,7 +3555,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>Verifying blocks...</source> <translation type="unfinished"/> </message> @@ -2952,11 +3566,21 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> + <source>Wait for RPC server to start</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Wallet %s resides outside data directory %s</source> <translation type="unfinished"/> </message> <message> - <location line="+4"/> + <location line="+3"/> + <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> @@ -2966,17 +3590,27 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-98"/> + <location line="-104"/> <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> <translation type="unfinished"/> </message> <message> - <location line="+17"/> + <location line="+14"/> + <source>Output debugging information (default: 0, supplying <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="+83"/> + <location line="+88"/> <source>Information</source> <translation type="unfinished"/> </message> @@ -3016,47 +3650,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+2"/> - <source>Output extra debugging information. Implies all other -debug* options</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Output extra network debugging information</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> - <source>Prepend debug output with timestamp</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+5"/> + <location line="+9"/> <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Select the version of socks proxy to use (4-5, default: 5)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> + <location line="+4"/> <source>Send trace/debug info to console instead of debug.log file</source> - <translation type="unfinished"/> + <translation>Слаць trace/debug звесткі ў кансоль замест файла debug.log</translation> </message> <message> <location line="+1"/> <source>Send trace/debug info to debugger</source> - <translation type="unfinished"/> + <translation>Слаць trace/debug звесткі ў адладчык</translation> </message> <message> - <location line="+5"/> - <source>Set maximum block size in bytes (default: 250000)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> + <location line="+6"/> <source>Set minimum block size in bytes (default: 0)</source> <translation type="unfinished"/> </message> @@ -3106,59 +3715,59 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Use proxy to reach tor hidden services (default: same as -proxy)</source> - <translation type="unfinished"/> - </message> - <message> <location line="+2"/> <source>Username for JSON-RPC connections</source> - <translation>Імя карыстальника лоя JSON-RPC злучэнняў</translation> + <translation>Імя карыстальника для JSON-RPC злучэнняў</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Warning</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Warning: This version is obsolete, upgrade required!</source> <translation type="unfinished"/> </message> <message> <location line="+2"/> + <source>version</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>wallet.dat corrupt, salvage failed</source> <translation type="unfinished"/> </message> <message> - <location line="-54"/> + <location line="-57"/> <source>Password for JSON-RPC connections</source> <translation>Пароль для JSON-RPC злучэнняў</translation> </message> <message> - <location line="-70"/> + <location line="-69"/> <source>Allow JSON-RPC connections from specified IP address</source> - <translation>Дазволіць JSON-RPC злучэнні з поўнага IP адрасу</translation> + <translation>Дазволіць JSON-RPC злучэнні з пэўнага IP адрасу</translation> </message> <message> <location line="+79"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> - <translation type="unfinished"/> + <translation>Адпраўляць каманды вузлу на <ip> (зыходна: 127.0.0.1)</translation> </message> <message> - <location line="-126"/> + <location line="-131"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation type="unfinished"/> + <translation>Выканаць каманду калі лепшы блок зменіцца (%s замяняецца на хэш блока)</translation> </message> <message> - <location line="+155"/> + <location line="+160"/> <source>Upgrade wallet to latest format</source> - <translation type="unfinished"/> + <translation>Абнавіць гаманец на новы фармат</translation> </message> <message> <location line="-23"/> <source>Set key pool size to <n> (default: 100)</source> - <translation type="unfinished"/> + <translation>Устанавіць памер фонда ключоў у <n> (тыпова: 100)</translation> </message> <message> <location line="-12"/> @@ -3173,7 +3782,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="-29"/> <source>Server certificate file (default: server.cert)</source> - <translation>Файл-сертыцікат сервера (зыходна: server.cert)</translation> + <translation>Файл-сертыфікат сервера (зыходна: server.cert)</translation> </message> <message> <location line="+1"/> @@ -3191,47 +3800,42 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-95"/> - <source>Connect through socks proxy</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-11"/> + <location line="-106"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation type="unfinished"/> </message> <message> - <location line="+58"/> + <location line="+59"/> <source>Loading addresses...</source> <translation>Загружаем адрасы...</translation> </message> <message> - <location line="-36"/> + <location line="-37"/> <source>Error loading wallet.dat: Wallet corrupted</source> - <translation type="unfinished"/> + <translation>Памылка загрузкі wallet.dat: гаманец пашкоджаны</translation> </message> <message> <location line="+1"/> <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source> - <translation type="unfinished"/> + <translation>Памылка загрузкі wallet.dat: гаманец патрабуе новую версію Bitcoin</translation> </message> <message> <location line="+98"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> - <translation type="unfinished"/> + <translation>Гаманец мае быць перазапісаны: патрэбны перазапуск Bitcoin для выканання</translation> </message> <message> <location line="-100"/> <source>Error loading wallet.dat</source> - <translation type="unfinished"/> + <translation>Памылка загрузкі wallet.dat</translation> </message> <message> - <location line="+30"/> + <location line="+31"/> <source>Invalid -proxy address: '%s'</source> <translation type="unfinished"/> </message> <message> - <location line="+57"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation type="unfinished"/> </message> @@ -3251,19 +3855,19 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+46"/> + <location line="+47"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation type="unfinished"/> </message> <message> <location line="+1"/> <source>Invalid amount</source> - <translation type="unfinished"/> + <translation>Памылковая колькасць</translation> </message> <message> <location line="-6"/> <source>Insufficient funds</source> - <translation type="unfinished"/> + <translation>Недастаткова сродкаў</translation> </message> <message> <location line="+10"/> @@ -3271,27 +3875,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Загружаем індэкс блокаў...</translation> </message> <message> - <location line="-60"/> + <location line="-61"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"/> </message> <message> - <location line="-28"/> + <location line="-32"/> <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source> <translation type="unfinished"/> </message> <message> - <location line="+69"/> - <source>Fee per KB to add to transactions you send</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+20"/> + <location line="+94"/> <source>Loading wallet...</source> <translation>Загружаем гаманец...</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> @@ -3318,10 +3917,10 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="-77"/> <source>Error</source> - <translation type="unfinished"/> + <translation>Памылка</translation> </message> <message> - <location line="-33"/> + <location line="-34"/> <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 f086c105ab..6b849e23ea 100644 --- a/src/qt/locale/bitcoin_bs.ts +++ b/src/qt/locale/bitcoin_bs.ts @@ -3,13 +3,13 @@ <name>AboutDialog</name> <message> <location filename="../forms/aboutdialog.ui" line="+14"/> - <source>About Bitcoin</source> - <translation>O Bitcoinu</translation> + <source>About Bitcoin Core</source> + <translation type="unfinished"/> </message> <message> <location line="+39"/> - <source><b>Bitcoin</b> version</source> - <translation><b>Bitcoin</b> verzija</translation> + <source><b>Bitcoin Core</b> version</source> + <translation type="unfinished"/> </message> <message> <location line="+57"/> @@ -22,7 +22,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="+14"/> + <location filename="../aboutdialog.cpp" line="+19"/> <source>Copyright</source> <translation type="unfinished"/> </message> @@ -65,7 +65,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location filename="../addressbookpage.cpp" line="+72"/> + <location filename="../addressbookpage.cpp" line="+74"/> <source>&Copy Address</source> <translation type="unfinished"/> </message> @@ -135,7 +135,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+197"/> + <location line="+194"/> <source>Export Address List</source> <translation type="unfinished"/> </message> @@ -158,7 +158,7 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>AddressTableModel</name> <message> - <location filename="../addresstablemodel.cpp" line="+164"/> + <location filename="../addresstablemodel.cpp" line="+168"/> <source>Label</source> <translation type="unfinished"/> </message> @@ -196,7 +196,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="+34"/> + <location filename="../askpassphrasedialog.cpp" line="+40"/> <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>10 or more random characters</b>, or <b>eight or more words</b>.</source> <translation type="unfinished"/> </message> @@ -317,17 +317,17 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+250"/> + <location filename="../bitcoingui.cpp" line="+260"/> <source>Sign &message...</source> <translation type="unfinished"/> </message> <message> - <location line="+254"/> + <location line="+290"/> <source>Synchronizing with network...</source> <translation type="unfinished"/> </message> <message> - <location line="-324"/> + <location line="-360"/> <source>&Overview</source> <translation type="unfinished"/> </message> @@ -393,7 +393,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+259"/> + <location line="+295"/> <source>Importing blocks from disk...</source> <translation type="unfinished"/> </message> @@ -403,7 +403,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-322"/> + <location line="-358"/> <source>Send coins to a Bitcoin address</source> <translation type="unfinished"/> </message> @@ -438,20 +438,18 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-180"/> - <location line="+6"/> - <location line="+513"/> + <location line="+375"/> <source>Bitcoin</source> - <translation type="unfinished"/> + <translation>Bitcoin</translation> </message> <message> - <location line="-519"/> - <location line="+6"/> + <location line="-563"/> + <location line="+10"/> <source>Wallet</source> <translation type="unfinished"/> </message> <message> - <location line="+109"/> + <location line="+113"/> <source>&Send</source> <translation type="unfinished"/> </message> @@ -461,13 +459,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+28"/> - <location line="+2"/> - <source>&About Bitcoin</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+14"/> + <location line="+44"/> <location line="+2"/> <source>&Show / Hide</source> <translation type="unfinished"/> @@ -493,12 +485,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+35"/> + <location line="+39"/> <source>&File</source> <translation type="unfinished"/> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>&Settings</source> <translation type="unfinished"/> </message> @@ -513,18 +505,30 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-235"/> - <location line="+294"/> + <location line="-244"/> + <location line="+321"/> <source>[testnet]</source> <translation type="unfinished"/> </message> <message> - <location line="-177"/> + <location line="-331"/> + <location line="+10"/> + <source>Bitcoin Core</source> + <translation>Bitcoin Jezrga</translation> + </message> + <message> + <location line="+121"/> <source>Request payments (generates QR codes and bitcoin: URIs)</source> <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+27"/> + <location line="+2"/> + <source>&About Bitcoin Core</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+34"/> <source>&Used sending addresses...</source> <translation type="unfinished"/> </message> @@ -544,13 +548,23 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+106"/> + <location line="+2"/> + <source>Open URI...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Open a bitcoin: URI or payment request</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+126"/> <location line="+5"/> <source>Bitcoin client</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+120"/> + <location line="+133"/> <source>%n active connection(s) to Bitcoin network</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> @@ -654,17 +668,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+34"/> - <source>URI handling</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+0"/> - <source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+45"/> + <location line="+67"/> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation type="unfinished"/> </message> @@ -674,7 +678,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../bitcoin.cpp" line="+110"/> + <location filename="../bitcoin.cpp" line="+116"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -682,12 +686,299 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+115"/> + <location filename="../clientmodel.cpp" line="+119"/> <source>Network Alert</source> <translation type="unfinished"/> </message> </context> <context> + <name>CoinControlDialog</name> + <message> + <location filename="../forms/coincontroldialog.ui" line="+14"/> + <source>Coin Control Address Selection</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+34"/> + <source>Quantity:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+29"/> + <source>Bytes:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+45"/> + <source>Amount:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+29"/> + <source>Priority:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+45"/> + <source>Fee:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+32"/> + <source>Low Output:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+48"/> + <source>After Fee:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+32"/> + <source>Change:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+63"/> + <source>(un)select all</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+13"/> + <source>Tree mode</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> + <source>List mode</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+52"/> + <source>Amount</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+10"/> + <source>Address</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+5"/> + <source>Date</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+5"/> + <source>Confirmations</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Confirmed</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+5"/> + <source>Priority</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../coincontroldialog.cpp" line="+42"/> + <source>Copy address</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy label</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <location line="+26"/> + <source>Copy amount</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-25"/> + <source>Copy transaction ID</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Lock unspent</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Unlock unspent</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+22"/> + <source>Copy quantity</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>Copy fee</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy after fee</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy bytes</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy priority</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy low output</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy change</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+323"/> + <source>highest</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>higher</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>high</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>medium-high</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>medium</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+4"/> + <source>low-medium</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>low</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>lower</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>lowest</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+11"/> + <source>(%1 locked)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+171"/> + <source>Dust</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>yes</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>no</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+10"/> + <source>This label turns red, if the transaction size is greater than 1000 bytes.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <location line="+5"/> + <source>This means a fee of at least %1 per kB is required.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-4"/> + <source>Can vary +/- 1 byte per input.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>Transactions with higher priority are more likely to get included into a block.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>This label turns red, if the priority is smaller than "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 type="unfinished"/> + </message> + <message> + <location line="-9"/> + <source>change from %1 (%2)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>(change)</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>EditAddressDialog</name> <message> <location filename="../forms/editaddressdialog.ui" line="+14"/> @@ -715,7 +1006,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../editaddressdialog.cpp" line="+21"/> + <location filename="../editaddressdialog.cpp" line="+25"/> <source>New receiving address</source> <translation type="unfinished"/> </message> @@ -758,7 +1049,7 @@ Address: %4 <context> <name>FreespaceChecker</name> <message> - <location filename="../intro.cpp" line="+61"/> + <location filename="../intro.cpp" line="+65"/> <source>A new data directory will be created.</source> <translation type="unfinished"/> </message> @@ -786,18 +1077,18 @@ Address: %4 <context> <name>GUIUtil::HelpMessageBox</name> <message> - <location filename="../guiutil.cpp" line="+558"/> - <location line="+13"/> - <source>Bitcoin-Qt</source> + <location filename="../guiutil.cpp" line="+597"/> + <source>version</source> <translation type="unfinished"/> </message> <message> - <location line="-13"/> - <source>version</source> - <translation type="unfinished"/> + <location line="+0"/> + <location line="+13"/> + <source>Bitcoin Core</source> + <translation>Bitcoin Jezrga</translation> </message> <message> - <location line="+2"/> + <location line="-11"/> <source>Usage:</source> <translation type="unfinished"/> </message> @@ -841,17 +1132,17 @@ Address: %4 </message> <message> <location line="+9"/> - <source>Welcome to Bitcoin-Qt.</source> + <source>Welcome to Bitcoin Core.</source> <translation type="unfinished"/> </message> <message> <location line="+26"/> - <source>As this is the first time the program is launched, you can choose where Bitcoin-Qt will store its data.</source> + <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source> <translation type="unfinished"/> </message> <message> <location line="+10"/> - <source>Bitcoin-Qt will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source> + <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source> <translation type="unfinished"/> </message> <message> @@ -865,7 +1156,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../intro.cpp" line="+105"/> + <location filename="../intro.cpp" line="+85"/> + <source>Bitcoin</source> + <translation>Bitcoin</translation> + </message> + <message> + <location line="+1"/> + <source>Error: Specified data directory "%1" can not be created.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+19"/> <source>Error</source> <translation type="unfinished"/> </message> @@ -881,6 +1182,34 @@ Address: %4 </message> </context> <context> + <name>OpenURIDialog</name> + <message> + <location filename="../forms/openuridialog.ui" line="+14"/> + <source>Open URI</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Open payment request from URI or file</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+9"/> + <source>URI:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+11"/> + <source>Select payment request file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../openuridialog.cpp" line="+47"/> + <source>Select payment request file to open</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OptionsDialog</name> <message> <location filename="../forms/optionsdialog.ui" line="+14"/> @@ -1038,6 +1367,16 @@ Address: %4 <translation type="unfinished"/> </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="+71"/> <source>&OK</source> <translation type="unfinished"/> @@ -1053,12 +1392,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../optionsdialog.cpp" line="+58"/> + <location filename="../optionsdialog.cpp" line="+63"/> <source>default</source> <translation type="unfinished"/> </message> <message> - <location line="+130"/> + <location line="+131"/> <source>Confirm options reset</source> <translation type="unfinished"/> </message> @@ -1099,17 +1438,17 @@ Address: %4 </message> <message> <location line="+50"/> - <location line="+202"/> + <location line="+214"/> <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source> <translation type="unfinished"/> </message> <message> - <location line="-131"/> + <location line="-140"/> <source>Unconfirmed:</source> <translation type="unfinished"/> </message> <message> - <location line="-78"/> + <location line="-81"/> <source>Wallet</source> <translation type="unfinished"/> </message> @@ -1124,12 +1463,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+29"/> + <location line="+32"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation type="unfinished"/> </message> <message> - <location line="+13"/> + <location line="+16"/> <source>Immature:</source> <translation type="unfinished"/> </message> @@ -1139,7 +1478,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+13"/> + <location line="+16"/> <source>Total:</source> <translation type="unfinished"/> </message> @@ -1149,12 +1488,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+53"/> + <location line="+56"/> <source><b>Recent transactions</b></source> <translation type="unfinished"/> </message> <message> - <location filename="../overviewpage.cpp" line="+116"/> + <location filename="../overviewpage.cpp" line="+120"/> <location line="+1"/> <source>out of sync</source> <translation type="unfinished"/> @@ -1163,7 +1502,7 @@ Address: %4 <context> <name>PaymentServer</name> <message> - <location filename="../paymentserver.cpp" line="+392"/> + <location filename="../paymentserver.cpp" line="+397"/> <source>URI handling</source> <translation type="unfinished"/> </message> @@ -1173,23 +1512,29 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+69"/> + <location line="+91"/> <source>Requested payment amount of %1 is too small (considered dust).</source> <translation type="unfinished"/> </message> <message> - <location line="+4"/> - <location line="+37"/> + <location line="-204"/> + <location line="+195"/> + <location line="+13"/> <source>Payment request error</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Insecure requests to custom payment scripts unsupported</source> + <location line="-207"/> + <source>Cannot start bitcoin: click-to-pay handler</source> <translation type="unfinished"/> </message> <message> - <location line="+38"/> + <location line="+195"/> + <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> @@ -1199,7 +1544,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>Bad response from server %1</source> <translation type="unfinished"/> </message> @@ -1209,8 +1554,8 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-58"/> - <location line="+30"/> + <location line="-55"/> + <location line="+27"/> <location line="+17"/> <source>Network request error</source> <translation type="unfinished"/> @@ -1219,11 +1564,10 @@ Address: %4 <context> <name>QObject</name> <message> - <location filename="../bitcoin.cpp" line="+114"/> + <location filename="../bitcoin.cpp" line="+119"/> <location line="+5"/> - <location filename="../intro.cpp" line="-32"/> <source>Bitcoin</source> - <translation type="unfinished"/> + <translation>Bitcoin</translation> </message> <message> <location line="-4"/> @@ -1235,16 +1579,11 @@ Address: %4 <source>Error: Invalid combination of -regtest and -testnet.</source> <translation type="unfinished"/> </message> - <message> - <location filename="../intro.cpp" line="+1"/> - <source>Error: Specified data directory "%1" can not be created.</source> - <translation type="unfinished"/> - </message> </context> <context> <name>QRImageWidget</name> <message> - <location filename="../receiverequestdialog.cpp" line="+32"/> + <location filename="../receiverequestdialog.cpp" line="+36"/> <source>&Save Image...</source> <translation type="unfinished"/> </message> @@ -1260,7 +1599,7 @@ Address: %4 </message> <message> <location line="+0"/> - <source>PNG Images (*.png)</source> + <source>PNG Image (*.png)</source> <translation type="unfinished"/> </message> </context> @@ -1281,7 +1620,7 @@ Address: %4 <location line="+53"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+352"/> + <location filename="../rpcconsole.cpp" line="+360"/> <source>N/A</source> <translation type="unfinished"/> </message> @@ -1296,7 +1635,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+68"/> + <location line="-10"/> + <source>Debug window</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+78"/> <source>Using OpenSSL version</source> <translation type="unfinished"/> </message> @@ -1351,12 +1695,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+7"/> - <source>Show the Bitcoin-Qt help message to get a list with possible Bitcoin command-line options.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> + <location line="+10"/> <source>&Show</source> <translation type="unfinished"/> </message> @@ -1396,14 +1735,9 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-104"/> - <source>Bitcoin - Debug window</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+25"/> + <location line="-79"/> <source>Bitcoin Core</source> - <translation type="unfinished"/> + <translation>Bitcoin Jezrga</translation> </message> <message> <location line="+279"/> @@ -1416,7 +1750,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+102"/> + <location line="+26"/> + <source>Show the Bitcoin-Core help message to get a list with possible Bitcoin command-line options.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+76"/> <source>Clear console</source> <translation type="unfinished"/> </message> @@ -1474,37 +1813,32 @@ Address: %4 <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+22"/> + <location filename="../forms/receivecoinsdialog.ui" line="+83"/> <source>&Amount:</source> <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+19"/> <source>The amount to request</source> <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="-32"/> <source>&Label:</source> <translation type="unfinished"/> </message> <message> - <location line="+10"/> - <source>The label to associate with the receiving address</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+7"/> + <location line="-34"/> <source>&Message:</source> <translation type="unfinished"/> </message> <message> - <location line="+10"/> + <location line="+20"/> <source>The message to attach to payment request</source> <translation type="unfinished"/> </message> <message> - <location line="+14"/> + <location line="-37"/> <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> @@ -1514,12 +1848,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="+27"/> + <source>The label to associate with the new receiving address</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+14"/> <source>Use this form to request payments. All fields are optional.</source> <translation type="unfinished"/> </message> <message> - <location line="+17"/> + <location line="+56"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -1533,6 +1872,31 @@ Address: %4 <source>&Request payment</source> <translation type="unfinished"/> </message> + <message> + <location line="+47"/> + <source>Previously requested payments</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> + <source>Show the selected request (does the same as double clicking an entry)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Show</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+11"/> + <source>Remove the selected entries from the list</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Remove</source> + <translation type="unfinished"/> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -1553,16 +1917,11 @@ Address: %4 </message> <message> <location line="+7"/> - <source>&Copy Image</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+7"/> <source>&Save Image...</source> <translation type="unfinished"/> </message> <message> - <location filename="../receiverequestdialog.cpp" line="+58"/> + <location filename="../receiverequestdialog.cpp" line="+56"/> <source>Request payment to %1</source> <translation type="unfinished"/> </message> @@ -1608,16 +1967,119 @@ Address: %4 </message> </context> <context> + <name>RecentRequestsTableModel</name> + <message> + <location filename="../recentrequeststablemodel.cpp" line="+14"/> + <source>Date</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>Label</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>Message</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>Amount</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+36"/> + <source>(no label)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+9"/> + <source>(no message)</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="+14"/> - <location filename="../sendcoinsdialog.cpp" line="+140"/> - <location line="+213"/> + <location filename="../sendcoinsdialog.cpp" line="+381"/> + <location line="+81"/> <source>Send Coins</source> <translation type="unfinished"/> </message> <message> - <location line="+50"/> + <location line="+76"/> + <source>Coin Control Features</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+20"/> + <source>Inputs...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> + <source>automatically selected</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+19"/> + <source>Insufficient funds!</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+89"/> + <source>Quantity:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+35"/> + <source>Bytes:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+48"/> + <source>Amount:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+32"/> + <source>Priority:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+48"/> + <source>Fee:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+32"/> + <source>Low Output:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+48"/> + <source>After Fee:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+32"/> + <source>Change:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+44"/> + <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Custom change address</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+115"/> <source>Send to multiple recipients at once</source> <translation type="unfinished"/> </message> @@ -1642,12 +2104,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+10"/> - <source>123.456 BTC</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+31"/> + <location line="+41"/> <source>Confirm the send action</source> <translation type="unfinished"/> </message> @@ -1657,69 +2114,135 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-154"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation type="unfinished"/> </message> <message> - <location line="-90"/> + <location line="-74"/> <location line="+5"/> <location line="+5"/> + <location line="+4"/> <source>%1 to %2</source> <translation type="unfinished"/> </message> <message> - <location line="+26"/> + <location line="-136"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+15"/> + <source>Copy quantity</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy fee</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy after fee</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy bytes</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy priority</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy low output</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy change</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+170"/> + <source>Total Amount %1 (= %2)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>or</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+202"/> <source>The recipient address is not valid, please recheck.</source> <translation type="unfinished"/> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>The amount to pay must be larger than 0.</source> <translation type="unfinished"/> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>The amount exceeds your balance.</source> <translation type="unfinished"/> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>The total exceeds your balance when the %1 transaction fee is included.</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+3"/> <source>Duplicate address found, can only send to each address once per send operation.</source> <translation type="unfinished"/> </message> <message> + <location line="+3"/> + <source>Transaction creation failed!</source> + <translation type="unfinished"/> + </message> + <message> <location line="+4"/> - <source>Error: Transaction creation failed!</source> + <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation type="unfinished"/> </message> <message> - <location line="+15"/> - <source>Are you sure you want to send?</source> + <location line="+113"/> + <source>Warning: Invalid Bitcoin address</source> <translation type="unfinished"/> </message> <message> - <location line="+9"/> - <source>added as transaction fee</source> + <location line="+13"/> + <source>(no label)</source> <translation type="unfinished"/> </message> <message> - <location line="+6"/> - <source>Total Amount %1</source> + <location line="+8"/> + <source>Warning: Unknown change address</source> <translation type="unfinished"/> </message> <message> - <location line="+20"/> - <source>Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> + <location line="-378"/> + <source>Are you sure you want to send?</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+9"/> + <source>added as transaction fee</source> <translation type="unfinished"/> </message> <message> - <location line="+144"/> + <location line="+170"/> <source>Payment request expired</source> <translation type="unfinished"/> </message> @@ -1732,43 +2255,48 @@ Address: %4 <context> <name>SendCoinsEntry</name> <message> - <location filename="../forms/sendcoinsentry.ui" line="+33"/> - <location line="+585"/> + <location filename="../forms/sendcoinsentry.ui" line="+131"/> + <location line="+501"/> + <location line="+536"/> <source>A&mount:</source> <translation type="unfinished"/> </message> <message> - <location line="-572"/> - <location line="+585"/> + <location line="-1132"/> <source>Pay &To:</source> <translation type="unfinished"/> </message> <message> - <location line="-551"/> + <location line="+18"/> <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation type="unfinished"/> </message> <message> - <location filename="../sendcoinsentry.cpp" line="+28"/> + <location filename="../sendcoinsentry.cpp" line="+30"/> <source>Enter a label for this address to add it to your address book</source> <translation type="unfinished"/> </message> <message> - <location filename="../forms/sendcoinsentry.ui" line="-18"/> + <location filename="../forms/sendcoinsentry.ui" line="+57"/> <source>&Label:</source> <translation type="unfinished"/> </message> <message> - <location line="+28"/> + <location line="-50"/> <source>Choose previously used address</source> <translation type="unfinished"/> </message> <message> - <location line="+10"/> - <source>Alt+A</source> + <location line="-40"/> + <source>This is a normal payment.</source> <translation type="unfinished"/> </message> <message> + <location line="+50"/> + <source>Alt+A</source> + <translation>Alt+A</translation> + </message> + <message> <location line="+7"/> <source>Paste address from clipboard</source> <translation type="unfinished"/> @@ -1776,20 +2304,39 @@ Address: %4 <message> <location line="+10"/> <source>Alt+P</source> - <translation type="unfinished"/> + <translation>Alt+P</translation> </message> <message> <location line="+7"/> - <source>Remove this recipient</source> + <location line="+504"/> + <location line="+536"/> + <source>Remove this entry</source> <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="-40"/> + <source>This is a verified payment request.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-971"/> <source>Enter a label for this address to add it to the list of used addresses</source> <translation type="unfinished"/> </message> <message> - <location line="+465"/> + <location line="+439"/> + <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> @@ -1831,7 +2378,7 @@ Address: %4 <location line="-203"/> <location line="+213"/> <source>Alt+A</source> - <translation type="unfinished"/> + <translation>Alt+A</translation> </message> <message> <location line="-203"/> @@ -1841,7 +2388,7 @@ Address: %4 <message> <location line="+10"/> <source>Alt+P</source> - <translation type="unfinished"/> + <translation>Alt+P</translation> </message> <message> <location line="+12"/> @@ -1910,7 +2457,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../signverifymessagedialog.cpp" line="+27"/> + <location filename="../signverifymessagedialog.cpp" line="+29"/> <location line="+3"/> <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation type="unfinished"/> @@ -1926,7 +2473,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+85"/> + <location line="+84"/> <location line="+81"/> <source>The entered address is invalid.</source> <translation type="unfinished"/> @@ -1995,8 +2542,13 @@ Address: %4 <context> <name>SplashScreen</name> <message> - <location filename="../splashscreen.cpp" line="+23"/> - <source>The Bitcoin developers</source> + <location filename="../splashscreen.cpp" line="+26"/> + <source>Bitcoin Core</source> + <translation>Bitcoin Jezrga</translation> + </message> + <message> + <location line="+2"/> + <source>The Bitcoin Core developers</source> <translation type="unfinished"/> </message> <message> @@ -2008,7 +2560,7 @@ Address: %4 <context> <name>TrafficGraphWidget</name> <message> - <location filename="../trafficgraphwidget.cpp" line="+75"/> + <location filename="../trafficgraphwidget.cpp" line="+79"/> <source>KB/s</source> <translation type="unfinished"/> </message> @@ -2016,7 +2568,7 @@ Address: %4 <context> <name>TransactionDesc</name> <message> - <location filename="../transactiondesc.cpp" line="+22"/> + <location filename="../transactiondesc.cpp" line="+28"/> <source>Open until %1</source> <translation type="unfinished"/> </message> @@ -2208,7 +2760,7 @@ Address: %4 <context> <name>TransactionTableModel</name> <message> - <location filename="../transactiontablemodel.cpp" line="+227"/> + <location filename="../transactiontablemodel.cpp" line="+234"/> <source>Date</source> <translation type="unfinished"/> </message> @@ -2326,15 +2878,15 @@ Address: %4 <context> <name>TransactionView</name> <message> - <location filename="../transactionview.cpp" line="+52"/> + <location filename="../transactionview.cpp" line="+57"/> <location line="+16"/> <source>All</source> - <translation type="unfinished"/> + <translation>Sve</translation> </message> <message> <location line="-15"/> <source>Today</source> - <translation type="unfinished"/> + <translation>Danas</translation> </message> <message> <location line="+1"/> @@ -2344,17 +2896,17 @@ Address: %4 <message> <location line="+1"/> <source>This month</source> - <translation type="unfinished"/> + <translation>Ovaj mjesec</translation> </message> <message> <location line="+1"/> <source>Last month</source> - <translation type="unfinished"/> + <translation>Prošli mjesec</translation> </message> <message> <location line="+1"/> <source>This year</source> - <translation type="unfinished"/> + <translation>Ove godine</translation> </message> <message> <location line="+1"/> @@ -2387,12 +2939,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>Enter address or label to search</source> <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>Min amount</source> <translation type="unfinished"/> </message> @@ -2427,17 +2979,37 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+143"/> - <source>Export Transaction Data</source> + <location line="+142"/> + <source>Export Transaction History</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+19"/> + <source>Exporting Failed</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>There was an error trying to save the transaction history to %1.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+4"/> + <source>Exporting Successful</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>The transaction history was successfully saved to %1.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-22"/> <source>Comma separated file (*.csv)</source> <translation type="unfinished"/> </message> <message> - <location line="+8"/> + <location line="+9"/> <source>Confirmed</source> <translation type="unfinished"/> </message> @@ -2472,17 +3044,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+4"/> - <source>Error exporting</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+0"/> - <source>Could not write to file %1.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+100"/> + <location line="+107"/> <source>Range:</source> <translation type="unfinished"/> </message> @@ -2493,9 +3055,17 @@ Address: %4 </message> </context> <context> + <name>WalletFrame</name> + <message> + <location filename="../walletframe.cpp" line="+26"/> + <source>No wallet has been loaded.</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>WalletModel</name> <message> - <location filename="../walletmodel.cpp" line="+218"/> + <location filename="../walletmodel.cpp" line="+245"/> <source>Send Coins</source> <translation type="unfinished"/> </message> @@ -2503,7 +3073,7 @@ Address: %4 <context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+46"/> + <location filename="../walletview.cpp" line="+43"/> <source>&Export</source> <translation type="unfinished"/> </message> @@ -2513,65 +3083,60 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+183"/> + <location line="+181"/> <source>Backup Wallet</source> <translation type="unfinished"/> </message> <message> - <location line="+0"/> + <location line="+1"/> <source>Wallet Data (*.dat)</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Backup Failed</source> <translation type="unfinished"/> </message> <message> <location line="+0"/> - <source>There was an error trying to save the wallet data to the new location.</source> + <source>There was an error trying to save the wallet data to %1.</source> <translation type="unfinished"/> </message> <message> <location line="+4"/> - <source>Backup Successful</source> + <source>The wallet data was successfully saved to %1.</source> <translation type="unfinished"/> </message> <message> <location line="+0"/> - <source>The wallet data was successfully saved to the new location.</source> + <source>Backup Successful</source> <translation type="unfinished"/> </message> </context> <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+102"/> - <source>Bitcoin version</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+107"/> + <location filename="../bitcoinstrings.cpp" line="+217"/> <source>Usage:</source> <translation type="unfinished"/> </message> <message> - <location line="-55"/> + <location line="-54"/> <source>List commands</source> <translation type="unfinished"/> </message> <message> - <location line="-13"/> + <location line="-14"/> <source>Get help for a command</source> <translation type="unfinished"/> </message> <message> - <location line="+25"/> + <location line="+26"/> <source>Options:</source> <translation type="unfinished"/> </message> <message> - <location line="+24"/> + <location line="+23"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation type="unfinished"/> </message> @@ -2591,7 +3156,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-28"/> + <location line="-27"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation type="unfinished"/> </message> @@ -2601,7 +3166,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-49"/> + <location line="-50"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation type="unfinished"/> </message> @@ -2616,7 +3181,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-142"/> + <location line="-147"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"/> </message> @@ -2631,7 +3196,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+40"/> + <location line="+45"/> <source>Accept command line and JSON-RPC commands</source> <translation type="unfinished"/> </message> @@ -2641,17 +3206,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+40"/> + <location line="+39"/> <source>Use the test network</source> <translation type="unfinished"/> </message> <message> - <location line="-118"/> + <location line="-117"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> <message> - <location line="-87"/> + <location line="-92"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2706,17 +3271,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+11"/> - <source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source> + <location line="+18"/> + <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation type="unfinished"/> </message> <message> - <location line="+6"/> - <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> + <location line="+5"/> + <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+3"/> <source>Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source> <translation type="unfinished"/> </message> @@ -2746,17 +3311,27 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+14"/> + <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="+2"/> + <location line="+1"/> <source>Block creation options:</source> <translation type="unfinished"/> </message> @@ -2766,7 +3341,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+2"/> + <location line="+1"/> + <source>Connect through SOCKS proxy</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Connect to JSON-RPC on <port> (default: 8332 or testnet: 18332)</source> <translation type="unfinished"/> </message> @@ -2876,7 +3456,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+2"/> + <location line="+1"/> + <source>Fee per kB to add to transactions you send</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Find peers using DNS lookup (default: 1 unless -connect)</source> <translation type="unfinished"/> </message> @@ -2896,6 +3481,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <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"/> @@ -2911,17 +3501,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+8"/> + <location line="+5"/> + <source>Prepend debug output with timestamp (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>RPC client options:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+5"/> + <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Send command to Bitcoin server</source> <translation type="unfinished"/> </message> <message> - <location line="+10"/> + <location line="+8"/> + <source>Set maximum block size in bytes (default: %d)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>Set the number of threads to service RPC calls (default: 4)</source> <translation type="unfinished"/> </message> @@ -2941,7 +3551,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>Verifying blocks...</source> <translation type="unfinished"/> </message> @@ -2952,11 +3562,21 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> + <source>Wait for RPC server to start</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Wallet %s resides outside data directory %s</source> <translation type="unfinished"/> </message> <message> - <location line="+4"/> + <location line="+3"/> + <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> @@ -2966,17 +3586,27 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-98"/> + <location line="-104"/> <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> <translation type="unfinished"/> </message> <message> - <location line="+17"/> + <location line="+14"/> + <source>Output debugging information (default: 0, supplying <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="+83"/> + <location line="+88"/> <source>Information</source> <translation type="unfinished"/> </message> @@ -3016,32 +3646,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+2"/> - <source>Output extra debugging information. Implies all other -debug* options</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Output extra network debugging information</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> - <source>Prepend debug output with timestamp</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+5"/> + <location line="+9"/> <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Select the version of socks proxy to use (4-5, default: 5)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> + <location line="+4"/> <source>Send trace/debug info to console instead of debug.log file</source> <translation type="unfinished"/> </message> @@ -3051,12 +3661,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+5"/> - <source>Set maximum block size in bytes (default: 250000)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> + <location line="+6"/> <source>Set minimum block size in bytes (default: 0)</source> <translation type="unfinished"/> </message> @@ -3106,37 +3711,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Use proxy to reach tor hidden services (default: same as -proxy)</source> - <translation type="unfinished"/> - </message> - <message> <location line="+2"/> <source>Username for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Warning</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Warning: This version is obsolete, upgrade required!</source> <translation type="unfinished"/> </message> <message> <location line="+2"/> + <source>version</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>wallet.dat corrupt, salvage failed</source> <translation type="unfinished"/> </message> <message> - <location line="-54"/> + <location line="-57"/> <source>Password for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-70"/> + <location line="-69"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation type="unfinished"/> </message> @@ -3146,12 +3751,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-126"/> + <location line="-131"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+155"/> + <location line="+160"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"/> </message> @@ -3191,22 +3796,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-95"/> - <source>Connect through socks proxy</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-11"/> + <location line="-106"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation type="unfinished"/> </message> <message> - <location line="+58"/> + <location line="+59"/> <source>Loading addresses...</source> <translation type="unfinished"/> </message> <message> - <location line="-36"/> + <location line="-37"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation type="unfinished"/> </message> @@ -3226,12 +3826,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+30"/> + <location line="+31"/> <source>Invalid -proxy address: '%s'</source> <translation type="unfinished"/> </message> <message> - <location line="+57"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation type="unfinished"/> </message> @@ -3251,7 +3851,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+46"/> + <location line="+47"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation type="unfinished"/> </message> @@ -3271,27 +3871,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-60"/> + <location line="-61"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"/> </message> <message> - <location line="-28"/> + <location line="-32"/> <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source> <translation type="unfinished"/> </message> <message> - <location line="+69"/> - <source>Fee per KB to add to transactions you send</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+20"/> + <location line="+94"/> <source>Loading wallet...</source> <translation type="unfinished"/> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> @@ -3321,7 +3916,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-33"/> + <location line="-34"/> <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 index 745633e57b..c26dbb1985 100644 --- a/src/qt/locale/bitcoin_de_AT.ts +++ b/src/qt/locale/bitcoin_de_AT.ts @@ -3,13 +3,13 @@ <name>AboutDialog</name> <message> <location filename="../forms/aboutdialog.ui" line="+14"/> - <source>About Bitcoin</source> - <translation>Iwa Bitcoin</translation> + <source>About Bitcoin Core</source> + <translation type="unfinished"/> </message> <message> <location line="+39"/> - <source><b>Bitcoin</b> version</source> - <translation><b>Bitcoin</b> Veasion</translation> + <source><b>Bitcoin Core</b> version</source> + <translation type="unfinished"/> </message> <message> <location line="+57"/> @@ -22,7 +22,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="+14"/> + <location filename="../aboutdialog.cpp" line="+19"/> <source>Copyright</source> <translation type="unfinished"/> </message> @@ -65,7 +65,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location filename="../addressbookpage.cpp" line="+72"/> + <location filename="../addressbookpage.cpp" line="+74"/> <source>&Copy Address</source> <translation>Adress &Kopian</translation> </message> @@ -135,7 +135,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Ändan</translation> </message> <message> - <location line="+197"/> + <location line="+194"/> <source>Export Address List</source> <translation type="unfinished"/> </message> @@ -158,7 +158,7 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>AddressTableModel</name> <message> - <location filename="../addresstablemodel.cpp" line="+164"/> + <location filename="../addresstablemodel.cpp" line="+168"/> <source>Label</source> <translation>Titl</translation> </message> @@ -196,7 +196,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Und des gleiche noamoi</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="+34"/> + <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> @@ -317,17 +317,17 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+250"/> + <location filename="../bitcoingui.cpp" line="+260"/> <source>Sign &message...</source> <translation>A Mödung untaschreim...</translation> </message> <message> - <location line="+254"/> + <location line="+290"/> <source>Synchronizing with network...</source> <translation>Obgleichn midm Netz...</translation> </message> <message> - <location line="-324"/> + <location line="-360"/> <source>&Overview</source> <translation>&Iwasicht</translation> </message> @@ -393,7 +393,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Geheimwuat ändan...</translation> </message> <message> - <location line="+259"/> + <location line="+295"/> <source>Importing blocks from disk...</source> <translation type="unfinished"/> </message> @@ -403,7 +403,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-322"/> + <location line="-358"/> <source>Send coins to a Bitcoin address</source> <translation>Schick Zasta aun a Bitcoin Adress</translation> </message> @@ -438,20 +438,18 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Untaschrift tscheckn...</translation> </message> <message> - <location line="-180"/> - <location line="+6"/> - <location line="+513"/> + <location line="+375"/> <source>Bitcoin</source> - <translation type="unfinished"/> + <translation>Bitcoin</translation> </message> <message> - <location line="-519"/> - <location line="+6"/> + <location line="-563"/> + <location line="+10"/> <source>Wallet</source> <translation>Beasl</translation> </message> <message> - <location line="+109"/> + <location line="+113"/> <source>&Send</source> <translation type="unfinished"/> </message> @@ -461,13 +459,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+28"/> - <location line="+2"/> - <source>&About Bitcoin</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+14"/> + <location line="+44"/> <location line="+2"/> <source>&Show / Hide</source> <translation type="unfinished"/> @@ -493,12 +485,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+35"/> + <location line="+39"/> <source>&File</source> <translation>&Datei</translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>&Settings</source> <translation>&Eistöllungen</translation> </message> @@ -513,18 +505,30 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Karteireita Werkzeigleistn</translation> </message> <message> - <location line="-235"/> - <location line="+294"/> + <location line="-244"/> + <location line="+321"/> <source>[testnet]</source> <translation>[testnetz]</translation> </message> <message> - <location line="-177"/> + <location line="-331"/> + <location line="+10"/> + <source>Bitcoin Core</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+121"/> <source>Request payments (generates QR codes and bitcoin: URIs)</source> <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+27"/> + <location line="+2"/> + <source>&About Bitcoin Core</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+34"/> <source>&Used sending addresses...</source> <translation type="unfinished"/> </message> @@ -544,13 +548,23 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+106"/> + <location line="+2"/> + <source>Open URI...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Open a bitcoin: URI or payment request</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+126"/> <location line="+5"/> <source>Bitcoin client</source> <translation>Bitcoin Klient</translation> </message> <message numerus="yes"> - <location line="+120"/> + <location line="+133"/> <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> @@ -658,17 +672,7 @@ Wohin: %4 </translation> </message> <message> - <location line="+34"/> - <source>URI handling</source> - <translation>URI Behaundlung</translation> - </message> - <message> - <location line="+0"/> - <source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source> - <translation>De URI is a Kas! Meglichaweis is de Bitcoin Adress foisch, oda hoit sunst wos vamuakst.</translation> - </message> - <message> - <location line="+45"/> + <location line="+67"/> <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> @@ -678,7 +682,7 @@ Wohin: %4 <translation>'s Beasl is <b>vaschlisslt</b> und deazeit grod <b>zuagschpeat</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+110"/> + <location filename="../bitcoin.cpp" line="+116"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -686,12 +690,299 @@ Wohin: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+115"/> + <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="+171"/> + <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"/> @@ -719,7 +1010,7 @@ Wohin: %4 <translation>&Adress</translation> </message> <message> - <location filename="../editaddressdialog.cpp" line="+21"/> + <location filename="../editaddressdialog.cpp" line="+25"/> <source>New receiving address</source> <translation>Neiche Empfaungsadress</translation> </message> @@ -762,7 +1053,7 @@ Wohin: %4 <context> <name>FreespaceChecker</name> <message> - <location filename="../intro.cpp" line="+61"/> + <location filename="../intro.cpp" line="+65"/> <source>A new data directory will be created.</source> <translation type="unfinished"/> </message> @@ -790,18 +1081,18 @@ Wohin: %4 <context> <name>GUIUtil::HelpMessageBox</name> <message> - <location filename="../guiutil.cpp" line="+558"/> - <location line="+13"/> - <source>Bitcoin-Qt</source> - <translation>Bitcoin-Qt</translation> - </message> - <message> - <location line="-13"/> + <location filename="../guiutil.cpp" line="+597"/> <source>version</source> <translation>veasion</translation> </message> <message> - <location line="+2"/> + <location line="+0"/> + <location line="+13"/> + <source>Bitcoin Core</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-11"/> <source>Usage:</source> <translation>Vawendung:</translation> </message> @@ -845,17 +1136,17 @@ Wohin: %4 </message> <message> <location line="+9"/> - <source>Welcome to Bitcoin-Qt.</source> + <source>Welcome to Bitcoin Core.</source> <translation type="unfinished"/> </message> <message> <location line="+26"/> - <source>As this is the first time the program is launched, you can choose where Bitcoin-Qt will store its data.</source> + <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source> <translation type="unfinished"/> </message> <message> <location line="+10"/> - <source>Bitcoin-Qt will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source> + <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source> <translation type="unfinished"/> </message> <message> @@ -869,7 +1160,17 @@ Wohin: %4 <translation type="unfinished"/> </message> <message> - <location filename="../intro.cpp" line="+105"/> + <location filename="../intro.cpp" line="+85"/> + <source>Bitcoin</source> + <translation>Bitcoin</translation> + </message> + <message> + <location line="+1"/> + <source>Error: Specified data directory "%1" can not be created.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+19"/> <source>Error</source> <translation>Föhla</translation> </message> @@ -885,6 +1186,34 @@ Wohin: %4 </message> </context> <context> + <name>OpenURIDialog</name> + <message> + <location filename="../forms/openuridialog.ui" line="+14"/> + <source>Open URI</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Open payment request from URI or file</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+9"/> + <source>URI:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+11"/> + <source>Select payment request file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../openuridialog.cpp" line="+47"/> + <source>Select payment request file to open</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OptionsDialog</name> <message> <location filename="../forms/optionsdialog.ui" line="+14"/> @@ -1042,6 +1371,16 @@ Wohin: %4 <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="+71"/> <source>&OK</source> <translation>&Passt!</translation> @@ -1057,12 +1396,12 @@ Wohin: %4 <translation>&Jo, genau!</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+58"/> + <location filename="../optionsdialog.cpp" line="+63"/> <source>default</source> <translation>sunsta</translation> </message> <message> - <location line="+130"/> + <location line="+131"/> <source>Confirm options reset</source> <translation type="unfinished"/> </message> @@ -1103,17 +1442,17 @@ Wohin: %4 </message> <message> <location line="+50"/> - <location line="+202"/> + <location line="+214"/> <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="-131"/> + <location line="-140"/> <source>Unconfirmed:</source> <translation>Gerüchteweis:</translation> </message> <message> - <location line="-78"/> + <location line="-81"/> <source>Wallet</source> <translation>Beasl</translation> </message> @@ -1128,12 +1467,12 @@ Wohin: %4 <translation type="unfinished"/> </message> <message> - <location line="+29"/> + <location line="+32"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation type="unfinished"/> </message> <message> - <location line="+13"/> + <location line="+16"/> <source>Immature:</source> <translation>Unreif:</translation> </message> @@ -1143,7 +1482,7 @@ Wohin: %4 <translation>Gschiafta Betrog, dea no ned reif is</translation> </message> <message> - <location line="+13"/> + <location line="+16"/> <source>Total:</source> <translation type="unfinished"/> </message> @@ -1153,12 +1492,12 @@ Wohin: %4 <translation type="unfinished"/> </message> <message> - <location line="+53"/> + <location line="+56"/> <source><b>Recent transactions</b></source> <translation><b>unlängste Iwaweisungen</b></translation> </message> <message> - <location filename="../overviewpage.cpp" line="+116"/> + <location filename="../overviewpage.cpp" line="+120"/> <location line="+1"/> <source>out of sync</source> <translation>nimma atkuö</translation> @@ -1167,7 +1506,7 @@ Wohin: %4 <context> <name>PaymentServer</name> <message> - <location filename="../paymentserver.cpp" line="+392"/> + <location filename="../paymentserver.cpp" line="+397"/> <source>URI handling</source> <translation>URI Behaundlung</translation> </message> @@ -1177,23 +1516,29 @@ Wohin: %4 <translation>De URI is a Kas! Meglichaweis is de Bitcoin Adress foisch, oda hoit sunst wos vamuakst.</translation> </message> <message> - <location line="+69"/> + <location line="+91"/> <source>Requested payment amount of %1 is too small (considered dust).</source> <translation type="unfinished"/> </message> <message> - <location line="+4"/> - <location line="+37"/> + <location line="-204"/> + <location line="+195"/> + <location line="+13"/> <source>Payment request error</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Insecure requests to custom payment scripts unsupported</source> + <location line="-207"/> + <source>Cannot start bitcoin: click-to-pay handler</source> <translation type="unfinished"/> </message> <message> - <location line="+38"/> + <location line="+195"/> + <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> @@ -1203,7 +1548,7 @@ Wohin: %4 <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>Bad response from server %1</source> <translation type="unfinished"/> </message> @@ -1213,8 +1558,8 @@ Wohin: %4 <translation type="unfinished"/> </message> <message> - <location line="-58"/> - <location line="+30"/> + <location line="-55"/> + <location line="+27"/> <location line="+17"/> <source>Network request error</source> <translation type="unfinished"/> @@ -1223,11 +1568,10 @@ Wohin: %4 <context> <name>QObject</name> <message> - <location filename="../bitcoin.cpp" line="+114"/> + <location filename="../bitcoin.cpp" line="+119"/> <location line="+5"/> - <location filename="../intro.cpp" line="-32"/> <source>Bitcoin</source> - <translation type="unfinished"/> + <translation>Bitcoin</translation> </message> <message> <location line="-4"/> @@ -1239,16 +1583,11 @@ Wohin: %4 <source>Error: Invalid combination of -regtest and -testnet.</source> <translation type="unfinished"/> </message> - <message> - <location filename="../intro.cpp" line="+1"/> - <source>Error: Specified data directory "%1" can not be created.</source> - <translation type="unfinished"/> - </message> </context> <context> <name>QRImageWidget</name> <message> - <location filename="../receiverequestdialog.cpp" line="+32"/> + <location filename="../receiverequestdialog.cpp" line="+36"/> <source>&Save Image...</source> <translation type="unfinished"/> </message> @@ -1264,8 +1603,8 @@ Wohin: %4 </message> <message> <location line="+0"/> - <source>PNG Images (*.png)</source> - <translation>PNG Büda (*.png)</translation> + <source>PNG Image (*.png)</source> + <translation type="unfinished"/> </message> </context> <context> @@ -1285,7 +1624,7 @@ Wohin: %4 <location line="+53"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+352"/> + <location filename="../rpcconsole.cpp" line="+360"/> <source>N/A</source> <translation>Nix</translation> </message> @@ -1300,7 +1639,12 @@ Wohin: %4 <translation>&Information</translation> </message> <message> - <location line="+68"/> + <location line="-10"/> + <source>Debug window</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+78"/> <source>Using OpenSSL version</source> <translation>Vawend OpenSSL in a Version</translation> </message> @@ -1355,12 +1699,7 @@ Wohin: %4 <translation>Kommandozeilen Optionen</translation> </message> <message> - <location line="+7"/> - <source>Show the Bitcoin-Qt help message to get a list with possible Bitcoin command-line options.</source> - <translation>Zeig die Bitcoin-QT Hüfe-Mödung fiara Listn mit de Kommandozeilen-Optionen.</translation> - </message> - <message> - <location line="+3"/> + <location line="+10"/> <source>&Show</source> <translation>&Zeig</translation> </message> @@ -1387,7 +1726,7 @@ Wohin: %4 <message> <location line="+64"/> <source>In:</source> - <translation type="unfinished"/> + <translation>In:</translation> </message> <message> <location line="+80"/> @@ -1400,12 +1739,7 @@ Wohin: %4 <translation>Programm-Iwasetzunszeitpunkt</translation> </message> <message> - <location line="-104"/> - <source>Bitcoin - Debug window</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+25"/> + <location line="-79"/> <source>Bitcoin Core</source> <translation type="unfinished"/> </message> @@ -1420,7 +1754,12 @@ Wohin: %4 <translation type="unfinished"/> </message> <message> - <location line="+102"/> + <location line="+26"/> + <source>Show the Bitcoin-Core help message to get a list with possible Bitcoin command-line options.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+76"/> <source>Clear console</source> <translation>Konsole leermochn</translation> </message> @@ -1478,37 +1817,32 @@ Wohin: %4 <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+22"/> + <location filename="../forms/receivecoinsdialog.ui" line="+83"/> <source>&Amount:</source> <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+19"/> <source>The amount to request</source> <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="-32"/> <source>&Label:</source> <translation>&Titl:</translation> </message> <message> - <location line="+10"/> - <source>The label to associate with the receiving address</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+7"/> + <location line="-34"/> <source>&Message:</source> <translation type="unfinished"/> </message> <message> - <location line="+10"/> + <location line="+20"/> <source>The message to attach to payment request</source> <translation type="unfinished"/> </message> <message> - <location line="+14"/> + <location line="-37"/> <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> @@ -1518,12 +1852,17 @@ Wohin: %4 <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="+27"/> + <source>The label to associate with the new receiving address</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+14"/> <source>Use this form to request payments. All fields are optional.</source> <translation type="unfinished"/> </message> <message> - <location line="+17"/> + <location line="+56"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -1537,6 +1876,31 @@ Wohin: %4 <source>&Request payment</source> <translation type="unfinished"/> </message> + <message> + <location line="+47"/> + <source>Previously requested payments</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> + <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> @@ -1557,16 +1921,11 @@ Wohin: %4 </message> <message> <location line="+7"/> - <source>&Copy Image</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+7"/> <source>&Save Image...</source> <translation type="unfinished"/> </message> <message> - <location filename="../receiverequestdialog.cpp" line="+58"/> + <location filename="../receiverequestdialog.cpp" line="+56"/> <source>Request payment to %1</source> <translation type="unfinished"/> </message> @@ -1612,16 +1971,119 @@ Wohin: %4 </message> </context> <context> + <name>RecentRequestsTableModel</name> + <message> + <location filename="../recentrequeststablemodel.cpp" line="+14"/> + <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="+36"/> + <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="+140"/> - <location line="+213"/> + <location filename="../sendcoinsdialog.cpp" line="+381"/> + <location line="+81"/> <source>Send Coins</source> <translation>Vaschick Zasta</translation> </message> <message> - <location line="+50"/> + <location line="+76"/> + <source>Coin Control Features</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+20"/> + <source>Inputs...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> + <source>automatically selected</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+19"/> + <source>Insufficient funds!</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+89"/> + <source>Quantity:</source> + <translation>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> @@ -1646,12 +2108,7 @@ Wohin: %4 <translation>Kontostaund:</translation> </message> <message> - <location line="+10"/> - <source>123.456 BTC</source> - <translation>123.456 BTC</translation> - </message> - <message> - <location line="+31"/> + <location line="+41"/> <source>Confirm the send action</source> <translation>Bschtätige de Iwaweisung</translation> </message> @@ -1661,69 +2118,135 @@ Wohin: %4 <translation type="unfinished"/> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-154"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation>Iwaweisung bschtätign</translation> </message> <message> - <location line="-90"/> + <location line="-74"/> <location line="+5"/> <location line="+5"/> + <location line="+4"/> <source>%1 to %2</source> <translation type="unfinished"/> </message> <message> - <location line="+26"/> + <location line="-136"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>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="+4"/> + <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="+4"/> + <location line="+3"/> <source>The amount exceeds your balance.</source> <translation>Des is mea ois wost host.</translation> </message> <message> - <location line="+4"/> + <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="+5"/> + <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>Error: Transaction creation failed!</source> + <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation type="unfinished"/> </message> <message> - <location line="+15"/> - <source>Are you sure you want to send?</source> + <location line="+113"/> + <source>Warning: Invalid Bitcoin address</source> <translation type="unfinished"/> </message> <message> - <location line="+9"/> - <source>added as transaction fee</source> + <location line="+13"/> + <source>(no label)</source> + <translation>nixda</translation> + </message> + <message> + <location line="+8"/> + <source>Warning: Unknown change address</source> <translation type="unfinished"/> </message> <message> - <location line="+6"/> - <source>Total Amount %1</source> + <location line="-378"/> + <source>Are you sure you want to send?</source> <translation type="unfinished"/> </message> <message> - <location line="+20"/> - <source>Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> - <translation>De Iwaweisung is obgwiesn wuadn. Des kau passian, waunnst Münzn scho ausgebn host, zum Beispü mit ana Kopie vom Beasl, während des Beasl hia no nix davon waas.</translation> + <location line="+9"/> + <source>added as transaction fee</source> + <translation type="unfinished"/> </message> <message> - <location line="+144"/> + <location line="+170"/> <source>Payment request expired</source> <translation type="unfinished"/> </message> @@ -1736,39 +2259,44 @@ Wohin: %4 <context> <name>SendCoinsEntry</name> <message> - <location filename="../forms/sendcoinsentry.ui" line="+33"/> - <location line="+585"/> + <location filename="../forms/sendcoinsentry.ui" line="+131"/> + <location line="+501"/> + <location line="+536"/> <source>A&mount:</source> <translation>&Betrog:</translation> </message> <message> - <location line="-572"/> - <location line="+585"/> + <location line="-1132"/> <source>Pay &To:</source> <translation>wo&hin:</translation> </message> <message> - <location line="-551"/> + <location line="+18"/> <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation type="unfinished"/> </message> <message> - <location filename="../sendcoinsentry.cpp" line="+28"/> + <location filename="../sendcoinsentry.cpp" line="+30"/> <source>Enter a label for this address to add it to your address book</source> <translation>Gib an Titl fia de neiche Adress</translation> </message> <message> - <location filename="../forms/sendcoinsentry.ui" line="-18"/> + <location filename="../forms/sendcoinsentry.ui" line="+57"/> <source>&Label:</source> <translation>&Titl:</translation> </message> <message> - <location line="+28"/> + <location line="-50"/> <source>Choose previously used address</source> <translation type="unfinished"/> </message> <message> - <location line="+10"/> + <location line="-40"/> + <source>This is a normal payment.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+50"/> <source>Alt+A</source> <translation>Alt+A</translation> </message> @@ -1784,16 +2312,35 @@ Wohin: %4 </message> <message> <location line="+7"/> - <source>Remove this recipient</source> - <translation>Na, dea kriagt do nix</translation> + <location line="+504"/> + <location line="+536"/> + <source>Remove this entry</source> + <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="-40"/> + <source>This is a verified payment request.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-971"/> <source>Enter a label for this address to add it to the list of used addresses</source> <translation type="unfinished"/> </message> <message> - <location line="+465"/> + <location line="+439"/> + <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> @@ -1914,7 +2461,7 @@ Wohin: %4 <translation>Olle Föda zrucksetzn</translation> </message> <message> - <location filename="../signverifymessagedialog.cpp" line="+27"/> + <location filename="../signverifymessagedialog.cpp" line="+29"/> <location line="+3"/> <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation>Gib a Bitcoin-Adress ei (sowos wia: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> @@ -1930,7 +2477,7 @@ Wohin: %4 <translation>Gib de Untaschrift ei</translation> </message> <message> - <location line="+85"/> + <location line="+84"/> <location line="+81"/> <source>The entered address is invalid.</source> <translation>De eingebane Adress is a Kas.</translation> @@ -1999,8 +2546,13 @@ Wohin: %4 <context> <name>SplashScreen</name> <message> - <location filename="../splashscreen.cpp" line="+23"/> - <source>The Bitcoin developers</source> + <location filename="../splashscreen.cpp" line="+26"/> + <source>Bitcoin Core</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>The Bitcoin Core developers</source> <translation type="unfinished"/> </message> <message> @@ -2012,7 +2564,7 @@ Wohin: %4 <context> <name>TrafficGraphWidget</name> <message> - <location filename="../trafficgraphwidget.cpp" line="+75"/> + <location filename="../trafficgraphwidget.cpp" line="+79"/> <source>KB/s</source> <translation type="unfinished"/> </message> @@ -2020,7 +2572,7 @@ Wohin: %4 <context> <name>TransactionDesc</name> <message> - <location filename="../transactiondesc.cpp" line="+22"/> + <location filename="../transactiondesc.cpp" line="+28"/> <source>Open until %1</source> <translation>Offn bis %1</translation> </message> @@ -2212,7 +2764,7 @@ Wohin: %4 <context> <name>TransactionTableModel</name> <message> - <location filename="../transactiontablemodel.cpp" line="+227"/> + <location filename="../transactiontablemodel.cpp" line="+234"/> <source>Date</source> <translation>Waunn</translation> </message> @@ -2330,7 +2882,7 @@ Wohin: %4 <context> <name>TransactionView</name> <message> - <location filename="../transactionview.cpp" line="+52"/> + <location filename="../transactionview.cpp" line="+57"/> <location line="+16"/> <source>All</source> <translation>Ois</translation> @@ -2391,12 +2943,12 @@ Wohin: %4 <translation>Aundare</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>Enter address or label to search</source> <translation>Suach noch ana Adress oda an Titl</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>Min amount</source> <translation>klaaansta Betrog</translation> </message> @@ -2431,17 +2983,37 @@ Wohin: %4 <translation>Zeig de Einzlheitn vo da Iwaweisung</translation> </message> <message> - <location line="+143"/> - <source>Export Transaction Data</source> - <translation>Iwaweisungsdatn speichan</translation> + <location line="+142"/> + <source>Export Transaction History</source> + <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+19"/> + <source>Exporting Failed</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>There was an error trying to save the transaction history to %1.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+4"/> + <source>Exporting Successful</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>The transaction history was successfully saved to %1.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-22"/> <source>Comma separated file (*.csv)</source> <translation>Beistrich 'trennte Weate (*.csv)</translation> </message> <message> - <location line="+8"/> + <location line="+9"/> <source>Confirmed</source> <translation>Bschtätigt</translation> </message> @@ -2476,17 +3048,7 @@ Wohin: %4 <translation>Nr</translation> </message> <message> - <location line="+4"/> - <source>Error exporting</source> - <translation>Föhla beim Speichan</translation> - </message> - <message> - <location line="+0"/> - <source>Could not write to file %1.</source> - <translation>Hob ned in de Datei %1 einespeichan kennan.</translation> - </message> - <message> - <location line="+100"/> + <location line="+107"/> <source>Range:</source> <translation>Bereich:</translation> </message> @@ -2497,9 +3059,17 @@ Wohin: %4 </message> </context> <context> + <name>WalletFrame</name> + <message> + <location filename="../walletframe.cpp" line="+26"/> + <source>No wallet has been loaded.</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>WalletModel</name> <message> - <location filename="../walletmodel.cpp" line="+218"/> + <location filename="../walletmodel.cpp" line="+245"/> <source>Send Coins</source> <translation>Vaschick Zasta</translation> </message> @@ -2507,7 +3077,7 @@ Wohin: %4 <context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+46"/> + <location filename="../walletview.cpp" line="+43"/> <source>&Export</source> <translation type="unfinished"/> </message> @@ -2517,65 +3087,60 @@ Wohin: %4 <translation type="unfinished"/> </message> <message> - <location line="+183"/> + <location line="+181"/> <source>Backup Wallet</source> <translation type="unfinished"/> </message> <message> - <location line="+0"/> + <location line="+1"/> <source>Wallet Data (*.dat)</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Backup Failed</source> <translation type="unfinished"/> </message> <message> <location line="+0"/> - <source>There was an error trying to save the wallet data to the new location.</source> + <source>There was an error trying to save the wallet data to %1.</source> <translation type="unfinished"/> </message> <message> <location line="+4"/> - <source>Backup Successful</source> + <source>The wallet data was successfully saved to %1.</source> <translation type="unfinished"/> </message> <message> <location line="+0"/> - <source>The wallet data was successfully saved to the new location.</source> + <source>Backup Successful</source> <translation type="unfinished"/> </message> </context> <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+102"/> - <source>Bitcoin version</source> - <translation>Bitcoin Veasion</translation> - </message> - <message> - <location line="+107"/> + <location filename="../bitcoinstrings.cpp" line="+217"/> <source>Usage:</source> <translation>Vawendung:</translation> </message> <message> - <location line="-55"/> + <location line="-54"/> <source>List commands</source> <translation>Kommandos aunzeign</translation> </message> <message> - <location line="-13"/> + <location line="-14"/> <source>Get help for a command</source> <translation>Hüfe fiara Kommando</translation> </message> <message> - <location line="+25"/> + <location line="+26"/> <source>Options:</source> <translation>Eistöllungen:</translation> </message> <message> - <location line="+24"/> + <location line="+23"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Gib de Konfigurationsdatei aun (sunsta: bitcoin.conf)</translation> </message> @@ -2595,7 +3160,7 @@ Wohin: %4 <translation>Zwischnspeichagreß fia de Datenbank in megabeits (sunsta: 25)</translation> </message> <message> - <location line="-28"/> + <location line="-27"/> <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> @@ -2605,7 +3170,7 @@ Wohin: %4 <translation>Hechstns <n> Vabindungen zu aundare Netz-Knotn aufrecht eahoitn (sunsta: 125)</translation> </message> <message> - <location line="-49"/> + <location line="-50"/> <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> @@ -2620,7 +3185,7 @@ Wohin: %4 <translation>Geduidsfodnstärke gegniwa deppate Netz-Knotn (sunsta: 100)</translation> </message> <message> - <location line="-142"/> + <location line="-147"/> <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> @@ -2635,7 +3200,7 @@ Wohin: %4 <translation type="unfinished"/> </message> <message> - <location line="+40"/> + <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> @@ -2645,17 +3210,17 @@ Wohin: %4 <translation>Ois Dämon im Hintagrund laafn und auf Beföhle lauschn</translation> </message> <message> - <location line="+40"/> + <location line="+39"/> <source>Use the test network</source> <translation>Des Test-Netz vawenden</translation> </message> <message> - <location line="-118"/> + <location line="-117"/> <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="-87"/> + <location line="-92"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2710,17 +3275,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>A programmal startn, waunn si a unbstätigte Iwaweisung ändat. (a %s wiad dabei duachn Iwaweisungs-Hash easetzt)</translation> </message> <message> - <location line="+11"/> - <source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source> + <location line="+18"/> + <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation type="unfinished"/> </message> <message> - <location line="+6"/> - <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> + <location line="+5"/> + <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+3"/> <source>Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source> <translation type="unfinished"/> </message> @@ -2750,17 +3315,27 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+14"/> + <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="+2"/> + <location line="+1"/> <source>Block creation options:</source> <translation type="unfinished"/> </message> @@ -2770,7 +3345,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Nur mit de aungebanen Netz-Knotn vabindn.</translation> </message> <message> - <location line="+2"/> + <location line="+1"/> + <source>Connect through SOCKS proxy</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Connect to JSON-RPC on <port> (default: 8332 or testnet: 18332)</source> <translation type="unfinished"/> </message> @@ -2880,7 +3460,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+2"/> + <location line="+1"/> + <source>Fee per kB to add to transactions you send</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Find peers using DNS lookup (default: 1 unless -connect)</source> <translation type="unfinished"/> </message> @@ -2900,6 +3485,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <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"/> @@ -2915,17 +3505,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+8"/> + <location line="+5"/> + <source>Prepend debug output with timestamp (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>RPC client options:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+5"/> + <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Send command to Bitcoin server</source> <translation type="unfinished"/> </message> <message> - <location line="+10"/> + <location line="+8"/> + <source>Set maximum block size in bytes (default: %d)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>Set the number of threads to service RPC calls (default: 4)</source> <translation type="unfinished"/> </message> @@ -2945,7 +3555,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>Verifying blocks...</source> <translation type="unfinished"/> </message> @@ -2956,11 +3566,21 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> + <source>Wait for RPC server to start</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Wallet %s resides outside data directory %s</source> <translation type="unfinished"/> </message> <message> - <location line="+4"/> + <location line="+3"/> + <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> @@ -2970,17 +3590,27 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-98"/> + <location line="-104"/> <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="+17"/> + <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="+83"/> + <location line="+88"/> <source>Information</source> <translation type="unfinished"/> </message> @@ -3020,32 +3650,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+2"/> - <source>Output extra debugging information. Implies all other -debug* options</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Output extra network debugging information</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> - <source>Prepend debug output with timestamp</source> - <translation>Fia Protokoi-Einträge imma vuan dazuaschreibn, waunns passiat san</translation> - </message> - <message> - <location line="+5"/> + <location line="+9"/> <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Select the version of socks proxy to use (4-5, default: 5)</source> - <translation>Wöche Version vom Sockn-Proxy gwinscht is (4 oda 5; waunn nix, daunn 5)</translation> - </message> - <message> - <location line="+3"/> + <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> @@ -3055,12 +3665,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Protokoi zum Debugger schickn</translation> </message> <message> - <location line="+5"/> - <source>Set maximum block size in bytes (default: 250000)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> + <location line="+6"/> <source>Set minimum block size in bytes (default: 0)</source> <translation type="unfinished"/> </message> @@ -3110,37 +3715,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Vawend UPnP um den Lausch-Port zuzuweisn (wenn nix aungebm is: 1, wenns Lauschn eigschoitn is)</translation> </message> <message> - <location line="+1"/> - <source>Use proxy to reach tor hidden services (default: same as -proxy)</source> - <translation type="unfinished"/> - </message> - <message> <location line="+2"/> <source>Username for JSON-RPC connections</source> <translation>Benutza fia JSON-RPC Vabindungen</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Warning</source> <translation>Pass auf</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Warning: This version is obsolete, upgrade required!</source> <translation type="unfinished"/> </message> <message> <location line="+2"/> + <source>version</source> + <translation>veasion</translation> + </message> + <message> + <location line="+1"/> <source>wallet.dat corrupt, salvage failed</source> <translation type="unfinished"/> </message> <message> - <location line="-54"/> + <location line="-57"/> <source>Password for JSON-RPC connections</source> <translation>Geheimwuat fia JSON-RPC Vabindungen</translation> </message> <message> - <location line="-70"/> + <location line="-69"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>JSON-RPC Beföhle nua vo da aungebanen Netz-Adress ealaubn</translation> </message> @@ -3150,12 +3755,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Beföhle zum Netz-Knotn mit da <ip>-Adress schickn (sunsta: 127.0.0.1)</translation> </message> <message> - <location line="-126"/> + <location line="-131"/> <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="+155"/> + <location line="+160"/> <source>Upgrade wallet to latest format</source> <translation>'s Beasl ins neichaste Foamat bringan</translation> </message> @@ -3195,22 +3800,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Kaun mi ned aun %s auf dera Maschin draunhängan (bind returned error %d, %s)</translation> </message> <message> - <location line="-95"/> - <source>Connect through socks proxy</source> - <translation>Iwa an sockn-Zwischnsöawa vabindn</translation> - </message> - <message> - <location line="-11"/> + <location line="-106"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>Ealaub DNS nochfrogn fia -addnode, -seednode und -connect</translation> </message> <message> - <location line="+58"/> + <location line="+59"/> <source>Loading addresses...</source> <translation>Adressbiachl lodn...</translation> </message> <message> - <location line="-36"/> + <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> @@ -3230,12 +3830,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Föhla beim Lodn vom Beasl (wallet.dat)</translation> </message> <message> - <location line="+30"/> + <location line="+31"/> <source>Invalid -proxy address: '%s'</source> <translation>Ungültige "-proxy" Adress: '%s'</translation> </message> <message> - <location line="+57"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Des Netzwerk in -onlynet is a Kas: '%s'</translation> </message> @@ -3255,7 +3855,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Kaunn de -externalip Adressn ned auflösn: '%s'</translation> </message> <message> - <location line="+46"/> + <location line="+47"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>Da Betrog fia -paytxfee=<amount> is a Kas: '%s'</translation> </message> @@ -3275,27 +3875,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Block index lodn...</translation> </message> <message> - <location line="-60"/> + <location line="-61"/> <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="-28"/> + <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="+69"/> - <source>Fee per KB to add to transactions you send</source> - <translation>Gebühr pro Kilobeit fia oogschickte Iwaweisungen</translation> - </message> - <message> - <location line="+20"/> + <location line="+94"/> <source>Loading wallet...</source> <translation>Beasl lodn...</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>Cannot downgrade wallet</source> <translation>Zrucksteign geht nimma beim Beasl</translation> </message> @@ -3325,7 +3920,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Föhla</translation> </message> <message> - <location line="-33"/> + <location line="-34"/> <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 0dc56ac5dc..368a4d6003 100644 --- a/src/qt/locale/bitcoin_en.ts +++ b/src/qt/locale/bitcoin_en.ts @@ -5,13 +5,13 @@ <name>AboutDialog</name> <message> <location filename="../forms/aboutdialog.ui" line="+14"/> - <source>About Bitcoin</source> - <translation>About Bitcoin</translation> + <source>About Bitcoin Core</source> + <translation type="unfinished"></translation> </message> <message> <location line="+39"/> - <source><b>Bitcoin</b> version</source> - <translation><b>Bitcoin</b> version</translation> + <source><b>Bitcoin Core</b> version</source> + <translation type="unfinished"></translation> </message> <message> <location line="+57"/> @@ -29,7 +29,7 @@ Distributed under the MIT/X11 software license, see the accompanying file COPYIN This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="+14"/> + <location filename="../aboutdialog.cpp" line="+19"/> <source>Copyright</source> <translation>Copyright</translation> </message> @@ -72,7 +72,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"></translation> </message> <message> - <location filename="../addressbookpage.cpp" line="+72"/> + <location filename="../addressbookpage.cpp" line="+74"/> <source>&Copy Address</source> <translation>&Copy Address</translation> </message> @@ -142,7 +142,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Edit</translation> </message> <message> - <location line="+197"/> + <location line="+194"/> <source>Export Address List</source> <translation type="unfinished"></translation> </message> @@ -165,7 +165,7 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>AddressTableModel</name> <message> - <location filename="../addresstablemodel.cpp" line="+164"/> + <location filename="../addresstablemodel.cpp" line="+168"/> <source>Label</source> <translation>Label</translation> </message> @@ -203,7 +203,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Repeat new passphrase</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="+34"/> + <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>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>.</translation> </message> @@ -324,17 +324,17 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+250"/> + <location filename="../bitcoingui.cpp" line="+260"/> <source>Sign &message...</source> <translation>Sign &message...</translation> </message> <message> - <location line="+254"/> + <location line="+290"/> <source>Synchronizing with network...</source> <translation>Synchronizing with network...</translation> </message> <message> - <location line="-324"/> + <location line="-360"/> <source>&Overview</source> <translation>&Overview</translation> </message> @@ -400,7 +400,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Change Passphrase...</translation> </message> <message> - <location line="+259"/> + <location line="+295"/> <source>Importing blocks from disk...</source> <translation>Importing blocks from disk...</translation> </message> @@ -410,7 +410,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Reindexing blocks on disk...</translation> </message> <message> - <location line="-322"/> + <location line="-358"/> <source>Send coins to a Bitcoin address</source> <translation>Send coins to a Bitcoin address</translation> </message> @@ -445,20 +445,18 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Verify message...</translation> </message> <message> - <location line="-180"/> - <location line="+6"/> - <location line="+513"/> + <location line="+375"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-519"/> - <location line="+6"/> + <location line="-563"/> + <location line="+10"/> <source>Wallet</source> <translation>Wallet</translation> </message> <message> - <location line="+109"/> + <location line="+113"/> <source>&Send</source> <translation>&Send</translation> </message> @@ -468,13 +466,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Receive</translation> </message> <message> - <location line="+28"/> - <location line="+2"/> - <source>&About Bitcoin</source> - <translation>&About Bitcoin</translation> - </message> - <message> - <location line="+14"/> + <location line="+44"/> <location line="+2"/> <source>&Show / Hide</source> <translation>&Show / Hide</translation> @@ -500,12 +492,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Verify messages to ensure they were signed with specified Bitcoin addresses</translation> </message> <message> - <location line="+35"/> + <location line="+39"/> <source>&File</source> <translation>&File</translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>&Settings</source> <translation>&Settings</translation> </message> @@ -520,18 +512,30 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Tabs toolbar</translation> </message> <message> - <location line="-235"/> - <location line="+294"/> + <location line="-244"/> + <location line="+321"/> <source>[testnet]</source> <translation>[testnet]</translation> </message> <message> - <location line="-177"/> + <location line="-331"/> + <location line="+10"/> + <source>Bitcoin Core</source> + <translation type="unfinished">Bitcoin Core</translation> + </message> + <message> + <location line="+121"/> <source>Request payments (generates QR codes and bitcoin: URIs)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+63"/> + <location line="+27"/> + <location line="+2"/> + <source>&About Bitcoin Core</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+34"/> <source>&Used sending addresses...</source> <translation type="unfinished"></translation> </message> @@ -551,13 +555,23 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"></translation> </message> <message> - <location line="+106"/> + <location line="+2"/> + <source>Open URI...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Open a bitcoin: URI or payment request</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+126"/> <location line="+5"/> <source>Bitcoin client</source> <translation>Bitcoin client</translation> </message> <message numerus="yes"> - <location line="+120"/> + <location line="+133"/> <source>%n active connection(s) to Bitcoin network</source> <translation> <numerusform>%n active connection to Bitcoin network</numerusform> @@ -677,17 +691,7 @@ Address: %4 </translation> </message> <message> - <location line="+34"/> - <source>URI handling</source> - <translation>URI handling</translation> - </message> - <message> - <location line="+0"/> - <source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source> - <translation>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</translation> - </message> - <message> - <location line="+45"/> + <location line="+67"/> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>Wallet is <b>encrypted</b> and currently <b>unlocked</b></translation> </message> @@ -697,7 +701,7 @@ Address: %4 <translation>Wallet is <b>encrypted</b> and currently <b>locked</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+110"/> + <location filename="../bitcoin.cpp" line="+116"/> <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> @@ -705,12 +709,299 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+115"/> + <location filename="../clientmodel.cpp" line="+119"/> <source>Network Alert</source> <translation>Network Alert</translation> </message> </context> <context> + <name>CoinControlDialog</name> + <message> + <location filename="../forms/coincontroldialog.ui" line="+14"/> + <source>Coin Control Address Selection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+34"/> + <source>Quantity:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+29"/> + <source>Bytes:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+45"/> + <source>Amount:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+29"/> + <source>Priority:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+45"/> + <source>Fee:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+32"/> + <source>Low Output:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+48"/> + <source>After Fee:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+32"/> + <source>Change:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+63"/> + <source>(un)select all</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+13"/> + <source>Tree mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+16"/> + <source>List mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+52"/> + <source>Amount</source> + <translation type="unfinished">Amount</translation> + </message> + <message> + <location line="+10"/> + <source>Address</source> + <translation type="unfinished">Address</translation> + </message> + <message> + <location line="+5"/> + <source>Date</source> + <translation type="unfinished">Date</translation> + </message> + <message> + <location line="+5"/> + <source>Confirmations</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Confirmed</source> + <translation type="unfinished">Confirmed</translation> + </message> + <message> + <location line="+5"/> + <source>Priority</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../coincontroldialog.cpp" line="+42"/> + <source>Copy address</source> + <translation type="unfinished">Copy address</translation> + </message> + <message> + <location line="+1"/> + <source>Copy label</source> + <translation type="unfinished">Copy label</translation> + </message> + <message> + <location line="+1"/> + <location line="+26"/> + <source>Copy amount</source> + <translation type="unfinished">Copy amount</translation> + </message> + <message> + <location line="-25"/> + <source>Copy transaction ID</source> + <translation type="unfinished">Copy transaction ID</translation> + </message> + <message> + <location line="+1"/> + <source>Lock unspent</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Unlock unspent</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+22"/> + <source>Copy quantity</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Copy fee</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Copy after fee</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Copy bytes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Copy priority</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Copy low output</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Copy change</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+323"/> + <source>highest</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>higher</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>high</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>medium-high</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>medium</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>low-medium</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>low</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>lower</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>lowest</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+11"/> + <source>(%1 locked)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+171"/> + <source>Dust</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+0"/> + <source>yes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+0"/> + <source>no</source> + <translation type="unfinished"></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> + </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> + </message> + <message> + <location line="-4"/> + <source>Can vary +/- 1 byte per input.</source> + <translation type="unfinished"></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> + </message> + <message> + <location line="+1"/> + <source>This label turns red, if the priority is smaller than "medium"</source> + <translation type="unfinished"></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> + </message> + <message> + <location line="+1"/> + <location line="+4"/> + <source>This means a fee of at least %1 is required.</source> + <translation type="unfinished"></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> + </message> + <message> + <location line="+2"/> + <source>This label turns red, if the change is smaller than %1.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+43"/> + <location line="+66"/> + <source>(no label)</source> + <translation type="unfinished">(no label)</translation> + </message> + <message> + <location line="-9"/> + <source>change from %1 (%2)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>(change)</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>EditAddressDialog</name> <message> <location filename="../forms/editaddressdialog.ui" line="+14"/> @@ -738,7 +1029,7 @@ Address: %4 <translation>&Address</translation> </message> <message> - <location filename="../editaddressdialog.cpp" line="+21"/> + <location filename="../editaddressdialog.cpp" line="+25"/> <source>New receiving address</source> <translation>New receiving address</translation> </message> @@ -781,7 +1072,7 @@ Address: %4 <context> <name>FreespaceChecker</name> <message> - <location filename="../intro.cpp" line="+61"/> + <location filename="../intro.cpp" line="+65"/> <source>A new data directory will be created.</source> <translation>A new data directory will be created.</translation> </message> @@ -809,18 +1100,18 @@ Address: %4 <context> <name>GUIUtil::HelpMessageBox</name> <message> - <location filename="../guiutil.cpp" line="+558"/> - <location line="+13"/> - <source>Bitcoin-Qt</source> - <translation>Bitcoin-Qt</translation> - </message> - <message> - <location line="-13"/> + <location filename="../guiutil.cpp" line="+597"/> <source>version</source> <translation>version</translation> </message> <message> - <location line="+2"/> + <location line="+0"/> + <location line="+13"/> + <source>Bitcoin Core</source> + <translation type="unfinished">Bitcoin Core</translation> + </message> + <message> + <location line="-11"/> <source>Usage:</source> <translation>Usage:</translation> </message> @@ -864,18 +1155,18 @@ Address: %4 </message> <message> <location line="+9"/> - <source>Welcome to Bitcoin-Qt.</source> - <translation>Welcome to Bitcoin-Qt.</translation> + <source>Welcome to Bitcoin Core.</source> + <translation type="unfinished"></translation> </message> <message> <location line="+26"/> - <source>As this is the first time the program is launched, you can choose where Bitcoin-Qt will store its data.</source> - <translation>As this is the first time the program is launched, you can choose where Bitcoin-Qt will store its data.</translation> + <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source> + <translation type="unfinished"></translation> </message> <message> <location line="+10"/> - <source>Bitcoin-Qt will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source> - <translation>Bitcoin-Qt 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.</translation> + <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source> + <translation type="unfinished"></translation> </message> <message> <location line="+10"/> @@ -888,7 +1179,17 @@ Address: %4 <translation>Use a custom data directory:</translation> </message> <message> - <location filename="../intro.cpp" line="+105"/> + <location filename="../intro.cpp" line="+85"/> + <source>Bitcoin</source> + <translation type="unfinished">Bitcoin</translation> + </message> + <message> + <location line="+1"/> + <source>Error: Specified data directory "%1" can not be created.</source> + <translation type="unfinished">Error: Specified data directory "%1" can not be created.</translation> + </message> + <message> + <location line="+19"/> <source>Error</source> <translation>Error</translation> </message> @@ -904,6 +1205,34 @@ Address: %4 </message> </context> <context> + <name>OpenURIDialog</name> + <message> + <location filename="../forms/openuridialog.ui" line="+14"/> + <source>Open URI</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>Open payment request from URI or file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> + <source>URI:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+11"/> + <source>Select payment request file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../openuridialog.cpp" line="+47"/> + <source>Select payment request file to open</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>OptionsDialog</name> <message> <location filename="../forms/optionsdialog.ui" line="+14"/> @@ -1061,6 +1390,16 @@ Address: %4 <translation>&Display addresses in transaction list</translation> </message> <message> + <location line="+7"/> + <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="+71"/> <source>&OK</source> <translation>&OK</translation> @@ -1076,12 +1415,12 @@ Address: %4 <translation>&Apply</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+58"/> + <location filename="../optionsdialog.cpp" line="+63"/> <source>default</source> <translation>default</translation> </message> <message> - <location line="+130"/> + <location line="+131"/> <source>Confirm options reset</source> <translation>Confirm options reset</translation> </message> @@ -1122,17 +1461,17 @@ Address: %4 </message> <message> <location line="+50"/> - <location line="+202"/> + <location line="+214"/> <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source> <translation>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</translation> </message> <message> - <location line="-131"/> + <location line="-140"/> <source>Unconfirmed:</source> <translation>Unconfirmed:</translation> </message> <message> - <location line="-78"/> + <location line="-81"/> <source>Wallet</source> <translation>Wallet</translation> </message> @@ -1147,12 +1486,12 @@ Address: %4 <translation>Your current spendable balance</translation> </message> <message> - <location line="+29"/> + <location line="+32"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</translation> </message> <message> - <location line="+13"/> + <location line="+16"/> <source>Immature:</source> <translation>Immature:</translation> </message> @@ -1162,7 +1501,7 @@ Address: %4 <translation>Mined balance that has not yet matured</translation> </message> <message> - <location line="+13"/> + <location line="+16"/> <source>Total:</source> <translation>Total:</translation> </message> @@ -1172,12 +1511,12 @@ Address: %4 <translation>Your current total balance</translation> </message> <message> - <location line="+53"/> + <location line="+56"/> <source><b>Recent transactions</b></source> <translation><b>Recent transactions</b></translation> </message> <message> - <location filename="../overviewpage.cpp" line="+116"/> + <location filename="../overviewpage.cpp" line="+120"/> <location line="+1"/> <source>out of sync</source> <translation>out of sync</translation> @@ -1186,7 +1525,7 @@ Address: %4 <context> <name>PaymentServer</name> <message> - <location filename="../paymentserver.cpp" line="+392"/> + <location filename="../paymentserver.cpp" line="+397"/> <source>URI handling</source> <translation type="unfinished">URI handling</translation> </message> @@ -1196,23 +1535,29 @@ Address: %4 <translation type="unfinished">URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</translation> </message> <message> - <location line="+69"/> + <location line="+91"/> <source>Requested payment amount of %1 is too small (considered dust).</source> <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> - <location line="+37"/> + <location line="-204"/> + <location line="+195"/> + <location line="+13"/> <source>Payment request error</source> <translation type="unfinished"></translation> </message> <message> - <location line="+1"/> - <source>Insecure requests to custom payment scripts unsupported</source> + <location line="-207"/> + <source>Cannot start bitcoin: click-to-pay handler</source> <translation type="unfinished"></translation> </message> <message> - <location line="+38"/> + <location line="+195"/> + <source>Unverified payment requests to custom payment scripts are unsupported.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+59"/> <source>Refund from %1</source> <translation type="unfinished"></translation> </message> @@ -1222,7 +1567,7 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>Bad response from server %1</source> <translation type="unfinished"></translation> </message> @@ -1232,8 +1577,8 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="-58"/> - <location line="+30"/> + <location line="-55"/> + <location line="+27"/> <location line="+17"/> <source>Network request error</source> <translation type="unfinished"></translation> @@ -1242,9 +1587,8 @@ Address: %4 <context> <name>QObject</name> <message> - <location filename="../bitcoin.cpp" line="+114"/> + <location filename="../bitcoin.cpp" line="+119"/> <location line="+5"/> - <location filename="../intro.cpp" line="-32"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> @@ -1258,16 +1602,11 @@ Address: %4 <source>Error: Invalid combination of -regtest and -testnet.</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../intro.cpp" line="+1"/> - <source>Error: Specified data directory "%1" can not be created.</source> - <translation>Error: Specified data directory "%1" can not be created.</translation> - </message> </context> <context> <name>QRImageWidget</name> <message> - <location filename="../receiverequestdialog.cpp" line="+32"/> + <location filename="../receiverequestdialog.cpp" line="+36"/> <source>&Save Image...</source> <translation type="unfinished"></translation> </message> @@ -1283,8 +1622,8 @@ Address: %4 </message> <message> <location line="+0"/> - <source>PNG Images (*.png)</source> - <translation type="unfinished">PNG Images (*.png)</translation> + <source>PNG Image (*.png)</source> + <translation type="unfinished"></translation> </message> </context> <context> @@ -1304,7 +1643,7 @@ Address: %4 <location line="+53"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+352"/> + <location filename="../rpcconsole.cpp" line="+360"/> <source>N/A</source> <translation>N/A</translation> </message> @@ -1319,7 +1658,12 @@ Address: %4 <translation>&Information</translation> </message> <message> - <location line="+68"/> + <location line="-10"/> + <source>Debug window</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+78"/> <source>Using OpenSSL version</source> <translation>Using OpenSSL version</translation> </message> @@ -1374,12 +1718,7 @@ Address: %4 <translation>Command-line options</translation> </message> <message> - <location line="+7"/> - <source>Show the Bitcoin-Qt help message to get a list with possible Bitcoin command-line options.</source> - <translation>Show the Bitcoin-Qt help message to get a list with possible Bitcoin command-line options.</translation> - </message> - <message> - <location line="+3"/> + <location line="+10"/> <source>&Show</source> <translation>&Show</translation> </message> @@ -1419,12 +1758,7 @@ Address: %4 <translation>Build date</translation> </message> <message> - <location line="-104"/> - <source>Bitcoin - Debug window</source> - <translation>Bitcoin - Debug window</translation> - </message> - <message> - <location line="+25"/> + <location line="-79"/> <source>Bitcoin Core</source> <translation>Bitcoin Core</translation> </message> @@ -1439,7 +1773,12 @@ Address: %4 <translation>Open the Bitcoin debug log file from the current data directory. This can take a few seconds for large log files.</translation> </message> <message> - <location line="+102"/> + <location line="+26"/> + <source>Show the Bitcoin-Core help message to get a list with possible Bitcoin command-line options.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+76"/> <source>Clear console</source> <translation>Clear console</translation> </message> @@ -1497,37 +1836,32 @@ Address: %4 <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+22"/> + <location filename="../forms/receivecoinsdialog.ui" line="+83"/> <source>&Amount:</source> <translation type="unfinished"></translation> </message> <message> - <location line="+16"/> + <location line="+19"/> <source>The amount to request</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> + <location line="-32"/> <source>&Label:</source> <translation type="unfinished">&Label:</translation> </message> <message> - <location line="+10"/> - <source>The label to associate with the receiving address</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> + <location line="-34"/> <source>&Message:</source> <translation type="unfinished"></translation> </message> <message> - <location line="+10"/> + <location line="+20"/> <source>The message to attach to payment request</source> <translation type="unfinished"></translation> </message> <message> - <location line="+14"/> + <location line="-37"/> <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source> <translation type="unfinished"></translation> </message> @@ -1537,12 +1871,17 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> + <location line="+27"/> + <source>The label to associate with the new receiving address</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+14"/> <source>Use this form to request payments. All fields are optional.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+17"/> + <location line="+56"/> <source>Clear all fields of the form.</source> <translation type="unfinished"></translation> </message> @@ -1556,6 +1895,31 @@ Address: %4 <source>&Request payment</source> <translation type="unfinished"></translation> </message> + <message> + <location line="+47"/> + <source>Previously requested payments</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+12"/> + <source>Show the selected request (does the same as double clicking an entry)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Show</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+11"/> + <source>Remove the selected entries from the list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Remove</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -1576,16 +1940,11 @@ Address: %4 </message> <message> <location line="+7"/> - <source>&Copy Image</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> <source>&Save Image...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../receiverequestdialog.cpp" line="+58"/> + <location filename="../receiverequestdialog.cpp" line="+56"/> <source>Request payment to %1</source> <translation type="unfinished"></translation> </message> @@ -1631,16 +1990,119 @@ Address: %4 </message> </context> <context> + <name>RecentRequestsTableModel</name> + <message> + <location filename="../recentrequeststablemodel.cpp" line="+14"/> + <source>Date</source> + <translation type="unfinished">Date</translation> + </message> + <message> + <location line="+0"/> + <source>Label</source> + <translation type="unfinished">Label</translation> + </message> + <message> + <location line="+0"/> + <source>Message</source> + <translation type="unfinished">Message</translation> + </message> + <message> + <location line="+0"/> + <source>Amount</source> + <translation type="unfinished">Amount</translation> + </message> + <message> + <location line="+36"/> + <source>(no label)</source> + <translation type="unfinished">(no label)</translation> + </message> + <message> + <location line="+9"/> + <source>(no message)</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="+14"/> - <location filename="../sendcoinsdialog.cpp" line="+140"/> - <location line="+213"/> + <location filename="../sendcoinsdialog.cpp" line="+381"/> + <location line="+81"/> <source>Send Coins</source> <translation>Send Coins</translation> </message> <message> - <location line="+50"/> + <location line="+76"/> + <source>Coin Control Features</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+20"/> + <source>Inputs...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>automatically selected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+19"/> + <source>Insufficient funds!</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+89"/> + <source>Quantity:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+35"/> + <source>Bytes:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+48"/> + <source>Amount:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+32"/> + <source>Priority:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+48"/> + <source>Fee:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+32"/> + <source>Low Output:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+48"/> + <source>After Fee:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+32"/> + <source>Change:</source> + <translation type="unfinished"></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> + </message> + <message> + <location line="+3"/> + <source>Custom change address</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+115"/> <source>Send to multiple recipients at once</source> <translation>Send to multiple recipients at once</translation> </message> @@ -1665,12 +2127,7 @@ Address: %4 <translation>Balance:</translation> </message> <message> - <location line="+10"/> - <source>123.456 BTC</source> - <translation>123.456 BTC</translation> - </message> - <message> - <location line="+31"/> + <location line="+41"/> <source>Confirm the send action</source> <translation>Confirm the send action</translation> </message> @@ -1680,69 +2137,135 @@ Address: %4 <translation>S&end</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-154"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation>Confirm send coins</translation> </message> <message> - <location line="-90"/> + <location line="-74"/> <location line="+5"/> <location line="+5"/> + <location line="+4"/> <source>%1 to %2</source> <translation type="unfinished"></translation> </message> <message> - <location line="+26"/> + <location line="-136"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation type="unfinished">Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> + <message> + <location line="+15"/> + <source>Copy quantity</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation type="unfinished">Copy amount</translation> + </message> + <message> + <location line="+1"/> + <source>Copy fee</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Copy after fee</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Copy bytes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Copy priority</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Copy low output</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Copy change</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+170"/> + <source>Total Amount %1 (= %2)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>or</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+202"/> <source>The recipient address is not valid, please recheck.</source> <translation>The recipient address is not valid, please recheck.</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>The amount to pay must be larger than 0.</source> <translation>The amount to pay must be larger than 0.</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>The amount exceeds your balance.</source> <translation>The amount exceeds your balance.</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>The total exceeds your balance when the %1 transaction fee is included.</source> <translation>The total exceeds your balance when the %1 transaction fee is included.</translation> </message> <message> - <location line="+5"/> + <location line="+3"/> <source>Duplicate address found, can only send to each address once per send operation.</source> <translation>Duplicate address found, can only send to each address once per send operation.</translation> </message> <message> + <location line="+3"/> + <source>Transaction creation failed!</source> + <translation type="unfinished"></translation> + </message> + <message> <location line="+4"/> - <source>Error: Transaction creation failed!</source> - <translation>Error: Transaction creation failed!</translation> + <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+15"/> - <source>Are you sure you want to send?</source> + <location line="+113"/> + <source>Warning: Invalid Bitcoin address</source> <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> - <source>added as transaction fee</source> + <location line="+13"/> + <source>(no label)</source> + <translation type="unfinished">(no label)</translation> + </message> + <message> + <location line="+8"/> + <source>Warning: Unknown change address</source> <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> - <source>Total Amount %1</source> + <location line="-378"/> + <source>Are you sure you want to send?</source> <translation type="unfinished"></translation> </message> <message> - <location line="+20"/> - <source>Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> - <translation>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> + <location line="+9"/> + <source>added as transaction fee</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+144"/> + <location line="+170"/> <source>Payment request expired</source> <translation type="unfinished"></translation> </message> @@ -1755,39 +2278,44 @@ Address: %4 <context> <name>SendCoinsEntry</name> <message> - <location filename="../forms/sendcoinsentry.ui" line="+33"/> - <location line="+585"/> + <location filename="../forms/sendcoinsentry.ui" line="+131"/> + <location line="+501"/> + <location line="+536"/> <source>A&mount:</source> <translation>A&mount:</translation> </message> <message> - <location line="-572"/> - <location line="+585"/> + <location line="-1132"/> <source>Pay &To:</source> <translation>Pay &To:</translation> </message> <message> - <location line="-551"/> + <location line="+18"/> <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location filename="../sendcoinsentry.cpp" line="+28"/> + <location filename="../sendcoinsentry.cpp" line="+30"/> <source>Enter a label for this address to add it to your address book</source> <translation>Enter a label for this address to add it to your address book</translation> </message> <message> - <location filename="../forms/sendcoinsentry.ui" line="-18"/> + <location filename="../forms/sendcoinsentry.ui" line="+57"/> <source>&Label:</source> <translation>&Label:</translation> </message> <message> - <location line="+28"/> + <location line="-50"/> <source>Choose previously used address</source> <translation type="unfinished"></translation> </message> <message> - <location line="+10"/> + <location line="-40"/> + <source>This is a normal payment.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+50"/> <source>Alt+A</source> <translation>Alt+A</translation> </message> @@ -1803,16 +2331,35 @@ Address: %4 </message> <message> <location line="+7"/> - <source>Remove this recipient</source> - <translation>Remove this recipient</translation> + <location line="+504"/> + <location line="+536"/> + <source>Remove this entry</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+16"/> + <location line="-40"/> + <source>This is a verified payment request.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-971"/> <source>Enter a label for this address to add it to the list of used addresses</source> <translation type="unfinished"></translation> </message> <message> - <location line="+465"/> + <location line="+439"/> + <source>This is an unverified payment request.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+18"/> + <location line="+532"/> + <source>Pay To:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-498"/> + <location line="+536"/> <source>Memo:</source> <translation type="unfinished"></translation> </message> @@ -1933,7 +2480,7 @@ Address: %4 <translation>Reset all verify message fields</translation> </message> <message> - <location filename="../signverifymessagedialog.cpp" line="+27"/> + <location filename="../signverifymessagedialog.cpp" line="+29"/> <location line="+3"/> <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> @@ -1949,7 +2496,7 @@ Address: %4 <translation>Enter Bitcoin signature</translation> </message> <message> - <location line="+85"/> + <location line="+84"/> <location line="+81"/> <source>The entered address is invalid.</source> <translation>The entered address is invalid.</translation> @@ -2018,9 +2565,14 @@ Address: %4 <context> <name>SplashScreen</name> <message> - <location filename="../splashscreen.cpp" line="+23"/> - <source>The Bitcoin developers</source> - <translation>The Bitcoin developers</translation> + <location filename="../splashscreen.cpp" line="+26"/> + <source>Bitcoin Core</source> + <translation type="unfinished">Bitcoin Core</translation> + </message> + <message> + <location line="+2"/> + <source>The Bitcoin Core developers</source> + <translation type="unfinished"></translation> </message> <message> <location line="+1"/> @@ -2031,7 +2583,7 @@ Address: %4 <context> <name>TrafficGraphWidget</name> <message> - <location filename="../trafficgraphwidget.cpp" line="+75"/> + <location filename="../trafficgraphwidget.cpp" line="+79"/> <source>KB/s</source> <translation type="unfinished"></translation> </message> @@ -2039,7 +2591,7 @@ Address: %4 <context> <name>TransactionDesc</name> <message> - <location filename="../transactiondesc.cpp" line="+22"/> + <location filename="../transactiondesc.cpp" line="+28"/> <source>Open until %1</source> <translation>Open until %1</translation> </message> @@ -2240,7 +2792,7 @@ Address: %4 <context> <name>TransactionTableModel</name> <message> - <location filename="../transactiontablemodel.cpp" line="+227"/> + <location filename="../transactiontablemodel.cpp" line="+234"/> <source>Date</source> <translation>Date</translation> </message> @@ -2364,7 +2916,7 @@ Address: %4 <context> <name>TransactionView</name> <message> - <location filename="../transactionview.cpp" line="+52"/> + <location filename="../transactionview.cpp" line="+57"/> <location line="+16"/> <source>All</source> <translation>All</translation> @@ -2425,12 +2977,12 @@ Address: %4 <translation>Other</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>Enter address or label to search</source> <translation>Enter address or label to search</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>Min amount</source> <translation>Min amount</translation> </message> @@ -2465,17 +3017,37 @@ Address: %4 <translation>Show transaction details</translation> </message> <message> - <location line="+143"/> - <source>Export Transaction Data</source> - <translation>Export Transaction Data</translation> + <location line="+142"/> + <source>Export Transaction History</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+1"/> + <location line="+19"/> + <source>Exporting Failed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+0"/> + <source>There was an error trying to save the transaction history to %1.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>Exporting Successful</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+0"/> + <source>The transaction history was successfully saved to %1.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-22"/> <source>Comma separated file (*.csv)</source> <translation>Comma separated file (*.csv)</translation> </message> <message> - <location line="+8"/> + <location line="+9"/> <source>Confirmed</source> <translation>Confirmed</translation> </message> @@ -2510,17 +3082,7 @@ Address: %4 <translation>ID</translation> </message> <message> - <location line="+4"/> - <source>Error exporting</source> - <translation>Error exporting</translation> - </message> - <message> - <location line="+0"/> - <source>Could not write to file %1.</source> - <translation>Could not write to file %1.</translation> - </message> - <message> - <location line="+100"/> + <location line="+107"/> <source>Range:</source> <translation>Range:</translation> </message> @@ -2531,9 +3093,17 @@ Address: %4 </message> </context> <context> + <name>WalletFrame</name> + <message> + <location filename="../walletframe.cpp" line="+26"/> + <source>No wallet has been loaded.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>WalletModel</name> <message> - <location filename="../walletmodel.cpp" line="+218"/> + <location filename="../walletmodel.cpp" line="+245"/> <source>Send Coins</source> <translation>Send Coins</translation> </message> @@ -2541,7 +3111,7 @@ Address: %4 <context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+46"/> + <location filename="../walletview.cpp" line="+43"/> <source>&Export</source> <translation>&Export</translation> </message> @@ -2551,65 +3121,60 @@ Address: %4 <translation>Export the data in the current tab to a file</translation> </message> <message> - <location line="+183"/> + <location line="+181"/> <source>Backup Wallet</source> <translation>Backup Wallet</translation> </message> <message> - <location line="+0"/> + <location line="+1"/> <source>Wallet Data (*.dat)</source> <translation>Wallet Data (*.dat)</translation> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Backup Failed</source> <translation>Backup Failed</translation> </message> <message> <location line="+0"/> - <source>There was an error trying to save the wallet data to the new location.</source> - <translation>There was an error trying to save the wallet data to the new location.</translation> + <source>There was an error trying to save the wallet data to %1.</source> + <translation type="unfinished"></translation> </message> <message> <location line="+4"/> - <source>Backup Successful</source> - <translation>Backup Successful</translation> + <source>The wallet data was successfully saved to %1.</source> + <translation type="unfinished"></translation> </message> <message> <location line="+0"/> - <source>The wallet data was successfully saved to the new location.</source> - <translation>The wallet data was successfully saved to the new location.</translation> + <source>Backup Successful</source> + <translation>Backup Successful</translation> </message> </context> <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+102"/> - <source>Bitcoin version</source> - <translation>Bitcoin version</translation> - </message> - <message> - <location line="+107"/> + <location filename="../bitcoinstrings.cpp" line="+217"/> <source>Usage:</source> <translation>Usage:</translation> </message> <message> - <location line="-55"/> + <location line="-54"/> <source>List commands</source> <translation>List commands</translation> </message> <message> - <location line="-13"/> + <location line="-14"/> <source>Get help for a command</source> <translation>Get help for a command</translation> </message> <message> - <location line="+25"/> + <location line="+26"/> <source>Options:</source> <translation>Options:</translation> </message> <message> - <location line="+24"/> + <location line="+23"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Specify configuration file (default: bitcoin.conf)</translation> </message> @@ -2629,7 +3194,7 @@ Address: %4 <translation>Set database cache size in megabytes (default: 25)</translation> </message> <message> - <location line="-28"/> + <location line="-27"/> <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> @@ -2639,7 +3204,7 @@ Address: %4 <translation>Maintain at most <n> connections to peers (default: 125)</translation> </message> <message> - <location line="-49"/> + <location line="-50"/> <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> @@ -2654,7 +3219,7 @@ Address: %4 <translation>Threshold for disconnecting misbehaving peers (default: 100)</translation> </message> <message> - <location line="-142"/> + <location line="-147"/> <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> @@ -2669,7 +3234,7 @@ Address: %4 <translation>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</translation> </message> <message> - <location line="+40"/> + <location line="+45"/> <source>Accept command line and JSON-RPC commands</source> <translation>Accept command line and JSON-RPC commands</translation> </message> @@ -2679,17 +3244,17 @@ Address: %4 <translation>Run in the background as a daemon and accept commands</translation> </message> <message> - <location line="+40"/> + <location line="+39"/> <source>Use the test network</source> <translation>Use the test network</translation> </message> <message> - <location line="-118"/> + <location line="-117"/> <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="-87"/> + <location line="-92"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2754,17 +3319,17 @@ 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="+11"/> - <source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source> - <translation>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</translation> - </message> - <message> - <location line="+6"/> + <location line="+18"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation>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"/> + <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source> + <translation type="unfinished"></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>Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</translation> </message> @@ -2794,17 +3359,27 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>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.</translation> </message> <message> - <location line="+14"/> + <location line="+9"/> + <source><category> can be:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> <source>Attempt to recover private keys from a corrupt wallet.dat</source> <translation>Attempt to recover private keys from a corrupt wallet.dat</translation> </message> <message> <location line="+1"/> + <source>Bitcoin Core Daemon</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> <source>Bitcoin RPC client version</source> <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> + <location line="+1"/> <source>Block creation options:</source> <translation>Block creation options:</translation> </message> @@ -2814,7 +3389,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Connect only to the specified node(s)</translation> </message> <message> - <location line="+2"/> + <location line="+1"/> + <source>Connect through SOCKS proxy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> <source>Connect to JSON-RPC on <port> (default: 8332 or testnet: 18332)</source> <translation type="unfinished"></translation> </message> @@ -2924,7 +3504,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Failed to write undo data</translation> </message> <message> - <location line="+2"/> + <location line="+1"/> + <source>Fee per kB to add to transactions you send</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> @@ -2944,6 +3529,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <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> + <message> <location line="+2"/> <source>Incorrect or no genesis block found. Wrong datadir for network?</source> <translation>Incorrect or no genesis block found. Wrong datadir for network?</translation> @@ -2959,17 +3549,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Not enough file descriptors available.</translation> </message> <message> - <location line="+8"/> + <location line="+5"/> + <source>Prepend debug output with timestamp (default: 1)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>RPC client options:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> <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="+6"/> + <location line="+5"/> + <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> <translation type="unfinished"></translation> </message> <message> - <location line="+10"/> + <location line="+8"/> + <source>Set maximum block size in bytes (default: %d)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> <source>Set the number of threads to service RPC calls (default: 4)</source> <translation>Set the number of threads to service RPC calls (default: 4)</translation> </message> @@ -2989,7 +3599,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"></translation> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>Verifying blocks...</source> <translation>Verifying blocks...</translation> </message> @@ -3000,11 +3610,21 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> + <source>Wait for RPC server to start</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> <source>Wallet %s resides outside data directory %s</source> <translation>Wallet %s resides outside data directory %s</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> + <source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> <source>You need to rebuild the database using -reindex to change -txindex</source> <translation>You need to rebuild the database using -reindex to change -txindex</translation> </message> @@ -3014,17 +3634,27 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Imports blocks from external blk000??.dat file</translation> </message> <message> - <location line="-98"/> + <location line="-104"/> <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="+17"/> + <location line="+14"/> + <source>Output debugging information (default: 0, supplying <category> is optional)</source> + <translation type="unfinished"></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> + </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="+83"/> + <location line="+88"/> <source>Information</source> <translation>Information</translation> </message> @@ -3064,32 +3694,12 @@ 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="+2"/> - <source>Output extra debugging information. Implies all other -debug* options</source> - <translation>Output extra debugging information. Implies all other -debug* options</translation> - </message> - <message> - <location line="+1"/> - <source>Output extra network debugging information</source> - <translation>Output extra network debugging information</translation> - </message> - <message> - <location line="+2"/> - <source>Prepend debug output with timestamp</source> - <translation>Prepend debug output with timestamp</translation> - </message> - <message> - <location line="+5"/> + <location line="+9"/> <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="+1"/> - <source>Select the version of socks proxy to use (4-5, default: 5)</source> - <translation>Select the version of socks proxy to use (4-5, default: 5)</translation> - </message> - <message> - <location line="+3"/> + <location line="+4"/> <source>Send trace/debug info to console instead of debug.log file</source> <translation>Send trace/debug info to console instead of debug.log file</translation> </message> @@ -3099,12 +3709,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Send trace/debug info to debugger</translation> </message> <message> - <location line="+5"/> - <source>Set maximum block size in bytes (default: 250000)</source> - <translation>Set maximum block size in bytes (default: 250000)</translation> - </message> - <message> - <location line="+1"/> + <location line="+6"/> <source>Set minimum block size in bytes (default: 0)</source> <translation>Set minimum block size in bytes (default: 0)</translation> </message> @@ -3154,37 +3759,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Use UPnP to map the listening port (default: 1 when listening)</translation> </message> <message> - <location line="+1"/> - <source>Use proxy to reach tor hidden services (default: same as -proxy)</source> - <translation>Use proxy to reach tor hidden services (default: same as -proxy)</translation> - </message> - <message> <location line="+2"/> <source>Username for JSON-RPC connections</source> <translation>Username for JSON-RPC connections</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Warning</source> <translation>Warning</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Warning: This version is obsolete, upgrade required!</source> <translation>Warning: This version is obsolete, upgrade required!</translation> </message> <message> <location line="+2"/> + <source>version</source> + <translation type="unfinished">version</translation> + </message> + <message> + <location line="+1"/> <source>wallet.dat corrupt, salvage failed</source> <translation>wallet.dat corrupt, salvage failed</translation> </message> <message> - <location line="-54"/> + <location line="-57"/> <source>Password for JSON-RPC connections</source> <translation>Password for JSON-RPC connections</translation> </message> <message> - <location line="-70"/> + <location line="-69"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Allow JSON-RPC connections from specified IP address</translation> </message> @@ -3194,12 +3799,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Send commands to node running on <ip> (default: 127.0.0.1)</translation> </message> <message> - <location line="-126"/> + <location line="-131"/> <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="+155"/> + <location line="+160"/> <source>Upgrade wallet to latest format</source> <translation>Upgrade wallet to latest format</translation> </message> @@ -3239,22 +3844,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="-95"/> - <source>Connect through socks proxy</source> - <translation>Connect through socks proxy</translation> - </message> - <message> - <location line="-11"/> + <location line="-106"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>Allow DNS lookups for -addnode, -seednode and -connect</translation> </message> <message> - <location line="+58"/> + <location line="+59"/> <source>Loading addresses...</source> <translation>Loading addresses...</translation> </message> <message> - <location line="-36"/> + <location line="-37"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>Error loading wallet.dat: Wallet corrupted</translation> </message> @@ -3274,12 +3874,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Error loading wallet.dat</translation> </message> <message> - <location line="+30"/> + <location line="+31"/> <source>Invalid -proxy address: '%s'</source> <translation>Invalid -proxy address: '%s'</translation> </message> <message> - <location line="+57"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Unknown network specified in -onlynet: '%s'</translation> </message> @@ -3299,7 +3899,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Cannot resolve -externalip address: '%s'</translation> </message> <message> - <location line="+46"/> + <location line="+47"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>Invalid amount for -paytxfee=<amount>: '%s'</translation> </message> @@ -3319,27 +3919,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Loading block index...</translation> </message> <message> - <location line="-60"/> + <location line="-61"/> <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="-28"/> + <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="+69"/> - <source>Fee per KB to add to transactions you send</source> - <translation>Fee per KB to add to transactions you send</translation> - </message> - <message> - <location line="+20"/> + <location line="+94"/> <source>Loading wallet...</source> <translation>Loading wallet...</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>Cannot downgrade wallet</source> <translation>Cannot downgrade wallet</translation> </message> @@ -3369,7 +3964,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Error</translation> </message> <message> - <location line="-33"/> + <location line="-34"/> <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 66e6049f3d..d5afe854b0 100644 --- a/src/qt/locale/bitcoin_es.ts +++ b/src/qt/locale/bitcoin_es.ts @@ -3,13 +3,13 @@ <name>AboutDialog</name> <message> <location filename="../forms/aboutdialog.ui" line="+14"/> - <source>About Bitcoin</source> - <translation>Acerca de Bitcoin</translation> + <source>About Bitcoin Core</source> + <translation>Acerca del Núcleo de Bitcoin</translation> </message> <message> <location line="+39"/> - <source><b>Bitcoin</b> version</source> - <translation>Versión de <b>Bitcoin</b></translation> + <source><b>Bitcoin Core</b> version</source> + <translation>Versión del <b>Núcleo de Bitcoin<b></translation> </message> <message> <location line="+57"/> @@ -30,7 +30,7 @@ el OpenSSL Toolkit (http://www.openssl.org/) y software criptográfico escrito p Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="+14"/> + <location filename="../aboutdialog.cpp" line="+19"/> <source>Copyright</source> <translation>Copyright</translation> </message> @@ -73,7 +73,7 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <translation>&Cerrar</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="+72"/> + <location filename="../addressbookpage.cpp" line="+74"/> <source>&Copy Address</source> <translation>&Copiar dirección</translation> </message> @@ -143,7 +143,7 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <translation>&Editar</translation> </message> <message> - <location line="+197"/> + <location line="+194"/> <source>Export Address List</source> <translation>Exportar la lista de direcciones </translation> </message> @@ -166,7 +166,7 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <context> <name>AddressTableModel</name> <message> - <location filename="../addresstablemodel.cpp" line="+164"/> + <location filename="../addresstablemodel.cpp" line="+168"/> <source>Label</source> <translation>Etiqueta</translation> </message> @@ -204,7 +204,7 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <translation>Repita la nueva contraseña</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="+34"/> + <location filename="../askpassphrasedialog.cpp" line="+40"/> <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>10 or more random characters</b>, or <b>eight or more words</b>.</source> <translation>Introduzca la nueva contraseña del monedero.<br/>Por favor elija una con <b>10 o más caracteres aleatorios</b>, u <b>ocho o más palabras</b>.</translation> </message> @@ -325,17 +325,17 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+250"/> + <location filename="../bitcoingui.cpp" line="+260"/> <source>Sign &message...</source> <translation>Firmar &mensaje...</translation> </message> <message> - <location line="+254"/> + <location line="+290"/> <source>Synchronizing with network...</source> <translation>Sincronizando con la red…</translation> </message> <message> - <location line="-324"/> + <location line="-360"/> <source>&Overview</source> <translation>&Vista general</translation> </message> @@ -401,7 +401,7 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <translation>&Cambiar la contraseña…</translation> </message> <message> - <location line="+259"/> + <location line="+295"/> <source>Importing blocks from disk...</source> <translation>Importando bloques de disco...</translation> </message> @@ -411,7 +411,7 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <translation>Reindexando bloques en disco...</translation> </message> <message> - <location line="-322"/> + <location line="-358"/> <source>Send coins to a Bitcoin address</source> <translation>Enviar monedas a una dirección Bitcoin</translation> </message> @@ -446,20 +446,18 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <translation>&Verificar mensaje...</translation> </message> <message> - <location line="-180"/> - <location line="+6"/> - <location line="+513"/> + <location line="+375"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-519"/> - <location line="+6"/> + <location line="-563"/> + <location line="+10"/> <source>Wallet</source> <translation>Monedero</translation> </message> <message> - <location line="+109"/> + <location line="+113"/> <source>&Send</source> <translation>&Enviar</translation> </message> @@ -469,13 +467,7 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <translation>&Recibir</translation> </message> <message> - <location line="+28"/> - <location line="+2"/> - <source>&About Bitcoin</source> - <translation>&Acerca de Bitcoin</translation> - </message> - <message> - <location line="+14"/> + <location line="+44"/> <location line="+2"/> <source>&Show / Hide</source> <translation>Mo&strar/ocultar</translation> @@ -501,12 +493,12 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <translation>Verificar mensajes comprobando que están firmados con direcciones Bitcoin concretas</translation> </message> <message> - <location line="+35"/> + <location line="+39"/> <source>&File</source> <translation>&Archivo</translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>&Settings</source> <translation>&Configuración</translation> </message> @@ -521,18 +513,30 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <translation>Barra de pestañas</translation> </message> <message> - <location line="-235"/> - <location line="+294"/> + <location line="-244"/> + <location line="+321"/> <source>[testnet]</source> <translation>[testnet]</translation> </message> <message> - <location line="-177"/> + <location line="-331"/> + <location line="+10"/> + <source>Bitcoin Core</source> + <translation>Núcleo de Bitcoin</translation> + </message> + <message> + <location line="+121"/> <source>Request payments (generates QR codes and bitcoin: URIs)</source> <translation>Solicitar pagos (genera codigo QR y URL's de Bitcoin)</translation> </message> <message> - <location line="+63"/> + <location line="+27"/> + <location line="+2"/> + <source>&About Bitcoin Core</source> + <translation>&Acerca del Núcleo de Bitcoin</translation> + </message> + <message> + <location line="+34"/> <source>&Used sending addresses...</source> <translation>Direcciones para enviar &usadas...</translation> </message> @@ -552,13 +556,23 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <translation>Muestra la lista de direcciones de recepción y etiquetas</translation> </message> <message> - <location line="+106"/> + <location line="+2"/> + <source>Open URI...</source> + <translation>Abrir URI...</translation> + </message> + <message> + <location line="+1"/> + <source>Open a bitcoin: URI or payment request</source> + <translation>Abrir un bitcoin: URI o petición de pago</translation> + </message> + <message> + <location line="+126"/> <location line="+5"/> <source>Bitcoin client</source> <translation>Cliente Bitcoin</translation> </message> <message numerus="yes"> - <location line="+120"/> + <location line="+133"/> <source>%n active connection(s) to Bitcoin network</source> <translation><numerusform>%n conexión activa hacia la red Bitcoin</numerusform><numerusform>%n conexiones activas hacia la red Bitcoin</numerusform></translation> </message> @@ -666,17 +680,7 @@ Dirección: %4 </translation> </message> <message> - <location line="+34"/> - <source>URI handling</source> - <translation>Gestión de URI</translation> - </message> - <message> - <location line="+0"/> - <source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source> - <translation>¡No se puede interpretar la URI! Esto puede deberse a una dirección Bitcoin inválida o a parámetros de URI mal formados.</translation> - </message> - <message> - <location line="+45"/> + <location line="+67"/> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>El monedero está <b>cifrado</b> y actualmente <b>desbloqueado</b></translation> </message> @@ -686,7 +690,7 @@ Dirección: %4 <translation>El monedero está <b>cifrado</b> y actualmente <b>bloqueado</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+110"/> + <location filename="../bitcoin.cpp" line="+116"/> <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> @@ -694,12 +698,299 @@ Dirección: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+115"/> + <location filename="../clientmodel.cpp" line="+119"/> <source>Network Alert</source> <translation>Alerta de red</translation> </message> </context> <context> + <name>CoinControlDialog</name> + <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> + </message> + <message> + <location line="+34"/> + <source>Quantity:</source> + <translation>Cantidad:</translation> + </message> + <message> + <location line="+29"/> + <source>Bytes:</source> + <translation>Bytes:</translation> + </message> + <message> + <location line="+45"/> + <source>Amount:</source> + <translation>Cuantía:</translation> + </message> + <message> + <location line="+29"/> + <source>Priority:</source> + <translation>Prioridad:</translation> + </message> + <message> + <location line="+45"/> + <source>Fee:</source> + <translation>Tasa:</translation> + </message> + <message> + <location line="+32"/> + <source>Low Output:</source> + <translation>Envío pequeño:</translation> + </message> + <message> + <location line="+48"/> + <source>After Fee:</source> + <translation>Después de tasas:</translation> + </message> + <message> + <location line="+32"/> + <source>Change:</source> + <translation>Cambio:</translation> + </message> + <message> + <location line="+63"/> + <source>(un)select all</source> + <translation>(des)selecciona todos</translation> + </message> + <message> + <location line="+13"/> + <source>Tree mode</source> + <translation>Modo arbol</translation> + </message> + <message> + <location line="+16"/> + <source>List mode</source> + <translation>Modo lista</translation> + </message> + <message> + <location line="+52"/> + <source>Amount</source> + <translation>Cantidad</translation> + </message> + <message> + <location line="+10"/> + <source>Address</source> + <translation>Dirección</translation> + </message> + <message> + <location line="+5"/> + <source>Date</source> + <translation>Fecha</translation> + </message> + <message> + <location line="+5"/> + <source>Confirmations</source> + <translation>Confirmaciones</translation> + </message> + <message> + <location line="+3"/> + <source>Confirmed</source> + <translation>Confirmado</translation> + </message> + <message> + <location line="+5"/> + <source>Priority</source> + <translation>Prioridad</translation> + </message> + <message> + <location filename="../coincontroldialog.cpp" line="+42"/> + <source>Copy address</source> + <translation>Copiar dirección</translation> + </message> + <message> + <location line="+1"/> + <source>Copy label</source> + <translation>Copiar etiqueta</translation> + </message> + <message> + <location line="+1"/> + <location line="+26"/> + <source>Copy amount</source> + <translation>Copiar cuantía</translation> + </message> + <message> + <location line="-25"/> + <source>Copy transaction ID</source> + <translation>Copiar identificador de transacción</translation> + </message> + <message> + <location line="+1"/> + <source>Lock unspent</source> + <translation>Bloquear lo no gastado</translation> + </message> + <message> + <location line="+1"/> + <source>Unlock unspent</source> + <translation>Desbloquear lo no gastado</translation> + </message> + <message> + <location line="+22"/> + <source>Copy quantity</source> + <translation>Copiar cantidad</translation> + </message> + <message> + <location line="+2"/> + <source>Copy fee</source> + <translation>Copiar donación</translation> + </message> + <message> + <location line="+1"/> + <source>Copy after fee</source> + <translation>Copiar después de aplicar donación</translation> + </message> + <message> + <location line="+1"/> + <source>Copy bytes</source> + <translation>Copiar bytes</translation> + </message> + <message> + <location line="+1"/> + <source>Copy priority</source> + <translation>Copiar prioridad</translation> + </message> + <message> + <location line="+1"/> + <source>Copy low output</source> + <translation>Copiar envío pequeño</translation> + </message> + <message> + <location line="+1"/> + <source>Copy change</source> + <translation>Copiar cambio</translation> + </message> + <message> + <location line="+323"/> + <source>highest</source> + <translation>lo más alto</translation> + </message> + <message> + <location line="+1"/> + <source>higher</source> + <translation>más alto</translation> + </message> + <message> + <location line="+1"/> + <source>high</source> + <translation>alto</translation> + </message> + <message> + <location line="+1"/> + <source>medium-high</source> + <translation>medio-alto</translation> + </message> + <message> + <location line="+1"/> + <source>medium</source> + <translation>medio</translation> + </message> + <message> + <location line="+4"/> + <source>low-medium</source> + <translation>bajo-medio</translation> + </message> + <message> + <location line="+1"/> + <source>low</source> + <translation>bajo</translation> + </message> + <message> + <location line="+1"/> + <source>lower</source> + <translation>más bajo</translation> + </message> + <message> + <location line="+1"/> + <source>lowest</source> + <translation>lo más bajo</translation> + </message> + <message> + <location line="+11"/> + <source>(%1 locked)</source> + <translation>(%1 bloqueado)</translation> + </message> + <message> + <location line="+171"/> + <source>Dust</source> + <translation>Basura</translation> + </message> + <message> + <location line="+0"/> + <source>yes</source> + <translation>si</translation> + </message> + <message> + <location line="+0"/> + <source>no</source> + <translation>no</translation> + </message> + <message> + <location line="+10"/> + <source>This label turns red, if the transaction size is greater than 1000 bytes.</source> + <translation>Esta etiqueta se torna roja si el tamaño de la transación es mayor a 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>Esto implica que se requiere una tarifa de al menos %1 por kB</translation> + </message> + <message> + <location line="-4"/> + <source>Can vary +/- 1 byte per input.</source> + <translation>Puede 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>Las transacciones con alta prioridad son más propensas a ser incluidas dentro de un bloque.</translation> + </message> + <message> + <location line="+1"/> + <source>This label turns red, if the priority is smaller than "medium"</source> + <translation>Esta etiqueta se torna roja si la prioridad es menor a "media"</translation> + </message> + <message> + <location line="+3"/> + <source>This label turns red, if any recipient receives an amount smaller than %1.</source> + <translation>Esta etiqueta se torna roja si cualquier destinatario recibe una cantidad menor a %1.</translation> + </message> + <message> + <location line="+1"/> + <location line="+4"/> + <source>This means a fee of at least %1 is required.</source> + <translation>Esto significa que se necesita una tarifa de al menos %1.</translation> + </message> + <message> + <location line="-3"/> + <source>Amounts below 0.546 times the minimum relay fee are shown as dust.</source> + <translation>Cantidades por debajo de 0.546 veces la tasa serán mostradas como basura</translation> + </message> + <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> + </message> + <message> + <location line="+43"/> + <location line="+66"/> + <source>(no label)</source> + <translation>(sin etiqueta)</translation> + </message> + <message> + <location line="-9"/> + <source>change from %1 (%2)</source> + <translation>Enviar desde %1 (%2)</translation> + </message> + <message> + <location line="+1"/> + <source>(change)</source> + <translation>(cambio)</translation> + </message> +</context> +<context> <name>EditAddressDialog</name> <message> <location filename="../forms/editaddressdialog.ui" line="+14"/> @@ -727,7 +1018,7 @@ Dirección: %4 <translation>&Dirección</translation> </message> <message> - <location filename="../editaddressdialog.cpp" line="+21"/> + <location filename="../editaddressdialog.cpp" line="+25"/> <source>New receiving address</source> <translation>Nueva dirección de recepción</translation> </message> @@ -770,7 +1061,7 @@ Dirección: %4 <context> <name>FreespaceChecker</name> <message> - <location filename="../intro.cpp" line="+61"/> + <location filename="../intro.cpp" line="+65"/> <source>A new data directory will be created.</source> <translation>Se creará un nuevo directorio de datos.</translation> </message> @@ -798,18 +1089,18 @@ Dirección: %4 <context> <name>GUIUtil::HelpMessageBox</name> <message> - <location filename="../guiutil.cpp" line="+558"/> - <location line="+13"/> - <source>Bitcoin-Qt</source> - <translation>Bitcoin-Qt</translation> - </message> - <message> - <location line="-13"/> + <location filename="../guiutil.cpp" line="+597"/> <source>version</source> <translation>versión</translation> </message> <message> - <location line="+2"/> + <location line="+0"/> + <location line="+13"/> + <source>Bitcoin Core</source> + <translation>Núcleo de Bitcoin</translation> + </message> + <message> + <location line="-11"/> <source>Usage:</source> <translation>Uso:</translation> </message> @@ -853,17 +1144,17 @@ Dirección: %4 </message> <message> <location line="+9"/> - <source>Welcome to Bitcoin-Qt.</source> - <translation>Bienvenido a Bitcoin-Qt.</translation> + <source>Welcome to Bitcoin Core.</source> + <translation>Bienvenido al Núcleo de Bitcoin</translation> </message> <message> <location line="+26"/> - <source>As this is the first time the program is launched, you can choose where Bitcoin-Qt will store its data.</source> + <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source> <translation>Al ser la primera vez que se ejecuta el programa, puede elegir dónde almacenará sus datos Bitcoin-Qt.</translation> </message> <message> <location line="+10"/> - <source>Bitcoin-Qt will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source> + <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-Qt va a descargar y guardar una copia de la cadena de bloques de Bitcoin. Se almacenará al menos %1GB de datos en este directorio, que irá creciendo con el tiempo. El monedero se guardará también en este directorio.</translation> </message> <message> @@ -877,7 +1168,17 @@ Dirección: %4 <translation>Utilice un directorio de datos personalizado:</translation> </message> <message> - <location filename="../intro.cpp" line="+105"/> + <location filename="../intro.cpp" line="+85"/> + <source>Bitcoin</source> + <translation>Bitcoin</translation> + </message> + <message> + <location line="+1"/> + <source>Error: Specified data directory "%1" can not be created.</source> + <translation>Error: No puede crearse el directorio de datos especificado "%1".</translation> + </message> + <message> + <location line="+19"/> <source>Error</source> <translation>Error</translation> </message> @@ -893,6 +1194,34 @@ Dirección: %4 </message> </context> <context> + <name>OpenURIDialog</name> + <message> + <location filename="../forms/openuridialog.ui" line="+14"/> + <source>Open URI</source> + <translation>Abrir URI...</translation> + </message> + <message> + <location line="+6"/> + <source>Open payment request from URI or file</source> + <translation>El pago requiere una URI o archivo</translation> + </message> + <message> + <location line="+9"/> + <source>URI:</source> + <translation>URI:</translation> + </message> + <message> + <location line="+11"/> + <source>Select payment request file</source> + <translation>Seleccione archivo de sulicitud de pago</translation> + </message> + <message> + <location filename="../openuridialog.cpp" line="+47"/> + <source>Select payment request file to open</source> + <translation>Abrir archivo de solicitud de pago</translation> + </message> +</context> +<context> <name>OptionsDialog</name> <message> <location filename="../forms/optionsdialog.ui" line="+14"/> @@ -1007,7 +1336,7 @@ Dirección: %4 <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>Minimizar en lugar de salir de la aplicación al cerrar la ventana.Cuando esta opción está activa, la aplicación solo se puede cerrar seleccionando Salir desde el menú.</translation> + <translation>Minimizar en lugar de salir de la aplicación al cerrar la ventana. Cuando esta opción está activa, la aplicación solo se puede cerrar seleccionando Salir desde el menú.</translation> </message> <message> <location line="+3"/> @@ -1050,6 +1379,16 @@ Dirección: %4 <translation>&Mostrar las direcciones en la lista de transacciones</translation> </message> <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> + </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="+71"/> <source>&OK</source> <translation>&Aceptar</translation> @@ -1065,12 +1404,12 @@ Dirección: %4 <translation>&Aplicar</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+58"/> + <location filename="../optionsdialog.cpp" line="+63"/> <source>default</source> <translation>predeterminado</translation> </message> <message> - <location line="+130"/> + <location line="+131"/> <source>Confirm options reset</source> <translation>Confirme el restablecimiento de las opciones</translation> </message> @@ -1111,17 +1450,17 @@ Dirección: %4 </message> <message> <location line="+50"/> - <location line="+202"/> + <location line="+214"/> <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source> - <translation>La información mostrada puede estar desactualizada. Su monedero se sincroniza automáticamente con la red Bitcoin después de que se haya establecido una conexión , pero este proceso aún no se ha completado.</translation> + <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="-131"/> + <location line="-140"/> <source>Unconfirmed:</source> <translation>No confirmado(s):</translation> </message> <message> - <location line="-78"/> + <location line="-81"/> <source>Wallet</source> <translation>Monedero</translation> </message> @@ -1136,12 +1475,12 @@ Dirección: %4 <translation>Su balance actual gastable</translation> </message> <message> - <location line="+29"/> + <location line="+32"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation>Total de transacciones que deben ser confirmadas, y que no cuentan con el balance gastable necesario</translation> </message> <message> - <location line="+13"/> + <location line="+16"/> <source>Immature:</source> <translation>No disponible:</translation> </message> @@ -1151,7 +1490,7 @@ Dirección: %4 <translation>Saldo recién minado que aún no está disponible.</translation> </message> <message> - <location line="+13"/> + <location line="+16"/> <source>Total:</source> <translation>Total:</translation> </message> @@ -1161,12 +1500,12 @@ Dirección: %4 <translation>Su balance actual total</translation> </message> <message> - <location line="+53"/> + <location line="+56"/> <source><b>Recent transactions</b></source> <translation><b>Movimientos recientes</b></translation> </message> <message> - <location filename="../overviewpage.cpp" line="+116"/> + <location filename="../overviewpage.cpp" line="+120"/> <location line="+1"/> <source>out of sync</source> <translation>desincronizado</translation> @@ -1175,7 +1514,7 @@ Dirección: %4 <context> <name>PaymentServer</name> <message> - <location filename="../paymentserver.cpp" line="+392"/> + <location filename="../paymentserver.cpp" line="+397"/> <source>URI handling</source> <translation>Gestión de URI</translation> </message> @@ -1185,23 +1524,29 @@ Dirección: %4 <translation>¡No se puede interpretar la URI! Esto puede deberse a una dirección Bitcoin inválida o a parámetros de URI mal formados.</translation> </message> <message> - <location line="+69"/> + <location line="+91"/> <source>Requested payment amount of %1 is too small (considered dust).</source> <translation>La cantidad del pago solicitado (%1) es demasiado pequeña (considerada polvo).</translation> </message> <message> - <location line="+4"/> - <location line="+37"/> + <location line="-204"/> + <location line="+195"/> + <location line="+13"/> <source>Payment request error</source> <translation>Error en petición de pago</translation> </message> <message> - <location line="+1"/> - <source>Insecure requests to custom payment scripts unsupported</source> + <location line="-207"/> + <source>Cannot start bitcoin: click-to-pay handler</source> + <translation>No se pudo iniciar bitcoin: manejador de pago-al-clic</translation> + </message> + <message> + <location line="+195"/> + <source>Unverified payment requests to custom payment scripts are unsupported.</source> <translation>No están soportadas las peticiones inseguras a scripts de pago personalizados</translation> </message> <message> - <location line="+38"/> + <location line="+59"/> <source>Refund from %1</source> <translation>Devolución de %1</translation> </message> @@ -1211,7 +1556,7 @@ Dirección: %4 <translation>Error en la comunicación con %1: %2</translation> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>Bad response from server %1</source> <translation>Respuesta errónea del servidor %1</translation> </message> @@ -1221,8 +1566,8 @@ Dirección: %4 <translation>Pago aceptado</translation> </message> <message> - <location line="-58"/> - <location line="+30"/> + <location line="-55"/> + <location line="+27"/> <location line="+17"/> <source>Network request error</source> <translation>Error en petición de red</translation> @@ -1231,9 +1576,8 @@ Dirección: %4 <context> <name>QObject</name> <message> - <location filename="../bitcoin.cpp" line="+114"/> + <location filename="../bitcoin.cpp" line="+119"/> <location line="+5"/> - <location filename="../intro.cpp" line="-32"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> @@ -1247,16 +1591,11 @@ Dirección: %4 <source>Error: Invalid combination of -regtest and -testnet.</source> <translation>Error: Combinación no válida de -regtest y -testnet.</translation> </message> - <message> - <location filename="../intro.cpp" line="+1"/> - <source>Error: Specified data directory "%1" can not be created.</source> - <translation>Error: No puede crearse el directorio de datos especificado "%1".</translation> - </message> </context> <context> <name>QRImageWidget</name> <message> - <location filename="../receiverequestdialog.cpp" line="+32"/> + <location filename="../receiverequestdialog.cpp" line="+36"/> <source>&Save Image...</source> <translation>Guardar Imagen...</translation> </message> @@ -1272,7 +1611,7 @@ Dirección: %4 </message> <message> <location line="+0"/> - <source>PNG Images (*.png)</source> + <source>PNG Image (*.png)</source> <translation>Imágenes PNG (*.png)</translation> </message> </context> @@ -1293,7 +1632,7 @@ Dirección: %4 <location line="+53"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+352"/> + <location filename="../rpcconsole.cpp" line="+360"/> <source>N/A</source> <translation>N/D</translation> </message> @@ -1308,7 +1647,12 @@ Dirección: %4 <translation>&Información</translation> </message> <message> - <location line="+68"/> + <location line="-10"/> + <source>Debug window</source> + <translation>Ventana de depuración</translation> + </message> + <message> + <location line="+78"/> <source>Using OpenSSL version</source> <translation>Utilizando la versión OpenSSL</translation> </message> @@ -1363,12 +1707,7 @@ Dirección: %4 <translation>Opciones de la línea de órdenes</translation> </message> <message> - <location line="+7"/> - <source>Show the Bitcoin-Qt help message to get a list with possible Bitcoin command-line options.</source> - <translation>Mostrar el mensaje de ayuda de Bitcoin-Qt que enumera las opciones disponibles de línea de órdenes para Bitcoin.</translation> - </message> - <message> - <location line="+3"/> + <location line="+10"/> <source>&Show</source> <translation>&Mostrar</translation> </message> @@ -1408,12 +1747,7 @@ Dirección: %4 <translation>Fecha de compilación</translation> </message> <message> - <location line="-104"/> - <source>Bitcoin - Debug window</source> - <translation>Bitcoin - Ventana de depuración</translation> - </message> - <message> - <location line="+25"/> + <location line="-79"/> <source>Bitcoin Core</source> <translation>Núcleo de Bitcoin</translation> </message> @@ -1428,7 +1762,12 @@ Dirección: %4 <translation>Abrir el archivo de registro de depuración en el directorio actual de datos. Esto puede llevar varios segundos para archivos de registro grandes.</translation> </message> <message> - <location line="+102"/> + <location line="+26"/> + <source>Show the Bitcoin-Core help message to get a list with possible Bitcoin command-line options.</source> + <translation>Mostrar el mensaje de ayuda de Bitcoin-Qt que enumera las opciones disponibles de línea de órdenes para Bitcoin.</translation> + </message> + <message> + <location line="+76"/> <source>Clear console</source> <translation>Borrar consola</translation> </message> @@ -1486,37 +1825,32 @@ Dirección: %4 <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+22"/> + <location filename="../forms/receivecoinsdialog.ui" line="+83"/> <source>&Amount:</source> <translation>Cantidad</translation> </message> <message> - <location line="+16"/> + <location line="+19"/> <source>The amount to request</source> <translation>La cantidad a solicitar</translation> </message> <message> - <location line="+7"/> + <location line="-32"/> <source>&Label:</source> <translation>&Etiqueta:</translation> </message> <message> - <location line="+10"/> - <source>The label to associate with the receiving address</source> - <translation>La etiqueta a asociar con la dirección para recibir</translation> - </message> - <message> - <location line="+7"/> + <location line="-34"/> <source>&Message:</source> <translation>Mensaje:</translation> </message> <message> - <location line="+10"/> + <location line="+20"/> <source>The message to attach to payment request</source> <translation>El mensaje a adjuntar a la solicitud de pago</translation> </message> <message> - <location line="+14"/> + <location line="-37"/> <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source> <translation>Reutilizar una de las direcciones previamente usadas para recibir. Reutilizar direcciones tiene problemas de seguridad y privacidad. No lo uses a menos que antes regeneres una solicitud de pago.</translation> </message> @@ -1526,12 +1860,17 @@ Dirección: %4 <translation>R&eutilizar una dirección existente para recibir (no recomendado)</translation> </message> <message> - <location line="+7"/> + <location line="+27"/> + <source>The label to associate with the new receiving address</source> + <translation>La etiqueta a asociar con la dirección para recibir</translation> + </message> + <message> + <location line="+14"/> <source>Use this form to request payments. All fields are optional.</source> <translation>Utiliza este formulario para solicitar pagos. Todos los campos son opcionales.</translation> </message> <message> - <location line="+17"/> + <location line="+56"/> <source>Clear all fields of the form.</source> <translation>Limpiar todos los campos del formulario.</translation> </message> @@ -1545,6 +1884,31 @@ Dirección: %4 <source>&Request payment</source> <translation>&Solicitar pago</translation> </message> + <message> + <location line="+47"/> + <source>Previously requested payments</source> + <translation>Pagos solicitados anteriormente</translation> + </message> + <message> + <location line="+12"/> + <source>Show the selected request (does the same as double clicking an entry)</source> + <translation>Muestra la petición seleccionada (También doble clic)</translation> + </message> + <message> + <location line="+3"/> + <source>Show</source> + <translation>Mostrar</translation> + </message> + <message> + <location line="+11"/> + <source>Remove the selected entries from the list</source> + <translation>Borrar de la lista las direcciónes actualmente seleccionadas</translation> + </message> + <message> + <location line="+3"/> + <source>Remove</source> + <translation>Eliminar</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -1565,16 +1929,11 @@ Dirección: %4 </message> <message> <location line="+7"/> - <source>&Copy Image</source> - <translation>Copiar imagen</translation> - </message> - <message> - <location line="+7"/> <source>&Save Image...</source> <translation>Guardar Imagen...</translation> </message> <message> - <location filename="../receiverequestdialog.cpp" line="+58"/> + <location filename="../receiverequestdialog.cpp" line="+56"/> <source>Request payment to %1</source> <translation>Solicitar pago a %1</translation> </message> @@ -1620,16 +1979,119 @@ Dirección: %4 </message> </context> <context> + <name>RecentRequestsTableModel</name> + <message> + <location filename="../recentrequeststablemodel.cpp" line="+14"/> + <source>Date</source> + <translation>Fecha</translation> + </message> + <message> + <location line="+0"/> + <source>Label</source> + <translation>Etiqueta</translation> + </message> + <message> + <location line="+0"/> + <source>Message</source> + <translation>Mensaje</translation> + </message> + <message> + <location line="+0"/> + <source>Amount</source> + <translation>Cantidad</translation> + </message> + <message> + <location line="+36"/> + <source>(no label)</source> + <translation>(sin etiqueta)</translation> + </message> + <message> + <location line="+9"/> + <source>(no message)</source> + <translation>(Ningun mensaje)</translation> + </message> +</context> +<context> <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="+14"/> - <location filename="../sendcoinsdialog.cpp" line="+140"/> - <location line="+213"/> + <location filename="../sendcoinsdialog.cpp" line="+381"/> + <location line="+81"/> <source>Send Coins</source> <translation>Enviar monedas</translation> </message> <message> - <location line="+50"/> + <location line="+76"/> + <source>Coin Control Features</source> + <translation>Características de control de la moneda</translation> + </message> + <message> + <location line="+20"/> + <source>Inputs...</source> + <translation>Entradas...</translation> + </message> + <message> + <location line="+7"/> + <source>automatically selected</source> + <translation>Seleccionado automaticamente</translation> + </message> + <message> + <location line="+19"/> + <source>Insufficient funds!</source> + <translation>Fondos insuficientes!</translation> + </message> + <message> + <location line="+89"/> + <source>Quantity:</source> + <translation>Cantidad:</translation> + </message> + <message> + <location line="+35"/> + <source>Bytes:</source> + <translation>Bytes:</translation> + </message> + <message> + <location line="+48"/> + <source>Amount:</source> + <translation>Cuantía:</translation> + </message> + <message> + <location line="+32"/> + <source>Priority:</source> + <translation>Prioridad:</translation> + </message> + <message> + <location line="+48"/> + <source>Fee:</source> + <translation>Tasa:</translation> + </message> + <message> + <location line="+32"/> + <source>Low Output:</source> + <translation>Envío pequeño:</translation> + </message> + <message> + <location line="+48"/> + <source>After Fee:</source> + <translation>Después de tasas:</translation> + </message> + <message> + <location line="+32"/> + <source>Change:</source> + <translation>Cambio:</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>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> + </message> + <message> + <location line="+3"/> + <source>Custom change address</source> + <translation>Dirección propia</translation> + </message> + <message> + <location line="+115"/> <source>Send to multiple recipients at once</source> <translation>Enviar a múltiples destinatarios de una vez</translation> </message> @@ -1654,12 +2116,7 @@ Dirección: %4 <translation>Saldo:</translation> </message> <message> - <location line="+10"/> - <source>123.456 BTC</source> - <translation>123.456 BTC</translation> - </message> - <message> - <location line="+31"/> + <location line="+41"/> <source>Confirm the send action</source> <translation>Confirmar el envío</translation> </message> @@ -1669,49 +2126,125 @@ Dirección: %4 <translation>&Enviar</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-154"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation>Confirmar el envío de monedas</translation> </message> <message> - <location line="-90"/> + <location line="-74"/> <location line="+5"/> <location line="+5"/> + <location line="+4"/> <source>%1 to %2</source> <translation>%1 a %2</translation> </message> <message> - <location line="+26"/> + <location line="-136"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>Introduzca una dirección Bitcoin (ej. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> + <message> + <location line="+15"/> + <source>Copy quantity</source> + <translation>Copiar cantidad</translation> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation>Copiar cuantía</translation> + </message> + <message> + <location line="+1"/> + <source>Copy fee</source> + <translation>Copiar donación</translation> + </message> + <message> + <location line="+1"/> + <source>Copy after fee</source> + <translation>Copiar después de aplicar donación</translation> + </message> + <message> + <location line="+1"/> + <source>Copy bytes</source> + <translation>Copiar bytes</translation> + </message> + <message> + <location line="+1"/> + <source>Copy priority</source> + <translation>Copiar prioridad</translation> + </message> + <message> + <location line="+1"/> + <source>Copy low output</source> + <translation>Copiar envío pequeño</translation> + </message> + <message> + <location line="+1"/> + <source>Copy change</source> + <translation>Copiar Cambio</translation> + </message> + <message> + <location line="+170"/> + <source>Total Amount %1 (= %2)</source> + <translation>Cuantía Total %1 (=%2)</translation> + </message> + <message> + <location line="+2"/> + <source>or</source> + <translation>o</translation> + </message> + <message> + <location line="+202"/> <source>The recipient address is not valid, please recheck.</source> <translation>La dirección de recepción no es válida, compruébela de nuevo.</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>The amount to pay must be larger than 0.</source> <translation>La cantidad por pagar tiene que ser mayor de 0.</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>The amount exceeds your balance.</source> <translation>La cantidad sobrepasa su saldo.</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>The total exceeds your balance when the %1 transaction fee is included.</source> <translation>El total sobrepasa su saldo cuando se incluye la tasa de envío de %1</translation> </message> <message> - <location line="+5"/> + <location line="+3"/> <source>Duplicate address found, can only send to each address once per send operation.</source> <translation>Se ha encontrado una dirección duplicada. Solo se puede enviar a cada dirección una vez por operación de envío.</translation> </message> <message> + <location line="+3"/> + <source>Transaction creation failed!</source> + <translation>¡Ha fallado la creación de la transacción!</translation> + </message> + <message> <location line="+4"/> - <source>Error: Transaction creation failed!</source> - <translation>Error: ¡Ha fallado la creación de la transacción!</translation> + <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> + <translation>La transacción fue rechazada. Esto puede haber ocurrido si alguna de las monedas ya estaba gastada o si ha usado una copia de wallet.dat y las monedas se gastaron en la copia pero no se han marcado como gastadas aqui.</translation> </message> <message> - <location line="+15"/> + <location line="+113"/> + <source>Warning: Invalid Bitcoin address</source> + <translation>Alerta: Dirección de Bitcoin inválida</translation> + </message> + <message> + <location line="+13"/> + <source>(no label)</source> + <translation>(sin etiqueta)</translation> + </message> + <message> + <location line="+8"/> + <source>Warning: Unknown change address</source> + <translation>Alerta: Dirección de Bitcoin inválida</translation> + </message> + <message> + <location line="-378"/> <source>Are you sure you want to send?</source> <translation>¿Está seguro que desea enviar?</translation> </message> @@ -1721,17 +2254,7 @@ Dirección: %4 <translation>añadido como comisión de transacción</translation> </message> <message> - <location line="+6"/> - <source>Total Amount %1</source> - <translation>Monto Total 1%</translation> - </message> - <message> - <location line="+20"/> - <source>Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> - <translation>Error: transacción rechazada. 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 así aquí.</translation> - </message> - <message> - <location line="+144"/> + <location line="+170"/> <source>Payment request expired</source> <translation>Petición de pago expirada</translation> </message> @@ -1744,39 +2267,44 @@ Dirección: %4 <context> <name>SendCoinsEntry</name> <message> - <location filename="../forms/sendcoinsentry.ui" line="+33"/> - <location line="+585"/> + <location filename="../forms/sendcoinsentry.ui" line="+131"/> + <location line="+501"/> + <location line="+536"/> <source>A&mount:</source> <translation>Ca&ntidad:</translation> </message> <message> - <location line="-572"/> - <location line="+585"/> + <location line="-1132"/> <source>Pay &To:</source> <translation>&Pagar a:</translation> </message> <message> - <location line="-551"/> + <location line="+18"/> <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation>La dirección a la que enviar el pago (p. ej. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location filename="../sendcoinsentry.cpp" line="+28"/> + <location filename="../sendcoinsentry.cpp" line="+30"/> <source>Enter a label for this address to add it to your address book</source> <translation>Etiquete esta dirección para añadirla a la libreta</translation> </message> <message> - <location filename="../forms/sendcoinsentry.ui" line="-18"/> + <location filename="../forms/sendcoinsentry.ui" line="+57"/> <source>&Label:</source> <translation>&Etiqueta:</translation> </message> <message> - <location line="+28"/> + <location line="-50"/> <source>Choose previously used address</source> <translation>Escoger direcciones previamente usadas</translation> </message> <message> - <location line="+10"/> + <location line="-40"/> + <source>This is a normal payment.</source> + <translation>Esto es un pago ordinario.</translation> + </message> + <message> + <location line="+50"/> <source>Alt+A</source> <translation>Alt+A</translation> </message> @@ -1792,16 +2320,35 @@ Dirección: %4 </message> <message> <location line="+7"/> - <source>Remove this recipient</source> - <translation>Eliminar destinatario</translation> + <location line="+504"/> + <location line="+536"/> + <source>Remove this entry</source> + <translation>Eliminar esta transacción</translation> </message> <message> - <location line="+16"/> + <location line="-40"/> + <source>This is a verified payment request.</source> + <translation>Esto es una petición de pago verificado.</translation> + </message> + <message> + <location line="-971"/> <source>Enter a label for this address to add it to the list of used addresses</source> <translation>Introduce una etiqueta para esta dirección para añadirla a la lista de direcciones utilizadas</translation> </message> <message> - <location line="+465"/> + <location line="+439"/> + <source>This is an unverified payment request.</source> + <translation>Esto es una petición de pago no verificado.</translation> + </message> + <message> + <location line="+18"/> + <location line="+532"/> + <source>Pay To:</source> + <translation>Paga a:</translation> + </message> + <message> + <location line="-498"/> + <location line="+536"/> <source>Memo:</source> <translation>Memo:</translation> </message> @@ -1922,7 +2469,7 @@ Dirección: %4 <translation>Limpiar todos los campos de la verificación de mensaje</translation> </message> <message> - <location filename="../signverifymessagedialog.cpp" line="+27"/> + <location filename="../signverifymessagedialog.cpp" line="+29"/> <location line="+3"/> <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation>Introduzca una dirección Bitcoin (ej. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> @@ -1938,7 +2485,7 @@ Dirección: %4 <translation>Introduzca una firma Bitcoin</translation> </message> <message> - <location line="+85"/> + <location line="+84"/> <location line="+81"/> <source>The entered address is invalid.</source> <translation>La dirección introducida es inválida.</translation> @@ -2007,9 +2554,14 @@ Dirección: %4 <context> <name>SplashScreen</name> <message> - <location filename="../splashscreen.cpp" line="+23"/> - <source>The Bitcoin developers</source> - <translation>Los programadores Bitcoin</translation> + <location filename="../splashscreen.cpp" line="+26"/> + <source>Bitcoin Core</source> + <translation>Núcleo de Bitcoin</translation> + </message> + <message> + <location line="+2"/> + <source>The Bitcoin Core developers</source> + <translation>Los desarrolladores del Núcleo de Bitcoin</translation> </message> <message> <location line="+1"/> @@ -2020,7 +2572,7 @@ Dirección: %4 <context> <name>TrafficGraphWidget</name> <message> - <location filename="../trafficgraphwidget.cpp" line="+75"/> + <location filename="../trafficgraphwidget.cpp" line="+79"/> <source>KB/s</source> <translation>KB/s</translation> </message> @@ -2028,7 +2580,7 @@ Dirección: %4 <context> <name>TransactionDesc</name> <message> - <location filename="../transactiondesc.cpp" line="+22"/> + <location filename="../transactiondesc.cpp" line="+28"/> <source>Open until %1</source> <translation>Abierto hasta %1</translation> </message> @@ -2220,7 +2772,7 @@ Dirección: %4 <context> <name>TransactionTableModel</name> <message> - <location filename="../transactiontablemodel.cpp" line="+227"/> + <location filename="../transactiontablemodel.cpp" line="+234"/> <source>Date</source> <translation>Fecha</translation> </message> @@ -2338,7 +2890,7 @@ Dirección: %4 <context> <name>TransactionView</name> <message> - <location filename="../transactionview.cpp" line="+52"/> + <location filename="../transactionview.cpp" line="+57"/> <location line="+16"/> <source>All</source> <translation>Todo</translation> @@ -2399,12 +2951,12 @@ Dirección: %4 <translation>Otra</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>Enter address or label to search</source> <translation>Introduzca una dirección o etiqueta que buscar</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>Min amount</source> <translation>Cantidad mínima</translation> </message> @@ -2439,17 +2991,37 @@ Dirección: %4 <translation>Mostrar detalles de la transacción</translation> </message> <message> - <location line="+143"/> - <source>Export Transaction Data</source> - <translation>Exportar datos de la transacción</translation> + <location line="+142"/> + <source>Export Transaction History</source> + <translation>Exportar historial de transacciones</translation> </message> <message> - <location line="+1"/> + <location line="+19"/> + <source>Exporting Failed</source> + <translation>Error exportando</translation> + </message> + <message> + <location line="+0"/> + <source>There was an error trying to save the transaction history to %1.</source> + <translation>Ha habido un error al intentar guardar la transacción con %1.</translation> + </message> + <message> + <location line="+4"/> + <source>Exporting Successful</source> + <translation>Exportación finalizada</translation> + </message> + <message> + <location line="+0"/> + <source>The transaction history was successfully saved to %1.</source> + <translation>La transacción ha sido guardada en %1.</translation> + </message> + <message> + <location line="-22"/> <source>Comma separated file (*.csv)</source> <translation>Archivos de columnas separadas por coma (*.csv)</translation> </message> <message> - <location line="+8"/> + <location line="+9"/> <source>Confirmed</source> <translation>Confirmado</translation> </message> @@ -2484,17 +3056,7 @@ Dirección: %4 <translation>ID</translation> </message> <message> - <location line="+4"/> - <source>Error exporting</source> - <translation>Error exportando</translation> - </message> - <message> - <location line="+0"/> - <source>Could not write to file %1.</source> - <translation>No se pudo escribir en el archivo %1.</translation> - </message> - <message> - <location line="+100"/> + <location line="+107"/> <source>Range:</source> <translation>Rango:</translation> </message> @@ -2505,9 +3067,17 @@ Dirección: %4 </message> </context> <context> + <name>WalletFrame</name> + <message> + <location filename="../walletframe.cpp" line="+26"/> + <source>No wallet has been loaded.</source> + <translation>No se ha cargado ningún monedero</translation> + </message> +</context> +<context> <name>WalletModel</name> <message> - <location filename="../walletmodel.cpp" line="+218"/> + <location filename="../walletmodel.cpp" line="+245"/> <source>Send Coins</source> <translation>Enviar monedas</translation> </message> @@ -2515,7 +3085,7 @@ Dirección: %4 <context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+46"/> + <location filename="../walletview.cpp" line="+43"/> <source>&Export</source> <translation>&Exportar</translation> </message> @@ -2525,68 +3095,63 @@ Dirección: %4 <translation>Exportar a un archivo los datos de esta pestaña</translation> </message> <message> - <location line="+183"/> + <location line="+181"/> <source>Backup Wallet</source> <translation>Respaldo de monedero</translation> </message> <message> - <location line="+0"/> + <location line="+1"/> <source>Wallet Data (*.dat)</source> <translation>Datos de monedero (*.dat)</translation> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Backup Failed</source> <translation>Ha fallado el respaldo</translation> </message> <message> <location line="+0"/> - <source>There was an error trying to save the wallet data to the new location.</source> - <translation>Se ha producido un error al intentar guardar los datos del monedero en la nueva ubicación.</translation> + <source>There was an error trying to save the wallet data to %1.</source> + <translation>Ha habido un error al intentar guardar los datos del monedero en %1.</translation> </message> <message> <location line="+4"/> - <source>Backup Successful</source> - <translation>Se ha completado con éxito la copia de respaldo</translation> + <source>The wallet data was successfully saved to %1.</source> + <translation>Los datos del monedero se han guardado con éxito en %1.</translation> </message> <message> <location line="+0"/> - <source>The wallet data was successfully saved to the new location.</source> - <translation>Los datos del monedero se han guardado con éxito en la nueva ubicación.</translation> + <source>Backup Successful</source> + <translation>Se ha completado con éxito la copia de respaldo</translation> </message> </context> <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+102"/> - <source>Bitcoin version</source> - <translation>Versión de Bitcoin</translation> - </message> - <message> - <location line="+107"/> + <location filename="../bitcoinstrings.cpp" line="+217"/> <source>Usage:</source> <translation>Uso:</translation> </message> <message> - <location line="-55"/> + <location line="-54"/> <source>List commands</source> <translation>Muestra comandos </translation> </message> <message> - <location line="-13"/> + <location line="-14"/> <source>Get help for a command</source> <translation>Recibir ayuda para un comando </translation> </message> <message> - <location line="+25"/> + <location line="+26"/> <source>Options:</source> <translation>Opciones: </translation> </message> <message> - <location line="+24"/> + <location line="+23"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Especificar archivo de configuración (predeterminado: bitcoin.conf) </translation> @@ -2608,7 +3173,7 @@ Dirección: %4 <translation>Establecer el tamaño de caché de la base de datos en megabytes (predeterminado: 25)</translation> </message> <message> - <location line="-28"/> + <location line="-27"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>Escuchar conexiones en <puerto> (predeterminado: 8333 o testnet: 18333)</translation> </message> @@ -2618,7 +3183,7 @@ Dirección: %4 <translation>Mantener como máximo <n> conexiones a pares (predeterminado: 125)</translation> </message> <message> - <location line="-49"/> + <location line="-50"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation>Conectar a un nodo para obtener direcciones de pares y desconectar</translation> </message> @@ -2633,7 +3198,7 @@ Dirección: %4 <translation>Umbral para la desconexión de pares con mal comportamiento (predeterminado: 100)</translation> </message> <message> - <location line="-142"/> + <location line="-147"/> <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> @@ -2648,7 +3213,7 @@ Dirección: %4 <translation>Escuchar conexiones JSON-RPC en <puerto> (predeterminado: 8332 o testnet:18332)</translation> </message> <message> - <location line="+40"/> + <location line="+45"/> <source>Accept command line and JSON-RPC commands</source> <translation>Aceptar comandos consola y JSON-RPC </translation> @@ -2656,22 +3221,22 @@ Dirección: %4 <message> <location line="+79"/> <source>Run in the background as a daemon and accept commands</source> - <translation>Correr como demonio y aceptar comandos + <translation>Ejecutar en segundo plano como daemon y aceptar comandos </translation> </message> <message> - <location line="+40"/> + <location line="+39"/> <source>Use the test network</source> <translation>Usar la red de pruebas </translation> </message> <message> - <location line="-118"/> + <location line="-117"/> <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="-87"/> + <location line="-92"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2736,17 +3301,17 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Ejecutar comando cuando una transacción del monedero cambia (%s en cmd se remplazará por TxID)</translation> </message> <message> - <location line="+11"/> - <source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source> - <translation>Establecer el tamaño máximo de las transacciones de alta prioridad/comisión baja en bytes (predeterminado:27000)</translation> - </message> - <message> - <location line="+6"/> + <location line="+18"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation>Esta 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"/> + <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> + <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>Aviso: ¡-paytxfee tiene un valor muy alto! Esta es la comisión que pagará si envía una transacción.</translation> </message> @@ -2776,17 +3341,27 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Aviso: ¡Recuperados datos de wallet.dat corrupto! El wallet.dat original se ha guardado como wallet.{timestamp}.bak en %s; si hubiera errores en su saldo o transacciones, deberá restaurar una copia de seguridad.</translation> </message> <message> - <location line="+14"/> + <location line="+9"/> + <source><category> can be:</source> + <translation><category> puede ser:</translation> + </message> + <message> + <location line="+6"/> <source>Attempt to recover private keys from a corrupt wallet.dat</source> <translation>Intento de recuperar claves privadas de un wallet.dat corrupto</translation> </message> <message> <location line="+1"/> + <source>Bitcoin Core Daemon</source> + <translation>Proceso Bitcoin-QT</translation> + </message> + <message> + <location line="+1"/> <source>Bitcoin RPC client version</source> <translation>Versión de cliente BitcoinROC</translation> </message> <message> - <location line="+2"/> + <location line="+1"/> <source>Block creation options:</source> <translation>Opciones de creación de bloques:</translation> </message> @@ -2796,7 +3371,12 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Conectar sólo a los nodos (o nodo) especificados</translation> </message> <message> - <location line="+2"/> + <location line="+1"/> + <source>Connect through SOCKS proxy</source> + <translation>Conectar a través de un proxy SOCKS</translation> + </message> + <message> + <location line="+1"/> <source>Connect to JSON-RPC on <port> (default: 8332 or testnet: 18332)</source> <translation>Conectar a JSON-RPC en <puerto> (predeterminado: 8332 o testnet: 18332)</translation> </message> @@ -2906,7 +3486,12 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>No se han podido escribir los datos de deshacer</translation> </message> <message> - <location line="+2"/> + <location line="+1"/> + <source>Fee per kB to add to transactions you send</source> + <translation>Donación por KB añadida a las transacciones que envíe</translation> + </message> + <message> + <location line="+1"/> <source>Find peers using DNS lookup (default: 1 unless -connect)</source> <translation>Encontrar pares mediante búsqueda de DNS (predeterminado: 1 salvo con -connect)</translation> </message> @@ -2926,6 +3511,11 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Como es de exhaustiva la verificación de bloques (0-4, por defecto 3)</translation> </message> <message> + <location line="+1"/> + <source>If <category> is not supplied, output all debugging information.</source> + <translation>Si no se proporciona <category>, mostrar toda la depuración</translation> + </message> + <message> <location line="+2"/> <source>Incorrect or no genesis block found. Wrong datadir for network?</source> <translation>Incorrecto o bloque de génesis no encontrado. Datadir equivocada para la red?</translation> @@ -2941,17 +3531,37 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>No hay suficientes descriptores de archivo disponibles. </translation> </message> <message> - <location line="+8"/> + <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> + </message> + <message> + <location line="+1"/> + <source>RPC client options:</source> + <translation>Opciones para cliente RPC:</translation> + </message> + <message> + <location line="+1"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation>Reconstruir el índice de la cadena de bloques a partir de los archivos blk000??.dat actuales</translation> </message> <message> - <location line="+6"/> + <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> + </message> + <message> + <location line="+1"/> <source>Send command to Bitcoin server</source> <translation>Enviar comando a servidor Bitcoin</translation> </message> <message> - <location line="+10"/> + <location line="+8"/> + <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> + <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> </message> @@ -2971,7 +3581,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Uso (desaconsejado, usar bitcoin-cli)</translation> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>Verifying blocks...</source> <translation>Verificando bloques...</translation> </message> @@ -2982,11 +3592,21 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> + <source>Wait for RPC server to start</source> + <translation>Espere a que se inicie el servidor RPC</translation> + </message> + <message> + <location line="+1"/> <source>Wallet %s resides outside data directory %s</source> <translation>El monedero %s se encuentra fuera del directorio de datos %s</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> + <source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source> + <translation>Aviso: Argumento -debugnet anticuado, utilice -debug=net</translation> + </message> + <message> + <location line="+2"/> <source>You need to rebuild the database using -reindex to change -txindex</source> <translation>Usted necesita reconstruir la base de datos utilizando -reindex para cambiar -txindex</translation> </message> @@ -2996,17 +3616,27 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Importa los bloques desde un archivo blk000??.dat externo</translation> </message> <message> - <location line="-98"/> + <location line="-104"/> <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="+17"/> + <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> + </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> + </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>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="+83"/> + <location line="+88"/> <source>Information</source> <translation>Información</translation> </message> @@ -3046,32 +3676,12 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Conectarse solo a nodos de la red <net> (IPv4, IPv6 o Tor)</translation> </message> <message> - <location line="+2"/> - <source>Output extra debugging information. Implies all other -debug* options</source> - <translation>Mostrar información de depuración adicional. Implica todos los demás opciones -debug*</translation> - </message> - <message> - <location line="+1"/> - <source>Output extra network debugging information</source> - <translation>Mostrar información de depuración adicional</translation> - </message> - <message> - <location line="+2"/> - <source>Prepend debug output with timestamp</source> - <translation>Anteponer marca temporal a la información de depuración</translation> - </message> - <message> - <location line="+5"/> + <location line="+9"/> <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation>Opciones SSL: (ver la Bitcoin Wiki para instrucciones de configuración SSL)</translation> </message> <message> - <location line="+1"/> - <source>Select the version of socks proxy to use (4-5, default: 5)</source> - <translation>Elija la versión del proxy socks a usar (4-5, predeterminado: 5)</translation> - </message> - <message> - <location line="+3"/> + <location line="+4"/> <source>Send trace/debug info to console instead of debug.log file</source> <translation>Enviar información de trazas/depuración a la consola en lugar de al archivo debug.log</translation> </message> @@ -3081,12 +3691,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Enviar información de trazas/depuración al depurador</translation> </message> <message> - <location line="+5"/> - <source>Set maximum block size in bytes (default: 250000)</source> - <translation>Establecer tamaño máximo de bloque en bytes (predeterminado: 250000)</translation> - </message> - <message> - <location line="+1"/> + <location line="+6"/> <source>Set minimum block size in bytes (default: 0)</source> <translation>Establecer tamaño mínimo de bloque en bytes (predeterminado: 0)</translation> </message> @@ -3136,39 +3741,39 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Usar UPnP para asignar el puerto de escucha (predeterminado: 1 al escuchar)</translation> </message> <message> - <location line="+1"/> - <source>Use proxy to reach tor hidden services (default: same as -proxy)</source> - <translation>Utilizar proxy para conectar a Tor servicios ocultos (predeterminado: igual que -proxy)</translation> - </message> - <message> <location line="+2"/> <source>Username for JSON-RPC connections</source> <translation>Nombre de usuario para las conexiones JSON-RPC </translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Warning</source> <translation>Aviso</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Warning: This version is obsolete, upgrade required!</source> <translation>Aviso: Esta versión es obsoleta, actualización necesaria!</translation> </message> <message> <location line="+2"/> + <source>version</source> + <translation>versión</translation> + </message> + <message> + <location line="+1"/> <source>wallet.dat corrupt, salvage failed</source> <translation>wallet.dat corrupto. Ha fallado la recuperación.</translation> </message> <message> - <location line="-54"/> + <location line="-57"/> <source>Password for JSON-RPC connections</source> <translation>Contraseña para las conexiones JSON-RPC </translation> </message> <message> - <location line="-70"/> + <location line="-69"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Permitir conexiones JSON-RPC desde la dirección IP especificada </translation> @@ -3180,12 +3785,12 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </translation> </message> <message> - <location line="-126"/> + <location line="-131"/> <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="+155"/> + <location line="+160"/> <source>Upgrade wallet to latest format</source> <translation>Actualizar el monedero al último formato</translation> </message> @@ -3230,22 +3835,17 @@ 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="-95"/> - <source>Connect through socks proxy</source> - <translation>Conectar mediante proxy socks</translation> - </message> - <message> - <location line="-11"/> + <location line="-106"/> <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="+58"/> + <location line="+59"/> <source>Loading addresses...</source> <translation>Cargando direcciones...</translation> </message> <message> - <location line="-36"/> + <location line="-37"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>Error al cargar wallet.dat: el monedero está dañado</translation> </message> @@ -3265,12 +3865,12 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Error al cargar wallet.dat</translation> </message> <message> - <location line="+30"/> + <location line="+31"/> <source>Invalid -proxy address: '%s'</source> <translation>Dirección -proxy inválida: '%s'</translation> </message> <message> - <location line="+57"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>La red especificada en -onlynet '%s' es desconocida</translation> </message> @@ -3290,7 +3890,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="+46"/> + <location line="+47"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>Cantidad inválida para -paytxfee=<amount>: '%s'</translation> </message> @@ -3310,27 +3910,22 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Cargando el índice de bloques...</translation> </message> <message> - <location line="-60"/> + <location line="-61"/> <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="-28"/> + <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="+69"/> - <source>Fee per KB to add to transactions you send</source> - <translation>Tarifa por KB que añadir a las transacciones que envíe</translation> - </message> - <message> - <location line="+20"/> + <location line="+94"/> <source>Loading wallet...</source> <translation>Cargando monedero...</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>Cannot downgrade wallet</source> <translation>No se puede rebajar el monedero</translation> </message> @@ -3360,7 +3955,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Error</translation> </message> <message> - <location line="-33"/> + <location line="-34"/> <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 new file mode 100644 index 0000000000..5530114fd7 --- /dev/null +++ b/src/qt/locale/bitcoin_es_MX.ts @@ -0,0 +1,3926 @@ +<?xml version="1.0" ?><!DOCTYPE TS><TS language="es_MX" 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="../aboutdialog.cpp" line="+19"/> + <source>Copyright</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>The Bitcoin 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>Haga doble clic para editar el domicilio o la etiqueta</translation> + </message> + <message> + <location line="+27"/> + <source>Create a new address</source> + <translation>Crear una dirección nueva</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>Copiar el domicilio seleccionado al portapapeles del sistema</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 type="unfinished"/> + </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>&Borrar</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 type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>&Edit</source> + <translation type="unfinished"/> + </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>Archivo separado por comas (*.CSV)</translation> + </message> + <message> + <location line="+13"/> + <source>Error exporting</source> + <translation>Error de exportación</translation> + </message> + <message> + <location line="+0"/> + <source>Could not write to file %1.</source> + <translation>No se puede excribir en el archivo %1.</translation> + </message> +</context> +<context> + <name>AddressTableModel</name> + <message> + <location filename="../addresstablemodel.cpp" line="+168"/> + <source>Label</source> + <translation>Etiqueta</translation> + </message> + <message> + <location line="+0"/> + <source>Address</source> + <translation>Domicilio</translation> + </message> + <message> + <location line="+36"/> + <source>(no label)</source> + <translation>(sin etiqueta)</translation> + </message> +</context> +<context> + <name>AskPassphraseDialog</name> + <message> + <location filename="../forms/askpassphrasedialog.ui" line="+26"/> + <source>Passphrase Dialog</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+21"/> + <source>Enter passphrase</source> + <translation>Ingrese la contraseña</translation> + </message> + <message> + <location line="+14"/> + <source>New passphrase</source> + <translation>Nueva contraseña</translation> + </message> + <message> + <location line="+14"/> + <source>Repeat new passphrase</source> + <translation>Repita la nueva contraseña</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>Ingrese la nueva contraseña a la cartera<br/>Por favor use una contraseña de<b>10 o más caracteres aleatorios</b> o <b>ocho o más palabras</b>.</translation> + </message> + <message> + <location line="+1"/> + <source>Encrypt wallet</source> + <translation>Cartera encriptada.</translation> + </message> + <message> + <location line="+3"/> + <source>This operation needs your wallet passphrase to unlock the wallet.</source> + <translation>Esta operación necesita la contraseña de su cartera para desbloquear su cartera.</translation> + </message> + <message> + <location line="+5"/> + <source>Unlock wallet</source> + <translation>Desbloquear cartera.</translation> + </message> + <message> + <location line="+3"/> + <source>This operation needs your wallet passphrase to decrypt the wallet.</source> + <translation>Esta operación necesita la contraseña de su cartera para desencriptar su cartera.</translation> + </message> + <message> + <location line="+5"/> + <source>Decrypt wallet</source> + <translation>Desencriptar la cartera</translation> + </message> + <message> + <location line="+3"/> + <source>Change passphrase</source> + <translation>Cambiar contraseña</translation> + </message> + <message> + <location line="+1"/> + <source>Enter the old and new passphrase to the wallet.</source> + <translation>Ingrese la antugüa y nueva contraseña de la cartera</translation> + </message> + <message> + <location line="+46"/> + <source>Confirm wallet encryption</source> + <translation>Confirmar la encriptación de cartera</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>Cartera encriptada</translation> + </message> + <message> + <location line="-56"/> + <source>Bitcoin will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+13"/> + <location line="+7"/> + <location line="+42"/> + <location line="+6"/> + <source>Wallet encryption failed</source> + <translation>La encriptación de la cartera falló</translation> + </message> + <message> + <location line="-54"/> + <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> + <translation>La encriptación de la cartera falló debido a un error interno. Su cartera no fue encriptada.</translation> + </message> + <message> + <location line="+7"/> + <location line="+48"/> + <source>The supplied passphrases do not match.</source> + <translation>Las contraseñas dadas no coinciden</translation> + </message> + <message> + <location line="-37"/> + <source>Wallet unlock failed</source> + <translation>El desbloqueo de la cartera Fallo</translation> + </message> + <message> + <location line="+1"/> + <location line="+11"/> + <location line="+19"/> + <source>The passphrase entered for the wallet decryption was incorrect.</source> + <translation>La contraseña ingresada para la des encriptación de la cartera es incorrecto</translation> + </message> + <message> + <location line="-20"/> + <source>Wallet decryption failed</source> + <translation>La desencriptación de la cartera fallo</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="+260"/> + <source>Sign &message...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+290"/> + <source>Synchronizing with network...</source> + <translation>Sincronizando con la red...</translation> + </message> + <message> + <location line="-360"/> + <source>&Overview</source> + <translation>&Vista previa</translation> + </message> + <message> + <location line="+1"/> + <source>Show general overview of wallet</source> + <translation>Mostrar la vista previa general de la cartera</translation> + </message> + <message> + <location line="+20"/> + <source>&Transactions</source> + <translation>&Transacciones</translation> + </message> + <message> + <location line="+1"/> + <source>Browse transaction history</source> + <translation>Explorar el historial de transacciones</translation> + </message> + <message> + <location line="+15"/> + <source>E&xit</source> + <translation>S&alir</translation> + </message> + <message> + <location line="+1"/> + <source>Quit application</source> + <translation>Salir de la aplicación</translation> + </message> + <message> + <location line="+7"/> + <source>Show information about Bitcoin</source> + <translation>Mostrar información acerca de Bitcoin</translation> + </message> + <message> + <location line="+3"/> + <location line="+2"/> + <source>About &Qt</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>Show information about Qt</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>&Options...</source> + <translation>&Opciones</translation> + </message> + <message> + <location line="+9"/> + <source>&Encrypt Wallet...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>&Backup Wallet...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>&Change Passphrase...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+295"/> + <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="-358"/> + <source>Send coins to a Bitcoin address</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+47"/> + <source>Modify configuration options for Bitcoin</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> + <source>Backup wallet to another location</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>Change the passphrase used for wallet encryption</source> + <translation>Cambiar la contraseña usada para la encriptación de la cartera</translation> + </message> + <message> + <location line="+6"/> + <source>&Debug window</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Open debugging and diagnostic console</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-4"/> + <source>&Verify message...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+375"/> + <source>Bitcoin</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-563"/> + <location line="+10"/> + <source>Wallet</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+113"/> + <source>&Send</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> + <source>&Receive</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+44"/> + <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="+39"/> + <source>&File</source> + <translation>&Archivo</translation> + </message> + <message> + <location line="+11"/> + <source>&Settings</source> + <translation>&Configuraciones</translation> + </message> + <message> + <location line="+6"/> + <source>&Help</source> + <translation>&Ayuda</translation> + </message> + <message> + <location line="+9"/> + <source>Tabs toolbar</source> + <translation>Pestañas</translation> + </message> + <message> + <location line="-244"/> + <location line="+321"/> + <source>[testnet]</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-331"/> + <location line="+10"/> + <source>Bitcoin Core</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+121"/> + <source>Request payments (generates QR codes and bitcoin: URIs)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+27"/> + <location line="+2"/> + <source>&About Bitcoin Core</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+34"/> + <source>&Used sending addresses...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Show the list of used sending addresses and labels</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Used &receiving addresses...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Show the list of used receiving addresses and labels</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>Open URI...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Open a bitcoin: URI or payment request</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+126"/> + <location line="+5"/> + <source>Bitcoin client</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location line="+133"/> + <source>%n active connection(s) to Bitcoin network</source> + <translation><numerusform>%n Activar conexión a la red de Bitcoin</numerusform><numerusform>%n Activar conexiones a la red de Bitcoin</numerusform></translation> + </message> + <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="+20"/> + <source>%n hour(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message numerus="yes"> + <location line="+4"/> + <source>%n day(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message numerus="yes"> + <location line="+4"/> + <source>%n week(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> + <location line="+4"/> + <source>%1 behind</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+14"/> + <source>Last received block was generated %1 ago.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>Transactions after this will not yet be visible.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+27"/> + <source>Error</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Warning</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Information</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+77"/> + <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-152"/> + <source>Up to date</source> + <translation>Actualizado al dia </translation> + </message> + <message> + <location line="+31"/> + <source>Catching up...</source> + <translation>Resiviendo...</translation> + </message> + <message> + <location line="+124"/> + <source>Confirm transaction fee</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+8"/> + <source>Sent transaction</source> + <translation>Enviar Transacción</translation> + </message> + <message> + <location line="+0"/> + <source>Incoming transaction</source> + <translation>Transacción entrante</translation> + </message> + <message> + <location line="+1"/> + <source>Date: %1 +Amount: %2 +Type: %3 +Address: %4 +</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+67"/> + <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> + <translation>La cartera esta <b>encriptada</b> y <b>desbloqueada</b> actualmente </translation> + </message> + <message> + <location line="+8"/> + <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> + <translation>La cartera esta <b>encriptada</b> y <b>bloqueada</b> actualmente </translation> + </message> + <message> + <location filename="../bitcoin.cpp" line="+116"/> + <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>ClientModel</name> + <message> + <location filename="../clientmodel.cpp" line="+119"/> + <source>Network Alert</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>CoinControlDialog</name> + <message> + <location filename="../forms/coincontroldialog.ui" line="+14"/> + <source>Coin Control Address Selection</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+34"/> + <source>Quantity:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+29"/> + <source>Bytes:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+45"/> + <source>Amount:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+29"/> + <source>Priority:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+45"/> + <source>Fee:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+32"/> + <source>Low Output:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+48"/> + <source>After Fee:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+32"/> + <source>Change:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+63"/> + <source>(un)select all</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+13"/> + <source>Tree mode</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> + <source>List mode</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+52"/> + <source>Amount</source> + <translation>Monto</translation> + </message> + <message> + <location line="+10"/> + <source>Address</source> + <translation>Domicilio</translation> + </message> + <message> + <location line="+5"/> + <source>Date</source> + <translation>Fecha</translation> + </message> + <message> + <location line="+5"/> + <source>Confirmations</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Confirmed</source> + <translation>Confirmado </translation> + </message> + <message> + <location line="+5"/> + <source>Priority</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../coincontroldialog.cpp" line="+42"/> + <source>Copy address</source> + <translation>Copiar dirección </translation> + </message> + <message> + <location line="+1"/> + <source>Copy label</source> + <translation>Copiar capa </translation> + </message> + <message> + <location line="+1"/> + <location line="+26"/> + <source>Copy amount</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-25"/> + <source>Copy transaction ID</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Lock unspent</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Unlock unspent</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+22"/> + <source>Copy quantity</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>Copy fee</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy after fee</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy bytes</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy priority</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy low output</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy change</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+323"/> + <source>highest</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>higher</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>high</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>medium-high</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>medium</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+4"/> + <source>low-medium</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>low</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>lower</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>lowest</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+11"/> + <source>(%1 locked)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+171"/> + <source>Dust</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>yes</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>no</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+10"/> + <source>This label turns red, if the transaction size is greater than 1000 bytes.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <location line="+5"/> + <source>This means a fee of at least %1 per kB is required.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-4"/> + <source>Can vary +/- 1 byte per input.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>Transactions with higher priority are more likely to get included into a block.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>This label turns red, if the priority is smaller than "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>(sin etiqueta)</translation> + </message> + <message> + <location line="-9"/> + <source>change from %1 (%2)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>(change)</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>EditAddressDialog</name> + <message> + <location filename="../forms/editaddressdialog.ui" line="+14"/> + <source>Edit Address</source> + <translation>Editar dirección</translation> + </message> + <message> + <location line="+11"/> + <source>&Label</source> + <translation>&Etiqueta</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>&Dirección</translation> + </message> + <message> + <location filename="../editaddressdialog.cpp" line="+25"/> + <source>New receiving address</source> + <translation>Nueva dirección de entregas</translation> + </message> + <message> + <location line="+4"/> + <source>New sending address</source> + <translation>Nueva dirección de entregas</translation> + </message> + <message> + <location line="+3"/> + <source>Edit receiving address</source> + <translation>Editar dirección de entregas</translation> + </message> + <message> + <location line="+4"/> + <source>Edit sending address</source> + <translation>Editar dirección de envios</translation> + </message> + <message> + <location line="+76"/> + <source>The entered address "%1" is already in the address book.</source> + <translation>El domicilio ingresado "%1" ya existe en la libreta de direcciones</translation> + </message> + <message> + <location line="-5"/> + <source>The entered address "%1" is not a valid Bitcoin address.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+10"/> + <source>Could not unlock wallet.</source> + <translation>No se puede desbloquear la cartera</translation> + </message> + <message> + <location line="+5"/> + <source>New key generation failed.</source> + <translation>La generación de la nueva clave fallo</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>GUIUtil::HelpMessageBox</name> + <message> + <location filename="../guiutil.cpp" line="+597"/> + <source>version</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <location line="+13"/> + <source>Bitcoin Core</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-11"/> + <source>Usage:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>command-line options</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+4"/> + <source>UI options</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Start minimized</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Show splash screen on startup (default: 1)</source> + <translation type="unfinished"/> + </message> + <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 type="unfinished"/> + </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 type="unfinished"/> + </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>Opciones</translation> + </message> + <message> + <location line="+16"/> + <source>&Main</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+15"/> + <source>Pay transaction &fee</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+31"/> + <source>Automatically start Bitcoin after logging in to the system.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>&Start Bitcoin on system login</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+35"/> + <source>Reset all client options to default.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>&Reset Options</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+13"/> + <source>&Network</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Map port using &UPnP</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> + <source>Connect to the Bitcoin network through a SOCKS proxy (e.g. when connecting through Tor).</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>&Connect through SOCKS proxy:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+9"/> + <source>Proxy &IP:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+19"/> + <source>IP address of the proxy (e.g. 127.0.0.1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> + <source>&Port:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+19"/> + <source>Port of the proxy (e.g. 9050)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> + <source>SOCKS &Version:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+13"/> + <source>SOCKS version of the proxy (e.g. 5)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+36"/> + <source>&Window</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Show only a tray icon after minimizing the window.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>&Minimize to the tray instead of the taskbar</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> + <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>M&inimize on close</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+21"/> + <source>&Display</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+8"/> + <source>User Interface &language:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+13"/> + <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+11"/> + <source>&Unit to show amounts in:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+13"/> + <source>Choose the default subdivision unit to show in the interface and when sending coins.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+9"/> + <source>Whether to show Bitcoin addresses in the transaction list or not.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>&Display addresses in transaction list</source> + <translation type="unfinished"/> + </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="+71"/> + <source>&OK</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> + <source>&Cancel</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+10"/> + <source>&Apply</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../optionsdialog.cpp" line="+63"/> + <source>default</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+131"/> + <source>Confirm options reset</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Some settings may require a client restart to take effect.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>Do you want to proceed?</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+42"/> + <location line="+9"/> + <source>Warning</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-9"/> + <location line="+9"/> + <source>This setting will take effect after restarting Bitcoin.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+29"/> + <source>The supplied proxy address is invalid.</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OverviewPage</name> + <message> + <location filename="../forms/overviewpage.ui" line="+14"/> + <source>Form</source> + <translation>Formulario</translation> + </message> + <message> + <location line="+50"/> + <location line="+214"/> + <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-140"/> + <source>Unconfirmed:</source> + <translation>Inconformidad :</translation> + </message> + <message> + <location line="-81"/> + <source>Wallet</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+49"/> + <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 type="unfinished"/> + </message> + <message> + <location line="+13"/> + <source>Mined balance that has not yet matured</source> + <translation type="unfinished"/> + </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="+56"/> + <source><b>Recent transactions</b></source> + <translation><b>Transacciones recientes</b></translation> + </message> + <message> + <location filename="../overviewpage.cpp" line="+120"/> + <location line="+1"/> + <source>out of sync</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>PaymentServer</name> + <message> + <location filename="../paymentserver.cpp" line="+397"/> + <source>URI handling</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+91"/> + <source>Requested payment amount of %1 is too small (considered dust).</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-204"/> + <location line="+195"/> + <location line="+13"/> + <source>Payment request error</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-207"/> + <source>Cannot start bitcoin: click-to-pay handler</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+195"/> + <source>Unverified payment requests to custom payment scripts are unsupported.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+59"/> + <source>Refund from %1</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+42"/> + <source>Error communicating with %1: %2</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+28"/> + <source>Bad response from server %1</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+32"/> + <source>Payment acknowledged</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-55"/> + <location line="+27"/> + <location line="+17"/> + <source>Network request error</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>QObject</name> + <message> + <location filename="../bitcoin.cpp" line="+119"/> + <location line="+5"/> + <source>Bitcoin</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-4"/> + <source>Error: Specified data directory "%1" does not exist.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+4"/> + <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 type="unfinished"/> + </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 type="unfinished"/> + </message> + <message> + <location line="+10"/> + <location line="+23"/> + <location line="+26"/> + <location line="+23"/> + <location line="+23"/> + <location line="+36"/> + <location line="+53"/> + <location line="+23"/> + <location line="+23"/> + <location filename="../rpcconsole.cpp" line="+360"/> + <source>N/A</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-217"/> + <source>Client version</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-45"/> + <source>&Information</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-10"/> + <source>Debug window</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+78"/> + <source>Using OpenSSL version</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+49"/> + <source>Startup time</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+29"/> + <source>Network</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> + <source>Number of connections</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+23"/> + <source>On testnet</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+23"/> + <source>Block chain</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> + <source>Current number of blocks</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+23"/> + <source>Estimated total blocks</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+23"/> + <source>Last block time</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+52"/> + <source>&Open</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> + <source>Command-line options</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+10"/> + <source>&Show</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+24"/> + <source>&Console</source> + <translation type="unfinished"/> + </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 type="unfinished"/> + </message> + <message> + <location line="+80"/> + <source>Out:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-541"/> + <source>Build date</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-79"/> + <source>Bitcoin Core</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+279"/> + <source>Debug log file</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> + <source>Open the Bitcoin debug log file from the current data directory. This can take a few seconds for large log files.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+26"/> + <source>Show the Bitcoin-Core help message to get a list with possible Bitcoin command-line options.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+76"/> + <source>Clear console</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../rpcconsole.cpp" line="-30"/> + <source>Welcome to the Bitcoin RPC console.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Type <b>help</b> for an overview of available commands.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+128"/> + <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="+19"/> + <source>The amount to request</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-32"/> + <source>&Label:</source> + <translation>&Etiqueta</translation> + </message> + <message> + <location line="-34"/> + <source>&Message:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+20"/> + <source>The message to attach to payment request</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-37"/> + <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>The label to associate with the new receiving address</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+14"/> + <source>Use this form to request payments. All fields are optional.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+56"/> + <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>Previously requested payments</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> + <source>Show the selected request (does the same as double clicking an entry)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Show</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+11"/> + <source>Remove the selected entries from the list</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Remove</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>ReceiveRequestDialog</name> + <message> + <location filename="../forms/receiverequestdialog.ui" line="+29"/> + <source>QR Code</source> + <translation type="unfinished"/> + </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>Domicilio</translation> + </message> + <message> + <location line="+2"/> + <source>Amount</source> + <translation>Monto</translation> + </message> + <message> + <location line="+2"/> + <source>Label</source> + <translation>Etiqueta</translation> + </message> + <message> + <location line="+2"/> + <source>Message</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+10"/> + <source>Resulting URI too long, try to reduce the text for label / message.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+5"/> + <source>Error encoding URI into QR Code.</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>RecentRequestsTableModel</name> + <message> + <location filename="../recentrequeststablemodel.cpp" line="+14"/> + <source>Date</source> + <translation>Fecha</translation> + </message> + <message> + <location line="+0"/> + <source>Label</source> + <translation>Etiqueta</translation> + </message> + <message> + <location line="+0"/> + <source>Message</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>Amount</source> + <translation>Monto</translation> + </message> + <message> + <location line="+36"/> + <source>(no label)</source> + <translation>(sin etiqueta)</translation> + </message> + <message> + <location line="+9"/> + <source>(no message)</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>SendCoinsDialog</name> + <message> + <location filename="../forms/sendcoinsdialog.ui" line="+14"/> + <location filename="../sendcoinsdialog.cpp" line="+381"/> + <location line="+81"/> + <source>Send Coins</source> + <translation>Mandar monedas</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 type="unfinished"/> + </message> + <message> + <location line="+35"/> + <source>Bytes:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+48"/> + <source>Amount:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+32"/> + <source>Priority:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+48"/> + <source>Fee:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+32"/> + <source>Low Output:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+48"/> + <source>After Fee:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+32"/> + <source>Change:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+44"/> + <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Custom change address</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+115"/> + <source>Send to multiple recipients at once</source> + <translation>Enviar a múltiples receptores a la vez</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 type="unfinished"/> + </message> + <message> + <location line="+22"/> + <source>Balance:</source> + <translation>Saldo:</translation> + </message> + <message> + <location line="+41"/> + <source>Confirm the send action</source> + <translation>Confirme la acción de enviar</translation> + </message> + <message> + <location line="+3"/> + <source>S&end</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../sendcoinsdialog.cpp" line="-229"/> + <source>Confirm send coins</source> + <translation>Confirme para mandar monedas</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>Ingrese una direccion Bitcoin (ejem. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> + <message> + <location line="+15"/> + <source>Copy quantity</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy fee</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy after fee</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy bytes</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy priority</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy low output</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy change</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+170"/> + <source>Total Amount %1 (= %2)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>or</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+202"/> + <source>The recipient address is not valid, please recheck.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>The amount to pay must be larger than 0.</source> + <translation>El monto a pagar debe ser mayor a 0</translation> + </message> + <message> + <location line="+3"/> + <source>The amount exceeds your balance.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>The total exceeds your balance when the %1 transaction fee is included.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Duplicate address found, can only send to each address once per send operation.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Transaction creation failed!</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+4"/> + <source>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="+113"/> + <source>Warning: Invalid Bitcoin address</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+13"/> + <source>(no label)</source> + <translation>(sin etiqueta)</translation> + </message> + <message> + <location line="+8"/> + <source>Warning: Unknown change address</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-378"/> + <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="+501"/> + <location line="+536"/> + <source>A&mount:</source> + <translation>M&onto</translation> + </message> + <message> + <location line="-1132"/> + <source>Pay &To:</source> + <translation>Pagar &a:</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>Ingrese una etiqueta para esta dirección para agregarlo en su libreta de direcciones.</translation> + </message> + <message> + <location filename="../forms/sendcoinsentry.ui" line="+57"/> + <source>&Label:</source> + <translation>&Etiqueta</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>Pegar dirección del portapapeles</translation> + </message> + <message> + <location line="+10"/> + <source>Alt+P</source> + <translation>Alt+P</translation> + </message> + <message> + <location line="+7"/> + <location line="+504"/> + <location line="+536"/> + <source>Remove this entry</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-40"/> + <source>This is a verified payment request.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-971"/> + <source>Enter a label for this address to add it to the list of used addresses</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+439"/> + <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>Ingrese una direccion Bitcoin (ejem. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> +</context> +<context> + <name>SignVerifyMessageDialog</name> + <message> + <location filename="../forms/signverifymessagedialog.ui" line="+14"/> + <source>Signatures - Sign / Verify a Message</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+13"/> + <source>&Sign Message</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>You can sign messages with your addresses to prove you own them. Be careful not to sign anything vague, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+18"/> + <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+10"/> + <location line="+213"/> + <source>Choose 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>Pegar dirección del portapapeles</translation> + </message> + <message> + <location line="+10"/> + <source>Alt+P</source> + <translation>Alt+P</translation> + </message> + <message> + <location line="+12"/> + <source>Enter the message you want to sign here</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> + <source>Signature</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+27"/> + <source>Copy the current signature to the system clipboard</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+21"/> + <source>Sign the message to prove you own this Bitcoin address</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Sign &Message</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+14"/> + <source>Reset all sign message fields</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <location line="+146"/> + <source>Clear &All</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-87"/> + <source>&Verify Message</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Enter the signing address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+21"/> + <source>The address the message was signed with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+40"/> + <source>Verify the message to ensure it was signed with the specified Bitcoin address</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Verify &Message</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+14"/> + <source>Reset all verify message fields</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../signverifymessagedialog.cpp" line="+29"/> + <location line="+3"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>Ingrese una direccion Bitcoin (ejem. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> + <message> + <location line="-2"/> + <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"/> + <source>The entered address is invalid.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-81"/> + <location line="+8"/> + <location line="+73"/> + <location line="+8"/> + <source>Please check the address and try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-81"/> + <location line="+81"/> + <source>The entered address does not refer to a key.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-73"/> + <source>Wallet unlock was cancelled.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+8"/> + <source>Private key for the entered address is not available.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> + <source>Message signing failed.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+5"/> + <source>Message signed.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+59"/> + <source>The signature could not be decoded.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <location line="+13"/> + <source>Please check the signature and try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>The signature did not match the message digest.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> + <source>Message verification failed.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+5"/> + <source>Message verified.</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>SplashScreen</name> + <message> + <location filename="../splashscreen.cpp" line="+26"/> + <source>Bitcoin Core</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>The Bitcoin Core developers</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>[testnet]</source> + <translation type="unfinished"/> + </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>Abrir hasta %1</translation> + </message> + <message> + <location line="+6"/> + <source>%1/offline</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>%1/unconfirmed</source> + <translation>%1/No confirmado</translation> + </message> + <message> + <location line="+2"/> + <source>%1 confirmations</source> + <translation>%1 confirmaciones</translation> + </message> + <message> + <location line="+18"/> + <source>Status</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location line="+7"/> + <source>, broadcast through %n node(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> + <location line="+4"/> + <source>Date</source> + <translation>Fecha</translation> + </message> + <message> + <location line="+7"/> + <source>Source</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>Generated</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+5"/> + <location line="+17"/> + <source>From</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <location line="+22"/> + <location line="+58"/> + <source>To</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-77"/> + <location line="+2"/> + <source>own address</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-2"/> + <source>label</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+37"/> + <location line="+12"/> + <location line="+45"/> + <location line="+17"/> + <location line="+48"/> + <source>Credit</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location line="-120"/> + <source>matures in %n more block(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> + <location line="+2"/> + <source>not accepted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+44"/> + <location line="+8"/> + <location line="+15"/> + <location line="+48"/> + <source>Debit</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-57"/> + <source>Transaction fee</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> + <source>Net amount</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Message</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>Comment</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>Transaction ID</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+13"/> + <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 type="unfinished"/> + </message> + <message> + <location line="+8"/> + <source>Transaction</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Inputs</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+23"/> + <source>Amount</source> + <translation>Monto</translation> + </message> + <message> + <location line="+1"/> + <source>true</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>false</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-227"/> + <source>, has not been successfully broadcast yet</source> + <translation>, no ha sido transmitido aun</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>desconocido</translation> + </message> +</context> +<context> + <name>TransactionDescDialog</name> + <message> + <location filename="../forms/transactiondescdialog.ui" line="+14"/> + <source>Transaction details</source> + <translation>Detalles de la transacción</translation> + </message> + <message> + <location line="+6"/> + <source>This pane shows a detailed description of the transaction</source> + <translation>Este panel muestras una descripción detallada de la transacción</translation> + </message> +</context> +<context> + <name>TransactionTableModel</name> + <message> + <location filename="../transactiontablemodel.cpp" line="+234"/> + <source>Date</source> + <translation>Fecha</translation> + </message> + <message> + <location line="+0"/> + <source>Type</source> + <translation>Tipo</translation> + </message> + <message> + <location line="+0"/> + <source>Address</source> + <translation>Domicilio</translation> + </message> + <message> + <location line="+0"/> + <source>Amount</source> + <translation>Monto</translation> + </message> + <message numerus="yes"> + <location line="+57"/> + <source>Open for %n more block(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> + <location line="+3"/> + <source>Open until %1</source> + <translation>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="+3"/> + <source>Confirmed (%1 confirmations)</source> + <translation>Confimado (%1 confirmaciones)</translation> + </message> + <message numerus="yes"> + <location line="+8"/> + <source>Mined balance will be available when it matures in %n more block(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> + <location line="+5"/> + <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> + <message> + <location line="+3"/> + <source>Generated but not accepted</source> + <translation>Generado pero no aprovado</translation> + </message> + <message> + <location line="+43"/> + <source>Received with</source> + <translation>Recivido con</translation> + </message> + <message> + <location line="+2"/> + <source>Received from</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Sent to</source> + <translation>Enviar a</translation> + </message> + <message> + <location line="+2"/> + <source>Payment to yourself</source> + <translation>Pagar a si mismo</translation> + </message> + <message> + <location line="+2"/> + <source>Mined</source> + <translation>Minado</translation> + </message> + <message> + <location line="+38"/> + <source>(n/a)</source> + <translation>(n/a)</translation> + </message> + <message> + <location line="+199"/> + <source>Transaction status. Hover over this field to show number of confirmations.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>Date and time that the transaction was received.</source> + <translation>Fecha y hora en que la transacción fue recibida </translation> + </message> + <message> + <location line="+2"/> + <source>Type of transaction.</source> + <translation>Escriba una transacción</translation> + </message> + <message> + <location line="+2"/> + <source>Destination address of transaction.</source> + <translation>Direccion del destinatario de la transacción</translation> + </message> + <message> + <location line="+2"/> + <source>Amount removed from or added to balance.</source> + <translation>Cantidad removida del saldo o agregada </translation> + </message> +</context> +<context> + <name>TransactionView</name> + <message> + <location filename="../transactionview.cpp" line="+57"/> + <location line="+16"/> + <source>All</source> + <translation>Todo</translation> + </message> + <message> + <location line="-15"/> + <source>Today</source> + <translation>Hoy</translation> + </message> + <message> + <location line="+1"/> + <source>This week</source> + <translation>Esta semana </translation> + </message> + <message> + <location line="+1"/> + <source>This month</source> + <translation>Este mes </translation> + </message> + <message> + <location line="+1"/> + <source>Last month</source> + <translation>El mes pasado </translation> + </message> + <message> + <location line="+1"/> + <source>This year</source> + <translation>Este año</translation> + </message> + <message> + <location line="+1"/> + <source>Range...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+11"/> + <source>Received with</source> + <translation>Recivido con</translation> + </message> + <message> + <location line="+2"/> + <source>Sent to</source> + <translation>Enviar a</translation> + </message> + <message> + <location line="+2"/> + <source>To yourself</source> + <translation>Para ti mismo</translation> + </message> + <message> + <location line="+1"/> + <source>Mined</source> + <translation>Minado </translation> + </message> + <message> + <location line="+1"/> + <source>Other</source> + <translation>Otro</translation> + </message> + <message> + <location line="+6"/> + <source>Enter address or label to search</source> + <translation>Ingrese dirección o capa a buscar </translation> + </message> + <message> + <location line="+6"/> + <source>Min amount</source> + <translation>Monto minimo </translation> + </message> + <message> + <location line="+34"/> + <source>Copy address</source> + <translation>Copiar dirección </translation> + </message> + <message> + <location line="+1"/> + <source>Copy label</source> + <translation>Copiar capa </translation> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy transaction ID</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Edit label</source> + <translation>Editar capa </translation> + </message> + <message> + <location line="+1"/> + <source>Show transaction details</source> + <translation type="unfinished"/> + </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>Arhchivo separado por comas (*.CSV)</translation> + </message> + <message> + <location line="+9"/> + <source>Confirmed</source> + <translation>Confirmado </translation> + </message> + <message> + <location line="+1"/> + <source>Date</source> + <translation>Fecha</translation> + </message> + <message> + <location line="+1"/> + <source>Type</source> + <translation>Tipo</translation> + </message> + <message> + <location line="+1"/> + <source>Label</source> + <translation>Etiqueta</translation> + </message> + <message> + <location line="+1"/> + <source>Address</source> + <translation>Domicilio</translation> + </message> + <message> + <location line="+1"/> + <source>Amount</source> + <translation>Monto</translation> + </message> + <message> + <location line="+1"/> + <source>ID</source> + <translation>ID</translation> + </message> + <message> + <location line="+107"/> + <source>Range:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+8"/> + <source>to</source> + <translation>Para</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>Mandar monedas</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="+217"/> + <source>Usage:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-54"/> + <source>List commands</source> + <translation>Lista de comandos</translation> + </message> + <message> + <location line="-14"/> + <source>Get help for a command</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+26"/> + <source>Options:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+23"/> + <source>Specify configuration file (default: bitcoin.conf)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Specify pid file (default: bitcoind.pid)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-1"/> + <source>Specify data directory</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-9"/> + <source>Set database cache size in megabytes (default: 25)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-27"/> + <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+5"/> + <source>Maintain at most <n> connections to peers (default: 125)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-50"/> + <source>Connect to a node to retrieve peer addresses, and disconnect</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+84"/> + <source>Specify your own public address</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+4"/> + <source>Threshold for disconnecting misbehaving peers (default: 100)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-147"/> + <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-33"/> + <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+31"/> + <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 type="unfinished"/> + </message> + <message> + <location line="+79"/> + <source>Run in the background as a daemon and accept commands</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+39"/> + <source>Use the test network</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-117"/> + <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-92"/> + <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>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 type="unfinished"/> + </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 type="unfinished"/> + </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 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 type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Failed to read block info</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Failed to read block</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Failed to sync block index</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Failed to write block index</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Failed to write block info</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Failed to write block</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Failed to write file info</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Failed to write to coin database</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Failed to write transaction index</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Failed to write undo data</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+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>Enviar instrucción al servidor de Bitcoin</translation> + </message> + <message> + <location line="+8"/> + <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>Iniciar servidor Bitcoin</translation> + </message> + <message> + <location line="+12"/> + <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="+3"/> + <source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>You need to rebuild the database using -reindex to change -txindex</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-78"/> + <source>Imports blocks from external blk000??.dat file</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-104"/> + <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+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="+88"/> + <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 type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Send trace/debug info to debugger</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Set minimum block size in bytes (default: 0)</source> + <translation type="unfinished"/> + </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="+4"/> + <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 type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Use UPnP to map the listening port (default: 1 when listening)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>Username for JSON-RPC connections</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Warning</source> + <translation type="unfinished"/> + </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 type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>wallet.dat corrupt, salvage failed</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-57"/> + <source>Password for JSON-RPC connections</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-69"/> + <source>Allow JSON-RPC connections from specified IP address</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+79"/> + <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-131"/> + <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+160"/> + <source>Upgrade wallet to latest format</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-23"/> + <source>Set key pool size to <n> (default: 100)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-12"/> + <source>Rescan the block chain for missing wallet transactions</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+38"/> + <source>Use OpenSSL (https) for JSON-RPC connections</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-29"/> + <source>Server certificate file (default: server.cert)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Server private key (default: server.pem)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> + <source>This help message</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-106"/> + <source>Allow DNS lookups for -addnode, -seednode and -connect</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+59"/> + <source>Loading addresses...</source> + <translation>Cargando direcciones...</translation> + </message> + <message> + <location line="-37"/> + <source>Error loading wallet.dat: Wallet corrupted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+98"/> + <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-100"/> + <source>Error loading wallet.dat</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+31"/> + <source>Invalid -proxy address: '%s'</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+56"/> + <source>Unknown network specified in -onlynet: '%s'</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-1"/> + <source>Unknown -socks proxy version requested: %i</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-100"/> + <source>Cannot resolve -bind address: '%s'</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Cannot resolve -externalip address: '%s'</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+47"/> + <source>Invalid amount for -paytxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Invalid amount</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-6"/> + <source>Insufficient funds</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+10"/> + <source>Loading block index...</source> + <translation>Cargando indice de bloques... </translation> + </message> + <message> + <location line="-61"/> + <source>Add a node to connect to and attempt to keep the connection open</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-32"/> + <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+94"/> + <source>Loading wallet...</source> + <translation>Cargando billetera...</translation> + </message> + <message> + <location line="-55"/> + <source>Cannot downgrade wallet</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Cannot write default address</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+66"/> + <source>Rescanning...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-58"/> + <source>Done loading</source> + <translation>Carga completa</translation> + </message> + <message> + <location line="+85"/> + <source>To use the %s option</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-77"/> + <source>Error</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-34"/> + <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 type="unfinished"/> + </message> +</context> +</TS>
\ No newline at end of file diff --git a/src/qt/locale/bitcoin_fa_IR.ts b/src/qt/locale/bitcoin_fa_IR.ts index 2345ed07d0..faf665f8f2 100644 --- a/src/qt/locale/bitcoin_fa_IR.ts +++ b/src/qt/locale/bitcoin_fa_IR.ts @@ -3,13 +3,13 @@ <name>AboutDialog</name> <message> <location filename="../forms/aboutdialog.ui" line="+14"/> - <source>About Bitcoin</source> - <translation>در مورد بیتکویین</translation> + <source>About Bitcoin Core</source> + <translation type="unfinished"/> </message> <message> <location line="+39"/> - <source><b>Bitcoin</b> version</source> - <translation><b>Bitcoin</b> version</translation> + <source><b>Bitcoin Core</b> version</source> + <translation type="unfinished"/> </message> <message> <location line="+57"/> @@ -22,7 +22,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="+14"/> + <location filename="../aboutdialog.cpp" line="+19"/> <source>Copyright</source> <translation type="unfinished"/> </message> @@ -65,7 +65,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location filename="../addressbookpage.cpp" line="+72"/> + <location filename="../addressbookpage.cpp" line="+74"/> <source>&Copy Address</source> <translation>و کپی آدرس</translation> </message> @@ -135,7 +135,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>و ویرایش</translation> </message> <message> - <location line="+197"/> + <location line="+194"/> <source>Export Address List</source> <translation type="unfinished"/> </message> @@ -158,7 +158,7 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>AddressTableModel</name> <message> - <location filename="../addresstablemodel.cpp" line="+164"/> + <location filename="../addresstablemodel.cpp" line="+168"/> <source>Label</source> <translation>برچسب</translation> </message> @@ -196,7 +196,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>رمز/پَس فرِیز را دوباره وارد کنید</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="+34"/> + <location filename="../askpassphrasedialog.cpp" line="+40"/> <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>10 or more random characters</b>, or <b>eight or more words</b>.</source> <translation>رمز/پَس فرِیز جدید را در wallet وارد کنید. برای انتخاب رمز/پَس فرِیز از 10 کاراکتر تصادفی یا بیشتر و یا هشت کلمه یا بیشتر استفاده کنید. </translation> </message> @@ -317,17 +317,17 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+250"/> + <location filename="../bitcoingui.cpp" line="+260"/> <source>Sign &message...</source> <translation>امضا و پیام</translation> </message> <message> - <location line="+254"/> + <location line="+290"/> <source>Synchronizing with network...</source> <translation>به روز رسانی با شبکه...</translation> </message> <message> - <location line="-324"/> + <location line="-360"/> <source>&Overview</source> <translation>و بازبینی</translation> </message> @@ -393,7 +393,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>تغییر رمز/پَس فرِیز</translation> </message> <message> - <location line="+259"/> + <location line="+295"/> <source>Importing blocks from disk...</source> <translation type="unfinished"/> </message> @@ -403,7 +403,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-322"/> + <location line="-358"/> <source>Send coins to a Bitcoin address</source> <translation type="unfinished"/> </message> @@ -438,20 +438,18 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-180"/> - <location line="+6"/> - <location line="+513"/> + <location line="+375"/> <source>Bitcoin</source> <translation>bitcoin</translation> </message> <message> - <location line="-519"/> - <location line="+6"/> + <location line="-563"/> + <location line="+10"/> <source>Wallet</source> <translation>کیف پول</translation> </message> <message> - <location line="+109"/> + <location line="+113"/> <source>&Send</source> <translation type="unfinished"/> </message> @@ -461,13 +459,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+28"/> - <location line="+2"/> - <source>&About Bitcoin</source> - <translation>&در مورد بیتکویین</translation> - </message> - <message> - <location line="+14"/> + <location line="+44"/> <location line="+2"/> <source>&Show / Hide</source> <translation>&نمایش/ عدم نمایش و</translation> @@ -493,12 +485,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+35"/> + <location line="+39"/> <source>&File</source> <translation>و فایل</translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>&Settings</source> <translation>و تنظیمات</translation> </message> @@ -513,18 +505,30 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>نوار ابزار</translation> </message> <message> - <location line="-235"/> - <location line="+294"/> + <location line="-244"/> + <location line="+321"/> <source>[testnet]</source> <translation>[testnet]</translation> </message> <message> - <location line="-177"/> + <location line="-331"/> + <location line="+10"/> + <source>Bitcoin Core</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+121"/> <source>Request payments (generates QR codes and bitcoin: URIs)</source> <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+27"/> + <location line="+2"/> + <source>&About Bitcoin Core</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+34"/> <source>&Used sending addresses...</source> <translation type="unfinished"/> </message> @@ -544,13 +548,23 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+106"/> + <location line="+2"/> + <source>Open URI...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Open a bitcoin: URI or payment request</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+126"/> <location line="+5"/> <source>Bitcoin client</source> <translation>مشتری bitcoin</translation> </message> <message numerus="yes"> - <location line="+120"/> + <location line="+133"/> <source>%n active connection(s) to Bitcoin network</source> <translation><numerusform>%n ارتباط فعال به شبکه Bitcoin %n ارتباط فعال به شبکه Bitcoin</numerusform></translation> @@ -656,17 +670,7 @@ Address: %4 </translation> </message> <message> - <location line="+34"/> - <source>URI handling</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+0"/> - <source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+45"/> + <location line="+67"/> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>wallet رمزگذاری شد و در حال حاضر از حالت قفل در آمده است</translation> </message> @@ -676,7 +680,7 @@ Address: %4 <translation>wallet رمزگذاری شد و در حال حاضر قفل است</translation> </message> <message> - <location filename="../bitcoin.cpp" line="+110"/> + <location filename="../bitcoin.cpp" line="+116"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -684,12 +688,299 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+115"/> + <location filename="../clientmodel.cpp" line="+119"/> <source>Network Alert</source> <translation>هشدار شبکه</translation> </message> </context> <context> + <name>CoinControlDialog</name> + <message> + <location filename="../forms/coincontroldialog.ui" line="+14"/> + <source>Coin Control Address Selection</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+34"/> + <source>Quantity:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+29"/> + <source>Bytes:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+45"/> + <source>Amount:</source> + <translation>میزان وجه:</translation> + </message> + <message> + <location line="+29"/> + <source>Priority:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+45"/> + <source>Fee:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+32"/> + <source>Low Output:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+48"/> + <source>After Fee:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+32"/> + <source>Change:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+63"/> + <source>(un)select all</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+13"/> + <source>Tree mode</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> + <source>List mode</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+52"/> + <source>Amount</source> + <translation>میزان</translation> + </message> + <message> + <location line="+10"/> + <source>Address</source> + <translation>حساب</translation> + </message> + <message> + <location line="+5"/> + <source>Date</source> + <translation>تاریخ</translation> + </message> + <message> + <location line="+5"/> + <source>Confirmations</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Confirmed</source> + <translation>تایید شده</translation> + </message> + <message> + <location line="+5"/> + <source>Priority</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../coincontroldialog.cpp" line="+42"/> + <source>Copy address</source> + <translation>آدرس را کپی کنید</translation> + </message> + <message> + <location line="+1"/> + <source>Copy label</source> + <translation>برچسب را کپی کنید</translation> + </message> + <message> + <location line="+1"/> + <location line="+26"/> + <source>Copy amount</source> + <translation>میزان وجه کپی شود</translation> + </message> + <message> + <location line="-25"/> + <source>Copy transaction ID</source> + <translation 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="+171"/> + <source>Dust</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>yes</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>no</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+10"/> + <source>This label turns red, if the transaction size is greater than 1000 bytes.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <location line="+5"/> + <source>This means a fee of at least %1 per kB is required.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-4"/> + <source>Can vary +/- 1 byte per input.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>Transactions with higher priority are more likely to get included into a block.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>This label turns red, if the priority is smaller than "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>(برچسب ندارد)</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"/> @@ -717,7 +1008,7 @@ Address: %4 <translation>حساب&</translation> </message> <message> - <location filename="../editaddressdialog.cpp" line="+21"/> + <location filename="../editaddressdialog.cpp" line="+25"/> <source>New receiving address</source> <translation>حساب دریافت کننده جدید </translation> @@ -761,7 +1052,7 @@ Address: %4 <context> <name>FreespaceChecker</name> <message> - <location filename="../intro.cpp" line="+61"/> + <location filename="../intro.cpp" line="+65"/> <source>A new data directory will be created.</source> <translation type="unfinished"/> </message> @@ -789,18 +1080,18 @@ Address: %4 <context> <name>GUIUtil::HelpMessageBox</name> <message> - <location filename="../guiutil.cpp" line="+558"/> - <location line="+13"/> - <source>Bitcoin-Qt</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-13"/> + <location filename="../guiutil.cpp" line="+597"/> <source>version</source> <translation>نسخه</translation> </message> <message> - <location line="+2"/> + <location line="+0"/> + <location line="+13"/> + <source>Bitcoin Core</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-11"/> <source>Usage:</source> <translation>میزان استفاده:</translation> </message> @@ -844,17 +1135,17 @@ Address: %4 </message> <message> <location line="+9"/> - <source>Welcome to Bitcoin-Qt.</source> + <source>Welcome to Bitcoin Core.</source> <translation type="unfinished"/> </message> <message> <location line="+26"/> - <source>As this is the first time the program is launched, you can choose where Bitcoin-Qt will store its data.</source> + <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source> <translation type="unfinished"/> </message> <message> <location line="+10"/> - <source>Bitcoin-Qt will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source> + <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source> <translation type="unfinished"/> </message> <message> @@ -868,7 +1159,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../intro.cpp" line="+105"/> + <location filename="../intro.cpp" line="+85"/> + <source>Bitcoin</source> + <translation>bitcoin</translation> + </message> + <message> + <location line="+1"/> + <source>Error: Specified data directory "%1" can not be created.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+19"/> <source>Error</source> <translation>خطا</translation> </message> @@ -884,6 +1185,34 @@ Address: %4 </message> </context> <context> + <name>OpenURIDialog</name> + <message> + <location filename="../forms/openuridialog.ui" line="+14"/> + <source>Open URI</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Open payment request from URI or file</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+9"/> + <source>URI:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+11"/> + <source>Select payment request file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../openuridialog.cpp" line="+47"/> + <source>Select payment request file to open</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OptionsDialog</name> <message> <location filename="../forms/optionsdialog.ui" line="+14"/> @@ -1041,6 +1370,16 @@ Address: %4 <translation>و نمایش آدرسها در فهرست تراکنش</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="+71"/> <source>&OK</source> <translation>و تایید</translation> @@ -1056,12 +1395,12 @@ Address: %4 <translation>و به کار گرفتن</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+58"/> + <location filename="../optionsdialog.cpp" line="+63"/> <source>default</source> <translation>پیش فرض</translation> </message> <message> - <location line="+130"/> + <location line="+131"/> <source>Confirm options reset</source> <translation type="unfinished"/> </message> @@ -1102,17 +1441,17 @@ Address: %4 </message> <message> <location line="+50"/> - <location line="+202"/> + <location line="+214"/> <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source> <translation>اطلاعات نمایش داده شده ممکن است روزآمد نباشد. wallet شما به صورت خودکار بعد از برقراری اتصال با شبکه bitcoin به روز می شود اما این فرایند هنوز تکمیل نشده است.</translation> </message> <message> - <location line="-131"/> + <location line="-140"/> <source>Unconfirmed:</source> <translation>تایید نشده</translation> </message> <message> - <location line="-78"/> + <location line="-81"/> <source>Wallet</source> <translation>کیف پول</translation> </message> @@ -1127,12 +1466,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+29"/> + <location line="+32"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation type="unfinished"/> </message> <message> - <location line="+13"/> + <location line="+16"/> <source>Immature:</source> <translation type="unfinished"/> </message> @@ -1142,7 +1481,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+13"/> + <location line="+16"/> <source>Total:</source> <translation type="unfinished"/> </message> @@ -1152,12 +1491,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+53"/> + <location line="+56"/> <source><b>Recent transactions</b></source> <translation>تراکنشهای اخیر</translation> </message> <message> - <location filename="../overviewpage.cpp" line="+116"/> + <location filename="../overviewpage.cpp" line="+120"/> <location line="+1"/> <source>out of sync</source> <translation>خارج از روزآمد سازی</translation> @@ -1166,7 +1505,7 @@ Address: %4 <context> <name>PaymentServer</name> <message> - <location filename="../paymentserver.cpp" line="+392"/> + <location filename="../paymentserver.cpp" line="+397"/> <source>URI handling</source> <translation type="unfinished"/> </message> @@ -1176,23 +1515,29 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+69"/> + <location line="+91"/> <source>Requested payment amount of %1 is too small (considered dust).</source> <translation type="unfinished"/> </message> <message> - <location line="+4"/> - <location line="+37"/> + <location line="-204"/> + <location line="+195"/> + <location line="+13"/> <source>Payment request error</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Insecure requests to custom payment scripts unsupported</source> + <location line="-207"/> + <source>Cannot start bitcoin: click-to-pay handler</source> <translation type="unfinished"/> </message> <message> - <location line="+38"/> + <location line="+195"/> + <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> @@ -1202,7 +1547,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>Bad response from server %1</source> <translation type="unfinished"/> </message> @@ -1212,8 +1557,8 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-58"/> - <location line="+30"/> + <location line="-55"/> + <location line="+27"/> <location line="+17"/> <source>Network request error</source> <translation type="unfinished"/> @@ -1222,9 +1567,8 @@ Address: %4 <context> <name>QObject</name> <message> - <location filename="../bitcoin.cpp" line="+114"/> + <location filename="../bitcoin.cpp" line="+119"/> <location line="+5"/> - <location filename="../intro.cpp" line="-32"/> <source>Bitcoin</source> <translation>bitcoin</translation> </message> @@ -1238,16 +1582,11 @@ Address: %4 <source>Error: Invalid combination of -regtest and -testnet.</source> <translation type="unfinished"/> </message> - <message> - <location filename="../intro.cpp" line="+1"/> - <source>Error: Specified data directory "%1" can not be created.</source> - <translation type="unfinished"/> - </message> </context> <context> <name>QRImageWidget</name> <message> - <location filename="../receiverequestdialog.cpp" line="+32"/> + <location filename="../receiverequestdialog.cpp" line="+36"/> <source>&Save Image...</source> <translation type="unfinished"/> </message> @@ -1263,9 +1602,8 @@ Address: %4 </message> <message> <location line="+0"/> - <source>PNG Images (*.png)</source> - <translation>تصاویر با فرمت PNG -(*.png)</translation> + <source>PNG Image (*.png)</source> + <translation type="unfinished"/> </message> </context> <context> @@ -1285,7 +1623,7 @@ Address: %4 <location line="+53"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+352"/> + <location filename="../rpcconsole.cpp" line="+360"/> <source>N/A</source> <translation type="unfinished"/> </message> @@ -1300,7 +1638,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+68"/> + <location line="-10"/> + <source>Debug window</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+78"/> <source>Using OpenSSL version</source> <translation type="unfinished"/> </message> @@ -1332,7 +1675,7 @@ Address: %4 <message> <location line="+7"/> <source>Current number of blocks</source> - <translation type="unfinished"/> + <translation>تعداد زنجیره های حاضر</translation> </message> <message> <location line="+23"/> @@ -1355,12 +1698,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+7"/> - <source>Show the Bitcoin-Qt help message to get a list with possible Bitcoin command-line options.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> + <location line="+10"/> <source>&Show</source> <translation type="unfinished"/> </message> @@ -1400,12 +1738,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-104"/> - <source>Bitcoin - Debug window</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+25"/> + <location line="-79"/> <source>Bitcoin Core</source> <translation type="unfinished"/> </message> @@ -1420,7 +1753,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+102"/> + <location line="+26"/> + <source>Show the Bitcoin-Core help message to get a list with possible Bitcoin command-line options.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+76"/> <source>Clear console</source> <translation type="unfinished"/> </message> @@ -1478,37 +1816,32 @@ Address: %4 <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+22"/> + <location filename="../forms/receivecoinsdialog.ui" line="+83"/> <source>&Amount:</source> <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+19"/> <source>The amount to request</source> <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="-32"/> <source>&Label:</source> <translation>و برچسب</translation> </message> <message> - <location line="+10"/> - <source>The label to associate with the receiving address</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+7"/> + <location line="-34"/> <source>&Message:</source> <translation type="unfinished"/> </message> <message> - <location line="+10"/> + <location line="+20"/> <source>The message to attach to payment request</source> <translation type="unfinished"/> </message> <message> - <location line="+14"/> + <location line="-37"/> <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> @@ -1518,12 +1851,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="+27"/> + <source>The label to associate with the new receiving address</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+14"/> <source>Use this form to request payments. All fields are optional.</source> <translation type="unfinished"/> </message> <message> - <location line="+17"/> + <location line="+56"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -1537,6 +1875,31 @@ Address: %4 <source>&Request payment</source> <translation type="unfinished"/> </message> + <message> + <location line="+47"/> + <source>Previously requested payments</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> + <source>Show the selected request (does the same as double clicking an entry)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Show</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+11"/> + <source>Remove the selected entries from the list</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Remove</source> + <translation type="unfinished"/> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -1557,16 +1920,11 @@ Address: %4 </message> <message> <location line="+7"/> - <source>&Copy Image</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+7"/> <source>&Save Image...</source> <translation type="unfinished"/> </message> <message> - <location filename="../receiverequestdialog.cpp" line="+58"/> + <location filename="../receiverequestdialog.cpp" line="+56"/> <source>Request payment to %1</source> <translation type="unfinished"/> </message> @@ -1612,16 +1970,119 @@ Address: %4 </message> </context> <context> + <name>RecentRequestsTableModel</name> + <message> + <location filename="../recentrequeststablemodel.cpp" line="+14"/> + <source>Date</source> + <translation>تاریخ</translation> + </message> + <message> + <location line="+0"/> + <source>Label</source> + <translation>برچسب</translation> + </message> + <message> + <location line="+0"/> + <source>Message</source> + <translation>پیام</translation> + </message> + <message> + <location line="+0"/> + <source>Amount</source> + <translation>میزان</translation> + </message> + <message> + <location line="+36"/> + <source>(no label)</source> + <translation>(برچسب ندارد)</translation> + </message> + <message> + <location line="+9"/> + <source>(no message)</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="+14"/> - <location filename="../sendcoinsdialog.cpp" line="+140"/> - <location line="+213"/> + <location filename="../sendcoinsdialog.cpp" line="+381"/> + <location line="+81"/> <source>Send Coins</source> <translation>سکه های ارسالی</translation> </message> <message> - <location line="+50"/> + <location line="+76"/> + <source>Coin Control Features</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+20"/> + <source>Inputs...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> + <source>automatically selected</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+19"/> + <source>Insufficient funds!</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+89"/> + <source>Quantity:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+35"/> + <source>Bytes:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+48"/> + <source>Amount:</source> + <translation>میزان وجه:</translation> + </message> + <message> + <location line="+32"/> + <source>Priority:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+48"/> + <source>Fee:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+32"/> + <source>Low Output:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+48"/> + <source>After Fee:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+32"/> + <source>Change:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+44"/> + <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Custom change address</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+115"/> <source>Send to multiple recipients at once</source> <translation>ارسال همزمان به گیرنده های متعدد</translation> </message> @@ -1646,12 +2107,7 @@ Address: %4 <translation>مانده حساب:</translation> </message> <message> - <location line="+10"/> - <source>123.456 BTC</source> - <translation>123.456 BTC</translation> - </message> - <message> - <location line="+31"/> + <location line="+41"/> <source>Confirm the send action</source> <translation>تایید عملیات ارسال </translation> </message> @@ -1661,69 +2117,135 @@ Address: %4 <translation>و ارسال</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-154"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation>تایید ارسال بیت کوین ها</translation> </message> <message> - <location line="-90"/> + <location line="-74"/> <location line="+5"/> <location line="+5"/> + <location line="+4"/> <source>%1 to %2</source> <translation type="unfinished"/> </message> <message> - <location line="+26"/> + <location line="-136"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>یک آدرس bitcoin وارد کنید (مثال 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> + <message> + <location line="+15"/> + <source>Copy quantity</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation>میزان وجه کپی شود</translation> + </message> + <message> + <location line="+1"/> + <source>Copy fee</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy after fee</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy bytes</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy priority</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy low output</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy change</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+170"/> + <source>Total Amount %1 (= %2)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>or</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+202"/> <source>The recipient address is not valid, please recheck.</source> <translation type="unfinished"/> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>The amount to pay must be larger than 0.</source> <translation>میزان پرداخت باید بیشتر از 0 باشد</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>The amount exceeds your balance.</source> <translation>مقدار مورد نظر از مانده حساب بیشتر است.</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>The total exceeds your balance when the %1 transaction fee is included.</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+3"/> <source>Duplicate address found, can only send to each address once per send operation.</source> <translation type="unfinished"/> </message> <message> + <location line="+3"/> + <source>Transaction creation failed!</source> + <translation type="unfinished"/> + </message> + <message> <location line="+4"/> - <source>Error: Transaction creation failed!</source> + <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation type="unfinished"/> </message> <message> - <location line="+15"/> - <source>Are you sure you want to send?</source> + <location line="+113"/> + <source>Warning: Invalid Bitcoin address</source> <translation type="unfinished"/> </message> <message> - <location line="+9"/> - <source>added as transaction fee</source> + <location line="+13"/> + <source>(no label)</source> + <translation>(برچسب ندارد)</translation> + </message> + <message> + <location line="+8"/> + <source>Warning: Unknown change address</source> <translation type="unfinished"/> </message> <message> - <location line="+6"/> - <source>Total Amount %1</source> + <location line="-378"/> + <source>Are you sure you want to send?</source> <translation type="unfinished"/> </message> <message> - <location line="+20"/> - <source>Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> - <translation>خطا: تراکنش تایید نشد. این خطا ممکن است به این دلیل اتفاق بیافتد که سکه های wallet شما خرج شده باشند مثلا اگر wallet.dat را مپی کرده باشید و سکه های شما در آن کپی استفاده شده باشند اما در اینجا نمایش داده نشده اند.</translation> + <location line="+9"/> + <source>added as transaction fee</source> + <translation type="unfinished"/> </message> <message> - <location line="+144"/> + <location line="+170"/> <source>Payment request expired</source> <translation type="unfinished"/> </message> @@ -1736,39 +2258,44 @@ Address: %4 <context> <name>SendCoinsEntry</name> <message> - <location filename="../forms/sendcoinsentry.ui" line="+33"/> - <location line="+585"/> + <location filename="../forms/sendcoinsentry.ui" line="+131"/> + <location line="+501"/> + <location line="+536"/> <source>A&mount:</source> <translation>و میزان وجه</translation> </message> <message> - <location line="-572"/> - <location line="+585"/> + <location line="-1132"/> <source>Pay &To:</source> <translation>پرداخت و به چه کسی</translation> </message> <message> - <location line="-551"/> + <location line="+18"/> <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation type="unfinished"/> </message> <message> - <location filename="../sendcoinsentry.cpp" line="+28"/> + <location filename="../sendcoinsentry.cpp" line="+30"/> <source>Enter a label for this address to add it to your address book</source> <translation>یک برچسب برای این آدرس بنویسید تا به دفترچه آدرسهای شما اضافه شود</translation> </message> <message> - <location filename="../forms/sendcoinsentry.ui" line="-18"/> + <location filename="../forms/sendcoinsentry.ui" line="+57"/> <source>&Label:</source> <translation>و برچسب</translation> </message> <message> - <location line="+28"/> + <location line="-50"/> <source>Choose previously used address</source> <translation type="unfinished"/> </message> <message> - <location line="+10"/> + <location line="-40"/> + <source>This is a normal payment.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+50"/> <source>Alt+A</source> <translation>Alt و A</translation> </message> @@ -1784,16 +2311,35 @@ Address: %4 </message> <message> <location line="+7"/> - <source>Remove this recipient</source> - <translation>این گیرنده را حذف کن</translation> + <location line="+504"/> + <location line="+536"/> + <source>Remove this entry</source> + <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="-40"/> + <source>This is a verified payment request.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-971"/> <source>Enter a label for this address to add it to the list of used addresses</source> <translation type="unfinished"/> </message> <message> - <location line="+465"/> + <location line="+439"/> + <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> @@ -1914,7 +2460,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../signverifymessagedialog.cpp" line="+27"/> + <location filename="../signverifymessagedialog.cpp" line="+29"/> <location line="+3"/> <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation>یک آدرس bitcoin وارد کنید (مثال 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> @@ -1930,7 +2476,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+85"/> + <location line="+84"/> <location line="+81"/> <source>The entered address is invalid.</source> <translation type="unfinished"/> @@ -1999,8 +2545,13 @@ Address: %4 <context> <name>SplashScreen</name> <message> - <location filename="../splashscreen.cpp" line="+23"/> - <source>The Bitcoin developers</source> + <location filename="../splashscreen.cpp" line="+26"/> + <source>Bitcoin Core</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>The Bitcoin Core developers</source> <translation type="unfinished"/> </message> <message> @@ -2012,7 +2563,7 @@ Address: %4 <context> <name>TrafficGraphWidget</name> <message> - <location filename="../trafficgraphwidget.cpp" line="+75"/> + <location filename="../trafficgraphwidget.cpp" line="+79"/> <source>KB/s</source> <translation type="unfinished"/> </message> @@ -2020,7 +2571,7 @@ Address: %4 <context> <name>TransactionDesc</name> <message> - <location filename="../transactiondesc.cpp" line="+22"/> + <location filename="../transactiondesc.cpp" line="+28"/> <source>Open until %1</source> <translation>باز کن تا %1</translation> </message> @@ -2212,7 +2763,7 @@ Address: %4 <context> <name>TransactionTableModel</name> <message> - <location filename="../transactiontablemodel.cpp" line="+227"/> + <location filename="../transactiontablemodel.cpp" line="+234"/> <source>Date</source> <translation>تاریخ</translation> </message> @@ -2330,7 +2881,7 @@ Address: %4 <context> <name>TransactionView</name> <message> - <location filename="../transactionview.cpp" line="+52"/> + <location filename="../transactionview.cpp" line="+57"/> <location line="+16"/> <source>All</source> <translation>همه</translation> @@ -2391,12 +2942,12 @@ Address: %4 <translation>دیگر</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>Enter address or label to search</source> <translation>آدرس یا برچسب را برای جستجو وارد کنید</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>Min amount</source> <translation>حداقل میزان وجه</translation> </message> @@ -2431,17 +2982,37 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+143"/> - <source>Export Transaction Data</source> - <translation>داده های تراکنش را صادر کنید</translation> + <location line="+142"/> + <source>Export Transaction History</source> + <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+19"/> + <source>Exporting Failed</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>There was an error trying to save the transaction history to %1.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+4"/> + <source>Exporting Successful</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>The transaction history was successfully saved to %1.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-22"/> <source>Comma separated file (*.csv)</source> <translation>Comma separated file (*.csv) فایل جداگانه دستوری</translation> </message> <message> - <location line="+8"/> + <location line="+9"/> <source>Confirmed</source> <translation>تایید شده</translation> </message> @@ -2476,17 +3047,7 @@ Address: %4 <translation>شناسه کاربری</translation> </message> <message> - <location line="+4"/> - <source>Error exporting</source> - <translation>خطا در ارسال</translation> - </message> - <message> - <location line="+0"/> - <source>Could not write to file %1.</source> - <translation>قابل کپی به فایل نیست %1.</translation> - </message> - <message> - <location line="+100"/> + <location line="+107"/> <source>Range:</source> <translation>دامنه:</translation> </message> @@ -2497,9 +3058,17 @@ Address: %4 </message> </context> <context> + <name>WalletFrame</name> + <message> + <location filename="../walletframe.cpp" line="+26"/> + <source>No wallet has been loaded.</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>WalletModel</name> <message> - <location filename="../walletmodel.cpp" line="+218"/> + <location filename="../walletmodel.cpp" line="+245"/> <source>Send Coins</source> <translation>سکه های ارسالی</translation> </message> @@ -2507,7 +3076,7 @@ Address: %4 <context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+46"/> + <location filename="../walletview.cpp" line="+43"/> <source>&Export</source> <translation type="unfinished"/> </message> @@ -2517,65 +3086,60 @@ Address: %4 <translation>صدور داده نوار جاری به یک فایل</translation> </message> <message> - <location line="+183"/> + <location line="+181"/> <source>Backup Wallet</source> <translation type="unfinished"/> </message> <message> - <location line="+0"/> + <location line="+1"/> <source>Wallet Data (*.dat)</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Backup Failed</source> <translation type="unfinished"/> </message> <message> <location line="+0"/> - <source>There was an error trying to save the wallet data to the new location.</source> + <source>There was an error trying to save the wallet data to %1.</source> <translation type="unfinished"/> </message> <message> <location line="+4"/> - <source>Backup Successful</source> + <source>The wallet data was successfully saved to %1.</source> <translation type="unfinished"/> </message> <message> <location line="+0"/> - <source>The wallet data was successfully saved to the new location.</source> + <source>Backup Successful</source> <translation type="unfinished"/> </message> </context> <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+102"/> - <source>Bitcoin version</source> - <translation>نسخه bitcoin</translation> - </message> - <message> - <location line="+107"/> + <location filename="../bitcoinstrings.cpp" line="+217"/> <source>Usage:</source> <translation>میزان استفاده:</translation> </message> <message> - <location line="-55"/> + <location line="-54"/> <source>List commands</source> <translation>فهرست دستورها</translation> </message> <message> - <location line="-13"/> + <location line="-14"/> <source>Get help for a command</source> <translation>درخواست کمک برای یک دستور</translation> </message> <message> - <location line="+25"/> + <location line="+26"/> <source>Options:</source> <translation>انتخابها:</translation> </message> <message> - <location line="+24"/> + <location line="+23"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>فایل پیکربندیِ را مشخص کنید (پیش فرض: bitcoin.conf)</translation> </message> @@ -2595,7 +3159,7 @@ Address: %4 <translation>حافظه بانک داده را به مگابایت تنظیم کنید (پیش فرض: 25)</translation> </message> <message> - <location line="-28"/> + <location line="-27"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>ارتباطات را در <PORT> بشنوید (پیش فرض: 8333 or testnet: 18333)</translation> </message> @@ -2605,7 +3169,7 @@ Address: %4 <translation>نگهداری <N> ارتباطات برای قرینه سازی (پیش فرض:125)</translation> </message> <message> - <location line="-49"/> + <location line="-50"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation type="unfinished"/> </message> @@ -2620,7 +3184,7 @@ Address: %4 <translation>آستانه قطع برای قرینه سازی اشتباه (پیش فرض:100)</translation> </message> <message> - <location line="-142"/> + <location line="-147"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>تعداد ثانیه ها برای اتصال دوباره قرینه های اشتباه (پیش فرض:86400)</translation> </message> @@ -2635,7 +3199,7 @@ Address: %4 <translation>ارتباطاتِ JSON-RPC را در <port> گوش کنید (پیش فرض:8332)</translation> </message> <message> - <location line="+40"/> + <location line="+45"/> <source>Accept command line and JSON-RPC commands</source> <translation>command line و JSON-RPC commands را قبول کنید</translation> </message> @@ -2645,17 +3209,17 @@ Address: %4 <translation>به عنوان daemon بک گراند را اجرا کنید و دستورات را قبول نمایید</translation> </message> <message> - <location line="+40"/> + <location line="+39"/> <source>Use the test network</source> <translation>از تستِ شبکه استفاده نمایید</translation> </message> <message> - <location line="-118"/> + <location line="-117"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> <message> - <location line="-87"/> + <location line="-92"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2710,17 +3274,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+11"/> - <source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source> + <location line="+18"/> + <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation type="unfinished"/> </message> <message> - <location line="+6"/> - <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> + <location line="+5"/> + <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+3"/> <source>Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source> <translation type="unfinished"/> </message> @@ -2750,17 +3314,27 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+14"/> + <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="+2"/> + <location line="+1"/> <source>Block creation options:</source> <translation type="unfinished"/> </message> @@ -2770,7 +3344,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+2"/> + <location line="+1"/> + <source>Connect through SOCKS proxy</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Connect to JSON-RPC on <port> (default: 8332 or testnet: 18332)</source> <translation type="unfinished"/> </message> @@ -2880,7 +3459,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+2"/> + <location line="+1"/> + <source>Fee per kB to add to transactions you send</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Find peers using DNS lookup (default: 1 unless -connect)</source> <translation type="unfinished"/> </message> @@ -2900,6 +3484,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <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"/> @@ -2915,17 +3504,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+8"/> + <location line="+5"/> + <source>Prepend debug output with timestamp (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>RPC client options:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+5"/> + <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Send command to Bitcoin server</source> <translation type="unfinished"/> </message> <message> - <location line="+10"/> + <location line="+8"/> + <source>Set maximum block size in bytes (default: %d)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>Set the number of threads to service RPC calls (default: 4)</source> <translation type="unfinished"/> </message> @@ -2945,7 +3554,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>Verifying blocks...</source> <translation type="unfinished"/> </message> @@ -2956,11 +3565,21 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> + <source>Wait for RPC server to start</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Wallet %s resides outside data directory %s</source> <translation type="unfinished"/> </message> <message> - <location line="+4"/> + <location line="+3"/> + <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> @@ -2970,17 +3589,27 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-98"/> + <location line="-104"/> <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> <translation type="unfinished"/> </message> <message> - <location line="+17"/> + <location line="+14"/> + <source>Output debugging information (default: 0, supplying <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="+83"/> + <location line="+88"/> <source>Information</source> <translation type="unfinished"/> </message> @@ -3020,32 +3649,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+2"/> - <source>Output extra debugging information. Implies all other -debug* options</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Output extra network debugging information</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> - <source>Prepend debug output with timestamp</source> - <translation>برونداد اشکال زدایی با timestamp</translation> - </message> - <message> - <location line="+5"/> + <location line="+9"/> <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Select the version of socks proxy to use (4-5, default: 5)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> + <location line="+4"/> <source>Send trace/debug info to console instead of debug.log file</source> <translation>ارسال اطلاعات پیگیری/خطایابی به کنسول به جای ارسال به فایل debug.log</translation> </message> @@ -3055,12 +3664,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>ارسال اطاعات خطایابی/پیگیری به سیستم خطایاب</translation> </message> <message> - <location line="+5"/> - <source>Set maximum block size in bytes (default: 250000)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> + <location line="+6"/> <source>Set minimum block size in bytes (default: 0)</source> <translation type="unfinished"/> </message> @@ -3110,37 +3714,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Use proxy to reach tor hidden services (default: same as -proxy)</source> - <translation type="unfinished"/> - </message> - <message> <location line="+2"/> <source>Username for JSON-RPC connections</source> <translation>شناسه کاربری برای ارتباطاتِ JSON-RPC</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Warning</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Warning: This version is obsolete, upgrade required!</source> <translation type="unfinished"/> </message> <message> <location line="+2"/> + <source>version</source> + <translation>نسخه</translation> + </message> + <message> + <location line="+1"/> <source>wallet.dat corrupt, salvage failed</source> <translation type="unfinished"/> </message> <message> - <location line="-54"/> + <location line="-57"/> <source>Password for JSON-RPC connections</source> <translation>رمز برای ارتباطاتِ JSON-RPC</translation> </message> <message> - <location line="-70"/> + <location line="-69"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>ارتباطاتِ JSON-RPC را از آدرس آی.پی. مشخصی برقرار کنید.</translation> </message> @@ -3150,12 +3754,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>دستورات را به گره اجرا شده در<ip> ارسال کنید (پیش فرض:127.0.0.1)</translation> </message> <message> - <location line="-126"/> + <location line="-131"/> <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="+155"/> + <location line="+160"/> <source>Upgrade wallet to latest format</source> <translation>wallet را به جدیدترین نسخه روزآمد کنید</translation> </message> @@ -3195,22 +3799,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-95"/> - <source>Connect through socks proxy</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-11"/> + <location line="-106"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation type="unfinished"/> </message> <message> - <location line="+58"/> + <location line="+59"/> <source>Loading addresses...</source> <translation>لود شدن آدرسها..</translation> </message> <message> - <location line="-36"/> + <location line="-37"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>خطا در هنگام لود شدن wallet.dat: Wallet corrupted</translation> </message> @@ -3230,12 +3829,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>خطا در هنگام لود شدن wallet.dat</translation> </message> <message> - <location line="+30"/> + <location line="+31"/> <source>Invalid -proxy address: '%s'</source> <translation type="unfinished"/> </message> <message> - <location line="+57"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation type="unfinished"/> </message> @@ -3255,7 +3854,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+46"/> + <location line="+47"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>میزان اشتباه است for -paytxfee=<amount>: '%s'</translation> </message> @@ -3275,27 +3874,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>لود شدن نمایه بلاکها..</translation> </message> <message> - <location line="-60"/> + <location line="-61"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>یک گره برای اتصال اضافه کنید و تلاش کنید تا اتصال را باز نگاه دارید</translation> </message> <message> - <location line="-28"/> + <location line="-32"/> <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source> <translation type="unfinished"/> </message> <message> - <location line="+69"/> - <source>Fee per KB to add to transactions you send</source> - <translation>هزینه بر اساس کیلو بایت برای اضافه شدن به تراکنشی که ارسال کرده اید</translation> - </message> - <message> - <location line="+20"/> + <location line="+94"/> <source>Loading wallet...</source> <translation>wallet در حال لود شدن است...</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>Cannot downgrade wallet</source> <translation>قابلیت برگشت به نسخه قبلی برای wallet امکان پذیر نیست</translation> </message> @@ -3325,7 +3919,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>خطا</translation> </message> <message> - <location line="-33"/> + <location line="-34"/> <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 80ea5f317a..84cb2414a3 100644 --- a/src/qt/locale/bitcoin_fr.ts +++ b/src/qt/locale/bitcoin_fr.ts @@ -3,13 +3,13 @@ <name>AboutDialog</name> <message> <location filename="../forms/aboutdialog.ui" line="+14"/> - <source>About Bitcoin</source> - <translation>À propos de Bitcoin</translation> + <source>About Bitcoin Core</source> + <translation>À propos de Bitcoin Core</translation> </message> <message> <location line="+39"/> - <source><b>Bitcoin</b> version</source> - <translation><b>Bitcoin</b> version</translation> + <source><b>Bitcoin Core</b> version</source> + <translation>Version de <b>Bitcoin Core</b> </translation> </message> <message> <location line="+57"/> @@ -22,12 +22,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation> Ce logiciel est expérimental. - Distribué sous licence MIT/X11, voir le fichier COPYING ou http://www.opensource.org/licenses/mit-license.php. + Distribué sous licence logicielle MIT/X11, voir le fichier COPYING joint ou http://www.opensource.org/licenses/mit-license.php. - Ce produit comprend des logiciels développés par le projet OpenSSL afin d'être utilisés dans la boîte à outils OpenSSL (http://www.openssl.org/), un logiciel de chiffrement écrits par Eric Young (eay@cryptsoft.com), et un logiciel UPnP développé par Thomas Bernard.</translation> + Ce produit comprend des logiciels développés par le projet OpenSSL afin d'être utilisés dans la boîte à outils OpenSSL (http://www.openssl.org/), un logiciel de chiffrement écrit par Eric Young (eay@cryptsoft.com), et un logiciel UPnP développé par Thomas Bernard.</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="+14"/> + <location filename="../aboutdialog.cpp" line="+19"/> <source>Copyright</source> <translation>Tous droits réservés</translation> </message> @@ -57,7 +57,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+11"/> <source>Copy the currently selected address to the system clipboard</source> - <translation>Copier l'adresse courante sélectionnée dans le presse-papiers</translation> + <translation>Copier l'adresse courante sélectionnée dans le presse-papier</translation> </message> <message> <location line="+3"/> @@ -70,7 +70,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Fermer</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="+72"/> + <location filename="../addressbookpage.cpp" line="+74"/> <source>&Copy Address</source> <translation>&Copier l'adresse</translation> </message> @@ -97,12 +97,12 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location filename="../addressbookpage.cpp" line="-30"/> <source>Choose the address to send coins to</source> - <translation>Choisir l'adresse à laquelle seront envoyés les bitcoins</translation> + <translation>Choisir l'adresse à laquelle envoyer des pièces</translation> </message> <message> <location line="+1"/> <source>Choose the address to receive coins with</source> - <translation>Choisir l'adresse avec laquelle les bitcoins seront reçus</translation> + <translation>Choisir l'adresse avec laquelle recevoir des pîèces</translation> </message> <message> <location line="+5"/> @@ -122,12 +122,12 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+7"/> <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> - <translation>Ce sont vos adresses Bitcoin pour émettre des paiements. Vérifiez toujours le montant et l'adresse du destinataire avant d'envoyer des pièces.</translation> + <translation>Voici vos adresses Bitcoin pour envoyer des paiements. Vérifiez toujours le montant et l'adresse du destinataire avant d'envoyer des pièces.</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>Ce sont vos adresses Bitcoin pour recevoir des paiements. Il est recommandé d'utiliser une nouvelle adresse de réception pour chaque transaction.</translation> + <translation>Voici vos adresses Bitcoin pour recevoir des paiements. Il est recommandé d'utiliser une nouvelle adresse de réception pour chaque transaction.</translation> </message> <message> <location line="+7"/> @@ -140,7 +140,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Modifier</translation> </message> <message> - <location line="+197"/> + <location line="+194"/> <source>Export Address List</source> <translation>Exporter la liste d'adresses</translation> </message> @@ -163,7 +163,7 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>AddressTableModel</name> <message> - <location filename="../addresstablemodel.cpp" line="+164"/> + <location filename="../addresstablemodel.cpp" line="+168"/> <source>Label</source> <translation>Étiquette</translation> </message> @@ -188,7 +188,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+21"/> <source>Enter passphrase</source> - <translation>Entrer la phrase de passe</translation> + <translation>Saisir la phrase de passe</translation> </message> <message> <location line="+14"/> @@ -201,34 +201,34 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Répéter la phrase de passe</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="+34"/> + <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>Entrer une nouvelle phrase de passe pour le porte-monnaie.<br/>Utiliser une phrase composée de <b>10 caractères aléatoires ou plus</b>, ou bien de <b>huit mots ou plus</b>.</translation> + <translation>Saisir la nouvelle phrase de passe pour le portefeuille. <br/>Veuillez utiliser une phrase de passe de <b>10 caractères aléatoires ou plus</b>, ou de <b>huit mots ou plus</b>.</translation> </message> <message> <location line="+1"/> <source>Encrypt wallet</source> - <translation>Chiffrer le porte-monnaie</translation> + <translation>Chiffrer le portefeuille</translation> </message> <message> <location line="+3"/> <source>This operation needs your wallet passphrase to unlock the wallet.</source> - <translation>Cette opération nécessite votre phrase de passe pour déverrouiller le porte-monnaie.</translation> + <translation>Cette opération nécessite votre phrase de passe pour déverrouiller le portefeuille.</translation> </message> <message> <location line="+5"/> <source>Unlock wallet</source> - <translation>Déverrouiller le porte-monnaie</translation> + <translation>Déverrouiller le portefeuille</translation> </message> <message> <location line="+3"/> <source>This operation needs your wallet passphrase to decrypt the wallet.</source> - <translation>Cette opération nécessite votre phrase de passe pour déchiffrer le porte-monnaie.</translation> + <translation>Cette opération nécessite votre phrase de passe pour déchiffrer le portefeuille.</translation> </message> <message> <location line="+5"/> <source>Decrypt wallet</source> - <translation>Déchiffrer le porte-monnaie</translation> + <translation>Déchiffrer le portefeuille</translation> </message> <message> <location line="+3"/> @@ -238,27 +238,27 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+1"/> <source>Enter the old and new passphrase to the wallet.</source> - <translation>Entrer l’ancienne phrase de passe pour le porte-monnaie ainsi que la nouvelle.</translation> + <translation>Saisir l’ancienne phrase de passe pour le portefeuille ainsi que la nouvelle.</translation> </message> <message> <location line="+46"/> <source>Confirm wallet encryption</source> - <translation>Confirmer le chiffrement du porte-monnaie</translation> + <translation>Confirmer le chiffrement du portefeuille</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>Attention : Si vous chiffrez votre porte-monnaie et perdez votre phrase de passe, vous <b>PERDREZ ACCÈS À TOUS VOS BITCOINS</b> !</translation> + <translation>Attention : Si vous chiffrez votre portefeuille et perdez votre phrase de passe, vous <b>PERDREZ TOUS VOS BITCOINS</b> !</translation> </message> <message> <location line="+0"/> <source>Are you sure you wish to encrypt your wallet?</source> - <translation>Êtes-vous sûr de vouloir chiffrer votre porte-monnaie ?</translation> + <translation>Êtes-vous sûr de vouloir chiffrer votre portefeuille ?</translation> </message> <message> <location line="+15"/> <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> - <translation>IMPORTANT : Toute sauvegarde précédente de votre fichier de porte-monnaie devrait être remplacée par le nouveau fichier chiffré de porte-monnaie. Pour des raisons de sécurité, les sauvegardes précédentes de votre fichier de porte-monnaie non chiffré deviendront inutilisables dès que vous commencerez à utiliser le nouveau porte-monnaie chiffré.</translation> + <translation>IMPORTANT : Toute sauvegarde précédente de votre fichier de portefeuille devrait être remplacée par le nouveau fichier de portefeuille chiffré. Pour des raisons de sécurité, les sauvegardes précédentes de votre fichier de portefeuille non chiffré deviendront inutilisables dès que vous commencerez à utiliser le nouveau portefeuille chiffré.</translation> </message> <message> <location line="+100"/> @@ -270,12 +270,12 @@ This product includes software developed by the OpenSSL Project for use in the O <location line="-130"/> <location line="+58"/> <source>Wallet encrypted</source> - <translation>Porte-monnaie chiffré</translation> + <translation>Portefeuille chiffré</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 va à présent se fermer pour terminer le chiffrement. N'oubliez pas que le chiffrement de votre porte-monnaie n'est pas une protection totale contre le vol par des logiciels malveillants qui infecteraient votre ordinateur.</translation> + <translation>Bitcoin va à présent se fermer pour terminer le chiffrement. N'oubliez pas que le chiffrement de votre portefeuille n'est pas une protection totale contre le vol par des logiciels malveillants qui infecteraient votre ordinateur.</translation> </message> <message> <location line="+13"/> @@ -283,63 +283,63 @@ This product includes software developed by the OpenSSL Project for use in the O <location line="+42"/> <location line="+6"/> <source>Wallet encryption failed</source> - <translation>Le chiffrement du porte-monnaie a échoué</translation> + <translation>Le chiffrement du portefeuille a échoué</translation> </message> <message> <location line="-54"/> <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> - <translation>Le chiffrement du porte-monnaie a échoué en raison d'une erreur interne. Votre porte-monnaie n'a pas été chiffré.</translation> + <translation>Le chiffrement du portefeuille a échoué en raison d'une erreur interne. Votre portefeuille n'a pas été chiffré.</translation> </message> <message> <location line="+7"/> <location line="+48"/> <source>The supplied passphrases do not match.</source> - <translation>Les phrases de passe entrées ne correspondent pas.</translation> + <translation>Les phrases de passe saisies ne correspondent pas.</translation> </message> <message> <location line="-37"/> <source>Wallet unlock failed</source> - <translation>Le déverrouillage du porte-monnaie a échoué</translation> + <translation>Le déverrouillage du portefeuille a échoué</translation> </message> <message> <location line="+1"/> <location line="+11"/> <location line="+19"/> <source>The passphrase entered for the wallet decryption was incorrect.</source> - <translation>La phrase de passe entrée pour déchiffrer le porte-monnaie était incorrecte.</translation> + <translation>La phrase de passe saisie pour déchiffrer le portefeuille était incorrecte.</translation> </message> <message> <location line="-20"/> <source>Wallet decryption failed</source> - <translation>Le déchiffrage du porte-monnaie a échoué</translation> + <translation>Le déchiffrage du portefeuille a échoué</translation> </message> <message> <location line="+14"/> <source>Wallet passphrase was successfully changed.</source> - <translation>La phrase de passe du porte-monnaie a été modifiée avec succès.</translation> + <translation>La phrase de passe du portefeuille a été modifiée avec succès.</translation> </message> </context> <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+250"/> + <location filename="../bitcoingui.cpp" line="+260"/> <source>Sign &message...</source> - <translation>Signer le &message...</translation> + <translation>&Signer le message...</translation> </message> <message> - <location line="+254"/> + <location line="+290"/> <source>Synchronizing with network...</source> <translation>Synchronisation avec le réseau en cours…</translation> </message> <message> - <location line="-324"/> + <location line="-360"/> <source>&Overview</source> <translation>&Vue d'ensemble</translation> </message> <message> <location line="+1"/> <source>Show general overview of wallet</source> - <translation>Afficher une vue d’ensemble du porte-monnaie</translation> + <translation>Afficher une vue d’ensemble du portefeuille</translation> </message> <message> <location line="+20"/> @@ -385,12 +385,12 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+9"/> <source>&Encrypt Wallet...</source> - <translation>&Chiffrer le porte-monnaie...</translation> + <translation>&Chiffrer le portefeuille...</translation> </message> <message> <location line="+3"/> <source>&Backup Wallet...</source> - <translation>&Sauvegarder le porte-monnaie...</translation> + <translation>Sauvegarder le &portefeuille...</translation> </message> <message> <location line="+2"/> @@ -398,7 +398,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Changer la phrase de passe...</translation> </message> <message> - <location line="+259"/> + <location line="+295"/> <source>Importing blocks from disk...</source> <translation>Importation des blocs depuis le disque...</translation> </message> @@ -408,7 +408,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Réindexation des blocs sur le disque...</translation> </message> <message> - <location line="-322"/> + <location line="-358"/> <source>Send coins to a Bitcoin address</source> <translation>Envoyer des pièces à une adresse Bitcoin</translation> </message> @@ -420,12 +420,12 @@ 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>Sauvegarder le porte-monnaie vers un autre emplacement</translation> + <translation>Sauvegarder le portefeuille vers un autre emplacement</translation> </message> <message> <location line="+2"/> <source>Change the passphrase used for wallet encryption</source> - <translation>Modifier la phrase de passe utilisée pour le chiffrement du porte-monnaie</translation> + <translation>Modifier la phrase de passe utilisée pour le chiffrement du portefeuille</translation> </message> <message> <location line="+6"/> @@ -443,20 +443,18 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Vérifier un message...</translation> </message> <message> - <location line="-180"/> - <location line="+6"/> - <location line="+513"/> + <location line="+375"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-519"/> - <location line="+6"/> + <location line="-563"/> + <location line="+10"/> <source>Wallet</source> - <translation>Porte-monnaie</translation> + <translation>Portefeuille</translation> </message> <message> - <location line="+109"/> + <location line="+113"/> <source>&Send</source> <translation>&Envoyer</translation> </message> @@ -466,13 +464,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Recevoir</translation> </message> <message> - <location line="+28"/> - <location line="+2"/> - <source>&About Bitcoin</source> - <translation>À &propos de Bitcoin</translation> - </message> - <message> - <location line="+14"/> + <location line="+44"/> <location line="+2"/> <source>&Show / Hide</source> <translation>&Afficher / Cacher</translation> @@ -485,7 +477,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+3"/> <source>Encrypt the private keys that belong to your wallet</source> - <translation>Chiffrer les clefs privées de votre porte-monnaie</translation> + <translation>Chiffrer les clefs privées de votre portefeuille</translation> </message> <message> <location line="+7"/> @@ -495,15 +487,15 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+2"/> <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source> - <translation>Vérifier les messages pour vous assurer qu'ils ont bien été signés avec les adresses Bitcoin spécifiées</translation> + <translation>Vérifier les messages pour vous assurer qu'ils ont été signés avec les adresses Bitcoin spécifiées</translation> </message> <message> - <location line="+35"/> + <location line="+39"/> <source>&File</source> <translation>&Fichier</translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>&Settings</source> <translation>&Réglages</translation> </message> @@ -518,18 +510,30 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Barre d'outils des onglets</translation> </message> <message> - <location line="-235"/> - <location line="+294"/> + <location line="-244"/> + <location line="+321"/> <source>[testnet]</source> <translation>[testnet]</translation> </message> <message> - <location line="-177"/> + <location line="-331"/> + <location line="+10"/> + <source>Bitcoin Core</source> + <translation>Bitcoin Core</translation> + </message> + <message> + <location line="+121"/> <source>Request payments (generates QR codes and bitcoin: URIs)</source> - <translation>Demander des paiements (génère des codes QR et des bitcoin:URIs)</translation> + <translation>Demander des paiements (génère des codes QR et des URIs bitcoin:)</translation> </message> <message> - <location line="+63"/> + <location line="+27"/> + <location line="+2"/> + <source>&About Bitcoin Core</source> + <translation>À &propos de Bitcoin Core</translation> + </message> + <message> + <location line="+34"/> <source>&Used sending addresses...</source> <translation>Adresses d'envoi &utilisées...</translation> </message> @@ -549,13 +553,23 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Afficher la liste d'adresses de réception et d'étiquettes utilisées</translation> </message> <message> - <location line="+106"/> + <location line="+2"/> + <source>Open URI...</source> + <translation>Ouvrir l'URI...</translation> + </message> + <message> + <location line="+1"/> + <source>Open a bitcoin: URI or payment request</source> + <translation>Ouvrir un URI bitcoin: ou une demande de paiement</translation> + </message> + <message> + <location line="+126"/> <location line="+5"/> <source>Bitcoin client</source> <translation>Client Bitcoin</translation> </message> <message numerus="yes"> - <location line="+120"/> + <location line="+133"/> <source>%n active connection(s) to Bitcoin network</source> <translation><numerusform>%n connexion active avec le réseau Bitcoin</numerusform><numerusform>%n connexions actives avec le réseau Bitcoin</numerusform></translation> </message> @@ -567,12 +581,12 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+12"/> <source>Processed %1 of %2 (estimated) blocks of transaction history.</source> - <translation>%1 blocs sur %2 (estimés) de l'historique des transactions traités.</translation> + <translation>À traité %1 blocs sur %2 (estimés) de l'historique des transactions.</translation> </message> <message> <location line="+4"/> <source>Processed %1 blocks of transaction history.</source> - <translation>%1 blocs de l'historique des transactions traités.</translation> + <translation>À traité %1 blocs de l'historique des transactions.</translation> </message> <message numerus="yes"> <location line="+20"/> @@ -602,7 +616,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>Les transactions après ceci ne seront pas encore visibles.</translation> + <translation>Les transactions après ceci ne sont pas encore visibles.</translation> </message> <message> <location line="+27"/> @@ -663,40 +677,317 @@ Adresse : %4 </translation> </message> <message> - <location line="+34"/> - <source>URI handling</source> - <translation>Gestion des URI</translation> - </message> - <message> - <location line="+0"/> - <source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source> - <translation>L'URI ne peut être analysé ! Cela peut être causé par une adresse Bitcoin invalide ou par des paramètres d'URI malformés.</translation> - </message> - <message> - <location line="+45"/> + <location line="+67"/> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> - <translation>Le porte-monnaie est <b>chiffré</b> et est actuellement <b>déverrouillé</b></translation> + <translation>Le portefeuille est <b>chiffré</b> et est actuellement <b>déverrouillé</b></translation> </message> <message> <location line="+8"/> <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> - <translation>Le porte-monnaie est <b>chiffré</b> et actuellement <b>verrouillé</b></translation> + <translation>Le portefeuille est <b>chiffré</b> et actuellement <b>verrouillé</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+110"/> + <location filename="../bitcoin.cpp" line="+116"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> - <translation>Une erreur fatale est survenue. Bitcoin ne peut plus continuer à fonctionner de façon sûre et va s'arrêter.</translation> + <translation>Une erreur fatale est survenue. Bitcoin ne peut plus continuer de façon sûre et va s'arrêter.</translation> </message> </context> <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+115"/> + <location filename="../clientmodel.cpp" line="+119"/> <source>Network Alert</source> <translation>Alerte réseau</translation> </message> </context> <context> + <name>CoinControlDialog</name> + <message> + <location filename="../forms/coincontroldialog.ui" line="+14"/> + <source>Coin Control Address Selection</source> + <translation>Sélection de l'adresse de contrôle des pièces</translation> + </message> + <message> + <location line="+34"/> + <source>Quantity:</source> + <translation>Quantité :</translation> + </message> + <message> + <location line="+29"/> + <source>Bytes:</source> + <translation>Octets :</translation> + </message> + <message> + <location line="+45"/> + <source>Amount:</source> + <translation>Montant :</translation> + </message> + <message> + <location line="+29"/> + <source>Priority:</source> + <translation>Priorité :</translation> + </message> + <message> + <location line="+45"/> + <source>Fee:</source> + <translation>Frais :</translation> + </message> + <message> + <location line="+32"/> + <source>Low Output:</source> + <translation>Sortie faible :</translation> + </message> + <message> + <location line="+48"/> + <source>After Fee:</source> + <translation>Après les frais :</translation> + </message> + <message> + <location line="+32"/> + <source>Change:</source> + <translation>Monnaie :</translation> + </message> + <message> + <location line="+63"/> + <source>(un)select all</source> + <translation>Tout (dé)sélectionner</translation> + </message> + <message> + <location line="+13"/> + <source>Tree mode</source> + <translation>Mode arborescence</translation> + </message> + <message> + <location line="+16"/> + <source>List mode</source> + <translation>Mode liste</translation> + </message> + <message> + <location line="+52"/> + <source>Amount</source> + <translation>Montant</translation> + </message> + <message> + <location line="+10"/> + <source>Address</source> + <translation>Adresse</translation> + </message> + <message> + <location line="+5"/> + <source>Date</source> + <translation>Date</translation> + </message> + <message> + <location line="+5"/> + <source>Confirmations</source> + <translation>Confirmations</translation> + </message> + <message> + <location line="+3"/> + <source>Confirmed</source> + <translation>Confirmée</translation> + </message> + <message> + <location line="+5"/> + <source>Priority</source> + <translation>Priorité</translation> + </message> + <message> + <location filename="../coincontroldialog.cpp" line="+42"/> + <source>Copy address</source> + <translation>Copier l’adresse</translation> + </message> + <message> + <location line="+1"/> + <source>Copy label</source> + <translation>Copier l’étiquette</translation> + </message> + <message> + <location line="+1"/> + <location line="+26"/> + <source>Copy amount</source> + <translation>Copier le montant</translation> + </message> + <message> + <location line="-25"/> + <source>Copy transaction ID</source> + <translation>Copier l'ID de la transaction</translation> + </message> + <message> + <location line="+1"/> + <source>Lock unspent</source> + <translation>Verrouiller ce qui n'est pas dépensé</translation> + </message> + <message> + <location line="+1"/> + <source>Unlock unspent</source> + <translation>Déverrouiller ce qui n'est pas dépensé</translation> + </message> + <message> + <location line="+22"/> + <source>Copy quantity</source> + <translation>Copier la quantité</translation> + </message> + <message> + <location line="+2"/> + <source>Copy fee</source> + <translation>Copier les frais</translation> + </message> + <message> + <location line="+1"/> + <source>Copy after fee</source> + <translation>Copier le montant après les frais</translation> + </message> + <message> + <location line="+1"/> + <source>Copy bytes</source> + <translation>Copier les octets</translation> + </message> + <message> + <location line="+1"/> + <source>Copy priority</source> + <translation>Copier la priorité</translation> + </message> + <message> + <location line="+1"/> + <source>Copy low output</source> + <translation>Copier la sortie faible</translation> + </message> + <message> + <location line="+1"/> + <source>Copy change</source> + <translation>Copier la monnaie</translation> + </message> + <message> + <location line="+323"/> + <source>highest</source> + <translation>la plus élevée</translation> + </message> + <message> + <location line="+1"/> + <source>higher</source> + <translation>plus élevée</translation> + </message> + <message> + <location line="+1"/> + <source>high</source> + <translation>élevée</translation> + </message> + <message> + <location line="+1"/> + <source>medium-high</source> + <translation>moyennement-élevée</translation> + </message> + <message> + <location line="+1"/> + <source>medium</source> + <translation>moyenne</translation> + </message> + <message> + <location line="+4"/> + <source>low-medium</source> + <translation>moyennement-basse</translation> + </message> + <message> + <location line="+1"/> + <source>low</source> + <translation>basse</translation> + </message> + <message> + <location line="+1"/> + <source>lower</source> + <translation>plus basse</translation> + </message> + <message> + <location line="+1"/> + <source>lowest</source> + <translation>la plus basse</translation> + </message> + <message> + <location line="+11"/> + <source>(%1 locked)</source> + <translation>(%1 verrouillé)</translation> + </message> + <message> + <location line="+171"/> + <source>Dust</source> + <translation>Poussière</translation> + </message> + <message> + <location line="+0"/> + <source>yes</source> + <translation>oui</translation> + </message> + <message> + <location line="+0"/> + <source>no</source> + <translation>non</translation> + </message> + <message> + <location line="+10"/> + <source>This label turns red, if the transaction size is greater than 1000 bytes.</source> + <translation>Cette étiquette devient rouge si la taille de la transaction est plus grande que 1 000 octets.</translation> + </message> + <message> + <location line="+1"/> + <location line="+5"/> + <source>This means a fee of at least %1 per kB is required.</source> + <translation>Signifie que des frais d'au moins 1% par ko sont requis.</translation> + </message> + <message> + <location line="-4"/> + <source>Can vary +/- 1 byte per input.</source> + <translation>Peut varier +/- 1 octet par entrée.</translation> + </message> + <message> + <location line="+2"/> + <source>Transactions with higher priority are more likely to get included into a block.</source> + <translation>Les transactions à priorité plus haute sont plus à même d'être incluses dans un bloc.</translation> + </message> + <message> + <location line="+1"/> + <source>This label turns red, if the priority is smaller than "medium"</source> + <translation>Cette étiquette devient rouge si la priorité est plus basse que « moyenne »</translation> + </message> + <message> + <location line="+3"/> + <source>This label turns red, if any recipient receives an amount smaller than %1.</source> + <translation>Cette étiquette devient rouge si un destinataire reçoit un montant inférieur à 1%.</translation> + </message> + <message> + <location line="+1"/> + <location line="+4"/> + <source>This means a fee of at least %1 is required.</source> + <translation>Signifie que des frais d'au moins %1 sont requis.</translation> + </message> + <message> + <location line="-3"/> + <source>Amounts below 0.546 times the minimum relay fee are shown as dust.</source> + <translation>Les montants inférieurs à 0,546 fois les frais minimums de relais sont affichés en tant que poussière.</translation> + </message> + <message> + <location line="+2"/> + <source>This label turns red, if the change is smaller than %1.</source> + <translation>Cette étiquette devient rouge si la monnaie rendue est inférieure à %1.</translation> + </message> + <message> + <location line="+43"/> + <location line="+66"/> + <source>(no label)</source> + <translation>(aucune étiquette)</translation> + </message> + <message> + <location line="-9"/> + <source>change from %1 (%2)</source> + <translation>monnaie de %1 (%2)</translation> + </message> + <message> + <location line="+1"/> + <source>(change)</source> + <translation>(monnaie)</translation> + </message> +</context> +<context> <name>EditAddressDialog</name> <message> <location filename="../forms/editaddressdialog.ui" line="+14"/> @@ -716,7 +1007,7 @@ Adresse : %4 <message> <location line="+17"/> <source>The address associated with this address list entry. This can only be modified for sending addresses.</source> - <translation>L'adresse associée à cette entrée de la liste d'adresses. Cela ne peut être modifié que pour les adresses d'envoi.</translation> + <translation>L'adresse associée à cette entrée de la liste d'adresses. Ceci ne peut être modifié que pour les adresses d'envoi.</translation> </message> <message> <location line="-10"/> @@ -724,7 +1015,7 @@ Adresse : %4 <translation>&Adresse</translation> </message> <message> - <location filename="../editaddressdialog.cpp" line="+21"/> + <location filename="../editaddressdialog.cpp" line="+25"/> <source>New receiving address</source> <translation>Nouvelle adresse de réception</translation> </message> @@ -756,18 +1047,18 @@ Adresse : %4 <message> <location line="+10"/> <source>Could not unlock wallet.</source> - <translation>Impossible de déverrouiller le porte-monnaie.</translation> + <translation>Impossible de déverrouiller le portefeuille.</translation> </message> <message> <location line="+5"/> <source>New key generation failed.</source> - <translation>Échec de la génération de la nouvelle clef.</translation> + <translation>Échec de génération de la nouvelle clef.</translation> </message> </context> <context> <name>FreespaceChecker</name> <message> - <location filename="../intro.cpp" line="+61"/> + <location filename="../intro.cpp" line="+65"/> <source>A new data directory will be created.</source> <translation>Un nouveau répertoire de données sera créé.</translation> </message> @@ -795,18 +1086,18 @@ Adresse : %4 <context> <name>GUIUtil::HelpMessageBox</name> <message> - <location filename="../guiutil.cpp" line="+558"/> - <location line="+13"/> - <source>Bitcoin-Qt</source> - <translation>Bitcoin-Qt</translation> - </message> - <message> - <location line="-13"/> + <location filename="../guiutil.cpp" line="+597"/> <source>version</source> <translation>version</translation> </message> <message> - <location line="+2"/> + <location line="+0"/> + <location line="+13"/> + <source>Bitcoin Core</source> + <translation>Bitcoin Core</translation> + </message> + <message> + <location line="-11"/> <source>Usage:</source> <translation>Utilisation :</translation> </message> @@ -828,7 +1119,7 @@ Adresse : %4 <message> <location line="+1"/> <source>Start minimized</source> - <translation>Démarrer sous forme minimisée</translation> + <translation>Démarrer minimisé</translation> </message> <message> <location line="+1"/> @@ -850,18 +1141,18 @@ Adresse : %4 </message> <message> <location line="+9"/> - <source>Welcome to Bitcoin-Qt.</source> - <translation>Bienvenue sur Bitcoin-Qt.</translation> + <source>Welcome to Bitcoin Core.</source> + <translation>Bienvenue à Bitcoin Core.</translation> </message> <message> <location line="+26"/> - <source>As this is the first time the program is launched, you can choose where Bitcoin-Qt will store its data.</source> - <translation>Comme c'est la première fois que le logiciel est lancé, vous pouvez choisir où Bitcoin-Qt stockera ses données.</translation> + <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source> + <translation>Comme c'est la première fois que le logiciel est lancé, vous pouvez choisir où Bitcoin Core stockera ses données.</translation> </message> <message> <location line="+10"/> - <source>Bitcoin-Qt will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source> - <translation>Bitcoin-Qt va télécharger et stocker une copie de la chaîne des blocs de Bitcoin. Au moins %1Go de données seront stockées dans ce répertoire et sa taille augmentera avec le temps. Le porte-monnaie sera également stocké dans ce répertoire.</translation> + <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source> + <translation>Bitcoin Core va télécharger et stocker une copie de la chaîne de blocs Bitcoin. Au moins %1Go de données seront stockées dans ce répertoire et cela augmentera avec le temps. Le portefeuille sera également stocké dans ce répertoire.</translation> </message> <message> <location line="+10"/> @@ -874,7 +1165,17 @@ Adresse : %4 <translation>Utiliser un répertoire de données personnalisé :</translation> </message> <message> - <location filename="../intro.cpp" line="+105"/> + <location filename="../intro.cpp" line="+85"/> + <source>Bitcoin</source> + <translation>Bitcoin</translation> + </message> + <message> + <location line="+1"/> + <source>Error: Specified data directory "%1" can not be created.</source> + <translation>Erreur : le répertoire de données spécifié « %1 » ne peut pas être créé.</translation> + </message> + <message> + <location line="+19"/> <source>Error</source> <translation>Erreur</translation> </message> @@ -890,6 +1191,34 @@ Adresse : %4 </message> </context> <context> + <name>OpenURIDialog</name> + <message> + <location filename="../forms/openuridialog.ui" line="+14"/> + <source>Open URI</source> + <translation>Ouvrir l'URI</translation> + </message> + <message> + <location line="+6"/> + <source>Open payment request from URI or file</source> + <translation>Ouvrir une demande de paiement à partir d'une URI ou d'un fichier</translation> + </message> + <message> + <location line="+9"/> + <source>URI:</source> + <translation>URI :</translation> + </message> + <message> + <location line="+11"/> + <source>Select payment request file</source> + <translation>Choisir le fichier de demande de paiement</translation> + </message> + <message> + <location filename="../openuridialog.cpp" line="+47"/> + <source>Select payment request file to open</source> + <translation>Choisir le fichier de demande de paiement à ouvrir</translation> + </message> +</context> +<context> <name>OptionsDialog</name> <message> <location filename="../forms/optionsdialog.ui" line="+14"/> @@ -924,7 +1253,7 @@ Adresse : %4 <message> <location line="+35"/> <source>Reset all client options to default.</source> - <translation>Remettre toutes les options du client aux valeurs par défaut.</translation> + <translation>Réinitialiser toutes les options du client aux valeurs par défaut.</translation> </message> <message> <location line="+3"/> @@ -939,7 +1268,7 @@ Adresse : %4 <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>Ouvrir le port du client Bitcoin automatiquement sur le routeur. Cela ne fonctionne que si votre routeur supporte l'UPnP et si la fonctionnalité est activée.</translation> + <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> <message> <location line="+3"/> @@ -1004,7 +1333,7 @@ Adresse : %4 <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>Minimiser au lieu de quitter l'application lorsque la fenêtre est fermée. Lorsque cette option est activée, l'application ne pourra être fermée qu'en sélectionnant Quitter dans le menu déroulant.</translation> + <translation>Minimiser au lieu de quitter l'application lorsque la fenêtre est fermée. Si cette option est activée, l'application ne pourra être fermée qu'en sélectionnant Quitter dans le menu.</translation> </message> <message> <location line="+3"/> @@ -1047,6 +1376,16 @@ Adresse : %4 <translation>&Afficher les adresses sur la liste des transactions</translation> </message> <message> + <location line="+7"/> + <source>Whether to show coin control features or not.</source> + <translation>Afficher ou non les fonctions de contrôle des pièces.</translation> + </message> + <message> + <location line="+3"/> + <source>Display coin &control features (experts only)</source> + <translation>Afficher les fonctions de &contrôle des pièces (experts seulement)</translation> + </message> + <message> <location line="+71"/> <source>&OK</source> <translation>&OK</translation> @@ -1062,12 +1401,12 @@ Adresse : %4 <translation>&Appliquer</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+58"/> + <location filename="../optionsdialog.cpp" line="+63"/> <source>default</source> <translation>par défaut</translation> </message> <message> - <location line="+130"/> + <location line="+131"/> <source>Confirm options reset</source> <translation>Confirmer la réinitialisation des options</translation> </message> @@ -1108,19 +1447,19 @@ Adresse : %4 </message> <message> <location line="+50"/> - <location line="+202"/> + <location line="+214"/> <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source> - <translation>Les informations affichées peuvent être obsolètes. Votre porte-monnaie est automatiquement synchronisé avec le réseau Bitcoin lorsque la connexion s'établit, or ce processus n'est pas encore terminé.</translation> + <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="-131"/> + <location line="-140"/> <source>Unconfirmed:</source> <translation>Non confirmé :</translation> </message> <message> - <location line="-78"/> + <location line="-81"/> <source>Wallet</source> - <translation>Porte-monnaie</translation> + <translation>Portefeuille</translation> </message> <message> <location line="+49"/> @@ -1130,15 +1469,15 @@ Adresse : %4 <message> <location line="+16"/> <source>Your current spendable balance</source> - <translation>Votre solde actuel que vous pouvez dépenser</translation> + <translation>Votre solde actuel pouvant être dépensé</translation> </message> <message> - <location line="+29"/> + <location line="+32"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation>Total des transactions qui doivent encore être confirmées et qu'il n'est pas encore possible de dépenser</translation> </message> <message> - <location line="+13"/> + <location line="+16"/> <source>Immature:</source> <translation>Immature :</translation> </message> @@ -1148,22 +1487,22 @@ Adresse : %4 <translation>Le solde généré n'est pas encore mûr</translation> </message> <message> - <location line="+13"/> + <location line="+16"/> <source>Total:</source> <translation>Total :</translation> </message> <message> <location line="+16"/> <source>Your current total balance</source> - <translation>Total de votre solde actuel</translation> + <translation>Votre solde total actuel</translation> </message> <message> - <location line="+53"/> + <location line="+56"/> <source><b>Recent transactions</b></source> <translation><b>Transactions récentes</b></translation> </message> <message> - <location filename="../overviewpage.cpp" line="+116"/> + <location filename="../overviewpage.cpp" line="+120"/> <location line="+1"/> <source>out of sync</source> <translation>désynchronisé</translation> @@ -1172,33 +1511,39 @@ Adresse : %4 <context> <name>PaymentServer</name> <message> - <location filename="../paymentserver.cpp" line="+392"/> + <location filename="../paymentserver.cpp" line="+397"/> <source>URI handling</source> - <translation>Gestion des URI</translation> + <translation>Gestion des URIs</translation> </message> <message> <location line="+1"/> <source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source> - <translation>L'URI ne peut être analysé ! Cela peut être causé par une adresse Bitcoin invalide ou par des paramètres d'URI mal formés.</translation> + <translation>L'URI ne peut être analysé ! Ceci peut être causé par une adresse Bitcoin invalide ou par des paramètres d'URI mal formés.</translation> </message> <message> - <location line="+69"/> + <location line="+91"/> <source>Requested payment amount of %1 is too small (considered dust).</source> <translation>Le paiement demandé d'un montant de %1 est trop faible (considéré comme de la poussière).</translation> </message> <message> - <location line="+4"/> - <location line="+37"/> + <location line="-204"/> + <location line="+195"/> + <location line="+13"/> <source>Payment request error</source> <translation>Erreur de demande de paiement</translation> </message> <message> - <location line="+1"/> - <source>Insecure requests to custom payment scripts unsupported</source> - <translation>Les requêtes non sécurisées vers les scripts de paiement personnalisés ne sont pas supportés</translation> + <location line="-207"/> + <source>Cannot start bitcoin: click-to-pay handler</source> + <translation>Impossible de démarrer le gestionnaire de cliquer-pour-payer bitcoin :</translation> </message> <message> - <location line="+38"/> + <location line="+195"/> + <source>Unverified payment requests to custom payment scripts are unsupported.</source> + <translation>Les demandes de paiements non vérifiées à des scripts de paiement personnalisés ne sont pas prises en charge.</translation> + </message> + <message> + <location line="+59"/> <source>Refund from %1</source> <translation>Remboursement de %1</translation> </message> @@ -1208,7 +1553,7 @@ Adresse : %4 <translation>Erreur de communication avec %1 : %2</translation> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>Bad response from server %1</source> <translation>Mauvaise réponse du serveur %1</translation> </message> @@ -1218,8 +1563,8 @@ Adresse : %4 <translation>Le paiement a été confirmé</translation> </message> <message> - <location line="-58"/> - <location line="+30"/> + <location line="-55"/> + <location line="+27"/> <location line="+17"/> <source>Network request error</source> <translation>Erreur de demande réseau</translation> @@ -1228,9 +1573,8 @@ Adresse : %4 <context> <name>QObject</name> <message> - <location filename="../bitcoin.cpp" line="+114"/> + <location filename="../bitcoin.cpp" line="+119"/> <location line="+5"/> - <location filename="../intro.cpp" line="-32"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> @@ -1244,16 +1588,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="../intro.cpp" line="+1"/> - <source>Error: Specified data directory "%1" can not be created.</source> - <translation>Erreur : le répertoire de données spécifié « %1 » ne peut être créé.</translation> - </message> </context> <context> <name>QRImageWidget</name> <message> - <location filename="../receiverequestdialog.cpp" line="+32"/> + <location filename="../receiverequestdialog.cpp" line="+36"/> <source>&Save Image...</source> <translation>&Sauvegarder l'image...</translation> </message> @@ -1269,8 +1608,8 @@ Adresse : %4 </message> <message> <location line="+0"/> - <source>PNG Images (*.png)</source> - <translation>Images PNG (*.png)</translation> + <source>PNG Image (*.png)</source> + <translation>Image PNG (*.png)</translation> </message> </context> <context> @@ -1290,9 +1629,9 @@ Adresse : %4 <location line="+53"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+352"/> + <location filename="../rpcconsole.cpp" line="+360"/> <source>N/A</source> - <translation>Indisponible</translation> + <translation>N.D.</translation> </message> <message> <location line="-217"/> @@ -1305,14 +1644,19 @@ Adresse : %4 <translation>&Informations</translation> </message> <message> - <location line="+68"/> + <location line="-10"/> + <source>Debug window</source> + <translation>Fenêtre de débogage</translation> + </message> + <message> + <location line="+78"/> <source>Using OpenSSL version</source> <translation>Version d'OpenSSL utilisée</translation> </message> <message> <location line="+49"/> <source>Startup time</source> - <translation>Date de démarrage</translation> + <translation>Heure de démarrage</translation> </message> <message> <location line="+29"/> @@ -1360,12 +1704,7 @@ Adresse : %4 <translation>Options de ligne de commande</translation> </message> <message> - <location line="+7"/> - <source>Show the Bitcoin-Qt help message to get a list with possible Bitcoin command-line options.</source> - <translation>Afficher le message d'aide de Bitcoin-Qt pour obtenir la liste des options de ligne de commande disponibles pour Bitcoin.</translation> - </message> - <message> - <location line="+3"/> + <location line="+10"/> <source>&Show</source> <translation>&Afficher</translation> </message> @@ -1405,14 +1744,9 @@ Adresse : %4 <translation>Date de compilation</translation> </message> <message> - <location line="-104"/> - <source>Bitcoin - Debug window</source> - <translation>Bitcoin - Fenêtre de débogage</translation> - </message> - <message> - <location line="+25"/> + <location line="-79"/> <source>Bitcoin Core</source> - <translation>Noyau Bitcoin</translation> + <translation>Bitcoin Core</translation> </message> <message> <location line="+279"/> @@ -1422,10 +1756,15 @@ 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>Ouvrir le journal de débogage de Bitcoin depuis le répertoire de données actuel. Cela peut prendre quelques secondes pour les journaux de grande taille.</translation> + <translation>Ouvrir le journal de débogage de Bitcoin depuis le répertoire de données actuel. Ceci peut prendre quelques secondes pour les journaux de grande taille.</translation> + </message> + <message> + <location line="+26"/> + <source>Show the Bitcoin-Core help message to get a list with possible Bitcoin command-line options.</source> + <translation>Afficher le message d'aide de Bitcoin Core pour obtenir une liste des options de ligne de commande Bitcoin possibles.</translation> </message> <message> - <location line="+102"/> + <location line="+76"/> <source>Clear console</source> <translation>Nettoyer la console</translation> </message> @@ -1437,12 +1776,12 @@ Adresse : %4 <message> <location line="+1"/> <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> - <translation>Utilisez les touches de curseur pour naviguer dans l'historique et <b>Ctrl-L</b> pour effacer l'écran.</translation> + <translation>Utiliser les touches de curseur pour naviguer dans l'historique et <b>Ctrl-L</b> pour effacer l'écran.</translation> </message> <message> <location line="+1"/> <source>Type <b>help</b> for an overview of available commands.</source> - <translation>Tapez <b>help</b> pour afficher une vue générale des commandes disponibles.</translation> + <translation>Taper <b>help</b> pour afficher une vue générale des commandes disponibles.</translation> </message> <message> <location line="+128"/> @@ -1467,7 +1806,7 @@ Adresse : %4 <message> <location line="+7"/> <source>%1 m</source> - <translation>%1 m</translation> + <translation>%1 min</translation> </message> <message> <location line="+5"/> @@ -1477,45 +1816,40 @@ Adresse : %4 <message> <location line="+2"/> <source>%1 h %2 m</source> - <translation>%1 h %2 m</translation> + <translation>%1 h %2 min</translation> </message> </context> <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+22"/> + <location filename="../forms/receivecoinsdialog.ui" line="+83"/> <source>&Amount:</source> <translation>&Montant :</translation> </message> <message> - <location line="+16"/> + <location line="+19"/> <source>The amount to request</source> <translation>Le montant à demander</translation> </message> <message> - <location line="+7"/> + <location line="-32"/> <source>&Label:</source> <translation>&Étiquette :</translation> </message> <message> - <location line="+10"/> - <source>The label to associate with the receiving address</source> - <translation>L'étiquette associée avec l'adresse de réception</translation> - </message> - <message> - <location line="+7"/> + <location line="-34"/> <source>&Message:</source> <translation>M&essage :</translation> </message> <message> - <location line="+10"/> + <location line="+20"/> <source>The message to attach to payment request</source> <translation>Le message à attacher à la demande de paiement</translation> </message> <message> - <location line="+14"/> + <location line="-37"/> <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éutiliser une adresse de réception précédemment utilisée. Réutiliser une adresse pose un problème de sécurité et de vie privée. N'utilisez pas cette option sauf si vous générez à nouveau une demande déjà faite.</translation> + <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> <message> <location line="+3"/> @@ -1523,12 +1857,17 @@ Adresse : %4 <translation>Ré&utiliser une adresse de réception existante (non recommandé)</translation> </message> <message> - <location line="+7"/> + <location line="+27"/> + <source>The label to associate with the new receiving address</source> + <translation>L'étiquette à associer à la nouvelle adresse de réception</translation> + </message> + <message> + <location line="+14"/> <source>Use this form to request payments. All fields are optional.</source> <translation>Utilisez ce formulaire pour demander des paiements. Tous les champs sont optionnels.</translation> </message> <message> - <location line="+17"/> + <location line="+56"/> <source>Clear all fields of the form.</source> <translation>Effacer tous les champs du formulaire.</translation> </message> @@ -1540,7 +1879,32 @@ Adresse : %4 <message> <location line="+36"/> <source>&Request payment</source> - <translation>&Demander de paiement</translation> + <translation>&Demande de paiement</translation> + </message> + <message> + <location line="+47"/> + <source>Previously requested payments</source> + <translation>Paiements demandés précédemment</translation> + </message> + <message> + <location line="+12"/> + <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> + <message> + <location line="+3"/> + <source>Show</source> + <translation>Afficher</translation> + </message> + <message> + <location line="+11"/> + <source>Remove the selected entries from the list</source> + <translation>Enlever les entrées sélectionnées de la liste</translation> + </message> + <message> + <location line="+3"/> + <source>Remove</source> + <translation>Enlever</translation> </message> </context> <context> @@ -1562,16 +1926,11 @@ Adresse : %4 </message> <message> <location line="+7"/> - <source>&Copy Image</source> - <translation>&Copier l'image</translation> - </message> - <message> - <location line="+7"/> <source>&Save Image...</source> <translation>&Sauvegarder l'image...</translation> </message> <message> - <location filename="../receiverequestdialog.cpp" line="+58"/> + <location filename="../receiverequestdialog.cpp" line="+56"/> <source>Request payment to %1</source> <translation>Demande de paiement à %1</translation> </message> @@ -1608,27 +1967,130 @@ Adresse : %4 <message> <location line="+10"/> <source>Resulting URI too long, try to reduce the text for label / message.</source> - <translation>L'URI résultant est trop long, essayez avec un texte d'étiquette ou de message plus court.</translation> + <translation>L'URI résultant est trop long, essayez de réduire le texte d'étiquette / de message.</translation> </message> <message> <location line="+5"/> <source>Error encoding URI into QR Code.</source> - <translation>Erreur de l'encodage de l'URI dans le code QR.</translation> + <translation>Erreur d'encodage de l'URI en code QR.</translation> + </message> +</context> +<context> + <name>RecentRequestsTableModel</name> + <message> + <location filename="../recentrequeststablemodel.cpp" line="+14"/> + <source>Date</source> + <translation>Date</translation> + </message> + <message> + <location line="+0"/> + <source>Label</source> + <translation>Étiquette</translation> + </message> + <message> + <location line="+0"/> + <source>Message</source> + <translation>Message</translation> + </message> + <message> + <location line="+0"/> + <source>Amount</source> + <translation>Montant</translation> + </message> + <message> + <location line="+36"/> + <source>(no label)</source> + <translation>(pas d'étiquette)</translation> + </message> + <message> + <location line="+9"/> + <source>(no message)</source> + <translation>(pas de message)</translation> </message> </context> <context> <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="+14"/> - <location filename="../sendcoinsdialog.cpp" line="+140"/> - <location line="+213"/> + <location filename="../sendcoinsdialog.cpp" line="+381"/> + <location line="+81"/> <source>Send Coins</source> - <translation>Envoyer des Bitcoins</translation> + <translation>Envoyer des pièces</translation> </message> <message> - <location line="+50"/> + <location line="+76"/> + <source>Coin Control Features</source> + <translation>Fonctions de contrôle des pièces</translation> + </message> + <message> + <location line="+20"/> + <source>Inputs...</source> + <translation>Entrants...</translation> + </message> + <message> + <location line="+7"/> + <source>automatically selected</source> + <translation>choisi automatiquement</translation> + </message> + <message> + <location line="+19"/> + <source>Insufficient funds!</source> + <translation>Fonds insuffisants !</translation> + </message> + <message> + <location line="+89"/> + <source>Quantity:</source> + <translation>Quantité :</translation> + </message> + <message> + <location line="+35"/> + <source>Bytes:</source> + <translation>Octets :</translation> + </message> + <message> + <location line="+48"/> + <source>Amount:</source> + <translation>Montant :</translation> + </message> + <message> + <location line="+32"/> + <source>Priority:</source> + <translation>Priorité :</translation> + </message> + <message> + <location line="+48"/> + <source>Fee:</source> + <translation>Frais :</translation> + </message> + <message> + <location line="+32"/> + <source>Low Output:</source> + <translation>Sortie faible</translation> + </message> + <message> + <location line="+48"/> + <source>After Fee:</source> + <translation>Après les frais :</translation> + </message> + <message> + <location line="+32"/> + <source>Change:</source> + <translation>Monnaie :</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>Si ceci est actif mais l'adresse de monnaie rendue est vide ou invalide, la monnaie sera envoyée vers une adresse nouvellement générée.</translation> + </message> + <message> + <location line="+3"/> + <source>Custom change address</source> + <translation>Adresse personnalisée de monnaie rendue</translation> + </message> + <message> + <location line="+115"/> <source>Send to multiple recipients at once</source> - <translation>Envoyer des Bitcoins à plusieurs destinataires à la fois</translation> + <translation>Envoyer à plusieurs destinataires à la fois</translation> </message> <message> <location line="+3"/> @@ -1651,12 +2113,7 @@ Adresse : %4 <translation>Solde :</translation> </message> <message> - <location line="+10"/> - <source>123.456 BTC</source> - <translation>123,456 BTC</translation> - </message> - <message> - <location line="+31"/> + <location line="+41"/> <source>Confirm the send action</source> <translation>Confirmer l’action d'envoi</translation> </message> @@ -1666,49 +2123,125 @@ Adresse : %4 <translation>E&nvoyer</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-154"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> - <translation>Confirmer l’envoi des Bitcoins</translation> + <translation>Confirmer l’envoi des pièces</translation> </message> <message> - <location line="-90"/> + <location line="-74"/> <location line="+5"/> <location line="+5"/> + <location line="+4"/> <source>%1 to %2</source> <translation>%1 à %2</translation> </message> <message> - <location line="+26"/> + <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"/> + <source>Copy quantity</source> + <translation>Copier la quantité</translation> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation>Copier le montant</translation> + </message> + <message> + <location line="+1"/> + <source>Copy fee</source> + <translation>Copier les frais</translation> + </message> + <message> + <location line="+1"/> + <source>Copy after fee</source> + <translation>Copier le montant après les frais</translation> + </message> + <message> + <location line="+1"/> + <source>Copy bytes</source> + <translation>Copier les octets</translation> + </message> + <message> + <location line="+1"/> + <source>Copy priority</source> + <translation>Copier la priorité</translation> + </message> + <message> + <location line="+1"/> + <source>Copy low output</source> + <translation>Copier la sortie faible</translation> + </message> + <message> + <location line="+1"/> + <source>Copy change</source> + <translation>Copier la monnaie</translation> + </message> + <message> + <location line="+170"/> + <source>Total Amount %1 (= %2)</source> + <translation>Montant total %1 (= %2)</translation> + </message> + <message> + <location line="+2"/> + <source>or</source> + <translation>ou</translation> + </message> + <message> + <location line="+202"/> <source>The recipient address is not valid, please recheck.</source> - <translation>Cette adresse de destinataire n’est pas valide, veuillez la vérifier.</translation> + <translation>L'adresse du destinataire n’est pas valide, veuillez la vérifier.</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>The amount to pay must be larger than 0.</source> <translation>Le montant à payer doit être supérieur à 0.</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>The amount exceeds your balance.</source> <translation>Le montant dépasse votre solde.</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>The total exceeds your balance when the %1 transaction fee is included.</source> <translation>Le montant dépasse votre solde lorsque les frais de transaction de %1 sont inclus.</translation> </message> <message> - <location line="+5"/> + <location line="+3"/> <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation>Adresse dupliquée trouvée, il n'est possible d'envoyer qu'une fois à chaque adresse par opération d'envoi.</translation> + <translation>Adresse indentique trouvée, il n'est possible d'envoyer qu'une fois à chaque adresse par opération d'envoi.</translation> + </message> + <message> + <location line="+3"/> + <source>Transaction creation failed!</source> + <translation>La création de la transaction a échoué !</translation> </message> <message> <location line="+4"/> - <source>Error: Transaction creation failed!</source> - <translation>Erreur : Échec de la création de la transaction !</translation> + <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> + <translation>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="+15"/> + <location line="+113"/> + <source>Warning: Invalid Bitcoin address</source> + <translation>Attention : adresse Bitcoin invalide</translation> + </message> + <message> + <location line="+13"/> + <source>(no label)</source> + <translation>(pas d'étiquette)</translation> + </message> + <message> + <location line="+8"/> + <source>Warning: Unknown change address</source> + <translation>Attention : adresse de monnaie rendue inconnue</translation> + </message> + <message> + <location line="-378"/> <source>Are you sure you want to send?</source> <translation>Êtes-vous sûr de vouloir envoyer ?</translation> </message> @@ -1718,17 +2251,7 @@ Adresse : %4 <translation>ajouté en tant que frais de transaction</translation> </message> <message> - <location line="+6"/> - <source>Total Amount %1</source> - <translation>Montant total %1</translation> - </message> - <message> - <location line="+20"/> - <source>Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> - <translation>Erreur : la transaction a été rejetée. Cela peut arriver si certaines pièces de votre porte-monnaie ont déjà été dépensées, par exemple si vous avez utilisé une copie de wallet.dat avec laquelle les pièces ont été dépensées mais pas marquées comme telles ici.</translation> - </message> - <message> - <location line="+144"/> + <location line="+170"/> <source>Payment request expired</source> <translation>La demande de paiement a expiré</translation> </message> @@ -1741,46 +2264,51 @@ Adresse : %4 <context> <name>SendCoinsEntry</name> <message> - <location filename="../forms/sendcoinsentry.ui" line="+33"/> - <location line="+585"/> + <location filename="../forms/sendcoinsentry.ui" line="+131"/> + <location line="+501"/> + <location line="+536"/> <source>A&mount:</source> <translation>&Montant :</translation> </message> <message> - <location line="-572"/> - <location line="+585"/> + <location line="-1132"/> <source>Pay &To:</source> - <translation>Paye&r &à :</translation> + <translation>&Payer à :</translation> </message> <message> - <location line="-551"/> + <location line="+18"/> <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation>L'adresse à laquelle le paiement sera envoyé (par ex. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location filename="../sendcoinsentry.cpp" line="+28"/> + <location filename="../sendcoinsentry.cpp" line="+30"/> <source>Enter a label for this address to add it to your address book</source> - <translation>Entrez une étiquette pour cette adresse afin de l’ajouter à votre carnet d’adresses</translation> + <translation>Saisir une étiquette pour cette adresse afin de l’ajouter à votre carnet d’adresses</translation> </message> <message> - <location filename="../forms/sendcoinsentry.ui" line="-18"/> + <location filename="../forms/sendcoinsentry.ui" line="+57"/> <source>&Label:</source> - <translation>&Étiquette :</translation> + <translation>É&tiquette :</translation> </message> <message> - <location line="+28"/> + <location line="-50"/> <source>Choose previously used address</source> <translation>Choisir une adresse déjà utilisée</translation> </message> <message> - <location line="+10"/> + <location line="-40"/> + <source>This is a normal payment.</source> + <translation>Ceci est un paiement normal.</translation> + </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>Coller une adresse depuis le presse-papier</translation> + <translation>Coller l'adresse depuis le presse-papier</translation> </message> <message> <location line="+10"/> @@ -1789,23 +2317,42 @@ Adresse : %4 </message> <message> <location line="+7"/> - <source>Remove this recipient</source> - <translation>Enlever ce destinataire</translation> + <location line="+504"/> + <location line="+536"/> + <source>Remove this entry</source> + <translation>Enlever cette entrée</translation> </message> <message> - <location line="+16"/> + <location line="-40"/> + <source>This is a verified payment request.</source> + <translation>Ceci est une demande de paiement vérifiée.</translation> + </message> + <message> + <location line="-971"/> <source>Enter a label for this address to add it to the list of used addresses</source> - <translation>Entrer une étiquette associée à cette adresse pour l'ajouter à la liste d'adresses utilisées</translation> + <translation>Saisir une étiquette pour cette adresse afin de l'ajouter à la liste d'adresses utilisées</translation> </message> <message> - <location line="+465"/> + <location line="+439"/> + <source>This is an unverified payment request.</source> + <translation>Ceci est une demande de paiement non vérifiée.</translation> + </message> + <message> + <location line="+18"/> + <location line="+532"/> + <source>Pay To:</source> + <translation>Payer à :</translation> + </message> + <message> + <location line="-498"/> + <location line="+536"/> <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>Entrez une adresse Bitcoin (par ex. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + <translation>Saisir une adresse Bitcoin (par ex. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> </context> <context> @@ -1823,7 +2370,7 @@ Adresse : %4 <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>Vous pouvez signer des messages avec vos adresses pour prouver que vous les détenez. Faites attention à ne pas signer quoi que ce soit de vague car des attaques d'hameçonnage peuvent essayer d'usurper votre identité par votre signature. Ne signez que des déclarations entièrement détaillées et avec lesquelles vous serez d'accord.</translation> + <translation>Vous pouvez signer des messages avec vos adresses pour prouver que vous les détenez. Faites attention de ne pas signer de vague car des attaques d'hameçonnage peuvent essayer d'usurper votre identité par votre signature. Ne signez que des déclarations entièrement détaillées et avec lesquelles vous serez d'accord.</translation> </message> <message> <location line="+18"/> @@ -1855,7 +2402,7 @@ Adresse : %4 <message> <location line="+12"/> <source>Enter the message you want to sign here</source> - <translation>Entrez ici le message que vous désirez signer</translation> + <translation>Saisir ici le message que vous désirez signer</translation> </message> <message> <location line="+7"/> @@ -1896,7 +2443,7 @@ Adresse : %4 <message> <location line="+6"/> <source>Enter the signing address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack.</source> - <translation>Saisir ci-dessous l'adresse de signature, le message (assurez-vous d'avoir copié exactement les retours à la ligne, les espacements, tabulations etc.) et la signature pour vérifier le message. Faire attention à ne pas déduire davantage de la signature que ce qui est contenu dans le message signé lui-même pour éviter d'être trompé par une attaque d'homme du milieu.</translation> + <translation>Saisir ci-dessous l'adresse de signature, le message (assurez-vous d'avoir copié exactement les retours à la ligne, les espaces, tabulations etc...) et la signature pour vérifier le message. Faire attention à ne pas déduire davantage de la signature que ce qui est contenu dans le message signé lui-même pour éviter d'être trompé par une attaque d'homme du milieu.</translation> </message> <message> <location line="+21"/> @@ -1911,7 +2458,7 @@ Adresse : %4 <message> <location line="+3"/> <source>Verify &Message</source> - <translation>Vérifier un &message</translation> + <translation>Vérifier le &message</translation> </message> <message> <location line="+14"/> @@ -1919,10 +2466,10 @@ Adresse : %4 <translation>Réinitialiser tous les champs de vérification de message</translation> </message> <message> - <location filename="../signverifymessagedialog.cpp" line="+27"/> + <location filename="../signverifymessagedialog.cpp" line="+29"/> <location line="+3"/> <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Entrez une adresse Bitcoin (par ex. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + <translation>Saisir une adresse Bitcoin (par ex. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> <location line="-2"/> @@ -1932,13 +2479,13 @@ Adresse : %4 <message> <location line="+3"/> <source>Enter Bitcoin signature</source> - <translation>Entrer une signature Bitcoin</translation> + <translation>Saisir une signature Bitcoin</translation> </message> <message> - <location line="+85"/> + <location line="+84"/> <location line="+81"/> <source>The entered address is invalid.</source> - <translation>L'adresse entrée est invalide.</translation> + <translation>L'adresse saisie est invalide.</translation> </message> <message> <location line="-81"/> @@ -1946,18 +2493,18 @@ Adresse : %4 <location line="+73"/> <location line="+8"/> <source>Please check the address and try again.</source> - <translation>Vérifier l'adresse et réessayer.</translation> + <translation>Veuillez vérifier l'adresse et réessayer.</translation> </message> <message> <location line="-81"/> <location line="+81"/> <source>The entered address does not refer to a key.</source> - <translation>L'adresse entrée ne fait pas référence à une clef.</translation> + <translation>L'adresse saisie ne fait pas référence à une clef.</translation> </message> <message> <location line="-73"/> <source>Wallet unlock was cancelled.</source> - <translation>Le déverrouillage du porte-monnaie a été annulé.</translation> + <translation>Le déverrouillage du portefeuille a été annulé.</translation> </message> <message> <location line="+8"/> @@ -1983,12 +2530,12 @@ Adresse : %4 <location line="+0"/> <location line="+13"/> <source>Please check the signature and try again.</source> - <translation>Vérifier la signature et réessayer.</translation> + <translation>Veuillez vérifier la signature et réessayer.</translation> </message> <message> <location line="+0"/> <source>The signature did not match the message digest.</source> - <translation>La signature ne correspond pas au hachage du message.</translation> + <translation>La signature ne correspond pas à l'empreinte du message.</translation> </message> <message> <location line="+7"/> @@ -2004,9 +2551,14 @@ Adresse : %4 <context> <name>SplashScreen</name> <message> - <location filename="../splashscreen.cpp" line="+23"/> - <source>The Bitcoin developers</source> - <translation>Les développeurs Bitcoin</translation> + <location filename="../splashscreen.cpp" line="+26"/> + <source>Bitcoin Core</source> + <translation>Bitcoin Core</translation> + </message> + <message> + <location line="+2"/> + <source>The Bitcoin Core developers</source> + <translation>Les développeurs Bitcoin Core</translation> </message> <message> <location line="+1"/> @@ -2017,7 +2569,7 @@ Adresse : %4 <context> <name>TrafficGraphWidget</name> <message> - <location filename="../trafficgraphwidget.cpp" line="+75"/> + <location filename="../trafficgraphwidget.cpp" line="+79"/> <source>KB/s</source> <translation>Ko/s</translation> </message> @@ -2025,7 +2577,7 @@ Adresse : %4 <context> <name>TransactionDesc</name> <message> - <location filename="../transactiondesc.cpp" line="+22"/> + <location filename="../transactiondesc.cpp" line="+28"/> <source>Open until %1</source> <translation>Ouvert jusqu'à %1</translation> </message> @@ -2105,12 +2657,12 @@ Adresse : %4 <message numerus="yes"> <location line="-120"/> <source>matures in %n more block(s)</source> - <translation><numerusform>arrive à maturité dans %n bloc</numerusform><numerusform>arrive à maturité dans %n blocs de plus</numerusform></translation> + <translation><numerusform>arrive à maturité dans %n bloc de plus</numerusform><numerusform>arrive à maturité dans %n blocs de plus</numerusform></translation> </message> <message> <location line="+2"/> <source>not accepted</source> - <translation>non accepté</translation> + <translation>refusé</translation> </message> <message> <location line="+44"/> @@ -2153,7 +2705,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>Les pièces générées doivent mûrir pendant %1 blocs avant de pouvoir être dépensées. Lorsque vous avez généré ce bloc, il a été diffusé sur le réseau pour être ajouté à la chaîne de blocs. S’il échoue a intégrer la chaîne, son état sera modifié en « non accepté » et il ne sera pas possible de le dépenser. Cela peut arriver occasionnellement si un autre nœud génère un bloc quelques secondes avant ou après vous.</translation> + <translation>Les pièces générées doivent mûrir pendant %1 blocs avant de pouvoir être dépensées. Lorsque vous avez généré ce bloc, il a été diffusé sur le réseau pour être ajouté à la chaîne de blocs. S’il échoue a intégrer la chaîne, son état sera modifié en « non accepté » et il ne sera pas possible de le dépenser. Ceci peut arriver occasionnellement si un autre nœud génère un bloc à quelques secondes du votre.</translation> </message> <message> <location line="+8"/> @@ -2168,7 +2720,7 @@ Adresse : %4 <message> <location line="+3"/> <source>Inputs</source> - <translation>Entrées</translation> + <translation>Entrants</translation> </message> <message> <location line="+23"/> @@ -2217,7 +2769,7 @@ Adresse : %4 <context> <name>TransactionTableModel</name> <message> - <location filename="../transactiontablemodel.cpp" line="+227"/> + <location filename="../transactiontablemodel.cpp" line="+234"/> <source>Date</source> <translation>Date</translation> </message> @@ -2304,7 +2856,7 @@ Adresse : %4 <message> <location line="+38"/> <source>(n/a)</source> - <translation>(indisponible)</translation> + <translation>(n.d)</translation> </message> <message> <location line="+199"/> @@ -2335,7 +2887,7 @@ Adresse : %4 <context> <name>TransactionView</name> <message> - <location filename="../transactionview.cpp" line="+52"/> + <location filename="../transactionview.cpp" line="+57"/> <location line="+16"/> <source>All</source> <translation>Toutes</translation> @@ -2396,12 +2948,12 @@ Adresse : %4 <translation>Autres</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>Enter address or label to search</source> - <translation>Entrez une adresse ou une étiquette à rechercher</translation> + <translation>Saisir une adresse ou une étiquette à rechercher</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>Min amount</source> <translation>Montant min.</translation> </message> @@ -2436,17 +2988,37 @@ Adresse : %4 <translation>Afficher les détails de la transaction</translation> </message> <message> - <location line="+143"/> - <source>Export Transaction Data</source> - <translation>Exporter les données de transaction</translation> + <location line="+142"/> + <source>Export Transaction History</source> + <translation>Exporter l'historique des transactions</translation> </message> <message> - <location line="+1"/> + <location line="+19"/> + <source>Exporting Failed</source> + <translation>L'exportation a échoué</translation> + </message> + <message> + <location line="+0"/> + <source>There was an error trying to save the transaction history to %1.</source> + <translation>Une erreur est survenue lors de l'enregistrement de l'historique des transactions vers %1.</translation> + </message> + <message> + <location line="+4"/> + <source>Exporting Successful</source> + <translation>Exportation réussie</translation> + </message> + <message> + <location line="+0"/> + <source>The transaction history was successfully saved to %1.</source> + <translation>L'historique des transactions a été sauvegardée avec succès vers %1.</translation> + </message> + <message> + <location line="-22"/> <source>Comma separated file (*.csv)</source> <translation>Valeurs séparées par des virgules (*.csv)</translation> </message> <message> - <location line="+8"/> + <location line="+9"/> <source>Confirmed</source> <translation>Confirmée</translation> </message> @@ -2481,17 +3053,7 @@ Adresse : %4 <translation>ID</translation> </message> <message> - <location line="+4"/> - <source>Error exporting</source> - <translation>Erreur lors de l’exportation</translation> - </message> - <message> - <location line="+0"/> - <source>Could not write to file %1.</source> - <translation>Impossible d'écrire dans le fichier %1.</translation> - </message> - <message> - <location line="+100"/> + <location line="+107"/> <source>Range:</source> <translation>Intervalle :</translation> </message> @@ -2502,9 +3064,17 @@ Adresse : %4 </message> </context> <context> + <name>WalletFrame</name> + <message> + <location filename="../walletframe.cpp" line="+26"/> + <source>No wallet has been loaded.</source> + <translation>Aucun portefeuille de chargé.</translation> + </message> +</context> +<context> <name>WalletModel</name> <message> - <location filename="../walletmodel.cpp" line="+218"/> + <location filename="../walletmodel.cpp" line="+245"/> <source>Send Coins</source> <translation>Envoyer des pièces</translation> </message> @@ -2512,7 +3082,7 @@ Adresse : %4 <context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+46"/> + <location filename="../walletview.cpp" line="+43"/> <source>&Export</source> <translation>&Exporter</translation> </message> @@ -2522,65 +3092,60 @@ Adresse : %4 <translation>Exporter les données de l'onglet courant vers un fichier</translation> </message> <message> - <location line="+183"/> + <location line="+181"/> <source>Backup Wallet</source> - <translation>Sauvegarder le porte-monnaie</translation> + <translation>Sauvegarder le portefeuille</translation> </message> <message> - <location line="+0"/> + <location line="+1"/> <source>Wallet Data (*.dat)</source> - <translation>Données de porte-monnaie (*.dat)</translation> + <translation>Données de portefeuille (*.dat)</translation> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Backup Failed</source> <translation>Échec de la sauvegarde</translation> </message> <message> <location line="+0"/> - <source>There was an error trying to save the wallet data to the new location.</source> - <translation>Une erreur est survenue lors de l'enregistrement des données de porte-monnaie à un nouvel endroit.</translation> + <source>There was an error trying to save the wallet data to %1.</source> + <translation>Une erreur est survenue lors de l'enregistrement des données de portefeuille vers %1.</translation> </message> <message> <location line="+4"/> - <source>Backup Successful</source> - <translation>Sauvegarde réussie</translation> + <source>The wallet data was successfully saved to %1.</source> + <translation>Les données de portefeuille ont été enregistrées avec succès vers %1</translation> </message> <message> <location line="+0"/> - <source>The wallet data was successfully saved to the new location.</source> - <translation>Les données de porte-monnaie ont été enregistrées avec succès sur le nouvel emplacement.</translation> + <source>Backup Successful</source> + <translation>Sauvegarde réussie</translation> </message> </context> <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+102"/> - <source>Bitcoin version</source> - <translation>Version de Bitcoin</translation> - </message> - <message> - <location line="+107"/> + <location filename="../bitcoinstrings.cpp" line="+217"/> <source>Usage:</source> <translation>Utilisation :</translation> </message> <message> - <location line="-55"/> + <location line="-54"/> <source>List commands</source> <translation>Lister les commandes</translation> </message> <message> - <location line="-13"/> + <location line="-14"/> <source>Get help for a command</source> <translation>Obtenir de l’aide pour une commande</translation> </message> <message> - <location line="+25"/> + <location line="+26"/> <source>Options:</source> <translation>Options :</translation> </message> <message> - <location line="+24"/> + <location line="+23"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Spécifier le fichier de configuration (par défaut : bitcoin.conf)</translation> </message> @@ -2600,7 +3165,7 @@ Adresse : %4 <translation>Définir la taille du tampon en mégaoctets (par défaut : 25)</translation> </message> <message> - <location line="-28"/> + <location line="-27"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>Écouter les connexions sur le <port> (par défaut : 8333 ou testnet : 18333)</translation> </message> @@ -2610,7 +3175,7 @@ Adresse : %4 <translation>Garder au plus <n> connexions avec les pairs (par défaut : 125)</translation> </message> <message> - <location line="-49"/> + <location line="-50"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation>Se connecter à un nœud pour obtenir des adresses de pairs puis se déconnecter</translation> </message> @@ -2625,14 +3190,14 @@ Adresse : %4 <translation>Seuil de déconnexion des pairs de mauvaise qualité (par défaut : 100)</translation> </message> <message> - <location line="-142"/> + <location line="-147"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>Délai en secondes de refus de reconnexion aux pairs de mauvaise qualité (par défaut : 86400)</translation> </message> <message> <location line="-33"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> - <translation>Une erreur est survenue lors de la mise en place du port RPC %u pour écouter sur IPv4 : %s</translation> + <translation>Une erreur est survenue lors du réglage du port RPC %u pour écouter sur IPv4 : %s</translation> </message> <message> <location line="+31"/> @@ -2640,7 +3205,7 @@ Adresse : %4 <translation>Écouter les connexions JSON-RPC sur le <port> (par défaut : 8332 ou tesnet : 18332)</translation> </message> <message> - <location line="+40"/> + <location line="+45"/> <source>Accept command line and JSON-RPC commands</source> <translation>Accepter les commandes de JSON-RPC et de la ligne de commande</translation> </message> @@ -2650,17 +3215,17 @@ Adresse : %4 <translation>Fonctionner en arrière-plan en tant que démon et accepter les commandes</translation> </message> <message> - <location line="+40"/> + <location line="+39"/> <source>Use the test network</source> <translation>Utiliser le réseau de test</translation> </message> <message> - <location line="-118"/> + <location line="-117"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Accepter les connexions entrantes (par défaut : 1 si -proxy ou -connect ne sont pas présents)</translation> + <translation>Accepter les connexions entrantes (par défaut : 1 si aucun -proxy ou -connect )</translation> </message> <message> - <location line="-87"/> + <location line="-92"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2681,18 +3246,18 @@ rpcpassword=%s Le nom d'utilisateur et le mot de passe NE DOIVENT PAS être identiques. Si le fichier n'existe pas, créez-le avec les droits de lecture accordés au propriétaire. Il est aussi conseillé de régler alertnotify pour être prévenu des problèmes ; -par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com +par exemple : alertnotify=echo %%s | mail -s "Alerte Bitcoin" admin@foo.com </translation> </message> <message> <location line="+12"/> <source>Acceptable ciphers (default: TLSv1.2+HIGH:TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!3DES:@STRENGTH)</source> - <translation>Chiffrements acceptables (par défaut : TLSv1.2+HIGH:TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!3DES:@STRENGTH)</translation> + <translation>Chiffrements acceptables (par défaut : TLSv1.2+HIGH : TLSv1+HIGH : !SSLv2 : !aNULL : !eNULL : !3DES : @STRENGTH)</translation> </message> <message> <location line="+5"/> <source>An error occurred while setting up the RPC port %u for listening on IPv6, falling back to IPv4: %s</source> - <translation>Une erreur est survenue lors de la mise en place du port RPC %u pour écouter sur IPv6, retour à IPv4 : %s</translation> + <translation>Une erreur est survenue lors du réglage du port RPC %u pour écouter sur IPv6, retour à IPv4 : %s</translation> </message> <message> <location line="+3"/> @@ -2707,77 +3272,87 @@ par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <message> <location line="+3"/> <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly. This is intended for regression testing tools and app development.</source> - <translation>Entrer dans le mode de test de régression qui utilise une chaîne spéciale dans laquelle les blocs peuvent être résolus instantanément. Ceci est destiné aux outils de test de régression et au développement de l'application.</translation> + <translation>Entrer dans le mode de test de régression qui utilise une chaîne spéciale dans laquelle les blocs peuvent être résolus instantanément. Ceci est destiné aux outils de test de régression et au développement d'applications.</translation> </message> <message> <location line="+4"/> <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> - <translation>Erreur : la transaction a été rejetée ! Cela peut arriver si certaines pièces de votre porte-monnaie étaient déjà dépensées, par exemple si vous avez utilisé une copie de wallet.dat et les pièces ont été dépensées avec cette copie sans être marquées comme telles ici.</translation> + <translation>Erreur : La transaction a été rejetée ! Ceci peut arriver si certaines pièces de votre portefeuille étaient déjà dépensées, par exemple si vous avez utilisé une copie de wallet.dat et les pièces ont été dépensées avec cette copie sans être marquées comme tel ici.</translation> </message> <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>Erreur : cette transaction nécessite des frais de transaction d'au moins %s en raison de son montant, de sa complexité ou parce que des fonds reçus récemment sont utilisés !</translation> + <translation>Erreur : Cette transaction nécessite des frais de transaction d'au moins %s en raison de son montant, de sa complexité ou de l'utilisation de fonds reçus récemment !</translation> </message> <message> <location line="+6"/> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> - <translation>Exécuter la commande lorsqu'une transaction de porte-monnaie change (%s dans la commande est remplacée par TxID)</translation> - </message> - <message> - <location line="+11"/> - <source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source> - <translation>Définir la taille maximale en octets des transactions prioritaires/à frais modiques (par défaut : 27000)</translation> + <translation>Exécuter la commande lorsqu'une transaction de portefeuille change (%s dans la commande est remplacée par TxID)</translation> </message> <message> - <location line="+6"/> + <location line="+18"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation>Ceci est une pré-version de test - l'utiliser à vos risques et périls - ne pas l'utiliser pour miner ou pour des applications marchandes</translation> </message> <message> <location line="+5"/> + <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source> + <translation>Utiliser un serveur mandataire SOCKS5 séparé pour atteindre les pairs par les services cachés de Tor (par défaut : -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>Attention : -paytxfee est réglée sur un montant très élevé ! Il s'agit des frais de transaction que vous payerez si vous émettez une transaction.</translation> + <translation>Attention : -paytxfee est réglée sur un montant très élevé ! Il s'agit des frais de transaction que vous payerez si vous envoyez une transaction.</translation> </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>Attention : veuillez vérifier que l'heure et la date de votre ordinateur sont correctes ! Si votre horloge n'est pas à l'heure, Bitcoin ne fonctionnera pas correctement.</translation> + <translation>Attention : Veuillez vérifier que la date et l'heure de votre ordinateur sont justes ! Si votre horloge n'est pas à l'heure, Bitcoin ne fonctionnera pas correctement.</translation> </message> <message> <location line="+3"/> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> - <translation>Attention : Le réseau ne semble pas totalement d'accord ! Quelques mineurs semblent rencontrer des problèmes.</translation> + <translation>Attention : Le réseau ne semble pas totalement d'accord ! Quelques mineurs semblent éprouver des difficultés.</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>Attention : Nous ne sommes pas apparemment en accord complet avec nos pairs ! Vous pourriez avoir besoin d'effectuer une mise à niveau, ou d'autres nœuds du réseau pourraient avoir besoin d'effectuer une mise à niveau.</translation> + <translation>Attention : Nous ne semblons pas être en accord complet avec nos pairs ! Vous pourriez avoir besoin d'effectuer une mise à niveau, ou d'autres nœuds du réseau pourraient avoir besoin d'effectuer une mise à niveau.</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>Avertissement : une erreur est survenue lors de la lecture de wallet.dat ! Toutes les clefs ont été lues correctement mais les données de transaction ou les entrées du carnet d'adresses pourraient être incorrectes ou manquantes.</translation> + <translation>Avertissement : une erreur est survenue lors de la lecture de wallet.dat ! Toutes les clefs ont été lues correctement mais les données de transaction ou les entrées du carnet d'adresses sont peut-être incorrectes ou manquantes.</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>Avertissement : wallet.dat corrompu, données récupérées ! Le fichier wallet.dat original a été enregistré en tant que wallet.{horodatage}.bak dans %s ; si votre solde ou transactions sont incorrects vous devriez effectuer une restauration depuis une sauvegarde.</translation> + <translation>Avertissement : wallet.dat corrompu, données récupérées ! Le fichier wallet.dat original a été enregistré en tant que wallet.{timestamp}.bak dans %s ; si votre solde ou transactions sont incorrects vous devriez effectuer une restauration depuis une sauvegarde.</translation> </message> <message> - <location line="+14"/> + <location line="+9"/> + <source><category> can be:</source> + <translation><category> peut être :</translation> + </message> + <message> + <location line="+6"/> <source>Attempt to recover private keys from a corrupt wallet.dat</source> <translation>Tenter de récupérer les clefs privées d'un wallet.dat corrompu</translation> </message> <message> <location line="+1"/> + <source>Bitcoin Core Daemon</source> + <translation>Démon Bitcoin Core</translation> + </message> + <message> + <location line="+1"/> <source>Bitcoin RPC client version</source> <translation>Version du client RPC Bitcoin</translation> </message> <message> - <location line="+2"/> + <location line="+1"/> <source>Block creation options:</source> - <translation>Options de création des blocs :</translation> + <translation>Options de création de bloc :</translation> </message> <message> <location line="+5"/> @@ -2785,19 +3360,24 @@ par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>Ne se connecter qu'au(x) nœud(s) spécifié(s)</translation> </message> <message> - <location line="+2"/> + <location line="+1"/> + <source>Connect through SOCKS proxy</source> + <translation>Connexion à travers un serveur mandataire SOCKS</translation> + </message> + <message> + <location line="+1"/> <source>Connect to JSON-RPC on <port> (default: 8332 or testnet: 18332)</source> - <translation>Se connecter à JSON-RPC sur le <port> (par défaut : 8332 ou testnet: 18332)</translation> + <translation>Se connecter à JSON-RPC sur le <port> (par défaut : 8332 ou testnet : 18332)</translation> </message> <message> <location line="+2"/> <source>Corrupted block database detected</source> - <translation>Base de données des blocs corrompue détectée</translation> + <translation>Base corrompue de données des blocs détectée</translation> </message> <message> <location line="+1"/> <source>Discover own IP address (default: 1 when listening and no -externalip)</source> - <translation>Découvrir sa propre adresse IP (par défaut : 1 lors de l'écoute et si -externalip n'est pas présent)</translation> + <translation>Découvrir sa propre adresse IP (par défaut : 1 lors de l'écoute et si aucun -externalip)</translation> </message> <message> <location line="+1"/> @@ -2812,7 +3392,7 @@ par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <message> <location line="+1"/> <source>Error initializing wallet database environment %s!</source> - <translation>Erreur lors de l'initialisation de l'environnement de la base de données du porte-monnaie %s !</translation> + <translation>Erreur lors de l'initialisation de l'environnement de la base de données du portefeuille %s !</translation> </message> <message> <location line="+1"/> @@ -2822,7 +3402,7 @@ par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <message> <location line="+4"/> <source>Error opening block database</source> - <translation>Erreur lors de l'ouverture de la base de données</translation> + <translation>Erreur lors de l'ouverture de la base de données des blocs</translation> </message> <message> <location line="+2"/> @@ -2832,7 +3412,7 @@ par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <message> <location line="+1"/> <source>Error: Wallet locked, unable to create transaction!</source> - <translation>Erreur : Porte-monnaie verrouillé, impossible de créer la transaction !</translation> + <translation>Erreur : Portefeuille verrouillé, impossible de créer la transaction !</translation> </message> <message> <location line="+1"/> @@ -2842,7 +3422,7 @@ par exemple : 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>Échec de l'écoute sur un port quelconque. Utilisez -listen=0 si vous voulez cela.</translation> + <translation>Échec de l'écoute sur un port quelconque. Utilisez -listen=0 si vous voulez ceci.</translation> </message> <message> <location line="+1"/> @@ -2895,7 +3475,12 @@ par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>L'écriture des données d'annulation a échoué</translation> </message> <message> - <location line="+2"/> + <location line="+1"/> + <source>Fee per kB to add to transactions you send</source> + <translation>Frais par ko à ajouter aux transactions que vous envoyez</translation> + </message> + <message> + <location line="+1"/> <source>Find peers using DNS lookup (default: 1 unless -connect)</source> <translation>Trouver des pairs en utilisant la recherche DNS (par défaut : 1 sauf si -connect est utilisé)</translation> </message> @@ -2915,6 +3500,11 @@ par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>Niveau d'approfondissement de la vérification des blocs (0-4, par défaut : 3)</translation> </message> <message> + <location line="+1"/> + <source>If <category> is not supplied, output all debugging information.</source> + <translation>Si <category> n'est pas indiqué, extraire toutes les données de débogage.</translation> + </message> + <message> <location line="+2"/> <source>Incorrect or no genesis block found. Wrong datadir for network?</source> <translation>Bloc de genèse incorrect ou introuvable. Mauvais répertoire de données pour le réseau ?</translation> @@ -2927,27 +3517,47 @@ par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <message> <location line="+15"/> <source>Not enough file descriptors available.</source> - <translation>Pas assez de descripteurs de fichiers disponibles.</translation> + <translation>Pas assez de descripteurs de fichiers de disponibles.</translation> </message> <message> - <location line="+8"/> + <location line="+5"/> + <source>Prepend debug output with timestamp (default: 1)</source> + <translation>Ajouter l'horodatage au début des résultats de débogage (par défaut : 1)</translation> + </message> + <message> + <location line="+1"/> + <source>RPC client options:</source> + <translation>Options du client RPC :</translation> + </message> + <message> + <location line="+1"/> <source>Rebuild block chain index from current blk000??.dat files</source> - <translation>Reconstruire l'index de la chaîne des blocs à partir des fichiers blk000??.dat courrants</translation> + <translation>Reconstruire l'index de la chaîne de blocs à partir des fichiers blk000??.dat courants</translation> </message> <message> - <location line="+6"/> + <location line="+5"/> + <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source> + <translation>Choisir la version SOCKS pour -proxy (4 ou 5, par défaut : 5)</translation> + </message> + <message> + <location line="+1"/> <source>Send command to Bitcoin server</source> <translation>Envoyer une commande au serveur Bitcoin</translation> </message> <message> - <location line="+10"/> + <location line="+8"/> + <source>Set maximum block size in bytes (default: %d)</source> + <translation>Définir la taille minimale de bloc en octets (par défaut : %d)</translation> + </message> + <message> + <location line="+2"/> <source>Set the number of threads to service RPC calls (default: 4)</source> <translation>Définir le nombre d'exétrons pour desservir les appels RPC (par défaut : 4)</translation> </message> <message> <location line="+7"/> <source>Specify wallet file (within data directory)</source> - <translation>Spécifiez le fichier de porte-monnaie (au sein du répertoire de données)</translation> + <translation>Spécifiez le fichier de portefeuille (dans le répertoire de données)</translation> </message> <message> <location line="+2"/> @@ -2960,22 +3570,32 @@ par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>Utilisation (obsolète, utiliser bitcoin-cli) :</translation> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>Verifying blocks...</source> - <translation>Vérification des blocs...</translation> + <translation>Vérification des blocs en cours...</translation> </message> <message> <location line="+1"/> <source>Verifying wallet...</source> - <translation>Vérification du porte-monnaie...</translation> + <translation>Vérification du portefeuille en cours...</translation> + </message> + <message> + <location line="+1"/> + <source>Wait for RPC server to start</source> + <translation>Attendre le démarrage du serveur RPC</translation> </message> <message> <location line="+1"/> <source>Wallet %s resides outside data directory %s</source> - <translation>Le porte-monnaie %s réside en dehors du répertoire de données %s</translation> + <translation>Le portefeuille %s réside en dehors du répertoire de données %s</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> + <source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source> + <translation>Attention : l'argument obsolète -debugnet a été ignoré, utiliser -debug=net</translation> + </message> + <message> + <location line="+2"/> <source>You need to rebuild the database using -reindex to change -txindex</source> <translation>Vous devez reconstruire la base de données en utilisant -reindex afin de modifier -txindex</translation> </message> @@ -2985,17 +3605,27 @@ par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>Importe des blocs depuis un fichier blk000??.dat externe</translation> </message> <message> - <location line="-98"/> + <location line="-104"/> <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 est reçue ou si nous voyons une bifurcation vraiment étendue (%s dans la commande sera remplacé par le message)</translation> + <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> <message> - <location line="+17"/> + <location line="+14"/> + <source>Output debugging information (default: 0, supplying <category> is optional)</source> + <translation>Informations du résultat de débogage (par défaut : 0, fournir <category> est optionnel)</translation> + </message> + <message> + <location line="+2"/> + <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source> + <translation>Définir la taille maximale en octets des transactions prioritaires/à frais modiques (par défaut : %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>Définir le nombre d'exétrons pour la vérification des scripts (maximum 16, 0 = auto, < 0 = laisser ce nombre de cœurs libres, par défaut : 0)</translation> + <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="+83"/> + <location line="+88"/> <source>Information</source> <translation>Informations</translation> </message> @@ -3017,12 +3647,12 @@ par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <message> <location line="+2"/> <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 5000)</source> - <translation>Tampon maximal de réception par -connection, <n>*1000 octets (par défaut : 5000)</translation> + <translation>Tampon maximal de réception par « -connection » <n>*1 000 octets (par défaut : 5 000)</translation> </message> <message> <location line="+1"/> <source>Maximum per-connection send buffer, <n>*1000 bytes (default: 1000)</source> - <translation>Tampon maximal d'envoi par connexion, <n>*1000 octets (par défaut : 1000)</translation> + <translation>Tampon maximal d'envoi par « -connection », <n>*1 000 octets (par défaut : 1 000)</translation> </message> <message> <location line="+2"/> @@ -3035,32 +3665,12 @@ par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>Se connecter uniquement aux nœuds du réseau <net> (IPv4, IPv6 ou Tor)</translation> </message> <message> - <location line="+2"/> - <source>Output extra debugging information. Implies all other -debug* options</source> - <translation>Afficher des information de débogage supplémentaires. Cela signifie toutes les autres options -debug*</translation> - </message> - <message> - <location line="+1"/> - <source>Output extra network debugging information</source> - <translation>Afficher des informations de débogage réseau supplémentaires</translation> - </message> - <message> - <location line="+2"/> - <source>Prepend debug output with timestamp</source> - <translation>Faire précéder les données de débogage par un horodatage</translation> - </message> - <message> - <location line="+5"/> + <location line="+9"/> <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> - <translation>Options SSL : (cf. le wiki de Bitcoin pour les instructions de configuration du SSL)</translation> - </message> - <message> - <location line="+1"/> - <source>Select the version of socks proxy to use (4-5, default: 5)</source> - <translation>Sélectionner la version du serveur mandataire socks à utiliser (4-5, 5 étant la valeur par défaut)</translation> + <translation>Options SSL : (voir le Wiki de Bitcoin pour les instructions de configuration du SSL)</translation> </message> <message> - <location line="+3"/> + <location line="+4"/> <source>Send trace/debug info to console instead of debug.log file</source> <translation>Envoyer les informations de débogage/trace à la console au lieu du fichier debug.log</translation> </message> @@ -3070,14 +3680,9 @@ par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>Envoyer les informations de débogage/trace au débogueur</translation> </message> <message> - <location line="+5"/> - <source>Set maximum block size in bytes (default: 250000)</source> - <translation>Définir la taille maximale des blocs en octets (par défaut : 250000)</translation> - </message> - <message> - <location line="+1"/> + <location line="+6"/> <source>Set minimum block size in bytes (default: 0)</source> - <translation>Définir la taille minimale des blocs en octets (par défaut : 0)</translation> + <translation>Définir la taille minimale de bloc en octets (par défaut : 0)</translation> </message> <message> <location line="+2"/> @@ -3092,7 +3697,7 @@ par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <message> <location line="+2"/> <source>Specify connection timeout in milliseconds (default: 5000)</source> - <translation>Spécifier le délai d'expiration de la connexion en millisecondes (par défaut : 5000)</translation> + <translation>Spécifier le délai d'expiration de la connexion en millisecondes (par défaut : 5 000)</translation> </message> <message> <location line="+6"/> @@ -3107,7 +3712,7 @@ par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <message> <location line="+1"/> <source>Transaction amounts must be positive</source> - <translation>Les montants de la transaction doivent être positifs</translation> + <translation>Les montants de transaction doivent être positifs</translation> </message> <message> <location line="+1"/> @@ -3125,54 +3730,54 @@ par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>Utiliser l'UPnP pour rediriger le port d'écoute (par défaut : 1 lors de l'écoute)</translation> </message> <message> - <location line="+1"/> - <source>Use proxy to reach tor hidden services (default: same as -proxy)</source> - <translation>Utiliser un serveur mandataire pour atteindre les services cachés de Tor (par défaut : même valeur que -proxy)</translation> - </message> - <message> <location line="+2"/> <source>Username for JSON-RPC connections</source> <translation>Nom d'utilisateur pour les connexions JSON-RPC</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Warning</source> <translation>Avertissement</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Warning: This version is obsolete, upgrade required!</source> <translation>Avertissement : cette version est obsolète, une mise à niveau est nécessaire !</translation> </message> <message> <location line="+2"/> + <source>version</source> + <translation>version</translation> + </message> + <message> + <location line="+1"/> <source>wallet.dat corrupt, salvage failed</source> <translation>wallet.dat corrompu, la récupération a échoué</translation> </message> <message> - <location line="-54"/> + <location line="-57"/> <source>Password for JSON-RPC connections</source> <translation>Mot de passe pour les connexions JSON-RPC</translation> </message> <message> - <location line="-70"/> + <location line="-69"/> <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="+79"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> - <translation>Envoyer des commandes au nœud fonctionnant à <ip> (par défaut : 127.0.0.1)</translation> + <translation>Envoyer des commandes au nœud fonctionnant sur <ip> (par défaut : 127.0.0.1)</translation> </message> <message> - <location line="-126"/> + <location line="-131"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation>Exécuter la commande lorsque le meilleur bloc change (%s est remplacé par le hachage du bloc dans cmd)</translation> + <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="+155"/> + <location line="+160"/> <source>Upgrade wallet to latest format</source> - <translation>Mettre à niveau le porte-monnaie vers le format le plus récent</translation> + <translation>Mettre à niveau le portefeuille vers le format le plus récent</translation> </message> <message> <location line="-23"/> @@ -3182,7 +3787,7 @@ par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <message> <location line="-12"/> <source>Rescan the block chain for missing wallet transactions</source> - <translation>Réanalyser la chaîne de blocs pour les transactions de porte-monnaie manquantes</translation> + <translation>Réanalyser la chaîne de blocs pour les transactions de portefeuille manquantes</translation> </message> <message> <location line="+38"/> @@ -3210,34 +3815,29 @@ par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>Impossible de se lier à %s sur cet ordinateur (bind a retourné l'erreur %d, %s)</translation> </message> <message> - <location line="-95"/> - <source>Connect through socks proxy</source> - <translation>Connexion par un serveur mandataire socks</translation> - </message> - <message> - <location line="-11"/> + <location line="-106"/> <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="+58"/> + <location line="+59"/> <source>Loading addresses...</source> <translation>Chargement des adresses…</translation> </message> <message> - <location line="-36"/> + <location line="-37"/> <source>Error loading wallet.dat: Wallet corrupted</source> - <translation>Erreur lors du chargement de wallet.dat : porte-monnaie corrompu</translation> + <translation>Erreur lors du chargement de wallet.dat : portefeuille corrompu</translation> </message> <message> <location line="+1"/> <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source> - <translation>Erreur lors du chargement de wallet.dat : le porte-monnaie nécessite une version plus récente de Bitcoin</translation> + <translation>Erreur lors du chargement de wallet.dat : le portefeuille exige une version plus récente de Bitcoin</translation> </message> <message> <location line="+98"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> - <translation>Le porte-monnaie nécessitait une réécriture : veuillez redémarrer Bitcoin pour terminer l'opération.</translation> + <translation>Le portefeuille devait être réécrit : redémarrer Bitcoin pour terminer l'opération.</translation> </message> <message> <location line="-100"/> @@ -3245,12 +3845,12 @@ par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>Erreur lors du chargement de wallet.dat</translation> </message> <message> - <location line="+30"/> + <location line="+31"/> <source>Invalid -proxy address: '%s'</source> <translation>Adresse -proxy invalide : « %s »</translation> </message> <message> - <location line="+57"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Réseau inconnu spécifié sur -onlynet : « %s »</translation> </message> @@ -3270,7 +3870,7 @@ par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>Impossible de résoudre l'adresse -externalip : « %s »</translation> </message> <message> - <location line="+46"/> + <location line="+47"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>Montant invalide pour -paytxfee=<montant> : « %s »</translation> </message> @@ -3290,29 +3890,24 @@ par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>Chargement de l’index des blocs…</translation> </message> <message> - <location line="-60"/> + <location line="-61"/> <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> <message> - <location line="-28"/> + <location line="-32"/> <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source> <translation>Impossible de se lier à %s sur cet ordinateur. Bitcoin fonctionne probablement déjà.</translation> </message> <message> - <location line="+69"/> - <source>Fee per KB to add to transactions you send</source> - <translation>Frais par Ko à ajouter aux transactions que vous envoyez</translation> - </message> - <message> - <location line="+20"/> + <location line="+94"/> <source>Loading wallet...</source> - <translation>Chargement du porte-monnaie…</translation> + <translation>Chargement du portefeuille…</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>Cannot downgrade wallet</source> - <translation>Impossible de revenir à une version inférieur du porte-monnaie</translation> + <translation>Impossible de revenir à une version inférieure du portefeuille</translation> </message> <message> <location line="+3"/> @@ -3340,7 +3935,7 @@ par exemple : alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo <translation>Erreur</translation> </message> <message> - <location line="-33"/> + <location line="-34"/> <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 8338eecd64..0adaef4e25 100644 --- a/src/qt/locale/bitcoin_he.ts +++ b/src/qt/locale/bitcoin_he.ts @@ -3,13 +3,13 @@ <name>AboutDialog</name> <message> <location filename="../forms/aboutdialog.ui" line="+14"/> - <source>About Bitcoin</source> - <translation>אודות ביטקוין</translation> + <source>About Bitcoin Core</source> + <translation type="unfinished"/> </message> <message> <location line="+39"/> - <source><b>Bitcoin</b> version</source> - <translation>גרסת <b>ביטקוין</b></translation> + <source><b>Bitcoin Core</b> version</source> + <translation type="unfinished"/> </message> <message> <location line="+57"/> @@ -27,7 +27,7 @@ This product includes software developed by the OpenSSL Project for use in the O המוצר הזה כולל תוכנה שפותחה ע"י פרויקט OpenSSL לשימוש בתיבת הכלים OpenSSL (http://www.openssl.org/) ותוכנה קריפטוגרפית שנכתבה ע"י אריק יאנג (eay@cryptsoft.com) ותוכנת UPnP שנכתבה ע"י תומס ברנרד.</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="+14"/> + <location filename="../aboutdialog.cpp" line="+19"/> <source>Copyright</source> <translation>זכויות יוצרים</translation> </message> @@ -52,7 +52,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>&חדש</translation> </message> <message> <location line="+11"/> @@ -70,7 +70,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location filename="../addressbookpage.cpp" line="+72"/> + <location filename="../addressbookpage.cpp" line="+74"/> <source>&Copy Address</source> <translation>העתק כתובת</translation> </message> @@ -92,12 +92,12 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="-27"/> <source>&Delete</source> - <translation>מחק</translation> + <translation>&מחק</translation> </message> <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"/> @@ -112,12 +112,12 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+6"/> <source>Sending addresses</source> - <translation type="unfinished"/> + <translation>כתובת לשליחה</translation> </message> <message> <location line="+1"/> <source>Receiving addresses</source> - <translation type="unfinished"/> + <translation>קבל כתובות</translation> </message> <message> <location line="+7"/> @@ -140,7 +140,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>עריכה</translation> </message> <message> - <location line="+197"/> + <location line="+194"/> <source>Export Address List</source> <translation type="unfinished"/> </message> @@ -163,7 +163,7 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>AddressTableModel</name> <message> - <location filename="../addresstablemodel.cpp" line="+164"/> + <location filename="../addresstablemodel.cpp" line="+168"/> <source>Label</source> <translation>תוית</translation> </message> @@ -201,7 +201,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>חזור על הסיסמה החדשה</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="+34"/> + <location filename="../askpassphrasedialog.cpp" line="+40"/> <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>10 or more random characters</b>, or <b>eight or more words</b>.</source> <translation>הכנס את הסיסמה החדשה לארנק. <br/>אנא השתמש בסיסמה המכילה <b>10 תוים אקראיים או יותר</b>, או <b>שמונה מילים או יותר</b>.</translation> </message> @@ -322,17 +322,17 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+250"/> + <location filename="../bitcoingui.cpp" line="+260"/> <source>Sign &message...</source> <translation>חתום על הודעה</translation> </message> <message> - <location line="+254"/> + <location line="+290"/> <source>Synchronizing with network...</source> <translation>מסתנכרן עם הרשת...</translation> </message> <message> - <location line="-324"/> + <location line="-360"/> <source>&Overview</source> <translation>&סקירה</translation> </message> @@ -398,7 +398,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>שנה סיסמא</translation> </message> <message> - <location line="+259"/> + <location line="+295"/> <source>Importing blocks from disk...</source> <translation>מייבא בלוקים מהדיסק...</translation> </message> @@ -408,7 +408,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>מחדש את אינדקס הבלוקים בדיסק...</translation> </message> <message> - <location line="-322"/> + <location line="-358"/> <source>Send coins to a Bitcoin address</source> <translation>שלח מטבעות לכתובת ביטקוין</translation> </message> @@ -443,22 +443,20 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>אמת הודעה...</translation> </message> <message> - <location line="-180"/> - <location line="+6"/> - <location line="+513"/> + <location line="+375"/> <source>Bitcoin</source> <translation>ביטקוין</translation> </message> <message> - <location line="-519"/> - <location line="+6"/> + <location line="-563"/> + <location line="+10"/> <source>Wallet</source> <translation>ארנק</translation> </message> <message> - <location line="+109"/> + <location line="+113"/> <source>&Send</source> - <translation>ושלח</translation> + <translation>&שלח</translation> </message> <message> <location line="+7"/> @@ -466,13 +464,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>וקבל</translation> </message> <message> - <location line="+28"/> - <location line="+2"/> - <source>&About Bitcoin</source> - <translation>אודות ביטקוין</translation> - </message> - <message> - <location line="+14"/> + <location line="+44"/> <location line="+2"/> <source>&Show / Hide</source> <translation>הצג / הסתר</translation> @@ -498,12 +490,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>אמת הודעות כדי להבטיח שהן נחתמו עם כתובת ביטקוין מסוימות</translation> </message> <message> - <location line="+35"/> + <location line="+39"/> <source>&File</source> <translation>&קובץ</translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>&Settings</source> <translation>ה&גדרות</translation> </message> @@ -518,25 +510,37 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>סרגל כלים טאבים</translation> </message> <message> - <location line="-235"/> - <location line="+294"/> + <location line="-244"/> + <location line="+321"/> <source>[testnet]</source> <translation>[רשת-בדיקה]</translation> </message> <message> - <location line="-177"/> + <location line="-331"/> + <location line="+10"/> + <source>Bitcoin Core</source> + <translation>ליבת ביטקוין</translation> + </message> + <message> + <location line="+121"/> <source>Request payments (generates QR codes and bitcoin: URIs)</source> <translation type="unfinished"/> </message> <message> - <location line="+63"/> - <source>&Used sending addresses...</source> + <location line="+27"/> + <location line="+2"/> + <source>&About Bitcoin Core</source> <translation type="unfinished"/> </message> <message> + <location line="+34"/> + <source>&Used sending addresses...</source> + <translation>כתובת לשליחה שהיו &בשימוש...</translation> + </message> + <message> <location line="+1"/> <source>Show the list of used sending addresses and labels</source> - <translation type="unfinished"/> + <translation>הצג את רשימת הכתובות לשליחה שהיו בשימוש לרבות התוויות</translation> </message> <message> <location line="+1"/> @@ -549,13 +553,23 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+106"/> + <location line="+2"/> + <source>Open URI...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Open a bitcoin: URI or payment request</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+126"/> <location line="+5"/> <source>Bitcoin client</source> <translation>תוכנת ביטקוין</translation> </message> <message numerus="yes"> - <location line="+120"/> + <location line="+133"/> <source>%n active connection(s) to Bitcoin network</source> <translation><numerusform>חיבור פעיל אחד לרשת הביטקוין</numerusform><numerusform>%n חיבורים פעילים לרשת הביטקוין</numerusform></translation> </message> @@ -567,7 +581,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+12"/> <source>Processed %1 of %2 (estimated) blocks of transaction history.</source> - <translation>1% מתוך 2% (משוער) בלוקים של הסטוריית פעולת עובדו </translation> + <translation>%1 מתוך %2 (משוער) בלוקים של הסטוריית פעולות עובדו.</translation> </message> <message> <location line="+4"/> @@ -662,17 +676,7 @@ Address: %4 כתובת: %4</translation> </message> <message> - <location line="+34"/> - <source>URI handling</source> - <translation>תפעול URI</translation> - </message> - <message> - <location line="+0"/> - <source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source> - <translation>לא ניתן לנתח URI! זה יכול להיגרם כתוצאה מכתובת ביטקוין לא תקינה או פרמטרי URI חסרי צורה תקינה.</translation> - </message> - <message> - <location line="+45"/> + <location line="+67"/> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>הארנק <b>מוצפן</b> וכרגע <b>פתוח</b></translation> </message> @@ -682,7 +686,7 @@ Address: %4 <translation>הארנק <b>מוצפן</b> וכרגע <b>נעול</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+110"/> + <location filename="../bitcoin.cpp" line="+116"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>שגיאה סופנית אירעה. ביטקוין אינו יכול להמשיך לפעול בבטחה ולכן ייסגר.</translation> </message> @@ -690,12 +694,299 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+115"/> + <location filename="../clientmodel.cpp" line="+119"/> <source>Network Alert</source> <translation>אזעקת רשת</translation> </message> </context> <context> + <name>CoinControlDialog</name> + <message> + <location filename="../forms/coincontroldialog.ui" line="+14"/> + <source>Coin Control Address Selection</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+34"/> + <source>Quantity:</source> + <translation>כמות:</translation> + </message> + <message> + <location line="+29"/> + <source>Bytes:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+45"/> + <source>Amount:</source> + <translation>כמות:</translation> + </message> + <message> + <location line="+29"/> + <source>Priority:</source> + <translation>קדימות:</translation> + </message> + <message> + <location line="+45"/> + <source>Fee:</source> + <translation>תשלום:</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>שינוי:</translation> + </message> + <message> + <location line="+63"/> + <source>(un)select all</source> + <translation>(מחק)(בחר) הכל</translation> + </message> + <message> + <location line="+13"/> + <source>Tree mode</source> + <translation>מצב עץ</translation> + </message> + <message> + <location line="+16"/> + <source>List mode</source> + <translation>מצר רשימה</translation> + </message> + <message> + <location line="+52"/> + <source>Amount</source> + <translation>כמות</translation> + </message> + <message> + <location line="+10"/> + <source>Address</source> + <translation>כתובת</translation> + </message> + <message> + <location line="+5"/> + <source>Date</source> + <translation>תאריך</translation> + </message> + <message> + <location line="+5"/> + <source>Confirmations</source> + <translation>אישורים</translation> + </message> + <message> + <location line="+3"/> + <source>Confirmed</source> + <translation>מאושר</translation> + </message> + <message> + <location line="+5"/> + <source>Priority</source> + <translation>קדימות</translation> + </message> + <message> + <location filename="../coincontroldialog.cpp" line="+42"/> + <source>Copy address</source> + <translation>העתק כתובת</translation> + </message> + <message> + <location line="+1"/> + <source>Copy label</source> + <translation>העתק תוית</translation> + </message> + <message> + <location line="+1"/> + <location line="+26"/> + <source>Copy amount</source> + <translation>העתק כמות</translation> + </message> + <message> + <location line="-25"/> + <source>Copy transaction ID</source> + <translation>העתק מזהה פעולה</translation> + </message> + <message> + <location line="+1"/> + <source>Lock unspent</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Unlock unspent</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+22"/> + <source>Copy quantity</source> + <translation>העתק כמות</translation> + </message> + <message> + <location line="+2"/> + <source>Copy fee</source> + <translation>העתק מחיר</translation> + </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>העתק קדימות</translation> + </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>הכי גבוה</translation> + </message> + <message> + <location line="+1"/> + <source>higher</source> + <translation>גבוהה יותר</translation> + </message> + <message> + <location line="+1"/> + <source>high</source> + <translation>גבוה</translation> + </message> + <message> + <location line="+1"/> + <source>medium-high</source> + <translation>בנוני גבוה</translation> + </message> + <message> + <location line="+1"/> + <source>medium</source> + <translation>בינוני</translation> + </message> + <message> + <location line="+4"/> + <source>low-medium</source> + <translation>בינוני - נמוך</translation> + </message> + <message> + <location line="+1"/> + <source>low</source> + <translation>נמוך</translation> + </message> + <message> + <location line="+1"/> + <source>lower</source> + <translation>נמוך יותר</translation> + </message> + <message> + <location line="+1"/> + <source>lowest</source> + <translation>הכי נמוך</translation> + </message> + <message> + <location line="+11"/> + <source>(%1 locked)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+171"/> + <source>Dust</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>yes</source> + <translation>כן</translation> + </message> + <message> + <location line="+0"/> + <source>no</source> + <translation>לא</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>(ללא תוית)</translation> + </message> + <message> + <location line="-9"/> + <source>change from %1 (%2)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>(change)</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>EditAddressDialog</name> <message> <location filename="../forms/editaddressdialog.ui" line="+14"/> @@ -715,7 +1006,7 @@ Address: %4 <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>הכתובת המשויכת עם רשומה זו ברשימת הכתובות. ניתן לשנות זאת רק עבור כתובות לשליחה.</translation> </message> <message> <location line="-10"/> @@ -723,7 +1014,7 @@ Address: %4 <translation>&כתובת</translation> </message> <message> - <location filename="../editaddressdialog.cpp" line="+21"/> + <location filename="../editaddressdialog.cpp" line="+25"/> <source>New receiving address</source> <translation>כתובת חדשה לקבלה</translation> </message> @@ -766,14 +1057,14 @@ Address: %4 <context> <name>FreespaceChecker</name> <message> - <location filename="../intro.cpp" line="+61"/> + <location filename="../intro.cpp" line="+65"/> <source>A new data directory will be created.</source> <translation type="unfinished"/> </message> <message> <location line="+22"/> <source>name</source> - <translation type="unfinished"/> + <translation>שם</translation> </message> <message> <location line="+2"/> @@ -794,18 +1085,18 @@ Address: %4 <context> <name>GUIUtil::HelpMessageBox</name> <message> - <location filename="../guiutil.cpp" line="+558"/> - <location line="+13"/> - <source>Bitcoin-Qt</source> - <translation>Bitcoin-Qt</translation> - </message> - <message> - <location line="-13"/> + <location filename="../guiutil.cpp" line="+597"/> <source>version</source> <translation>גרסה</translation> </message> <message> - <location line="+2"/> + <location line="+0"/> + <location line="+13"/> + <source>Bitcoin Core</source> + <translation>ליבת ביטקוין</translation> + </message> + <message> + <location line="-11"/> <source>Usage:</source> <translation>שימוש:</translation> </message> @@ -845,21 +1136,21 @@ 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-Qt.</source> + <source>Welcome to Bitcoin Core.</source> <translation type="unfinished"/> </message> <message> <location line="+26"/> - <source>As this is the first time the program is launched, you can choose where Bitcoin-Qt will store its data.</source> - <translation type="unfinished"/> + <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source> + <translation>מכיוון שזאת הפעם הראשונה שהתוכנה הופעלה תוכל לבחור איפה ביטקויין קור תאכסן את </translation> </message> <message> <location line="+10"/> - <source>Bitcoin-Qt will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source> + <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source> <translation type="unfinished"/> </message> <message> @@ -873,7 +1164,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../intro.cpp" line="+105"/> + <location filename="../intro.cpp" line="+85"/> + <source>Bitcoin</source> + <translation>ביטקוין</translation> + </message> + <message> + <location line="+1"/> + <source>Error: Specified data directory "%1" can not be created.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+19"/> <source>Error</source> <translation>שגיאה</translation> </message> @@ -889,6 +1190,34 @@ Address: %4 </message> </context> <context> + <name>OpenURIDialog</name> + <message> + <location filename="../forms/openuridialog.ui" line="+14"/> + <source>Open URI</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Open payment request from URI or file</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+9"/> + <source>URI:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+11"/> + <source>Select payment request file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../openuridialog.cpp" line="+47"/> + <source>Select payment request file to open</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OptionsDialog</name> <message> <location filename="../forms/optionsdialog.ui" line="+14"/> @@ -1046,6 +1375,16 @@ Address: %4 <translation>הצג כתובות ברשימת הפעולות</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="+71"/> <source>&OK</source> <translation>אישור</translation> @@ -1061,12 +1400,12 @@ Address: %4 <translation>יישום</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+58"/> + <location filename="../optionsdialog.cpp" line="+63"/> <source>default</source> <translation>ברירת מחדל</translation> </message> <message> - <location line="+130"/> + <location line="+131"/> <source>Confirm options reset</source> <translation>אשר את איפוס האפשרויות</translation> </message> @@ -1107,24 +1446,24 @@ Address: %4 </message> <message> <location line="+50"/> - <location line="+202"/> + <location line="+214"/> <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source> <translation>המידע המוצג עשוי להיות מיושן. הארנק שלך מסתנכרן באופן אוטומטי עם רשת הביטקוין לאחר כינון חיבור, אך התהליך טרם הסתיים.</translation> </message> <message> - <location line="-131"/> + <location line="-140"/> <source>Unconfirmed:</source> <translation>ממתין לאישור:</translation> </message> <message> - <location line="-78"/> + <location line="-81"/> <source>Wallet</source> <translation>ארנק</translation> </message> <message> <location line="+49"/> <source>Confirmed:</source> - <translation type="unfinished"/> + <translation>מאושר:</translation> </message> <message> <location line="+16"/> @@ -1132,12 +1471,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+29"/> + <location line="+32"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation type="unfinished"/> </message> <message> - <location line="+13"/> + <location line="+16"/> <source>Immature:</source> <translation>לא בשל:</translation> </message> @@ -1147,22 +1486,22 @@ Address: %4 <translation>מאזן שנכרה וטרם הבשיל</translation> </message> <message> - <location line="+13"/> + <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="+53"/> + <location line="+56"/> <source><b>Recent transactions</b></source> <translation><b>פעולות אחרונות</b></translation> </message> <message> - <location filename="../overviewpage.cpp" line="+116"/> + <location filename="../overviewpage.cpp" line="+120"/> <location line="+1"/> <source>out of sync</source> <translation>לא מסונכרן</translation> @@ -1171,7 +1510,7 @@ Address: %4 <context> <name>PaymentServer</name> <message> - <location filename="../paymentserver.cpp" line="+392"/> + <location filename="../paymentserver.cpp" line="+397"/> <source>URI handling</source> <translation>תפעול URI</translation> </message> @@ -1181,23 +1520,29 @@ Address: %4 <translation>לא ניתן לנתח URI! זה יכול להיגרם כתוצאה מכתובת ביטקוין לא תקינה או פרמטרי URI חסרי צורה תקינה.</translation> </message> <message> - <location line="+69"/> + <location line="+91"/> <source>Requested payment amount of %1 is too small (considered dust).</source> <translation type="unfinished"/> </message> <message> - <location line="+4"/> - <location line="+37"/> + <location line="-204"/> + <location line="+195"/> + <location line="+13"/> <source>Payment request error</source> - <translation type="unfinished"/> + <translation>שגיאה בבקשת תשלום</translation> </message> <message> - <location line="+1"/> - <source>Insecure requests to custom payment scripts unsupported</source> + <location line="-207"/> + <source>Cannot start bitcoin: click-to-pay handler</source> + <translation>לא ניתן להתחיל את ביטקוין: מפעיל לחץ-לתשלום </translation> + </message> + <message> + <location line="+195"/> + <source>Unverified payment requests to custom payment scripts are unsupported.</source> <translation type="unfinished"/> </message> <message> - <location line="+38"/> + <location line="+59"/> <source>Refund from %1</source> <translation type="unfinished"/> </message> @@ -1207,29 +1552,28 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>Bad response from server %1</source> <translation type="unfinished"/> </message> <message> <location line="+32"/> <source>Payment acknowledged</source> - <translation type="unfinished"/> + <translation>התשלום התקבל</translation> </message> <message> - <location line="-58"/> - <location line="+30"/> + <location line="-55"/> + <location line="+27"/> <location line="+17"/> <source>Network request error</source> - <translation type="unfinished"/> + <translation>שגיאת בקשת שרת</translation> </message> </context> <context> <name>QObject</name> <message> - <location filename="../bitcoin.cpp" line="+114"/> + <location filename="../bitcoin.cpp" line="+119"/> <location line="+5"/> - <location filename="../intro.cpp" line="-32"/> <source>Bitcoin</source> <translation>ביטקוין</translation> </message> @@ -1243,16 +1587,11 @@ Address: %4 <source>Error: Invalid combination of -regtest and -testnet.</source> <translation type="unfinished"/> </message> - <message> - <location filename="../intro.cpp" line="+1"/> - <source>Error: Specified data directory "%1" can not be created.</source> - <translation type="unfinished"/> - </message> </context> <context> <name>QRImageWidget</name> <message> - <location filename="../receiverequestdialog.cpp" line="+32"/> + <location filename="../receiverequestdialog.cpp" line="+36"/> <source>&Save Image...</source> <translation type="unfinished"/> </message> @@ -1268,8 +1607,8 @@ Address: %4 </message> <message> <location line="+0"/> - <source>PNG Images (*.png)</source> - <translation>תמונות PNG (*.png)</translation> + <source>PNG Image (*.png)</source> + <translation type="unfinished"/> </message> </context> <context> @@ -1289,7 +1628,7 @@ Address: %4 <location line="+53"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+352"/> + <location filename="../rpcconsole.cpp" line="+360"/> <source>N/A</source> <translation>N/A</translation> </message> @@ -1304,7 +1643,12 @@ Address: %4 <translation>מידע</translation> </message> <message> - <location line="+68"/> + <location line="-10"/> + <source>Debug window</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+78"/> <source>Using OpenSSL version</source> <translation>משתמש ב-OpenSSL גרסה</translation> </message> @@ -1359,12 +1703,7 @@ Address: %4 <translation>אפשרויות שורת פקודה</translation> </message> <message> - <location line="+7"/> - <source>Show the Bitcoin-Qt help message to get a list with possible Bitcoin command-line options.</source> - <translation>הצג את הודעה העזרה של bitcoin-qt כדי לקבל רשימה של אפשרויות שורת פקודה של ביטקוין.</translation> - </message> - <message> - <location line="+3"/> + <location line="+10"/> <source>&Show</source> <translation>הצג</translation> </message> @@ -1404,12 +1743,7 @@ Address: %4 <translation>תאריך בניה</translation> </message> <message> - <location line="-104"/> - <source>Bitcoin - Debug window</source> - <translation>ביטקוין - חלון ניפוי</translation> - </message> - <message> - <location line="+25"/> + <location line="-79"/> <source>Bitcoin Core</source> <translation>ליבת ביטקוין</translation> </message> @@ -1424,7 +1758,12 @@ Address: %4 <translation>פתח את קובץ יומן הניפוי מתיקיית הנתונים הנוכחית. זה עשוי לקחת מספר שניות עבור קובצי יומן גדולים.</translation> </message> <message> - <location line="+102"/> + <location line="+26"/> + <source>Show the Bitcoin-Core help message to get a list with possible Bitcoin command-line options.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+76"/> <source>Clear console</source> <translation>נקה לוח בקרה</translation> </message> @@ -1466,12 +1805,12 @@ Address: %4 <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"/> @@ -1482,37 +1821,32 @@ Address: %4 <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+22"/> + <location filename="../forms/receivecoinsdialog.ui" line="+83"/> <source>&Amount:</source> <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+19"/> <source>The amount to request</source> - <translation type="unfinished"/> + <translation>כמות הבקשה</translation> </message> <message> - <location line="+7"/> + <location line="-32"/> <source>&Label:</source> <translation>ת&וית:</translation> </message> <message> - <location line="+10"/> - <source>The label to associate with the receiving address</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+7"/> + <location line="-34"/> <source>&Message:</source> <translation type="unfinished"/> </message> <message> - <location line="+10"/> + <location line="+20"/> <source>The message to attach to payment request</source> <translation type="unfinished"/> </message> <message> - <location line="+14"/> + <location line="-37"/> <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> @@ -1522,25 +1856,55 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="+27"/> + <source>The label to associate with the new receiving address</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+14"/> <source>Use this form to request payments. All fields are optional.</source> <translation type="unfinished"/> </message> <message> - <location line="+17"/> + <location line="+56"/> <source>Clear all fields of the form.</source> - <translation type="unfinished"/> + <translation>נקה את כל השדות</translation> </message> <message> <location line="+3"/> <source>Clear</source> - <translation type="unfinished"/> + <translation>נקה</translation> </message> <message> <location line="+36"/> <source>&Request payment</source> <translation type="unfinished"/> </message> + <message> + <location line="+47"/> + <source>Previously requested payments</source> + <translation>בקשות תשלום ישנות</translation> + </message> + <message> + <location line="+12"/> + <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>הצג</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>הסר</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -1561,23 +1925,18 @@ Address: %4 </message> <message> <location line="+7"/> - <source>&Copy Image</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+7"/> <source>&Save Image...</source> <translation type="unfinished"/> </message> <message> - <location filename="../receiverequestdialog.cpp" line="+58"/> + <location filename="../receiverequestdialog.cpp" line="+56"/> <source>Request payment to %1</source> <translation type="unfinished"/> </message> <message> <location line="+6"/> <source>Payment information</source> - <translation type="unfinished"/> + <translation>אנפרומצייה על התשלום</translation> </message> <message> <location line="+1"/> @@ -1616,16 +1975,119 @@ Address: %4 </message> </context> <context> + <name>RecentRequestsTableModel</name> + <message> + <location filename="../recentrequeststablemodel.cpp" line="+14"/> + <source>Date</source> + <translation>תאריך</translation> + </message> + <message> + <location line="+0"/> + <source>Label</source> + <translation>תוית</translation> + </message> + <message> + <location line="+0"/> + <source>Message</source> + <translation>הודעה</translation> + </message> + <message> + <location line="+0"/> + <source>Amount</source> + <translation>כמות</translation> + </message> + <message> + <location line="+36"/> + <source>(no label)</source> + <translation>(ללא תוית)</translation> + </message> + <message> + <location line="+9"/> + <source>(no message)</source> + <translation>(אין הודעות)</translation> + </message> +</context> +<context> <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="+14"/> - <location filename="../sendcoinsdialog.cpp" line="+140"/> - <location line="+213"/> + <location filename="../sendcoinsdialog.cpp" line="+381"/> + <location line="+81"/> <source>Send Coins</source> <translation>שלח מטבעות</translation> </message> <message> - <location line="+50"/> + <location line="+76"/> + <source>Coin Control Features</source> + <translation>ה</translation> + </message> + <message> + <location line="+20"/> + <source>Inputs...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> + <source>automatically selected</source> + <translation>נבחר אוטומאטית</translation> + </message> + <message> + <location line="+19"/> + <source>Insufficient funds!</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+89"/> + <source>Quantity:</source> + <translation>כמות:</translation> + </message> + <message> + <location line="+35"/> + <source>Bytes:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+48"/> + <source>Amount:</source> + <translation>כמות:</translation> + </message> + <message> + <location line="+32"/> + <source>Priority:</source> + <translation>קדימות:</translation> + </message> + <message> + <location line="+48"/> + <source>Fee:</source> + <translation>תשלום:</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>שינוי:</translation> + </message> + <message> + <location line="+44"/> + <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Custom change address</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+115"/> <source>Send to multiple recipients at once</source> <translation>שלח למספר מקבלים בו-זמנית</translation> </message> @@ -1637,7 +2099,7 @@ Address: %4 <message> <location line="+20"/> <source>Clear all fields of the form.</source> - <translation type="unfinished"/> + <translation>נקה את כל השדות</translation> </message> <message> <location line="+3"/> @@ -1650,12 +2112,7 @@ Address: %4 <translation>יתרה:</translation> </message> <message> - <location line="+10"/> - <source>123.456 BTC</source> - <translation>123.456 ביטקוין</translation> - </message> - <message> - <location line="+31"/> + <location line="+41"/> <source>Confirm the send action</source> <translation>אשר את פעולת השליחה</translation> </message> @@ -1665,69 +2122,135 @@ Address: %4 <translation>שלח</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-154"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation>אשר שליחת מטבעות</translation> </message> <message> - <location line="-90"/> + <location line="-74"/> <location line="+5"/> <location line="+5"/> + <location line="+4"/> <source>%1 to %2</source> <translation type="unfinished"/> </message> <message> - <location line="+26"/> + <location line="-136"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>הכנס כתובת ביטקוין (למשל 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> + <message> + <location line="+15"/> + <source>Copy quantity</source> + <translation>העתק כמות</translation> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation>העתק כמות</translation> + </message> + <message> + <location line="+1"/> + <source>Copy fee</source> + <translation>העתק מחיר</translation> + </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>העתק קדימות</translation> + </message> + <message> + <location line="+1"/> + <source>Copy low output</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy change</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+170"/> + <source>Total Amount %1 (= %2)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>or</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+202"/> <source>The recipient address is not valid, please recheck.</source> <translation>כתובת המקבל אינה תקינה, אנא בדוק שנית.</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>The amount to pay must be larger than 0.</source> <translation>הכמות לשלם חייבת להיות גדולה מ-0.</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>The amount exceeds your balance.</source> <translation>הכמות עולה על המאזן שלך.</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>The total exceeds your balance when the %1 transaction fee is included.</source> <translation>הכמות הכוללת, ובכללה עמלת פעולה בסך %1, עולה על המאזן שלך.</translation> </message> <message> - <location line="+5"/> + <location line="+3"/> <source>Duplicate address found, can only send to each address once per send operation.</source> <translation>כתובת כפולה נמצאה, ניתן לשלוח לכל כתובת רק פעם אחת בכל פעולת שליחה.</translation> </message> <message> - <location line="+4"/> - <source>Error: Transaction creation failed!</source> - <translation>שגיאה: יצירת הפעולה נכשלה!</translation> + <location line="+3"/> + <source>Transaction creation failed!</source> + <translation type="unfinished"/> </message> <message> - <location line="+15"/> - <source>Are you sure you want to send?</source> + <location line="+4"/> + <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation type="unfinished"/> </message> <message> - <location line="+9"/> - <source>added as transaction fee</source> + <location line="+113"/> + <source>Warning: Invalid Bitcoin address</source> <translation type="unfinished"/> </message> <message> - <location line="+6"/> - <source>Total Amount %1</source> + <location line="+13"/> + <source>(no label)</source> + <translation>(ללא תוית)</translation> + </message> + <message> + <location line="+8"/> + <source>Warning: Unknown change address</source> <translation type="unfinished"/> </message> <message> - <location line="+20"/> - <source>Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> - <translation>שגיאה: הפעולה נדחתה. זה עשוי לקרות עם חלק מהמטבעות בארנק שלך כבר נוצלו, למשל אם השתמשת בעותק של wallet.dat ומטבעות נוצלו בעותק אך לא סומנו כמנוצלות כאן.</translation> + <location line="-378"/> + <source>Are you sure you want to send?</source> + <translation>האם אכן לשלוח?</translation> </message> <message> - <location line="+144"/> + <location line="+9"/> + <source>added as transaction fee</source> + <translation>הוסף מחיר טיפול</translation> + </message> + <message> + <location line="+170"/> <source>Payment request expired</source> <translation type="unfinished"/> </message> @@ -1740,39 +2263,44 @@ Address: %4 <context> <name>SendCoinsEntry</name> <message> - <location filename="../forms/sendcoinsentry.ui" line="+33"/> - <location line="+585"/> + <location filename="../forms/sendcoinsentry.ui" line="+131"/> + <location line="+501"/> + <location line="+536"/> <source>A&mount:</source> <translation>כ&מות:</translation> </message> <message> - <location line="-572"/> - <location line="+585"/> + <location line="-1132"/> <source>Pay &To:</source> <translation>שלם &ל:</translation> </message> <message> - <location line="-551"/> + <location line="+18"/> <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation>הכתובת שאליה ישלח התשלום (למשל 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location filename="../sendcoinsentry.cpp" line="+28"/> + <location filename="../sendcoinsentry.cpp" line="+30"/> <source>Enter a label for this address to add it to your address book</source> <translation>הכנס תוית לכתובת הזאת כדי להכניס לפנקס הכתובות</translation> </message> <message> - <location filename="../forms/sendcoinsentry.ui" line="-18"/> + <location filename="../forms/sendcoinsentry.ui" line="+57"/> <source>&Label:</source> <translation>ת&וית:</translation> </message> <message> - <location line="+28"/> + <location line="-50"/> <source>Choose previously used address</source> + <translation>בחר כתובת שהייתה בשימוש</translation> + </message> + <message> + <location line="-40"/> + <source>This is a normal payment.</source> <translation type="unfinished"/> </message> <message> - <location line="+10"/> + <location line="+50"/> <source>Alt+A</source> <translation>Alt+A</translation> </message> @@ -1788,20 +2316,39 @@ Address: %4 </message> <message> <location line="+7"/> - <source>Remove this recipient</source> - <translation>הסר את המקבל הזה</translation> + <location line="+504"/> + <location line="+536"/> + <source>Remove this entry</source> + <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="-40"/> + <source>This is a verified payment request.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-971"/> <source>Enter a label for this address to add it to the list of used addresses</source> <translation type="unfinished"/> </message> <message> - <location line="+465"/> - <source>Memo:</source> + <location line="+439"/> + <source>This is an unverified payment request.</source> <translation type="unfinished"/> </message> <message> + <location line="+18"/> + <location line="+532"/> + <source>Pay To:</source> + <translation>תשלום ל:</translation> + </message> + <message> + <location line="-498"/> + <location line="+536"/> + <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> @@ -1833,7 +2380,7 @@ Address: %4 <location line="+10"/> <location line="+213"/> <source>Choose previously used address</source> - <translation type="unfinished"/> + <translation>בחר כתובת שהייתה בשימוש</translation> </message> <message> <location line="-203"/> @@ -1918,7 +2465,7 @@ Address: %4 <translation>אפס את כל שדות אימות הודעה</translation> </message> <message> - <location filename="../signverifymessagedialog.cpp" line="+27"/> + <location filename="../signverifymessagedialog.cpp" line="+29"/> <location line="+3"/> <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation>הכנס כתובת ביטקוין (למשל 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> @@ -1934,7 +2481,7 @@ Address: %4 <translation>הכנס חתימת ביטקוין</translation> </message> <message> - <location line="+85"/> + <location line="+84"/> <location line="+81"/> <source>The entered address is invalid.</source> <translation>הכתובת שהוכנסה אינה תקינה.</translation> @@ -2003,9 +2550,14 @@ Address: %4 <context> <name>SplashScreen</name> <message> - <location filename="../splashscreen.cpp" line="+23"/> - <source>The Bitcoin developers</source> - <translation>מפתחי ביטקוין</translation> + <location filename="../splashscreen.cpp" line="+26"/> + <source>Bitcoin Core</source> + <translation>ליבת ביטקוין</translation> + </message> + <message> + <location line="+2"/> + <source>The Bitcoin Core developers</source> + <translation type="unfinished"/> </message> <message> <location line="+1"/> @@ -2016,7 +2568,7 @@ Address: %4 <context> <name>TrafficGraphWidget</name> <message> - <location filename="../trafficgraphwidget.cpp" line="+75"/> + <location filename="../trafficgraphwidget.cpp" line="+79"/> <source>KB/s</source> <translation type="unfinished"/> </message> @@ -2024,7 +2576,7 @@ Address: %4 <context> <name>TransactionDesc</name> <message> - <location filename="../transactiondesc.cpp" line="+22"/> + <location filename="../transactiondesc.cpp" line="+28"/> <source>Open until %1</source> <translation>פתוח עד %1</translation> </message> @@ -2216,7 +2768,7 @@ Address: %4 <context> <name>TransactionTableModel</name> <message> - <location filename="../transactiontablemodel.cpp" line="+227"/> + <location filename="../transactiontablemodel.cpp" line="+234"/> <source>Date</source> <translation>תאריך</translation> </message> @@ -2334,7 +2886,7 @@ Address: %4 <context> <name>TransactionView</name> <message> - <location filename="../transactionview.cpp" line="+52"/> + <location filename="../transactionview.cpp" line="+57"/> <location line="+16"/> <source>All</source> <translation>הכל</translation> @@ -2395,12 +2947,12 @@ Address: %4 <translation>אחר</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>Enter address or label to search</source> <translation>הכנס כתובת או תוית לחפש</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>Min amount</source> <translation>כמות מזערית</translation> </message> @@ -2435,17 +2987,37 @@ Address: %4 <translation>הצג פרטי פעולה</translation> </message> <message> - <location line="+143"/> - <source>Export Transaction Data</source> - <translation>יצוא נתוני פעולות</translation> + <location line="+142"/> + <source>Export Transaction History</source> + <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+19"/> + <source>Exporting Failed</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>There was an error trying to save the transaction history to %1.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+4"/> + <source>Exporting Successful</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>The transaction history was successfully saved to %1.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-22"/> <source>Comma separated file (*.csv)</source> <translation>קובץ מופרד בפסיקים (*.csv)</translation> </message> <message> - <location line="+8"/> + <location line="+9"/> <source>Confirmed</source> <translation>מאושר</translation> </message> @@ -2480,17 +3052,7 @@ Address: %4 <translation>מזהה</translation> </message> <message> - <location line="+4"/> - <source>Error exporting</source> - <translation>שגיאה ביצוא</translation> - </message> - <message> - <location line="+0"/> - <source>Could not write to file %1.</source> - <translation>לא מסוגל לכתוב לקובץ %1.</translation> - </message> - <message> - <location line="+100"/> + <location line="+107"/> <source>Range:</source> <translation>טווח:</translation> </message> @@ -2501,9 +3063,17 @@ Address: %4 </message> </context> <context> + <name>WalletFrame</name> + <message> + <location filename="../walletframe.cpp" line="+26"/> + <source>No wallet has been loaded.</source> + <translation>לא נטען ארנק</translation> + </message> +</context> +<context> <name>WalletModel</name> <message> - <location filename="../walletmodel.cpp" line="+218"/> + <location filename="../walletmodel.cpp" line="+245"/> <source>Send Coins</source> <translation>שלח מטבעות</translation> </message> @@ -2511,7 +3081,7 @@ Address: %4 <context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+46"/> + <location filename="../walletview.cpp" line="+43"/> <source>&Export</source> <translation>&ייצא</translation> </message> @@ -2521,65 +3091,60 @@ Address: %4 <translation>יצוא הנתונים בטאב הנוכחי לקובץ</translation> </message> <message> - <location line="+183"/> + <location line="+181"/> <source>Backup Wallet</source> <translation>גבה ארנק</translation> </message> <message> - <location line="+0"/> + <location line="+1"/> <source>Wallet Data (*.dat)</source> <translation>נתוני ארנק (*.dat)</translation> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Backup Failed</source> <translation>גיבוי נכשל</translation> </message> <message> <location line="+0"/> - <source>There was an error trying to save the wallet data to the new location.</source> - <translation>הייתה שגיאה בנסיון לשמור את המידע הארנק למיקום החדש.</translation> + <source>There was an error trying to save the wallet data to %1.</source> + <translation type="unfinished"/> </message> <message> <location line="+4"/> - <source>Backup Successful</source> - <translation>גיבוי הושלם בהצלחה</translation> + <source>The wallet data was successfully saved to %1.</source> + <translation type="unfinished"/> </message> <message> <location line="+0"/> - <source>The wallet data was successfully saved to the new location.</source> - <translation>נתוני הארנק נשמרו בהצלחה במקום החדש.</translation> + <source>Backup Successful</source> + <translation>גיבוי הושלם בהצלחה</translation> </message> </context> <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+102"/> - <source>Bitcoin version</source> - <translation>גרסת ביטקוין</translation> - </message> - <message> - <location line="+107"/> + <location filename="../bitcoinstrings.cpp" line="+217"/> <source>Usage:</source> <translation>שימוש:</translation> </message> <message> - <location line="-55"/> + <location line="-54"/> <source>List commands</source> <translation>רשימת פקודות</translation> </message> <message> - <location line="-13"/> + <location line="-14"/> <source>Get help for a command</source> <translation>קבל עזרה עבור פקודה</translation> </message> <message> - <location line="+25"/> + <location line="+26"/> <source>Options:</source> <translation>אפשרויות:</translation> </message> <message> - <location line="+24"/> + <location line="+23"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>ציין קובץ הגדרות (ברירת מחדל: bitcoin.conf)</translation> </message> @@ -2599,7 +3164,7 @@ Address: %4 <translation>קבע את גודל המטמון של מסד הנתונים במגהבייט (ברירת מחדל: 25)</translation> </message> <message> - <location line="-28"/> + <location line="-27"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>האזן לחיבורים ב<פורט> (ברירת מחדל: 8333 או ברשת הבדיקה: 18333)</translation> </message> @@ -2609,7 +3174,7 @@ Address: %4 <translation>החזק לכל היותר <n> חיבורים לעמיתים (ברירת מחדל: 125)</translation> </message> <message> - <location line="-49"/> + <location line="-50"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation>התחבר לצומת כדי לדלות כתובות עמיתים, ואז התנתק</translation> </message> @@ -2624,7 +3189,7 @@ Address: %4 <translation>סף להתנתקות מעמיתים הנוהגים שלא כהלכה (ברירת מחדל: 100)</translation> </message> <message> - <location line="-142"/> + <location line="-147"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>מספר שניות למנוע מעמיתים הנוהגים שלא כהלכה מלהתחבר מחדש (ברירת מחדל: 86400)</translation> </message> @@ -2639,7 +3204,7 @@ Address: %4 <translation>האזן לחיבורי JSON-RPC ב- <port> (ברירת מחדל: 8332 או רשת בדיקה: 18332)</translation> </message> <message> - <location line="+40"/> + <location line="+45"/> <source>Accept command line and JSON-RPC commands</source> <translation>קבל פקודות משורת הפקודה ו- JSON-RPC</translation> </message> @@ -2649,17 +3214,17 @@ Address: %4 <translation>רוץ ברקע כדימון וקבל פקודות</translation> </message> <message> - <location line="+40"/> + <location line="+39"/> <source>Use the test network</source> <translation>השתמש ברשת הבדיקה</translation> </message> <message> - <location line="-118"/> + <location line="-117"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>קבל חיבורים מבחוץ (ברירת מחדל: 1 ללא -proxy או -connect)</translation> </message> <message> - <location line="-87"/> + <location line="-92"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2724,17 +3289,17 @@ rpcpassword=%s <translation>בצע פקודה כאשר פעולת ארנק משתנה (%s ב cmd יוחלף ב TxID)</translation> </message> <message> - <location line="+11"/> - <source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source> - <translation>קבע גודל מקסימלי עבור פעולות עדיפות גבוהה/עמלה נמוכה בבתים (ברירת מחדל: 27000)</translation> - </message> - <message> - <location line="+6"/> + <location line="+18"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation>זוהי בניית ניסיון טרום-שחרור - השימוש בה על אחריותך - אין להשתמש לצורך כריה או יישומי מסחר</translation> </message> <message> <location line="+5"/> + <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> <source>Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source> <translation>אזהרה: -paytxfee נקבע לערך מאד גבוה! זוהי עמלת הפעולה שתשלם אם אתה שולח פעולה.</translation> </message> @@ -2764,17 +3329,27 @@ rpcpassword=%s <translation>אזהרה: קובץ wallet.dat מושחת, המידע חולץ! קובץ wallet.dat המקורח נשמר כ - wallet.{timestamp}.bak ב - %s; אם המאזן או הפעולות שגויים עליך לשחזר גיבוי.</translation> </message> <message> - <location line="+14"/> + <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>נסה לשחזר מפתחות פרטיים מקובץ wallet.dat מושחת.</translation> </message> <message> <location line="+1"/> + <source>Bitcoin Core Daemon</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Bitcoin RPC client version</source> <translation type="unfinished"/> </message> <message> - <location line="+2"/> + <location line="+1"/> <source>Block creation options:</source> <translation>אפשרויות יצירת בלוק:</translation> </message> @@ -2784,7 +3359,12 @@ rpcpassword=%s <translation>התחבר רק לצמתים המצוינים</translation> </message> <message> - <location line="+2"/> + <location line="+1"/> + <source>Connect through SOCKS proxy</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Connect to JSON-RPC on <port> (default: 8332 or testnet: 18332)</source> <translation type="unfinished"/> </message> @@ -2894,7 +3474,12 @@ rpcpassword=%s <translation>כתיבת נתוני ביטול נכשלה</translation> </message> <message> - <location line="+2"/> + <location line="+1"/> + <source>Fee per kB to add to transactions you send</source> + <translation>עמלה לכל kB להוסיף לפעולות שאתה שולח</translation> + </message> + <message> + <location line="+1"/> <source>Find peers using DNS lookup (default: 1 unless -connect)</source> <translation>מצא עמיתים ע"י חיפוש DNS (ברירת מחדל: 1 ללא -connect)</translation> </message> @@ -2914,6 +3499,11 @@ rpcpassword=%s <translation>מידת היסודיות של אימות הבלוקים (0-4, ברירת מחדל: 3)</translation> </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"/> @@ -2929,17 +3519,37 @@ rpcpassword=%s <translation>אין מספיק מידע על הקובץ</translation> </message> <message> - <location line="+8"/> + <location line="+5"/> + <source>Prepend debug output with timestamp (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>RPC client options:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation>בנה מחדש את אינדק שרשרת הבלוקים מקבצי ה-blk000??.dat הנוכחיים.</translation> </message> <message> - <location line="+6"/> + <location line="+5"/> + <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Send command to Bitcoin server</source> + <translation>שליחת פקודה לשרת הביטקוין</translation> + </message> + <message> + <location line="+8"/> + <source>Set maximum block size in bytes (default: %d)</source> <translation type="unfinished"/> </message> <message> - <location line="+10"/> + <location line="+2"/> <source>Set the number of threads to service RPC calls (default: 4)</source> <translation>קבע את מספר תהליכוני לשירות קריאות RPC (ברירת מחדל: 4)</translation> </message> @@ -2951,7 +3561,7 @@ rpcpassword=%s <message> <location line="+2"/> <source>Start Bitcoin server</source> - <translation type="unfinished"/> + <translation>הפעל ביטקוין סרוור</translation> </message> <message> <location line="+12"/> @@ -2959,7 +3569,7 @@ rpcpassword=%s <translation type="unfinished"/> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>Verifying blocks...</source> <translation>מאמת את שלמות מסד הנתונים...</translation> </message> @@ -2970,11 +3580,21 @@ rpcpassword=%s </message> <message> <location line="+1"/> + <source>Wait for RPC server to start</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Wallet %s resides outside data directory %s</source> <translation type="unfinished"/> </message> <message> - <location line="+4"/> + <location line="+3"/> + <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> @@ -2984,17 +3604,27 @@ rpcpassword=%s <translation>מייבא בלוקים מקובצי blk000??.dat חיצוניים</translation> </message> <message> - <location line="-98"/> + <location line="-104"/> <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> <translation type="unfinished"/> </message> <message> - <location line="+17"/> + <location line="+14"/> + <source>Output debugging information (default: 0, supplying <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>קבע את מספר תהליכוני אימות הסקריפטים (1-16, 0 = אוטומטי, ברירת מחדל: 0)</translation> </message> <message> - <location line="+83"/> + <location line="+88"/> <source>Information</source> <translation>מידע</translation> </message> @@ -3034,32 +3664,12 @@ rpcpassword=%s <translation>התחבר רק לצמתים ברשת <net> (IPv4, IPv6 או Tor)</translation> </message> <message> - <location line="+2"/> - <source>Output extra debugging information. Implies all other -debug* options</source> - <translation>פלוט מידע ניפוי נוסף. נובע מכך כל אפשרויות -debug* האחרות.</translation> - </message> - <message> - <location line="+1"/> - <source>Output extra network debugging information</source> - <translation>פלוט מידע נוסף לניפוי שגיאות ברשת.</translation> - </message> - <message> - <location line="+2"/> - <source>Prepend debug output with timestamp</source> - <translation>הוסף חותמת זמן לפני פלט דיבאג</translation> - </message> - <message> - <location line="+5"/> + <location line="+9"/> <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation>אפשרויות SSL: (ראה את הויקי של ביטקוין עבור הוראות הגדרת SSL)</translation> </message> <message> - <location line="+1"/> - <source>Select the version of socks proxy to use (4-5, default: 5)</source> - <translation>בחר את גרסת פרוקסי SOCKS להשתמש בה (4-5, ברירת מחדל: 5)</translation> - </message> - <message> - <location line="+3"/> + <location line="+4"/> <source>Send trace/debug info to console instead of debug.log file</source> <translation>שלח מידע דיבאג ועקבה לקונסולה במקום לקובץ debug.log</translation> </message> @@ -3069,12 +3679,7 @@ rpcpassword=%s <translation>שלח מידע דיבאג ועקבה לכלי דיבאג</translation> </message> <message> - <location line="+5"/> - <source>Set maximum block size in bytes (default: 250000)</source> - <translation>קבע את גדול הבלוק המירבי בבתים (ברירת מחדל: 250000)</translation> - </message> - <message> - <location line="+1"/> + <location line="+6"/> <source>Set minimum block size in bytes (default: 0)</source> <translation>קבע את גודל הבלוק המינימלי בבתים (ברירת מחדל: 0)</translation> </message> @@ -3124,37 +3729,37 @@ rpcpassword=%s <translation>השתמש ב-UPnP כדי למפות את הפורט להאזנה (ברירת מחדל: 1 בעת האזנה)</translation> </message> <message> - <location line="+1"/> - <source>Use proxy to reach tor hidden services (default: same as -proxy)</source> - <translation>השתמש בפרוקסי כדי להגיע לשירותים חבויים ב-tor (ברירת מחדל: כמו ב- -proxy)</translation> - </message> - <message> <location line="+2"/> <source>Username for JSON-RPC connections</source> <translation>שם משתמש לחיבורי JSON-RPC</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Warning</source> <translation>אזהרה</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Warning: This version is obsolete, upgrade required!</source> <translation>אזהרה: הגרסה הזאת מיושנת, יש צורך בשדרוג!</translation> </message> <message> <location line="+2"/> + <source>version</source> + <translation>גרסה</translation> + </message> + <message> + <location line="+1"/> <source>wallet.dat corrupt, salvage failed</source> <translation>קובץ wallet.dat מושחת, החילוץ נכשל</translation> </message> <message> - <location line="-54"/> + <location line="-57"/> <source>Password for JSON-RPC connections</source> <translation>סיסמה לחיבורי JSON-RPC</translation> </message> <message> - <location line="-70"/> + <location line="-69"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>אפשר חיבורי JSON-RPC מכתובת האינטרנט המצוינת</translation> </message> @@ -3164,12 +3769,12 @@ rpcpassword=%s <translation>שלח פקודות לצומת ב-<ip> (ברירת מחדל: 127.0.0.1)</translation> </message> <message> - <location line="-126"/> + <location line="-131"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>בצע פקודה זו כשהבלוק הטוב ביותר משתנה (%s בפקודה יוחלף בגיבוב הבלוק)</translation> </message> <message> - <location line="+155"/> + <location line="+160"/> <source>Upgrade wallet to latest format</source> <translation>שדרג את הארנק לפורמט העדכני</translation> </message> @@ -3209,22 +3814,17 @@ rpcpassword=%s <translation>לא מסוגל לקשור ל-%s במחשב זה (הקשירה החזירה שגיאה %d, %s)</translation> </message> <message> - <location line="-95"/> - <source>Connect through socks proxy</source> - <translation>התחבר דרך פרוקסי SOCKS</translation> - </message> - <message> - <location line="-11"/> + <location line="-106"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>אפשר בדיקת DNS עבור -addnode, -seednode ו- -connect</translation> </message> <message> - <location line="+58"/> + <location line="+59"/> <source>Loading addresses...</source> <translation>טוען כתובות...</translation> </message> <message> - <location line="-36"/> + <location line="-37"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>שגיאה בטעינת הקובץ wallet.dat: הארנק מושחת</translation> </message> @@ -3244,12 +3844,12 @@ rpcpassword=%s <translation>שגיאה בטעינת הקובץ wallet.dat</translation> </message> <message> - <location line="+30"/> + <location line="+31"/> <source>Invalid -proxy address: '%s'</source> <translation>כתובת -proxy לא תקינה: '%s'</translation> </message> <message> - <location line="+57"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>רשת לא ידועה צוינה ב- -onlynet: '%s'</translation> </message> @@ -3269,7 +3869,7 @@ rpcpassword=%s <translation>לא מסוגל לפתור כתובת -externalip: '%s'</translation> </message> <message> - <location line="+46"/> + <location line="+47"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>כמות לא תקינה עבור -paytxfee=<amount>: '%s'</translation> </message> @@ -3289,27 +3889,22 @@ rpcpassword=%s <translation>טוען את אינדקס הבלוקים...</translation> </message> <message> - <location line="-60"/> + <location line="-61"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>הוסף צומת להתחברות ונסה לשמור את החיבור פתוח</translation> </message> <message> - <location line="-28"/> + <location line="-32"/> <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source> <translation>לא ניתן לקשור ל-%s במחשב זה. ביטקוין כנראה עדיין רץ.</translation> </message> <message> - <location line="+69"/> - <source>Fee per KB to add to transactions you send</source> - <translation>עמלה להוסיף לפעולות שאתה שולח עבור כל KB</translation> - </message> - <message> - <location line="+20"/> + <location line="+94"/> <source>Loading wallet...</source> <translation>טוען ארנק...</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>Cannot downgrade wallet</source> <translation>לא יכול להוריד דרגת הארנק</translation> </message> @@ -3339,7 +3934,7 @@ rpcpassword=%s <translation>שגיאה</translation> </message> <message> - <location line="-33"/> + <location line="-34"/> <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 cffaab83a9..e216da932f 100644 --- a/src/qt/locale/bitcoin_hr.ts +++ b/src/qt/locale/bitcoin_hr.ts @@ -3,13 +3,13 @@ <name>AboutDialog</name> <message> <location filename="../forms/aboutdialog.ui" line="+14"/> - <source>About Bitcoin</source> - <translation>O Bitcoin-u</translation> + <source>About Bitcoin Core</source> + <translation>O Bitcoin Jezrgu</translation> </message> <message> <location line="+39"/> - <source><b>Bitcoin</b> version</source> - <translation><b>Bitcoin</b> verzija</translation> + <source><b>Bitcoin Core</b> version</source> + <translation type="unfinished"/> </message> <message> <location line="+57"/> @@ -22,7 +22,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="+14"/> + <location filename="../aboutdialog.cpp" line="+19"/> <source>Copyright</source> <translation>Autorsko pravo</translation> </message> @@ -65,7 +65,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location filename="../addressbookpage.cpp" line="+72"/> + <location filename="../addressbookpage.cpp" line="+74"/> <source>&Copy Address</source> <translation>&Kopirati adresu</translation> </message> @@ -135,7 +135,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Izmjeniti</translation> </message> <message> - <location line="+197"/> + <location line="+194"/> <source>Export Address List</source> <translation type="unfinished"/> </message> @@ -158,7 +158,7 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>AddressTableModel</name> <message> - <location filename="../addresstablemodel.cpp" line="+164"/> + <location filename="../addresstablemodel.cpp" line="+168"/> <source>Label</source> <translation>Oznaka</translation> </message> @@ -196,7 +196,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Ponovite novu lozinku</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="+34"/> + <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>Unesite novi lozinku za novčanik. <br/> Molimo Vas da koristite zaporku od <b>10 ili više slučajnih znakova,</b> ili <b>osam ili više riječi.</b></translation> </message> @@ -317,17 +317,17 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+250"/> + <location filename="../bitcoingui.cpp" line="+260"/> <source>Sign &message...</source> <translation>&Potpišite poruku...</translation> </message> <message> - <location line="+254"/> + <location line="+290"/> <source>Synchronizing with network...</source> <translation>Usklađivanje s mrežom ...</translation> </message> <message> - <location line="-324"/> + <location line="-360"/> <source>&Overview</source> <translation>&Pregled</translation> </message> @@ -393,7 +393,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Promijena lozinke...</translation> </message> <message> - <location line="+259"/> + <location line="+295"/> <source>Importing blocks from disk...</source> <translation>Importiranje blokova sa diska...</translation> </message> @@ -403,7 +403,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Re-indeksiranje blokova na disku...</translation> </message> <message> - <location line="-322"/> + <location line="-358"/> <source>Send coins to a Bitcoin address</source> <translation>Slanje novca na bitcoin adresu</translation> </message> @@ -438,20 +438,18 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Potvrdite poruku...</translation> </message> <message> - <location line="-180"/> - <location line="+6"/> - <location line="+513"/> + <location line="+375"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-519"/> - <location line="+6"/> + <location line="-563"/> + <location line="+10"/> <source>Wallet</source> <translation>Novčanik</translation> </message> <message> - <location line="+109"/> + <location line="+113"/> <source>&Send</source> <translation>&Pošalji</translation> </message> @@ -461,13 +459,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+28"/> - <location line="+2"/> - <source>&About Bitcoin</source> - <translation>&O Bitcoinu</translation> - </message> - <message> - <location line="+14"/> + <location line="+44"/> <location line="+2"/> <source>&Show / Hide</source> <translation type="unfinished"/> @@ -493,12 +485,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+35"/> + <location line="+39"/> <source>&File</source> <translation>&Datoteka</translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>&Settings</source> <translation>&Konfiguracija</translation> </message> @@ -513,18 +505,30 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Traka kartica</translation> </message> <message> - <location line="-235"/> - <location line="+294"/> + <location line="-244"/> + <location line="+321"/> <source>[testnet]</source> <translation>[testnet]</translation> </message> <message> - <location line="-177"/> + <location line="-331"/> + <location line="+10"/> + <source>Bitcoin Core</source> + <translation>Bitcoin Jezgra</translation> + </message> + <message> + <location line="+121"/> <source>Request payments (generates QR codes and bitcoin: URIs)</source> <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+27"/> + <location line="+2"/> + <source>&About Bitcoin Core</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+34"/> <source>&Used sending addresses...</source> <translation type="unfinished"/> </message> @@ -544,13 +548,23 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+106"/> + <location line="+2"/> + <source>Open URI...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Open a bitcoin: URI or payment request</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+126"/> <location line="+5"/> <source>Bitcoin client</source> <translation>Bitcoin klijent</translation> </message> <message numerus="yes"> - <location line="+120"/> + <location line="+133"/> <source>%n active connection(s) to Bitcoin network</source> <translation><numerusform>%n aktivna veza na Bitcoin mrežu</numerusform><numerusform>%n aktivne veze na Bitcoin mrežu</numerusform><numerusform>%n aktivnih veza na Bitcoin mrežu</numerusform></translation> </message> @@ -658,17 +672,7 @@ Adresa:%4 </translation> </message> <message> - <location line="+34"/> - <source>URI handling</source> - <translation>URI upravljanje</translation> - </message> - <message> - <location line="+0"/> - <source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+45"/> + <location line="+67"/> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>Novčanik je <b>šifriran</b> i trenutno <b>otključan</b></translation> </message> @@ -678,7 +682,7 @@ Adresa:%4 <translation>Novčanik je <b>šifriran</b> i trenutno <b>zaključan</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+110"/> + <location filename="../bitcoin.cpp" line="+116"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -686,12 +690,299 @@ Adresa:%4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+115"/> + <location filename="../clientmodel.cpp" line="+119"/> <source>Network Alert</source> <translation type="unfinished"/> </message> </context> <context> + <name>CoinControlDialog</name> + <message> + <location filename="../forms/coincontroldialog.ui" line="+14"/> + <source>Coin Control Address Selection</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+34"/> + <source>Quantity:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+29"/> + <source>Bytes:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+45"/> + <source>Amount:</source> + <translation>Iznos:</translation> + </message> + <message> + <location line="+29"/> + <source>Priority:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+45"/> + <source>Fee:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+32"/> + <source>Low Output:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+48"/> + <source>After Fee:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+32"/> + <source>Change:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+63"/> + <source>(un)select all</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+13"/> + <source>Tree mode</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> + <source>List mode</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+52"/> + <source>Amount</source> + <translation>Iznos</translation> + </message> + <message> + <location line="+10"/> + <source>Address</source> + <translation>Adresa</translation> + </message> + <message> + <location line="+5"/> + <source>Date</source> + <translation>Datum</translation> + </message> + <message> + <location line="+5"/> + <source>Confirmations</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Confirmed</source> + <translation>Potvrđeno</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>Kopirati adresu</translation> + </message> + <message> + <location line="+1"/> + <source>Copy label</source> + <translation>Kopirati oznaku</translation> + </message> + <message> + <location line="+1"/> + <location line="+26"/> + <source>Copy amount</source> + <translation>Kopiraj iznos</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="+171"/> + <source>Dust</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>yes</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>no</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+10"/> + <source>This label turns red, if the transaction size is greater than 1000 bytes.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <location line="+5"/> + <source>This means a fee of at least %1 per kB is required.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-4"/> + <source>Can vary +/- 1 byte per input.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>Transactions with higher priority are more likely to get included into a block.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>This label turns red, if the priority is smaller than "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>(bez oznake)</translation> + </message> + <message> + <location line="-9"/> + <source>change from %1 (%2)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>(change)</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>EditAddressDialog</name> <message> <location filename="../forms/editaddressdialog.ui" line="+14"/> @@ -719,7 +1010,7 @@ Adresa:%4 <translation>&Adresa</translation> </message> <message> - <location filename="../editaddressdialog.cpp" line="+21"/> + <location filename="../editaddressdialog.cpp" line="+25"/> <source>New receiving address</source> <translation>Nova adresa za primanje</translation> </message> @@ -762,7 +1053,7 @@ Adresa:%4 <context> <name>FreespaceChecker</name> <message> - <location filename="../intro.cpp" line="+61"/> + <location filename="../intro.cpp" line="+65"/> <source>A new data directory will be created.</source> <translation type="unfinished"/> </message> @@ -790,18 +1081,18 @@ Adresa:%4 <context> <name>GUIUtil::HelpMessageBox</name> <message> - <location filename="../guiutil.cpp" line="+558"/> - <location line="+13"/> - <source>Bitcoin-Qt</source> - <translation>Bitcoin-Qt</translation> - </message> - <message> - <location line="-13"/> + <location filename="../guiutil.cpp" line="+597"/> <source>version</source> <translation>verzija</translation> </message> <message> - <location line="+2"/> + <location line="+0"/> + <location line="+13"/> + <source>Bitcoin Core</source> + <translation>Bitcoin Jezgra</translation> + </message> + <message> + <location line="-11"/> <source>Usage:</source> <translation>Upotreba:</translation> </message> @@ -845,17 +1136,17 @@ Adresa:%4 </message> <message> <location line="+9"/> - <source>Welcome to Bitcoin-Qt.</source> - <translation>Dobrodošli u Bitcoin-Qt.</translation> + <source>Welcome to Bitcoin Core.</source> + <translation type="unfinished"/> </message> <message> <location line="+26"/> - <source>As this is the first time the program is launched, you can choose where Bitcoin-Qt will store its data.</source> + <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source> <translation type="unfinished"/> </message> <message> <location line="+10"/> - <source>Bitcoin-Qt will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source> + <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source> <translation type="unfinished"/> </message> <message> @@ -869,7 +1160,17 @@ Adresa:%4 <translation type="unfinished"/> </message> <message> - <location filename="../intro.cpp" line="+105"/> + <location filename="../intro.cpp" line="+85"/> + <source>Bitcoin</source> + <translation>Bitcoin</translation> + </message> + <message> + <location line="+1"/> + <source>Error: Specified data directory "%1" can not be created.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+19"/> <source>Error</source> <translation>Pogreška</translation> </message> @@ -885,6 +1186,34 @@ Adresa:%4 </message> </context> <context> + <name>OpenURIDialog</name> + <message> + <location filename="../forms/openuridialog.ui" line="+14"/> + <source>Open URI</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Open payment request from URI or file</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+9"/> + <source>URI:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+11"/> + <source>Select payment request file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../openuridialog.cpp" line="+47"/> + <source>Select payment request file to open</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OptionsDialog</name> <message> <location filename="../forms/optionsdialog.ui" line="+14"/> @@ -1042,6 +1371,16 @@ Adresa:%4 <translation>&Prikaži adrese u popisu transakcija</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="+71"/> <source>&OK</source> <translation>&U redu</translation> @@ -1057,12 +1396,12 @@ Adresa:%4 <translation>&Primjeni</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+58"/> + <location filename="../optionsdialog.cpp" line="+63"/> <source>default</source> <translation>standardne vrijednosti</translation> </message> <message> - <location line="+130"/> + <location line="+131"/> <source>Confirm options reset</source> <translation type="unfinished"/> </message> @@ -1103,17 +1442,17 @@ Adresa:%4 </message> <message> <location line="+50"/> - <location line="+202"/> + <location line="+214"/> <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source> <translation type="unfinished"/> </message> <message> - <location line="-131"/> + <location line="-140"/> <source>Unconfirmed:</source> <translation>Nepotvrđene:</translation> </message> <message> - <location line="-78"/> + <location line="-81"/> <source>Wallet</source> <translation>Novčanik</translation> </message> @@ -1128,12 +1467,12 @@ Adresa:%4 <translation type="unfinished"/> </message> <message> - <location line="+29"/> + <location line="+32"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation type="unfinished"/> </message> <message> - <location line="+13"/> + <location line="+16"/> <source>Immature:</source> <translation type="unfinished"/> </message> @@ -1143,7 +1482,7 @@ Adresa:%4 <translation type="unfinished"/> </message> <message> - <location line="+13"/> + <location line="+16"/> <source>Total:</source> <translation>Ukupno:</translation> </message> @@ -1153,12 +1492,12 @@ Adresa:%4 <translation type="unfinished"/> </message> <message> - <location line="+53"/> + <location line="+56"/> <source><b>Recent transactions</b></source> <translation><b>Nedavne transakcije</b></translation> </message> <message> - <location filename="../overviewpage.cpp" line="+116"/> + <location filename="../overviewpage.cpp" line="+120"/> <location line="+1"/> <source>out of sync</source> <translation type="unfinished"/> @@ -1167,7 +1506,7 @@ Adresa:%4 <context> <name>PaymentServer</name> <message> - <location filename="../paymentserver.cpp" line="+392"/> + <location filename="../paymentserver.cpp" line="+397"/> <source>URI handling</source> <translation>URI upravljanje</translation> </message> @@ -1177,23 +1516,29 @@ Adresa:%4 <translation type="unfinished"/> </message> <message> - <location line="+69"/> + <location line="+91"/> <source>Requested payment amount of %1 is too small (considered dust).</source> <translation type="unfinished"/> </message> <message> - <location line="+4"/> - <location line="+37"/> + <location line="-204"/> + <location line="+195"/> + <location line="+13"/> <source>Payment request error</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Insecure requests to custom payment scripts unsupported</source> + <location line="-207"/> + <source>Cannot start bitcoin: click-to-pay handler</source> <translation type="unfinished"/> </message> <message> - <location line="+38"/> + <location line="+195"/> + <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> @@ -1203,7 +1548,7 @@ Adresa:%4 <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>Bad response from server %1</source> <translation type="unfinished"/> </message> @@ -1213,8 +1558,8 @@ Adresa:%4 <translation type="unfinished"/> </message> <message> - <location line="-58"/> - <location line="+30"/> + <location line="-55"/> + <location line="+27"/> <location line="+17"/> <source>Network request error</source> <translation type="unfinished"/> @@ -1223,9 +1568,8 @@ Adresa:%4 <context> <name>QObject</name> <message> - <location filename="../bitcoin.cpp" line="+114"/> + <location filename="../bitcoin.cpp" line="+119"/> <location line="+5"/> - <location filename="../intro.cpp" line="-32"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> @@ -1239,16 +1583,11 @@ Adresa:%4 <source>Error: Invalid combination of -regtest and -testnet.</source> <translation type="unfinished"/> </message> - <message> - <location filename="../intro.cpp" line="+1"/> - <source>Error: Specified data directory "%1" can not be created.</source> - <translation type="unfinished"/> - </message> </context> <context> <name>QRImageWidget</name> <message> - <location filename="../receiverequestdialog.cpp" line="+32"/> + <location filename="../receiverequestdialog.cpp" line="+36"/> <source>&Save Image...</source> <translation type="unfinished"/> </message> @@ -1264,8 +1603,8 @@ Adresa:%4 </message> <message> <location line="+0"/> - <source>PNG Images (*.png)</source> - <translation>PNG slike (*.png)</translation> + <source>PNG Image (*.png)</source> + <translation type="unfinished"/> </message> </context> <context> @@ -1285,7 +1624,7 @@ Adresa:%4 <location line="+53"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+352"/> + <location filename="../rpcconsole.cpp" line="+360"/> <source>N/A</source> <translation>N/A</translation> </message> @@ -1300,7 +1639,12 @@ Adresa:%4 <translation>&Informacija</translation> </message> <message> - <location line="+68"/> + <location line="-10"/> + <source>Debug window</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+78"/> <source>Using OpenSSL version</source> <translation>Koristim OpenSSL verziju</translation> </message> @@ -1355,12 +1699,7 @@ Adresa:%4 <translation type="unfinished"/> </message> <message> - <location line="+7"/> - <source>Show the Bitcoin-Qt help message to get a list with possible Bitcoin command-line options.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> + <location line="+10"/> <source>&Show</source> <translation>&Pokaži</translation> </message> @@ -1400,12 +1739,7 @@ Adresa:%4 <translation type="unfinished"/> </message> <message> - <location line="-104"/> - <source>Bitcoin - Debug window</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+25"/> + <location line="-79"/> <source>Bitcoin Core</source> <translation>Bitcoin Jezgra</translation> </message> @@ -1420,7 +1754,12 @@ Adresa:%4 <translation type="unfinished"/> </message> <message> - <location line="+102"/> + <location line="+26"/> + <source>Show the Bitcoin-Core help message to get a list with possible Bitcoin command-line options.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+76"/> <source>Clear console</source> <translation>Očisti konzolu</translation> </message> @@ -1478,37 +1817,32 @@ Adresa:%4 <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+22"/> + <location filename="../forms/receivecoinsdialog.ui" line="+83"/> <source>&Amount:</source> <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+19"/> <source>The amount to request</source> <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="-32"/> <source>&Label:</source> <translation>&Oznaka:</translation> </message> <message> - <location line="+10"/> - <source>The label to associate with the receiving address</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+7"/> + <location line="-34"/> <source>&Message:</source> <translation type="unfinished"/> </message> <message> - <location line="+10"/> + <location line="+20"/> <source>The message to attach to payment request</source> <translation type="unfinished"/> </message> <message> - <location line="+14"/> + <location line="-37"/> <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> @@ -1518,12 +1852,17 @@ Adresa:%4 <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="+27"/> + <source>The label to associate with the new receiving address</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+14"/> <source>Use this form to request payments. All fields are optional.</source> <translation type="unfinished"/> </message> <message> - <location line="+17"/> + <location line="+56"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -1537,6 +1876,31 @@ Adresa:%4 <source>&Request payment</source> <translation type="unfinished"/> </message> + <message> + <location line="+47"/> + <source>Previously requested payments</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> + <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>Pokaži</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> @@ -1557,16 +1921,11 @@ Adresa:%4 </message> <message> <location line="+7"/> - <source>&Copy Image</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+7"/> <source>&Save Image...</source> <translation type="unfinished"/> </message> <message> - <location filename="../receiverequestdialog.cpp" line="+58"/> + <location filename="../receiverequestdialog.cpp" line="+56"/> <source>Request payment to %1</source> <translation type="unfinished"/> </message> @@ -1612,16 +1971,119 @@ Adresa:%4 </message> </context> <context> + <name>RecentRequestsTableModel</name> + <message> + <location filename="../recentrequeststablemodel.cpp" line="+14"/> + <source>Date</source> + <translation>Datum</translation> + </message> + <message> + <location line="+0"/> + <source>Label</source> + <translation>Oznaka</translation> + </message> + <message> + <location line="+0"/> + <source>Message</source> + <translation>Poruka</translation> + </message> + <message> + <location line="+0"/> + <source>Amount</source> + <translation>Iznos</translation> + </message> + <message> + <location line="+36"/> + <source>(no label)</source> + <translation>(bez oznake)</translation> + </message> + <message> + <location line="+9"/> + <source>(no message)</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="+14"/> - <location filename="../sendcoinsdialog.cpp" line="+140"/> - <location line="+213"/> + <location filename="../sendcoinsdialog.cpp" line="+381"/> + <location line="+81"/> <source>Send Coins</source> <translation>Slanje novca</translation> </message> <message> - <location line="+50"/> + <location line="+76"/> + <source>Coin Control Features</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+20"/> + <source>Inputs...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> + <source>automatically selected</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+19"/> + <source>Insufficient funds!</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+89"/> + <source>Quantity:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+35"/> + <source>Bytes:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+48"/> + <source>Amount:</source> + <translation>Iznos:</translation> + </message> + <message> + <location line="+32"/> + <source>Priority:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+48"/> + <source>Fee:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+32"/> + <source>Low Output:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+48"/> + <source>After Fee:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+32"/> + <source>Change:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+44"/> + <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Custom change address</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+115"/> <source>Send to multiple recipients at once</source> <translation>Pošalji k nekoliko primatelja odjednom</translation> </message> @@ -1646,12 +2108,7 @@ Adresa:%4 <translation>Stanje:</translation> </message> <message> - <location line="+10"/> - <source>123.456 BTC</source> - <translation>123,456 BTC</translation> - </message> - <message> - <location line="+31"/> + <location line="+41"/> <source>Confirm the send action</source> <translation>Potvrdi akciju slanja</translation> </message> @@ -1661,69 +2118,135 @@ Adresa:%4 <translation>&Pošalji</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-154"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation>Potvrdi slanje novca</translation> </message> <message> - <location line="-90"/> + <location line="-74"/> <location line="+5"/> <location line="+5"/> + <location line="+4"/> <source>%1 to %2</source> <translation type="unfinished"/> </message> <message> - <location line="+26"/> + <location line="-136"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>Unesite Bitcoin adresu (npr. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> + <message> + <location line="+15"/> + <source>Copy quantity</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation>Kopiraj iznos</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>ili</translation> + </message> + <message> + <location line="+202"/> <source>The recipient address is not valid, please recheck.</source> <translation>Adresa primatelja je nevaljala, molimo provjerite je ponovo.</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>The amount to pay must be larger than 0.</source> <translation>Iznos mora biti veći od 0.</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>The amount exceeds your balance.</source> <translation>Iznos je veći od stanja računa.</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>The total exceeds your balance when the %1 transaction fee is included.</source> <translation>Iznos je veći od stanja računa kad se doda naknada za transakcije od %1.</translation> </message> <message> - <location line="+5"/> + <location line="+3"/> <source>Duplicate address found, can only send to each address once per send operation.</source> <translation>Pronašli smo adresu koja se ponavlja. U svakom plaćanju program može svaku adresu koristiti samo jedanput.</translation> </message> <message> + <location line="+3"/> + <source>Transaction creation failed!</source> + <translation type="unfinished"/> + </message> + <message> <location line="+4"/> - <source>Error: Transaction creation failed!</source> + <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation type="unfinished"/> </message> <message> - <location line="+15"/> - <source>Are you sure you want to send?</source> + <location line="+113"/> + <source>Warning: Invalid Bitcoin address</source> <translation type="unfinished"/> </message> <message> - <location line="+9"/> - <source>added as transaction fee</source> + <location line="+13"/> + <source>(no label)</source> + <translation>(bez oznake)</translation> + </message> + <message> + <location line="+8"/> + <source>Warning: Unknown change address</source> <translation type="unfinished"/> </message> <message> - <location line="+6"/> - <source>Total Amount %1</source> + <location line="-378"/> + <source>Are you sure you want to send?</source> <translation type="unfinished"/> </message> <message> - <location line="+20"/> - <source>Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> - <translation>Generirani novčići moraju pričekati nastanak 120 blokova prije nego što ih je moguće potrošiti. Kad ste generirali taj blok, on je bio emitiran u mrežu kako bi bio dodan postojećim lancima blokova. Ako ne uspije biti dodan, njegov status bit će promijenjen u "nije prihvatljiv" i on neće biti potrošiv. S vremena na vrijeme tako nešto se može desiti ako neki drugi nod približno istovremeno generira blok.</translation> + <location line="+9"/> + <source>added as transaction fee</source> + <translation type="unfinished"/> </message> <message> - <location line="+144"/> + <location line="+170"/> <source>Payment request expired</source> <translation type="unfinished"/> </message> @@ -1736,39 +2259,44 @@ Adresa:%4 <context> <name>SendCoinsEntry</name> <message> - <location filename="../forms/sendcoinsentry.ui" line="+33"/> - <location line="+585"/> + <location filename="../forms/sendcoinsentry.ui" line="+131"/> + <location line="+501"/> + <location line="+536"/> <source>A&mount:</source> <translation>&Iznos:</translation> </message> <message> - <location line="-572"/> - <location line="+585"/> + <location line="-1132"/> <source>Pay &To:</source> <translation>&Primatelj plaćanja:</translation> </message> <message> - <location line="-551"/> + <location line="+18"/> <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation type="unfinished"/> </message> <message> - <location filename="../sendcoinsentry.cpp" line="+28"/> + <location filename="../sendcoinsentry.cpp" line="+30"/> <source>Enter a label for this address to add it to your address book</source> <translation>Unesite oznaku za ovu adresu kako bi ju dodali u vaš adresar</translation> </message> <message> - <location filename="../forms/sendcoinsentry.ui" line="-18"/> + <location filename="../forms/sendcoinsentry.ui" line="+57"/> <source>&Label:</source> <translation>&Oznaka:</translation> </message> <message> - <location line="+28"/> + <location line="-50"/> <source>Choose previously used address</source> <translation type="unfinished"/> </message> <message> - <location line="+10"/> + <location line="-40"/> + <source>This is a normal payment.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+50"/> <source>Alt+A</source> <translation>Alt+A</translation> </message> @@ -1784,16 +2312,35 @@ Adresa:%4 </message> <message> <location line="+7"/> - <source>Remove this recipient</source> - <translation>Ukloni ovog primatelja</translation> + <location line="+504"/> + <location line="+536"/> + <source>Remove this entry</source> + <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="-40"/> + <source>This is a verified payment request.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-971"/> <source>Enter a label for this address to add it to the list of used addresses</source> <translation type="unfinished"/> </message> <message> - <location line="+465"/> + <location line="+439"/> + <source>This is an unverified payment request.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+18"/> + <location line="+532"/> + <source>Pay To:</source> + <translation>Primatelj plaćanja:</translation> + </message> + <message> + <location line="-498"/> + <location line="+536"/> <source>Memo:</source> <translation type="unfinished"/> </message> @@ -1914,7 +2461,7 @@ Adresa:%4 <translation type="unfinished"/> </message> <message> - <location filename="../signverifymessagedialog.cpp" line="+27"/> + <location filename="../signverifymessagedialog.cpp" line="+29"/> <location line="+3"/> <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation>Unesite Bitcoin adresu (npr. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> @@ -1930,7 +2477,7 @@ Adresa:%4 <translation type="unfinished"/> </message> <message> - <location line="+85"/> + <location line="+84"/> <location line="+81"/> <source>The entered address is invalid.</source> <translation type="unfinished"/> @@ -1999,8 +2546,13 @@ Adresa:%4 <context> <name>SplashScreen</name> <message> - <location filename="../splashscreen.cpp" line="+23"/> - <source>The Bitcoin developers</source> + <location filename="../splashscreen.cpp" line="+26"/> + <source>Bitcoin Core</source> + <translation>Bitcoin Jezgra</translation> + </message> + <message> + <location line="+2"/> + <source>The Bitcoin Core developers</source> <translation type="unfinished"/> </message> <message> @@ -2012,7 +2564,7 @@ Adresa:%4 <context> <name>TrafficGraphWidget</name> <message> - <location filename="../trafficgraphwidget.cpp" line="+75"/> + <location filename="../trafficgraphwidget.cpp" line="+79"/> <source>KB/s</source> <translation type="unfinished"/> </message> @@ -2020,7 +2572,7 @@ Adresa:%4 <context> <name>TransactionDesc</name> <message> - <location filename="../transactiondesc.cpp" line="+22"/> + <location filename="../transactiondesc.cpp" line="+28"/> <source>Open until %1</source> <translation>Otvoren do %1</translation> </message> @@ -2212,7 +2764,7 @@ Adresa:%4 <context> <name>TransactionTableModel</name> <message> - <location filename="../transactiontablemodel.cpp" line="+227"/> + <location filename="../transactiontablemodel.cpp" line="+234"/> <source>Date</source> <translation>Datum</translation> </message> @@ -2330,7 +2882,7 @@ Adresa:%4 <context> <name>TransactionView</name> <message> - <location filename="../transactionview.cpp" line="+52"/> + <location filename="../transactionview.cpp" line="+57"/> <location line="+16"/> <source>All</source> <translation>Sve</translation> @@ -2391,12 +2943,12 @@ Adresa:%4 <translation>Ostalo</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>Enter address or label to search</source> <translation>Unesite adresu ili oznaku za pretraživanje</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>Min amount</source> <translation>Min iznos</translation> </message> @@ -2431,17 +2983,37 @@ Adresa:%4 <translation type="unfinished"/> </message> <message> - <location line="+143"/> - <source>Export Transaction Data</source> - <translation>Izvoz podataka transakcija</translation> + <location line="+142"/> + <source>Export Transaction History</source> + <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+19"/> + <source>Exporting Failed</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>There was an error trying to save the transaction history to %1.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+4"/> + <source>Exporting Successful</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>The transaction history was successfully saved to %1.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-22"/> <source>Comma separated file (*.csv)</source> <translation>Datoteka podataka odvojenih zarezima (*.csv)</translation> </message> <message> - <location line="+8"/> + <location line="+9"/> <source>Confirmed</source> <translation>Potvrđeno</translation> </message> @@ -2476,17 +3048,7 @@ Adresa:%4 <translation>ID</translation> </message> <message> - <location line="+4"/> - <source>Error exporting</source> - <translation>Izvoz pogreške</translation> - </message> - <message> - <location line="+0"/> - <source>Could not write to file %1.</source> - <translation>Ne mogu pisati u datoteku %1.</translation> - </message> - <message> - <location line="+100"/> + <location line="+107"/> <source>Range:</source> <translation>Raspon:</translation> </message> @@ -2497,9 +3059,17 @@ Adresa:%4 </message> </context> <context> + <name>WalletFrame</name> + <message> + <location filename="../walletframe.cpp" line="+26"/> + <source>No wallet has been loaded.</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>WalletModel</name> <message> - <location filename="../walletmodel.cpp" line="+218"/> + <location filename="../walletmodel.cpp" line="+245"/> <source>Send Coins</source> <translation>Slanje novca</translation> </message> @@ -2507,7 +3077,7 @@ Adresa:%4 <context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+46"/> + <location filename="../walletview.cpp" line="+43"/> <source>&Export</source> <translation>&Izvoz</translation> </message> @@ -2517,65 +3087,60 @@ Adresa:%4 <translation>Izvoz podataka iz trenutnog taba u datoteku</translation> </message> <message> - <location line="+183"/> + <location line="+181"/> <source>Backup Wallet</source> <translation type="unfinished"/> </message> <message> - <location line="+0"/> + <location line="+1"/> <source>Wallet Data (*.dat)</source> <translation>Podaci novčanika (*.dat)</translation> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Backup Failed</source> <translation type="unfinished"/> </message> <message> <location line="+0"/> - <source>There was an error trying to save the wallet data to the new location.</source> + <source>There was an error trying to save the wallet data to %1.</source> <translation type="unfinished"/> </message> <message> <location line="+4"/> - <source>Backup Successful</source> + <source>The wallet data was successfully saved to %1.</source> <translation type="unfinished"/> </message> <message> <location line="+0"/> - <source>The wallet data was successfully saved to the new location.</source> + <source>Backup Successful</source> <translation type="unfinished"/> </message> </context> <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+102"/> - <source>Bitcoin version</source> - <translation>Bitcoin verzija</translation> - </message> - <message> - <location line="+107"/> + <location filename="../bitcoinstrings.cpp" line="+217"/> <source>Usage:</source> <translation>Upotreba:</translation> </message> <message> - <location line="-55"/> + <location line="-54"/> <source>List commands</source> <translation>Prikaži komande</translation> </message> <message> - <location line="-13"/> + <location line="-14"/> <source>Get help for a command</source> <translation>Potraži pomoć za komandu</translation> </message> <message> - <location line="+25"/> + <location line="+26"/> <source>Options:</source> <translation>Postavke:</translation> </message> <message> - <location line="+24"/> + <location line="+23"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Odredi konfiguracijsku datoteku (ugrađeni izbor: bitcoin.conf)</translation> </message> @@ -2595,7 +3160,7 @@ Adresa:%4 <translation>Postavi cache za bazu podataka u MB (zadano:25)</translation> </message> <message> - <location line="-28"/> + <location line="-27"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>Slušaj na <port>u (default: 8333 ili testnet: 18333)</translation> </message> @@ -2605,7 +3170,7 @@ Adresa:%4 <translation>Održavaj najviše <n> veza sa članovima (default: 125)</translation> </message> <message> - <location line="-49"/> + <location line="-50"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation type="unfinished"/> </message> @@ -2620,7 +3185,7 @@ Adresa:%4 <translation>Prag za odspajanje članova koji se čudno ponašaju (default: 100)</translation> </message> <message> - <location line="-142"/> + <location line="-147"/> <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> @@ -2635,7 +3200,7 @@ Adresa:%4 <translation>Prihvaćaj JSON-RPC povezivanje na portu broj <port> (ugrađeni izbor: 8332 or testnet: 18332)</translation> </message> <message> - <location line="+40"/> + <location line="+45"/> <source>Accept command line and JSON-RPC commands</source> <translation>Prihvati komande iz tekst moda i JSON-RPC</translation> </message> @@ -2645,17 +3210,17 @@ Adresa:%4 <translation>Izvršavaj u pozadini kao uslužnik i prihvaćaj komande</translation> </message> <message> - <location line="+40"/> + <location line="+39"/> <source>Use the test network</source> <translation>Koristi test mrežu</translation> </message> <message> - <location line="-118"/> + <location line="-117"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> <message> - <location line="-87"/> + <location line="-92"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2710,17 +3275,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+11"/> - <source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source> + <location line="+18"/> + <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation type="unfinished"/> </message> <message> - <location line="+6"/> - <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> + <location line="+5"/> + <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+3"/> <source>Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source> <translation>Upozorenje: -paytxfee je podešen na preveliki iznos. To je iznos koji ćete platiti za obradu transakcije.</translation> </message> @@ -2750,17 +3315,27 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+14"/> + <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="+2"/> + <location line="+1"/> <source>Block creation options:</source> <translation>Opcije za kreiranje bloka:</translation> </message> @@ -2770,7 +3345,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Poveži se samo sa određenim nodom</translation> </message> <message> - <location line="+2"/> + <location line="+1"/> + <source>Connect through SOCKS proxy</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Connect to JSON-RPC on <port> (default: 8332 or testnet: 18332)</source> <translation type="unfinished"/> </message> @@ -2880,7 +3460,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+2"/> + <location line="+1"/> + <source>Fee per kB to add to transactions you send</source> + <translation>Naknada po kB dodana transakciji koju šaljete</translation> + </message> + <message> + <location line="+1"/> <source>Find peers using DNS lookup (default: 1 unless -connect)</source> <translation type="unfinished"/> </message> @@ -2900,6 +3485,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <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"/> @@ -2915,17 +3505,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+8"/> + <location line="+5"/> + <source>Prepend debug output with timestamp (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>RPC client options:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+5"/> + <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Send command to Bitcoin server</source> <translation type="unfinished"/> </message> <message> - <location line="+10"/> + <location line="+8"/> + <source>Set maximum block size in bytes (default: %d)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>Set the number of threads to service RPC calls (default: 4)</source> <translation type="unfinished"/> </message> @@ -2945,7 +3555,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>Verifying blocks...</source> <translation type="unfinished"/> </message> @@ -2956,11 +3566,21 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> + <source>Wait for RPC server to start</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Wallet %s resides outside data directory %s</source> <translation type="unfinished"/> </message> <message> - <location line="+4"/> + <location line="+3"/> + <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> @@ -2970,17 +3590,27 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Importiraj blokove sa vanjskog blk000??.dat fajla</translation> </message> <message> - <location line="-98"/> + <location line="-104"/> <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> <translation type="unfinished"/> </message> <message> - <location line="+17"/> + <location line="+14"/> + <source>Output debugging information (default: 0, supplying <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="+83"/> + <location line="+88"/> <source>Information</source> <translation>Informacija</translation> </message> @@ -3020,32 +3650,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+2"/> - <source>Output extra debugging information. Implies all other -debug* options</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Output extra network debugging information</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> - <source>Prepend debug output with timestamp</source> - <translation>Dodaj izlaz debuga na početak sa vremenskom oznakom</translation> - </message> - <message> - <location line="+5"/> + <location line="+9"/> <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation>SSL postavke: (za detalje o podešavanju SSL opcija vidi Bitcoin Wiki)</translation> </message> <message> - <location line="+1"/> - <source>Select the version of socks proxy to use (4-5, default: 5)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> + <location line="+4"/> <source>Send trace/debug info to console instead of debug.log file</source> <translation>Šalji trace/debug informacije na konzolu umjesto u debug.log datoteku</translation> </message> @@ -3055,12 +3665,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Pošalji trace/debug informacije u debugger</translation> </message> <message> - <location line="+5"/> - <source>Set maximum block size in bytes (default: 250000)</source> - <translation>Podesite maksimalnu veličinu bloka u bajtovima (default: 250000)</translation> - </message> - <message> - <location line="+1"/> + <location line="+6"/> <source>Set minimum block size in bytes (default: 0)</source> <translation>Podesite minimalnu veličinu bloka u bajtovima (default: 0)</translation> </message> @@ -3110,37 +3715,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Pokušaj koristiti UPnP da otvoriš port za uslugu (default: 1 when listening)</translation> </message> <message> - <location line="+1"/> - <source>Use proxy to reach tor hidden services (default: same as -proxy)</source> - <translation type="unfinished"/> - </message> - <message> <location line="+2"/> <source>Username for JSON-RPC connections</source> <translation>Korisničko ime za JSON-RPC veze</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Warning</source> <translation>Upozorenje</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Warning: This version is obsolete, upgrade required!</source> <translation type="unfinished"/> </message> <message> <location line="+2"/> + <source>version</source> + <translation>verzija</translation> + </message> + <message> + <location line="+1"/> <source>wallet.dat corrupt, salvage failed</source> <translation type="unfinished"/> </message> <message> - <location line="-54"/> + <location line="-57"/> <source>Password for JSON-RPC connections</source> <translation>Lozinka za JSON-RPC veze</translation> </message> <message> - <location line="-70"/> + <location line="-69"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Dozvoli JSON-RPC povezivanje s određene IP adrese</translation> </message> @@ -3150,12 +3755,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Pošalji komande nodu na adresi <ip> (ugrađeni izbor: 127.0.0.1)</translation> </message> <message> - <location line="-126"/> + <location line="-131"/> <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="+155"/> + <location line="+160"/> <source>Upgrade wallet to latest format</source> <translation>Nadogradite novčanik u posljednji format.</translation> </message> @@ -3195,22 +3800,17 @@ 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="-95"/> - <source>Connect through socks proxy</source> - <translation>Poveži se kroz socks proxy</translation> - </message> - <message> - <location line="-11"/> + <location line="-106"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>Dozvoli DNS upite za dodavanje nodova i povezivanje</translation> </message> <message> - <location line="+58"/> + <location line="+59"/> <source>Loading addresses...</source> <translation>Učitavanje adresa...</translation> </message> <message> - <location line="-36"/> + <location line="-37"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>Greška kod učitavanja wallet.dat: Novčanik pokvaren</translation> </message> @@ -3230,12 +3830,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Greška kod učitavanja wallet.dat</translation> </message> <message> - <location line="+30"/> + <location line="+31"/> <source>Invalid -proxy address: '%s'</source> <translation>Nevaljala -proxy adresa: '%s'</translation> </message> <message> - <location line="+57"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation type="unfinished"/> </message> @@ -3255,7 +3855,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+46"/> + <location line="+47"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>Nevaljali iznos za opciju -paytxfee=<amount>: '%s'</translation> </message> @@ -3275,27 +3875,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Učitavanje indeksa blokova...</translation> </message> <message> - <location line="-60"/> + <location line="-61"/> <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> <message> - <location line="-28"/> + <location line="-32"/> <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source> <translation>Program ne može koristiti %s na ovom računalu. Bitcoin program je vjerojatno već pokrenut.</translation> </message> <message> - <location line="+69"/> - <source>Fee per KB to add to transactions you send</source> - <translation>Naknada posredniku po KB-u koja će biti dodana svakoj transakciji koju pošalješ</translation> - </message> - <message> - <location line="+20"/> + <location line="+94"/> <source>Loading wallet...</source> <translation>Učitavanje novčanika...</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>Cannot downgrade wallet</source> <translation>Nije moguće novčanik vratiti na prijašnju verziju.</translation> </message> @@ -3325,7 +3920,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Greška</translation> </message> <message> - <location line="-33"/> + <location line="-34"/> <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 d12de7f355..b0e143ce88 100644 --- a/src/qt/locale/bitcoin_it.ts +++ b/src/qt/locale/bitcoin_it.ts @@ -3,13 +3,13 @@ <name>AboutDialog</name> <message> <location filename="../forms/aboutdialog.ui" line="+14"/> - <source>About Bitcoin</source> - <translation>&Informazioni su Bitcoin</translation> + <source>About Bitcoin Core</source> + <translation>Info su Bitcoin Core</translation> </message> <message> <location line="+39"/> - <source><b>Bitcoin</b> version</source> - <translation>Versione di <b>Bitcoin</b></translation> + <source><b>Bitcoin Core</b> version</source> + <translation>Versione <b>Bitcoin Core</b></translation> </message> <message> <location line="+57"/> @@ -27,7 +27,7 @@ Distribuito sotto la licenza software MIT/X11, vedi il file COPYING incluso oppu Questo prodotto include software sviluppato dal progetto OpenSSL per l'uso del Toolkit OpenSSL (http://www.openssl.org/), software crittografico scritto da Eric Young (eay@cryptsoft.com) e software UPnP scritto da Thomas Bernard.</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="+14"/> + <location filename="../aboutdialog.cpp" line="+19"/> <source>Copyright</source> <translation>Copyright</translation> </message> @@ -70,7 +70,7 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l'uso <translation>C&hiudi</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="+72"/> + <location filename="../addressbookpage.cpp" line="+74"/> <source>&Copy Address</source> <translation>&Copia l'indirizzo</translation> </message> @@ -140,7 +140,7 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l'uso <translation>&Modifica</translation> </message> <message> - <location line="+197"/> + <location line="+194"/> <source>Export Address List</source> <translation>Esporta Lista Indirizzi</translation> </message> @@ -163,7 +163,7 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l'uso <context> <name>AddressTableModel</name> <message> - <location filename="../addresstablemodel.cpp" line="+164"/> + <location filename="../addresstablemodel.cpp" line="+168"/> <source>Label</source> <translation>Etichetta</translation> </message> @@ -201,7 +201,7 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l'uso <translation>Ripeti la passphrase</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="+34"/> + <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>Inserisci la passphrase per il portamonete.<br/>Per piacere usare unapassphrase di <b>10 o più caratteri casuali</b>, o <b>otto o più parole</b>.</translation> </message> @@ -322,17 +322,17 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l'uso <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+250"/> + <location filename="../bitcoingui.cpp" line="+260"/> <source>Sign &message...</source> <translation>Firma il &messaggio...</translation> </message> <message> - <location line="+254"/> + <location line="+290"/> <source>Synchronizing with network...</source> <translation>Sto sincronizzando con la rete...</translation> </message> <message> - <location line="-324"/> + <location line="-360"/> <source>&Overview</source> <translation>&Sintesi</translation> </message> @@ -398,7 +398,7 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l'uso <translation>&Cambia la passphrase...</translation> </message> <message> - <location line="+259"/> + <location line="+295"/> <source>Importing blocks from disk...</source> <translation>Importa blocchi dal disco...</translation> </message> @@ -408,7 +408,7 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l'uso <translation>Re-indicizzazione blocchi su disco...</translation> </message> <message> - <location line="-322"/> + <location line="-358"/> <source>Send coins to a Bitcoin address</source> <translation>Invia monete ad un indirizzo bitcoin</translation> </message> @@ -443,20 +443,18 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l'uso <translation>&Verifica messaggio...</translation> </message> <message> - <location line="-180"/> - <location line="+6"/> - <location line="+513"/> + <location line="+375"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-519"/> - <location line="+6"/> + <location line="-563"/> + <location line="+10"/> <source>Wallet</source> <translation>Portamonete</translation> </message> <message> - <location line="+109"/> + <location line="+113"/> <source>&Send</source> <translation>&Spedisci</translation> </message> @@ -466,13 +464,7 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l'uso <translation>&Ricevi</translation> </message> <message> - <location line="+28"/> - <location line="+2"/> - <source>&About Bitcoin</source> - <translation>&Info su Bitcoin</translation> - </message> - <message> - <location line="+14"/> + <location line="+44"/> <location line="+2"/> <source>&Show / Hide</source> <translation>&Mostra/Nascondi</translation> @@ -498,12 +490,12 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l'uso <translation>Verifica i messaggi per accertarsi che siano stati firmati con gli indirizzi Bitcoin specificati</translation> </message> <message> - <location line="+35"/> + <location line="+39"/> <source>&File</source> <translation>&File</translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>&Settings</source> <translation>&Impostazioni</translation> </message> @@ -518,18 +510,30 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l'uso <translation>Barra degli strumenti "Tabs"</translation> </message> <message> - <location line="-235"/> - <location line="+294"/> + <location line="-244"/> + <location line="+321"/> <source>[testnet]</source> <translation>[testnet]</translation> </message> <message> - <location line="-177"/> + <location line="-331"/> + <location line="+10"/> + <source>Bitcoin Core</source> + <translation>Nucleo di Bitcoin</translation> + </message> + <message> + <location line="+121"/> <source>Request payments (generates QR codes and bitcoin: URIs)</source> <translation>Richiedi pagamenti (genera codici QR e bitcoin: URI)</translation> </message> <message> - <location line="+63"/> + <location line="+27"/> + <location line="+2"/> + <source>&About Bitcoin Core</source> + <translation>%Info su Bitcoin Core</translation> + </message> + <message> + <location line="+34"/> <source>&Used sending addresses...</source> <translation>&Modifica indirizzo d'invio</translation> </message> @@ -549,13 +553,23 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l'uso <translation>Mostra la lista di indirizzi su cui ricevere pagamenti</translation> </message> <message> - <location line="+106"/> + <location line="+2"/> + <source>Open URI...</source> + <translation>Apri URI...</translation> + </message> + <message> + <location line="+1"/> + <source>Open a bitcoin: URI or payment request</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+126"/> <location line="+5"/> <source>Bitcoin client</source> <translation>Bitcoin client</translation> </message> <message numerus="yes"> - <location line="+120"/> + <location line="+133"/> <source>%n active connection(s) to Bitcoin network</source> <translation><numerusform>%n connessione attiva alla rete Bitcoin</numerusform><numerusform>%n connessioni attive alla rete Bitcoin</numerusform></translation> </message> @@ -664,17 +678,7 @@ Indirizzo: %4 </translation> </message> <message> - <location line="+34"/> - <source>URI handling</source> - <translation>Gestione URI</translation> - </message> - <message> - <location line="+0"/> - <source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source> - <translation>Impossibile interpretare l'URI! Ciò può essere causato da un indirizzo Bitcoin invalido o da parametri URI non corretti.</translation> - </message> - <message> - <location line="+45"/> + <location line="+67"/> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>Il portamonete è <b>cifrato</b> e attualmente <b>sbloccato</b></translation> </message> @@ -684,7 +688,7 @@ Indirizzo: %4 <translation>Il portamonete è <b>cifrato</b> e attualmente <b>bloccato</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+110"/> + <location filename="../bitcoin.cpp" line="+116"/> <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> @@ -692,12 +696,299 @@ Indirizzo: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+115"/> + <location filename="../clientmodel.cpp" line="+119"/> <source>Network Alert</source> <translation>Avviso di rete</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à:</translation> + </message> + <message> + <location line="+29"/> + <source>Bytes:</source> + <translation>Byte:</translation> + </message> + <message> + <location line="+45"/> + <source>Amount:</source> + <translation>Importo:</translation> + </message> + <message> + <location line="+29"/> + <source>Priority:</source> + <translation>Priorità:</translation> + </message> + <message> + <location line="+45"/> + <source>Fee:</source> + <translation>Commissione:</translation> + </message> + <message> + <location line="+32"/> + <source>Low Output:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+48"/> + <source>After Fee:</source> + <translation>Dopo Commissione:</translation> + </message> + <message> + <location line="+32"/> + <source>Change:</source> + <translation>Resto:</translation> + </message> + <message> + <location line="+63"/> + <source>(un)select all</source> + <translation>(de)seleziona tutto</translation> + </message> + <message> + <location line="+13"/> + <source>Tree mode</source> + <translation>Modalità Albero</translation> + </message> + <message> + <location line="+16"/> + <source>List mode</source> + <translation>Modalità Lista</translation> + </message> + <message> + <location line="+52"/> + <source>Amount</source> + <translation>Importo</translation> + </message> + <message> + <location line="+10"/> + <source>Address</source> + <translation>Indirizzo</translation> + </message> + <message> + <location line="+5"/> + <source>Date</source> + <translation>Data</translation> + </message> + <message> + <location line="+5"/> + <source>Confirmations</source> + <translation>Conferme:</translation> + </message> + <message> + <location line="+3"/> + <source>Confirmed</source> + <translation>Confermato</translation> + </message> + <message> + <location line="+5"/> + <source>Priority</source> + <translation>Priorità</translation> + </message> + <message> + <location filename="../coincontroldialog.cpp" line="+42"/> + <source>Copy address</source> + <translation>Copia l'indirizzo</translation> + </message> + <message> + <location line="+1"/> + <source>Copy label</source> + <translation>Copia l'etichetta</translation> + </message> + <message> + <location line="+1"/> + <location line="+26"/> + <source>Copy amount</source> + <translation>Copia l'importo</translation> + </message> + <message> + <location line="-25"/> + <source>Copy transaction ID</source> + <translation>Copia l'ID transazione</translation> + </message> + <message> + <location line="+1"/> + <source>Lock unspent</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Unlock unspent</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+22"/> + <source>Copy quantity</source> + <translation>Copia quantità</translation> + </message> + <message> + <location line="+2"/> + <source>Copy fee</source> + <translation>Copia commissione</translation> + </message> + <message> + <location line="+1"/> + <source>Copy after fee</source> + <translation>Copia dopo commissione</translation> + </message> + <message> + <location line="+1"/> + <source>Copy bytes</source> + <translation>Copia byte</translation> + </message> + <message> + <location line="+1"/> + <source>Copy priority</source> + <translation>Copia priorità</translation> + </message> + <message> + <location line="+1"/> + <source>Copy low output</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy change</source> + <translation>Copia resto</translation> + </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="+171"/> + <source>Dust</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>yes</source> + <translation>si</translation> + </message> + <message> + <location line="+0"/> + <source>no</source> + <translation>no</translation> + </message> + <message> + <location line="+10"/> + <source>This label turns red, if the transaction size is greater than 1000 bytes.</source> + <translation>Questa etichetta diventa rossa, se la dimensione della transazione supera i 1000 bytes</translation> + </message> + <message> + <location line="+1"/> + <location line="+5"/> + <source>This means a fee of at least %1 per kB is required.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-4"/> + <source>Can vary +/- 1 byte per input.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>Transactions with higher priority are more likely to get included into a block.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>This label turns red, if the priority is smaller than "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>(nessuna etichetta)</translation> + </message> + <message> + <location line="-9"/> + <source>change from %1 (%2)</source> + <translation>resto da %1 (%2)</translation> + </message> + <message> + <location line="+1"/> + <source>(change)</source> + <translation>(resto)</translation> + </message> +</context> +<context> <name>EditAddressDialog</name> <message> <location filename="../forms/editaddressdialog.ui" line="+14"/> @@ -725,7 +1016,7 @@ Indirizzo: %4 <translation>&Indirizzo</translation> </message> <message> - <location filename="../editaddressdialog.cpp" line="+21"/> + <location filename="../editaddressdialog.cpp" line="+25"/> <source>New receiving address</source> <translation>Nuovo indirizzo di ricezione</translation> </message> @@ -768,7 +1059,7 @@ Indirizzo: %4 <context> <name>FreespaceChecker</name> <message> - <location filename="../intro.cpp" line="+61"/> + <location filename="../intro.cpp" line="+65"/> <source>A new data directory will be created.</source> <translation>Sarà creata una nuova cartella dati.</translation> </message> @@ -796,18 +1087,18 @@ Indirizzo: %4 <context> <name>GUIUtil::HelpMessageBox</name> <message> - <location filename="../guiutil.cpp" line="+558"/> - <location line="+13"/> - <source>Bitcoin-Qt</source> - <translation>Bitcoin-Qt</translation> - </message> - <message> - <location line="-13"/> + <location filename="../guiutil.cpp" line="+597"/> <source>version</source> <translation>versione</translation> </message> <message> - <location line="+2"/> + <location line="+0"/> + <location line="+13"/> + <source>Bitcoin Core</source> + <translation>Nucleo di Bitcoin</translation> + </message> + <message> + <location line="-11"/> <source>Usage:</source> <translation>Utilizzo:</translation> </message> @@ -852,18 +1143,18 @@ Indirizzo: %4 </message> <message> <location line="+9"/> - <source>Welcome to Bitcoin-Qt.</source> - <translation>Benvenuto su Bitcoin-Qt</translation> + <source>Welcome to Bitcoin Core.</source> + <translation>Benvenuti su Bitcoin Core.</translation> </message> <message> <location line="+26"/> - <source>As this is the first time the program is launched, you can choose where Bitcoin-Qt will store its data.</source> - <translation>Visto che questa è la prima volta che il programma viene lanciato, puoi scegliere dove Bitcoin-Qt salverà i suoi dati.</translation> + <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source> + <translation type="unfinished"/> </message> <message> <location line="+10"/> - <source>Bitcoin-Qt will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source> - <translation>Bitcoin-Qt scaricherà e salverà una copia del block chain di Bitcoin. Almeno %1GB di dati saranno salvati in questa cartella, e aumenteranno col tempo. Anche il portafoglio sarà salvato in questa cartella.</translation> + <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"/> @@ -876,7 +1167,17 @@ Indirizzo: %4 <translation>Usa una cartella dati personalizzata:</translation> </message> <message> - <location filename="../intro.cpp" line="+105"/> + <location filename="../intro.cpp" line="+85"/> + <source>Bitcoin</source> + <translation>Bitcoin</translation> + </message> + <message> + <location line="+1"/> + <source>Error: Specified data directory "%1" can not be created.</source> + <translation>Errore: La cartella dati "%1" specificata non può essere creata.</translation> + </message> + <message> + <location line="+19"/> <source>Error</source> <translation>Errore</translation> </message> @@ -892,6 +1193,34 @@ Indirizzo: %4 </message> </context> <context> + <name>OpenURIDialog</name> + <message> + <location filename="../forms/openuridialog.ui" line="+14"/> + <source>Open URI</source> + <translation>Apri URI</translation> + </message> + <message> + <location line="+6"/> + <source>Open payment request from URI or file</source> + <translation>Apri richiesta di pagamento da URI o file</translation> + </message> + <message> + <location line="+9"/> + <source>URI:</source> + <translation>URI:</translation> + </message> + <message> + <location line="+11"/> + <source>Select payment request file</source> + <translation>Seleziona il file di richiesta di pagamento</translation> + </message> + <message> + <location filename="../openuridialog.cpp" line="+47"/> + <source>Select payment request file to open</source> + <translation>Seleziona il file di richiesta di pagamento da aprire</translation> + </message> +</context> +<context> <name>OptionsDialog</name> <message> <location filename="../forms/optionsdialog.ui" line="+14"/> @@ -1049,6 +1378,16 @@ Indirizzo: %4 <translation>&Mostra gli indirizzi nella lista delle transazioni</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>Mostrare funzionalità coin &control (solo per esperti)</translation> + </message> + <message> <location line="+71"/> <source>&OK</source> <translation>&OK</translation> @@ -1064,12 +1403,12 @@ Indirizzo: %4 <translation>&Applica</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+58"/> + <location filename="../optionsdialog.cpp" line="+63"/> <source>default</source> <translation>default</translation> </message> <message> - <location line="+130"/> + <location line="+131"/> <source>Confirm options reset</source> <translation>Conferma ripristino opzioni</translation> </message> @@ -1110,17 +1449,17 @@ Indirizzo: %4 </message> <message> <location line="+50"/> - <location line="+202"/> + <location line="+214"/> <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source> <translation>Le informazioni visualizzate sono datate. Il tuo partafogli verrà sincronizzato automaticamente con il network Bitcoin dopo che la connessione è stabilita, ma questo processo non può essere completato ora.</translation> </message> <message> - <location line="-131"/> + <location line="-140"/> <source>Unconfirmed:</source> <translation>Non confermato:</translation> </message> <message> - <location line="-78"/> + <location line="-81"/> <source>Wallet</source> <translation>Portamonete</translation> </message> @@ -1135,12 +1474,12 @@ Indirizzo: %4 <translation>Saldo spendibile attuale</translation> </message> <message> - <location line="+29"/> + <location line="+32"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation>Totale delle transazioni in corso di conferma, che non sono ancora incluse nel saldo spendibile attuale</translation> </message> <message> - <location line="+13"/> + <location line="+16"/> <source>Immature:</source> <translation>Immaturo:</translation> </message> @@ -1150,7 +1489,7 @@ Indirizzo: %4 <translation>Importo scavato che non è ancora maturato</translation> </message> <message> - <location line="+13"/> + <location line="+16"/> <source>Total:</source> <translation>Totale:</translation> </message> @@ -1160,12 +1499,12 @@ Indirizzo: %4 <translation>Saldo totale attuale</translation> </message> <message> - <location line="+53"/> + <location line="+56"/> <source><b>Recent transactions</b></source> <translation><b>Transazioni recenti</b></translation> </message> <message> - <location filename="../overviewpage.cpp" line="+116"/> + <location filename="../overviewpage.cpp" line="+120"/> <location line="+1"/> <source>out of sync</source> <translation>fuori sincrono</translation> @@ -1174,7 +1513,7 @@ Indirizzo: %4 <context> <name>PaymentServer</name> <message> - <location filename="../paymentserver.cpp" line="+392"/> + <location filename="../paymentserver.cpp" line="+397"/> <source>URI handling</source> <translation>Gestione URI</translation> </message> @@ -1184,23 +1523,29 @@ Indirizzo: %4 <translation>Impossibile interpretare l'URI! Ciò può essere causato da un indirizzo Bitcoin invalido o da parametri URI non corretti.</translation> </message> <message> - <location line="+69"/> + <location line="+91"/> <source>Requested payment amount of %1 is too small (considered dust).</source> <translation>L'importo di pagamento richiesto di %1 è troppo piccolo (considerato polvere).</translation> </message> <message> - <location line="+4"/> - <location line="+37"/> + <location line="-204"/> + <location line="+195"/> + <location line="+13"/> <source>Payment request error</source> <translation>Errore di richiesta di pagamento</translation> </message> <message> - <location line="+1"/> - <source>Insecure requests to custom payment scripts unsupported</source> - <translation>Richieste insicure per script di pagamento personalizzati non sono supportate.</translation> + <location line="-207"/> + <source>Cannot start bitcoin: click-to-pay handler</source> + <translation>Impossibile avviare bitcoin: gestore click-to-pay</translation> </message> <message> - <location line="+38"/> + <location line="+195"/> + <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>Rimborso da %1</translation> </message> @@ -1210,7 +1555,7 @@ Indirizzo: %4 <translation>Errore di comunicazione con %1: %2</translation> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>Bad response from server %1</source> <translation>Risposta sbagliata dal server %1</translation> </message> @@ -1220,8 +1565,8 @@ Indirizzo: %4 <translation>Pagamento riconosciuto</translation> </message> <message> - <location line="-58"/> - <location line="+30"/> + <location line="-55"/> + <location line="+27"/> <location line="+17"/> <source>Network request error</source> <translation>Errore di richiesta di rete</translation> @@ -1230,9 +1575,8 @@ Indirizzo: %4 <context> <name>QObject</name> <message> - <location filename="../bitcoin.cpp" line="+114"/> + <location filename="../bitcoin.cpp" line="+119"/> <location line="+5"/> - <location filename="../intro.cpp" line="-32"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> @@ -1246,16 +1590,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="../intro.cpp" line="+1"/> - <source>Error: Specified data directory "%1" can not be created.</source> - <translation>Errore: La cartella dati "%1" specificata non può essere creata.</translation> - </message> </context> <context> <name>QRImageWidget</name> <message> - <location filename="../receiverequestdialog.cpp" line="+32"/> + <location filename="../receiverequestdialog.cpp" line="+36"/> <source>&Save Image...</source> <translation>&Salva Immagine</translation> </message> @@ -1271,8 +1610,8 @@ Indirizzo: %4 </message> <message> <location line="+0"/> - <source>PNG Images (*.png)</source> - <translation>Immagini PNG (*.png)</translation> + <source>PNG Image (*.png)</source> + <translation>Immagine PNG (*.png)</translation> </message> </context> <context> @@ -1292,7 +1631,7 @@ Indirizzo: %4 <location line="+53"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+352"/> + <location filename="../rpcconsole.cpp" line="+360"/> <source>N/A</source> <translation>N/D</translation> </message> @@ -1307,7 +1646,12 @@ Indirizzo: %4 <translation>&Informazione</translation> </message> <message> - <location line="+68"/> + <location line="-10"/> + <source>Debug window</source> + <translation>Finestra di debug</translation> + </message> + <message> + <location line="+78"/> <source>Using OpenSSL version</source> <translation>Versione OpenSSL in uso</translation> </message> @@ -1362,12 +1706,7 @@ Indirizzo: %4 <translation>opzioni riga di comando</translation> </message> <message> - <location line="+7"/> - <source>Show the Bitcoin-Qt help message to get a list with possible Bitcoin command-line options.</source> - <translation>Mostra il messaggio di aiuto di Bitcoin-QT per avere la lista di tutte le opzioni della riga di comando di Bitcoin.</translation> - </message> - <message> - <location line="+3"/> + <location line="+10"/> <source>&Show</source> <translation>&Mostra</translation> </message> @@ -1407,12 +1746,7 @@ Indirizzo: %4 <translation>Data di creazione</translation> </message> <message> - <location line="-104"/> - <source>Bitcoin - Debug window</source> - <translation>Bitcoin - Finestra debug</translation> - </message> - <message> - <location line="+25"/> + <location line="-79"/> <source>Bitcoin Core</source> <translation>Nucleo di Bitcoin</translation> </message> @@ -1427,7 +1761,12 @@ Indirizzo: %4 <translation>Apri il file di log del debug di Bitcoin dalla cartella attuale. Può richiedere alcuni secondi per file di log grandi.</translation> </message> <message> - <location line="+102"/> + <location line="+26"/> + <source>Show the Bitcoin-Core help message to get a list with possible Bitcoin command-line options.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+76"/> <source>Clear console</source> <translation>Svuota console</translation> </message> @@ -1485,37 +1824,32 @@ Indirizzo: %4 <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+22"/> + <location filename="../forms/receivecoinsdialog.ui" line="+83"/> <source>&Amount:</source> <translation>&Importo:</translation> </message> <message> - <location line="+16"/> + <location line="+19"/> <source>The amount to request</source> <translation>L'importo da richiedere</translation> </message> <message> - <location line="+7"/> + <location line="-32"/> <source>&Label:</source> <translation>&Etichetta</translation> </message> <message> - <location line="+10"/> - <source>The label to associate with the receiving address</source> - <translation>L'etichetta da associare l'indirizzo di ricezione</translation> - </message> - <message> - <location line="+7"/> + <location line="-34"/> <source>&Message:</source> <translation>&Messaggio:</translation> </message> <message> - <location line="+10"/> + <location line="+20"/> <source>The message to attach to payment request</source> <translation>Il messaggio da allegare alla richiesta di pagamento</translation> </message> <message> - <location line="+14"/> + <location line="-37"/> <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> @@ -1525,12 +1859,17 @@ Indirizzo: %4 <translation>R&iusa un indirizzo di pagamento (non raccomandato)</translation> </message> <message> - <location line="+7"/> + <location line="+27"/> + <source>The label to associate with the new receiving address</source> + <translation>L'etichetta da associare al nuovo indirizzo ricevente</translation> + </message> + <message> + <location line="+14"/> <source>Use this form to request payments. All fields are optional.</source> <translation>Usa questo modulo per richiedere pagamenti. Tutti i campi sono opzionali.</translation> </message> <message> - <location line="+17"/> + <location line="+56"/> <source>Clear all fields of the form.</source> <translation>Cancellare tutti i campi del modulo.</translation> </message> @@ -1544,6 +1883,31 @@ Indirizzo: %4 <source>&Request payment</source> <translation>&Richiedi pagamento</translation> </message> + <message> + <location line="+47"/> + <source>Previously requested payments</source> + <translation>Pagamenti richiesti precedentemente</translation> + </message> + <message> + <location line="+12"/> + <source>Show the selected request (does the same as double clicking an entry)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Show</source> + <translation>Mostra</translation> + </message> + <message> + <location line="+11"/> + <source>Remove the selected entries from the list</source> + <translation>Rimuovi le voci selezionate dalla lista</translation> + </message> + <message> + <location line="+3"/> + <source>Remove</source> + <translation>Rimuovi</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -1564,16 +1928,11 @@ Indirizzo: %4 </message> <message> <location line="+7"/> - <source>&Copy Image</source> - <translation>&Copia Immagine</translation> - </message> - <message> - <location line="+7"/> <source>&Save Image...</source> <translation>&Salva Immagine</translation> </message> <message> - <location filename="../receiverequestdialog.cpp" line="+58"/> + <location filename="../receiverequestdialog.cpp" line="+56"/> <source>Request payment to %1</source> <translation>Richiesta di pagamento a %1</translation> </message> @@ -1619,16 +1978,119 @@ Indirizzo: %4 </message> </context> <context> + <name>RecentRequestsTableModel</name> + <message> + <location filename="../recentrequeststablemodel.cpp" line="+14"/> + <source>Date</source> + <translation>Data</translation> + </message> + <message> + <location line="+0"/> + <source>Label</source> + <translation>Etichetta</translation> + </message> + <message> + <location line="+0"/> + <source>Message</source> + <translation>Messaggio</translation> + </message> + <message> + <location line="+0"/> + <source>Amount</source> + <translation>Importo</translation> + </message> + <message> + <location line="+36"/> + <source>(no label)</source> + <translation>(nessuna etichetta)</translation> + </message> + <message> + <location line="+9"/> + <source>(no message)</source> + <translation>(nessun messaggio)</translation> + </message> +</context> +<context> <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="+14"/> - <location filename="../sendcoinsdialog.cpp" line="+140"/> - <location line="+213"/> + <location filename="../sendcoinsdialog.cpp" line="+381"/> + <location line="+81"/> <source>Send Coins</source> <translation>Spedisci Bitcoin</translation> </message> <message> - <location line="+50"/> + <location line="+76"/> + <source>Coin Control Features</source> + <translation>Funzionalità di Coin Control</translation> + </message> + <message> + <location line="+20"/> + <source>Inputs...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> + <source>automatically selected</source> + <translation>selezionato automaticamente</translation> + </message> + <message> + <location line="+19"/> + <source>Insufficient funds!</source> + <translation>Fondi insufficienti!</translation> + </message> + <message> + <location line="+89"/> + <source>Quantity:</source> + <translation>Quantità:</translation> + </message> + <message> + <location line="+35"/> + <source>Bytes:</source> + <translation>Byte:</translation> + </message> + <message> + <location line="+48"/> + <source>Amount:</source> + <translation>Importo:</translation> + </message> + <message> + <location line="+32"/> + <source>Priority:</source> + <translation>Priorità:</translation> + </message> + <message> + <location line="+48"/> + <source>Fee:</source> + <translation>Commissione:</translation> + </message> + <message> + <location line="+32"/> + <source>Low Output:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+48"/> + <source>After Fee:</source> + <translation>Dopo Commissione:</translation> + </message> + <message> + <location line="+32"/> + <source>Change:</source> + <translation>Resto:</translation> + </message> + <message> + <location line="+44"/> + <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Custom change address</source> + <translation>Personalizza indirizzo di resto</translation> + </message> + <message> + <location line="+115"/> <source>Send to multiple recipients at once</source> <translation>Spedisci a diversi beneficiari in una volta sola</translation> </message> @@ -1653,12 +2115,7 @@ Indirizzo: %4 <translation>Saldo:</translation> </message> <message> - <location line="+10"/> - <source>123.456 BTC</source> - <translation>123,456 BTC</translation> - </message> - <message> - <location line="+31"/> + <location line="+41"/> <source>Confirm the send action</source> <translation>Conferma la spedizione</translation> </message> @@ -1668,49 +2125,125 @@ Indirizzo: %4 <translation>&Spedisci</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-154"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation>Conferma la spedizione di bitcoin</translation> </message> <message> - <location line="-90"/> + <location line="-74"/> <location line="+5"/> <location line="+5"/> + <location line="+4"/> <source>%1 to %2</source> <translation>%1 a %2</translation> </message> <message> - <location line="+26"/> + <location line="-136"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>Inserisci un indirizzo Bitcoin (ad esempio 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> + <message> + <location line="+15"/> + <source>Copy quantity</source> + <translation>Copia quantità</translation> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation>Copia l'importo</translation> + </message> + <message> + <location line="+1"/> + <source>Copy fee</source> + <translation>Copia commissione</translation> + </message> + <message> + <location line="+1"/> + <source>Copy after fee</source> + <translation>Copia dopo commissione</translation> + </message> + <message> + <location line="+1"/> + <source>Copy bytes</source> + <translation>Copia byte</translation> + </message> + <message> + <location line="+1"/> + <source>Copy priority</source> + <translation>Copia priorità</translation> + </message> + <message> + <location line="+1"/> + <source>Copy low output</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy change</source> + <translation>Copia resto</translation> + </message> + <message> + <location line="+170"/> + <source>Total Amount %1 (= %2)</source> + <translation>Importo Totale %1 (= %2)</translation> + </message> + <message> + <location line="+2"/> + <source>or</source> + <translation>o</translation> + </message> + <message> + <location line="+202"/> <source>The recipient address is not valid, please recheck.</source> <translation>L'indirizzo del beneficiario non è valido, per cortesia controlla.</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>The amount to pay must be larger than 0.</source> <translation>L'importo da pagare dev'essere maggiore di 0.</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>The amount exceeds your balance.</source> <translation>L'importo è superiore al saldo attuale</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>The total exceeds your balance when the %1 transaction fee is included.</source> <translation>Il totale è superiore al saldo attuale includendo la commissione %1.</translation> </message> <message> - <location line="+5"/> + <location line="+3"/> <source>Duplicate address found, can only send to each address once per send operation.</source> <translation>Trovato un indirizzo doppio, si può spedire solo una volta a ciascun indirizzo in una singola operazione.</translation> </message> <message> + <location line="+3"/> + <source>Transaction creation failed!</source> + <translation>Creazione transazione fallita!</translation> + </message> + <message> <location line="+4"/> - <source>Error: Transaction creation failed!</source> - <translation>Errore: Creazione transazione fallita!</translation> + <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> + <translation type="unfinished"/> </message> <message> - <location line="+15"/> + <location line="+113"/> + <source>Warning: Invalid Bitcoin address</source> + <translation>Attenzione: Indirizzo Bitcoin non valido</translation> + </message> + <message> + <location line="+13"/> + <source>(no label)</source> + <translation>(nessuna etichetta)</translation> + </message> + <message> + <location line="+8"/> + <source>Warning: Unknown change address</source> + <translation>Attenzione: Indirizzo di ritorno sconosciuto</translation> + </message> + <message> + <location line="-378"/> <source>Are you sure you want to send?</source> <translation>Sei sicuro di voler inviare?</translation> </message> @@ -1720,17 +2253,7 @@ Indirizzo: %4 <translation>aggiunto come tassa di transazione</translation> </message> <message> - <location line="+6"/> - <source>Total Amount %1</source> - <translation>Importo Totale %1</translation> - </message> - <message> - <location line="+20"/> - <source>Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> - <translation>Errore: la transazione è stata rifiutata. Ciò accade se alcuni bitcoin nel portamonete sono stati già spesi, ad esempio se è stata usata una copia del file wallet.dat e i bitcoin sono stati spesi dalla copia ma non segnati come spesi qui.</translation> - </message> - <message> - <location line="+144"/> + <location line="+170"/> <source>Payment request expired</source> <translation>Richiesta di pagamento scaduta</translation> </message> @@ -1743,39 +2266,44 @@ Indirizzo: %4 <context> <name>SendCoinsEntry</name> <message> - <location filename="../forms/sendcoinsentry.ui" line="+33"/> - <location line="+585"/> + <location filename="../forms/sendcoinsentry.ui" line="+131"/> + <location line="+501"/> + <location line="+536"/> <source>A&mount:</source> <translation>&Importo:</translation> </message> <message> - <location line="-572"/> - <location line="+585"/> + <location line="-1132"/> <source>Pay &To:</source> <translation>Paga &a:</translation> </message> <message> - <location line="-551"/> + <location line="+18"/> <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation>L'indirizzo del beneficiario a cui inviare il pagamento (ad esempio 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location filename="../sendcoinsentry.cpp" line="+28"/> + <location filename="../sendcoinsentry.cpp" line="+30"/> <source>Enter a label for this address to add it to your address book</source> <translation>Inserisci un'etichetta per questo indirizzo, per aggiungerlo nella rubrica</translation> </message> <message> - <location filename="../forms/sendcoinsentry.ui" line="-18"/> + <location filename="../forms/sendcoinsentry.ui" line="+57"/> <source>&Label:</source> <translation>&Etichetta</translation> </message> <message> - <location line="+28"/> + <location line="-50"/> <source>Choose previously used address</source> <translation>Scegli indirizzo usato precedentemente</translation> </message> <message> - <location line="+10"/> + <location line="-40"/> + <source>This is a normal payment.</source> + <translation>Questo è un normale pagamento.</translation> + </message> + <message> + <location line="+50"/> <source>Alt+A</source> <translation>Alt+A</translation> </message> @@ -1791,16 +2319,35 @@ Indirizzo: %4 </message> <message> <location line="+7"/> - <source>Remove this recipient</source> - <translation>Rimuovere questo beneficiario</translation> + <location line="+504"/> + <location line="+536"/> + <source>Remove this entry</source> + <translation>Rimuovi questa voce</translation> </message> <message> - <location line="+16"/> + <location line="-40"/> + <source>This is a verified payment request.</source> + <translation>Questa è una richiesta di pagamento verificata.</translation> + </message> + <message> + <location line="-971"/> <source>Enter a label for this address to add it to the list of used addresses</source> <translation>Inserisci un'etichetta per questo indirizzo per aggiungerlo nella rubrica</translation> </message> <message> - <location line="+465"/> + <location line="+439"/> + <source>This is an unverified payment request.</source> + <translation>Questa è una richiesta di pagamento non verificata.</translation> + </message> + <message> + <location line="+18"/> + <location line="+532"/> + <source>Pay To:</source> + <translation>Pagare a:</translation> + </message> + <message> + <location line="-498"/> + <location line="+536"/> <source>Memo:</source> <translation>Memo:</translation> </message> @@ -1921,7 +2468,7 @@ Indirizzo: %4 <translation>Reimposta tutti i campi della verifica messaggio</translation> </message> <message> - <location filename="../signverifymessagedialog.cpp" line="+27"/> + <location filename="../signverifymessagedialog.cpp" line="+29"/> <location line="+3"/> <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation>Inserisci un indirizzo Bitcoin (ad esempio 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> @@ -1937,7 +2484,7 @@ Indirizzo: %4 <translation>Inserisci firma Bitcoin</translation> </message> <message> - <location line="+85"/> + <location line="+84"/> <location line="+81"/> <source>The entered address is invalid.</source> <translation>L'indirizzo inserito non è valido.</translation> @@ -2006,9 +2553,14 @@ Indirizzo: %4 <context> <name>SplashScreen</name> <message> - <location filename="../splashscreen.cpp" line="+23"/> - <source>The Bitcoin developers</source> - <translation>Sviluppatori di Bitcoin</translation> + <location filename="../splashscreen.cpp" line="+26"/> + <source>Bitcoin Core</source> + <translation>Nucleo di Bitcoin</translation> + </message> + <message> + <location line="+2"/> + <source>The Bitcoin Core developers</source> + <translation>Gli sviluppatori del Bitcoin Core</translation> </message> <message> <location line="+1"/> @@ -2019,7 +2571,7 @@ Indirizzo: %4 <context> <name>TrafficGraphWidget</name> <message> - <location filename="../trafficgraphwidget.cpp" line="+75"/> + <location filename="../trafficgraphwidget.cpp" line="+79"/> <source>KB/s</source> <translation>KB/s</translation> </message> @@ -2027,7 +2579,7 @@ Indirizzo: %4 <context> <name>TransactionDesc</name> <message> - <location filename="../transactiondesc.cpp" line="+22"/> + <location filename="../transactiondesc.cpp" line="+28"/> <source>Open until %1</source> <translation>Aperto fino a %1</translation> </message> @@ -2125,7 +2677,7 @@ Indirizzo: %4 <message> <location line="-57"/> <source>Transaction fee</source> - <translation>Tranzakciós díj</translation> + <translation>Commissione transazione</translation> </message> <message> <location line="+16"/> @@ -2219,7 +2771,7 @@ Indirizzo: %4 <context> <name>TransactionTableModel</name> <message> - <location filename="../transactiontablemodel.cpp" line="+227"/> + <location filename="../transactiontablemodel.cpp" line="+234"/> <source>Date</source> <translation>Data</translation> </message> @@ -2337,7 +2889,7 @@ Indirizzo: %4 <context> <name>TransactionView</name> <message> - <location filename="../transactionview.cpp" line="+52"/> + <location filename="../transactionview.cpp" line="+57"/> <location line="+16"/> <source>All</source> <translation>Tutti</translation> @@ -2398,12 +2950,12 @@ Indirizzo: %4 <translation>Altro</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>Enter address or label to search</source> <translation>Inserisci un indirizzo o un'etichetta da cercare</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>Min amount</source> <translation>Importo minimo</translation> </message> @@ -2438,17 +2990,37 @@ Indirizzo: %4 <translation>Mostra i dettagli della transazione</translation> </message> <message> - <location line="+143"/> - <source>Export Transaction Data</source> - <translation>Esporta i dati della transazione</translation> + <location line="+142"/> + <source>Export Transaction History</source> + <translation>Esporta storico delle transazioni</translation> </message> <message> - <location line="+1"/> + <location line="+19"/> + <source>Exporting Failed</source> + <translation>Esportazione Fallita.</translation> + </message> + <message> + <location line="+0"/> + <source>There was an error trying to save the transaction history to %1.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+4"/> + <source>Exporting Successful</source> + <translation>Esportazione Riuscita</translation> + </message> + <message> + <location line="+0"/> + <source>The transaction history was successfully saved to %1.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-22"/> <source>Comma separated file (*.csv)</source> <translation>Testo CSV (*.csv)</translation> </message> <message> - <location line="+8"/> + <location line="+9"/> <source>Confirmed</source> <translation>Confermato</translation> </message> @@ -2483,17 +3055,7 @@ Indirizzo: %4 <translation>ID</translation> </message> <message> - <location line="+4"/> - <source>Error exporting</source> - <translation>Errore nell'esportazione</translation> - </message> - <message> - <location line="+0"/> - <source>Could not write to file %1.</source> - <translation>Impossibile scrivere sul file %1.</translation> - </message> - <message> - <location line="+100"/> + <location line="+107"/> <source>Range:</source> <translation>Intervallo:</translation> </message> @@ -2504,9 +3066,17 @@ Indirizzo: %4 </message> </context> <context> + <name>WalletFrame</name> + <message> + <location filename="../walletframe.cpp" line="+26"/> + <source>No wallet has been loaded.</source> + <translation>Non è stato caricato alcun portafoglio.</translation> + </message> +</context> +<context> <name>WalletModel</name> <message> - <location filename="../walletmodel.cpp" line="+218"/> + <location filename="../walletmodel.cpp" line="+245"/> <source>Send Coins</source> <translation>Spedisci Bitcoin</translation> </message> @@ -2514,7 +3084,7 @@ Indirizzo: %4 <context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+46"/> + <location filename="../walletview.cpp" line="+43"/> <source>&Export</source> <translation>&Esporta</translation> </message> @@ -2524,68 +3094,63 @@ Indirizzo: %4 <translation>Esporta i dati nella tabella corrente su un file</translation> </message> <message> - <location line="+183"/> + <location line="+181"/> <source>Backup Wallet</source> <translation>Backup Portamonete</translation> </message> <message> - <location line="+0"/> + <location line="+1"/> <source>Wallet Data (*.dat)</source> <translation>Dati Portamonete (*.dat)</translation> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Backup Failed</source> <translation>Backup Fallito</translation> </message> <message> <location line="+0"/> - <source>There was an error trying to save the wallet data to the new location.</source> - <translation>C'è stato un errore tentando di salvare i dati del portamonete in un'altra locazione</translation> + <source>There was an error trying to save the wallet data to %1.</source> + <translation type="unfinished"/> </message> <message> <location line="+4"/> - <source>Backup Successful</source> - <translation>Backup eseguito con successo</translation> + <source>The wallet data was successfully saved to %1.</source> + <translation>Il portafoglio è stato correttamente salvato in %1.</translation> </message> <message> <location line="+0"/> - <source>The wallet data was successfully saved to the new location.</source> - <translation>Il portafoglio è stato correttamente salvato nella nuova cartella.</translation> + <source>Backup Successful</source> + <translation>Backup eseguito con successo</translation> </message> </context> <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+102"/> - <source>Bitcoin version</source> - <translation>Versione di Bitcoin</translation> - </message> - <message> - <location line="+107"/> + <location filename="../bitcoinstrings.cpp" line="+217"/> <source>Usage:</source> <translation>Utilizzo:</translation> </message> <message> - <location line="-55"/> + <location line="-54"/> <source>List commands</source> <translation>Lista comandi </translation> </message> <message> - <location line="-13"/> + <location line="-14"/> <source>Get help for a command</source> <translation>Aiuto su un comando </translation> </message> <message> - <location line="+25"/> + <location line="+26"/> <source>Options:</source> <translation>Opzioni: </translation> </message> <message> - <location line="+24"/> + <location line="+23"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Specifica il file di configurazione (di default: bitcoin.conf) </translation> @@ -2608,7 +3173,7 @@ Indirizzo: %4 <translation>Imposta la dimensione cache del database in megabyte (default: 25)</translation> </message> <message> - <location line="-28"/> + <location line="-27"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>Ascolta le connessioni JSON-RPC su <porta> (default: 8333 o testnet: 18333)</translation> </message> @@ -2618,7 +3183,7 @@ Indirizzo: %4 <translation>Mantieni al massimo <n> connessioni ai peer (default: 125)</translation> </message> <message> - <location line="-49"/> + <location line="-50"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation>Connessione ad un nodo per ricevere l'indirizzo del peer, e disconnessione</translation> </message> @@ -2633,7 +3198,7 @@ Indirizzo: %4 <translation>Soglia di disconnessione dei peer di cattiva qualità (default: 100)</translation> </message> <message> - <location line="-142"/> + <location line="-147"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>Numero di secondi di sospensione che i peer di cattiva qualità devono trascorrere prima di riconnettersi (default: 86400)</translation> </message> @@ -2648,7 +3213,7 @@ Indirizzo: %4 <translation>Attendi le connessioni JSON-RPC su <porta> (default: 8332 or testnet: 18332)</translation> </message> <message> - <location line="+40"/> + <location line="+45"/> <source>Accept command line and JSON-RPC commands</source> <translation>Accetta da linea di comando e da comandi JSON-RPC </translation> @@ -2660,18 +3225,18 @@ Indirizzo: %4 </translation> </message> <message> - <location line="+40"/> + <location line="+39"/> <source>Use the test network</source> <translation>Utilizza la rete di prova </translation> </message> <message> - <location line="-118"/> + <location line="-117"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>Accetta connessioni dall'esterno (default: 1 se no -proxy o -connect)</translation> </message> <message> - <location line="-87"/> + <location line="-92"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2736,17 +3301,17 @@ per esempio: alertnotify=echo %%s | mail -s "Allarme Bitcoin" admin@fo <translation>Esegui comando quando una transazione del portafoglio cambia (%s in cmd è sostituito da TxID)</translation> </message> <message> - <location line="+11"/> - <source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source> - <translation>Imposta dimensione massima delle transazioni ad alta priorità/bassa-tassa in bytes (predefinito: 27000)</translation> - </message> - <message> - <location line="+6"/> + <location line="+18"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation>Questa versione è una compilazione pre-rilascio - usala a tuo rischio - non utilizzarla per la generazione o per applicazioni di commercio</translation> </message> <message> <location line="+5"/> + <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> <source>Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source> <translation>Attenzione: -paytxfee è molto alta. Questa è la commissione che si paga quando si invia una transazione.</translation> </message> @@ -2776,17 +3341,27 @@ per esempio: alertnotify=echo %%s | mail -s "Allarme Bitcoin" admin@fo <translation>Attenzione: wallet.dat corrotto, dati salvati! Il wallet.dat originale salvato come wallet.{timestamp}.bak in %s; se il tuo bilancio o le transazioni non sono corrette dovresti ripristinare da un backup.</translation> </message> <message> - <location line="+14"/> + <location line="+9"/> + <source><category> can be:</source> + <translation><category> può essere:</translation> + </message> + <message> + <location line="+6"/> <source>Attempt to recover private keys from a corrupt wallet.dat</source> <translation>Tenta di recuperare le chiavi private da un wallet.dat corrotto</translation> </message> <message> <location line="+1"/> + <source>Bitcoin Core Daemon</source> + <translation>Bitcoin Core Daemon</translation> + </message> + <message> + <location line="+1"/> <source>Bitcoin RPC client version</source> <translation>Versione Bitcoin RPC client</translation> </message> <message> - <location line="+2"/> + <location line="+1"/> <source>Block creation options:</source> <translation>Opzioni creazione blocco:</translation> </message> @@ -2796,7 +3371,12 @@ per esempio: alertnotify=echo %%s | mail -s "Allarme Bitcoin" admin@fo <translation>Connetti solo al nodo specificato</translation> </message> <message> - <location line="+2"/> + <location line="+1"/> + <source>Connect through SOCKS proxy</source> + <translation>Connetti attraverso SOCKS proxy</translation> + </message> + <message> + <location line="+1"/> <source>Connect to JSON-RPC on <port> (default: 8332 or testnet: 18332)</source> <translation>Connetti al JSON-RPC su <port> (default: 8332 o testnet: 18332)</translation> </message> @@ -2906,7 +3486,12 @@ per esempio: alertnotify=echo %%s | mail -s "Allarme Bitcoin" admin@fo <translation>Scrittura dei dati di ripristino falllita</translation> </message> <message> - <location line="+2"/> + <location line="+1"/> + <source>Fee per kB to add to transactions you send</source> + <translation>Commissione per kB da aggiungere alle transazioni in uscita</translation> + </message> + <message> + <location line="+1"/> <source>Find peers using DNS lookup (default: 1 unless -connect)</source> <translation>Trova peer utilizzando la ricerca DNS (predefinito: 1 finché utilizzato -connect)</translation> </message> @@ -2926,6 +3511,11 @@ per esempio: alertnotify=echo %%s | mail -s "Allarme Bitcoin" admin@fo <translation>Quanto è precisa la verifica del blocco (0-4, default: 3)</translation> </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>Blocco genesis non corretto o non trovato. Cartella dati sbagliata per network?</translation> @@ -2941,17 +3531,37 @@ per esempio: alertnotify=echo %%s | mail -s "Allarme Bitcoin" admin@fo <translation>Non ci sono abbastanza descrittori di file disponibili.</translation> </message> <message> - <location line="+8"/> + <location line="+5"/> + <source>Prepend debug output with timestamp (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>RPC client options:</source> + <translation>Opzioni client RPC:</translation> + </message> + <message> + <location line="+1"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation>Ricreare l'indice della catena di blocchi dai file blk000??.dat correnti</translation> </message> <message> - <location line="+6"/> + <location line="+5"/> + <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source> + <translation>Selezionare la versione SOCKS per -proxy (4 o 5, default: 5)</translation> + </message> + <message> + <location line="+1"/> <source>Send command to Bitcoin server</source> <translation>Invia comando al server Bitcoin</translation> </message> <message> - <location line="+10"/> + <location line="+8"/> + <source>Set maximum block size in bytes (default: %d)</source> + <translation>Impostare la dimensione massima del blocco in byte (default: %d)</translation> + </message> + <message> + <location line="+2"/> <source>Set the number of threads to service RPC calls (default: 4)</source> <translation>Specifica il numero massimo di richieste RPC in parallelo (di default: 4)</translation> </message> @@ -2971,7 +3581,7 @@ per esempio: alertnotify=echo %%s | mail -s "Allarme Bitcoin" admin@fo <translation>Usage (deprecato, usare bitcoin-cli):</translation> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>Verifying blocks...</source> <translation>Verifica blocchi...</translation> </message> @@ -2982,11 +3592,21 @@ per esempio: alertnotify=echo %%s | mail -s "Allarme Bitcoin" admin@fo </message> <message> <location line="+1"/> + <source>Wait for RPC server to start</source> + <translation>Attendere l'avvio dell'RPC server</translation> + </message> + <message> + <location line="+1"/> <source>Wallet %s resides outside data directory %s</source> <translation>Il portafoglio %s si trova fuori dalla cartella dati %s</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> + <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>Serve ricostruire il database usando -reindex per cambiare -txindex</translation> </message> @@ -2996,17 +3616,27 @@ per esempio: alertnotify=echo %%s | mail -s "Allarme Bitcoin" admin@fo <translation>Importa blocchi da un file blk000??.dat esterno</translation> </message> <message> - <location line="-98"/> + <location line="-104"/> <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> <translation>Eseguire comando quando un rilevante allarme viene ricevuto o vediamo una fork veramente lunga (%s in cmd è sostituito dal messaggio)</translation> </message> <message> - <location line="+17"/> + <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>Imposta il numero di thread di verifica script (fino a 16, 0 = auto, <0 = lascia il maggior numero di core liberi, default: 0)</translation> </message> <message> - <location line="+83"/> + <location line="+88"/> <source>Information</source> <translation>Informazioni</translation> </message> @@ -3046,32 +3676,12 @@ per esempio: alertnotify=echo %%s | mail -s "Allarme Bitcoin" admin@fo <translation>Connetti solo a nodi nella rete <net> (IPv4, IPv6 o Tor)</translation> </message> <message> - <location line="+2"/> - <source>Output extra debugging information. Implies all other -debug* options</source> - <translation>Produci informazioni extra utili al debug. Implies all other -debug* options</translation> - </message> - <message> - <location line="+1"/> - <source>Output extra network debugging information</source> - <translation>Genera informazioni extra utili al debug della rete</translation> - </message> - <message> - <location line="+2"/> - <source>Prepend debug output with timestamp</source> - <translation>Anteponi all'output di debug una marca temporale</translation> - </message> - <message> - <location line="+5"/> + <location line="+9"/> <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation>Opzioni SSL: (vedi il wiki di Bitcoin per le istruzioni di configurazione SSL)</translation> </message> <message> - <location line="+1"/> - <source>Select the version of socks proxy to use (4-5, default: 5)</source> - <translation>Selezionare la versione del proxy socks da usare (4-5, default: 5)</translation> - </message> - <message> - <location line="+3"/> + <location line="+4"/> <source>Send trace/debug info to console instead of debug.log file</source> <translation>Invia le informazioni di trace/debug alla console invece che al file debug.log</translation> </message> @@ -3081,12 +3691,7 @@ per esempio: alertnotify=echo %%s | mail -s "Allarme Bitcoin" admin@fo <translation>Invia le informazioni di trace/debug al debugger</translation> </message> <message> - <location line="+5"/> - <source>Set maximum block size in bytes (default: 250000)</source> - <translation>Imposta dimensione massima del blocco in bytes (predefinito: 250000)</translation> - </message> - <message> - <location line="+1"/> + <location line="+6"/> <source>Set minimum block size in bytes (default: 0)</source> <translation>Imposta dimensione minima del blocco in bytes (predefinito: 0)</translation> </message> @@ -3136,39 +3741,39 @@ per esempio: alertnotify=echo %%s | mail -s "Allarme Bitcoin" admin@fo <translation>UPnP-használat engedélyezése a figyelő port feltérképezésénél (default: 1 when listening)</translation> </message> <message> - <location line="+1"/> - <source>Use proxy to reach tor hidden services (default: same as -proxy)</source> - <translation>Usa un proxy per raggiungere servizi nascosti di tor (predefinito: uguale a -proxy)</translation> - </message> - <message> <location line="+2"/> <source>Username for JSON-RPC connections</source> <translation>Nome utente per connessioni JSON-RPC </translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Warning</source> <translation>Attenzione</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Warning: This version is obsolete, upgrade required!</source> <translation>Attenzione: questa versione è obsoleta, aggiornamento necessario!</translation> </message> <message> <location line="+2"/> + <source>version</source> + <translation>versione</translation> + </message> + <message> + <location line="+1"/> <source>wallet.dat corrupt, salvage failed</source> <translation>wallet.dat corrotto, salvataggio fallito</translation> </message> <message> - <location line="-54"/> + <location line="-57"/> <source>Password for JSON-RPC connections</source> <translation>Password per connessioni JSON-RPC </translation> </message> <message> - <location line="-70"/> + <location line="-69"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Consenti connessioni JSON-RPC dall'indirizzo IP specificato </translation> @@ -3180,12 +3785,12 @@ per esempio: alertnotify=echo %%s | mail -s "Allarme Bitcoin" admin@fo </translation> </message> <message> - <location line="-126"/> + <location line="-131"/> <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="+155"/> + <location line="+160"/> <source>Upgrade wallet to latest format</source> <translation>Aggiorna il wallet all'ultimo formato</translation> </message> @@ -3231,23 +3836,18 @@ 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="-95"/> - <source>Connect through socks proxy</source> - <translation>Connessione tramite socks proxy</translation> - </message> - <message> - <location line="-11"/> + <location line="-106"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>Consenti ricerche DNS per aggiungere nodi e collegare </translation> </message> <message> - <location line="+58"/> + <location line="+59"/> <source>Loading addresses...</source> <translation>Caricamento indirizzi...</translation> </message> <message> - <location line="-36"/> + <location line="-37"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>Errore caricamento wallet.dat: Wallet corrotto</translation> </message> @@ -3267,12 +3867,12 @@ per esempio: alertnotify=echo %%s | mail -s "Allarme Bitcoin" admin@fo <translation>Errore caricamento wallet.dat</translation> </message> <message> - <location line="+30"/> + <location line="+31"/> <source>Invalid -proxy address: '%s'</source> <translation>Indirizzo -proxy non valido: '%s'</translation> </message> <message> - <location line="+57"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Rete sconosciuta specificata in -onlynet: '%s'</translation> </message> @@ -3292,7 +3892,7 @@ per esempio: alertnotify=echo %%s | mail -s "Allarme Bitcoin" admin@fo <translation>Impossibile risolvere indirizzo -externalip: '%s'</translation> </message> <message> - <location line="+46"/> + <location line="+47"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>Importo non valido per -paytxfee=<amount>: '%s'</translation> </message> @@ -3312,27 +3912,22 @@ per esempio: alertnotify=echo %%s | mail -s "Allarme Bitcoin" admin@fo <translation>Caricamento dell'indice del blocco...</translation> </message> <message> - <location line="-60"/> + <location line="-61"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>Elérendő csomópont megadása and attempt to keep the connection open</translation> </message> <message> - <location line="-28"/> + <location line="-32"/> <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source> <translation>Impossibile collegarsi alla %s su questo computer. Probabilmente Bitcoin è già in esecuzione.</translation> </message> <message> - <location line="+69"/> - <source>Fee per KB to add to transactions you send</source> - <translation>Commissione per KB da aggiungere alle transazioni in uscita</translation> - </message> - <message> - <location line="+20"/> + <location line="+94"/> <source>Loading wallet...</source> <translation>Caricamento portamonete...</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>Cannot downgrade wallet</source> <translation>Non è possibile retrocedere il wallet</translation> </message> @@ -3362,7 +3957,7 @@ per esempio: alertnotify=echo %%s | mail -s "Allarme Bitcoin" admin@fo <translation>Errore</translation> </message> <message> - <location line="-33"/> + <location line="-34"/> <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 50957a5753..d252b2e353 100644 --- a/src/qt/locale/bitcoin_ms_MY.ts +++ b/src/qt/locale/bitcoin_ms_MY.ts @@ -3,12 +3,12 @@ <name>AboutDialog</name> <message> <location filename="../forms/aboutdialog.ui" line="+14"/> - <source>About Bitcoin</source> + <source>About Bitcoin Core</source> <translation type="unfinished"/> </message> <message> <location line="+39"/> - <source><b>Bitcoin</b> version</source> + <source><b>Bitcoin Core</b> version</source> <translation type="unfinished"/> </message> <message> @@ -22,7 +22,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="+14"/> + <location filename="../aboutdialog.cpp" line="+19"/> <source>Copyright</source> <translation type="unfinished"/> </message> @@ -37,12 +37,12 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location filename="../forms/addressbookpage.ui" line="+30"/> <source>Double-click to edit address or label</source> - <translation type="unfinished"/> + <translation>Klik dua kali untuk mengubah alamat atau label</translation> </message> <message> <location line="+27"/> <source>Create a new address</source> - <translation type="unfinished"/> + <translation>Cipta alamat baru</translation> </message> <message> <location line="+3"/> @@ -52,7 +52,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+11"/> <source>Copy the currently selected address to the system clipboard</source> - <translation type="unfinished"/> + <translation>Salin alamat terpilih ke dalam sistem papan klip</translation> </message> <message> <location line="+3"/> @@ -65,7 +65,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location filename="../addressbookpage.cpp" line="+72"/> + <location filename="../addressbookpage.cpp" line="+74"/> <source>&Copy Address</source> <translation type="unfinished"/> </message> @@ -87,7 +87,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="-27"/> <source>&Delete</source> - <translation type="unfinished"/> + <translation>&Padam</translation> </message> <message> <location filename="../addressbookpage.cpp" line="-30"/> @@ -135,37 +135,37 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+197"/> + <location line="+194"/> <source>Export Address List</source> <translation type="unfinished"/> </message> <message> <location line="+1"/> <source>Comma separated file (*.csv)</source> - <translation type="unfinished"/> + <translation>Fail yang dipisahkan dengan koma</translation> </message> <message> <location line="+13"/> <source>Error exporting</source> - <translation type="unfinished"/> + <translation>Laporan ralat</translation> </message> <message> <location line="+0"/> <source>Could not write to file %1.</source> - <translation type="unfinished"/> + <translation>Tidak dapat tulis ke dalam fail %1.</translation> </message> </context> <context> <name>AddressTableModel</name> <message> - <location filename="../addresstablemodel.cpp" line="+164"/> + <location filename="../addresstablemodel.cpp" line="+168"/> <source>Label</source> <translation type="unfinished"/> </message> <message> <location line="+0"/> <source>Address</source> - <translation type="unfinished"/> + <translation>Alamat</translation> </message> <message> <location line="+36"/> @@ -196,7 +196,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="+34"/> + <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"/> </message> @@ -317,17 +317,17 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+250"/> + <location filename="../bitcoingui.cpp" line="+260"/> <source>Sign &message...</source> <translation type="unfinished"/> </message> <message> - <location line="+254"/> + <location line="+290"/> <source>Synchronizing with network...</source> <translation type="unfinished"/> </message> <message> - <location line="-324"/> + <location line="-360"/> <source>&Overview</source> <translation type="unfinished"/> </message> @@ -375,7 +375,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+2"/> <source>&Options...</source> - <translation type="unfinished"/> + <translation>Pilihan</translation> </message> <message> <location line="+9"/> @@ -393,7 +393,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+259"/> + <location line="+295"/> <source>Importing blocks from disk...</source> <translation type="unfinished"/> </message> @@ -403,7 +403,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-322"/> + <location line="-358"/> <source>Send coins to a Bitcoin address</source> <translation type="unfinished"/> </message> @@ -438,20 +438,18 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-180"/> - <location line="+6"/> - <location line="+513"/> + <location line="+375"/> <source>Bitcoin</source> <translation type="unfinished"/> </message> <message> - <location line="-519"/> - <location line="+6"/> + <location line="-563"/> + <location line="+10"/> <source>Wallet</source> <translation type="unfinished"/> </message> <message> - <location line="+109"/> + <location line="+113"/> <source>&Send</source> <translation type="unfinished"/> </message> @@ -461,13 +459,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+28"/> - <location line="+2"/> - <source>&About Bitcoin</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+14"/> + <location line="+44"/> <location line="+2"/> <source>&Show / Hide</source> <translation type="unfinished"/> @@ -493,12 +485,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+35"/> + <location line="+39"/> <source>&File</source> <translation type="unfinished"/> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>&Settings</source> <translation type="unfinished"/> </message> @@ -513,18 +505,30 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-235"/> - <location line="+294"/> + <location line="-244"/> + <location line="+321"/> <source>[testnet]</source> <translation type="unfinished"/> </message> <message> - <location line="-177"/> + <location line="-331"/> + <location line="+10"/> + <source>Bitcoin Core</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+121"/> <source>Request payments (generates QR codes and bitcoin: URIs)</source> <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+27"/> + <location line="+2"/> + <source>&About Bitcoin Core</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+34"/> <source>&Used sending addresses...</source> <translation type="unfinished"/> </message> @@ -544,13 +548,23 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+106"/> + <location line="+2"/> + <source>Open URI...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Open a bitcoin: URI or payment request</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+126"/> <location line="+5"/> <source>Bitcoin client</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+120"/> + <location line="+133"/> <source>%n active connection(s) to Bitcoin network</source> <translation type="unfinished"><numerusform></numerusform></translation> </message> @@ -654,17 +668,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+34"/> - <source>URI handling</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+0"/> - <source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+45"/> + <location line="+67"/> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation type="unfinished"/> </message> @@ -674,7 +678,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../bitcoin.cpp" line="+110"/> + <location filename="../bitcoin.cpp" line="+116"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -682,17 +686,304 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+115"/> + <location filename="../clientmodel.cpp" line="+119"/> <source>Network Alert</source> <translation type="unfinished"/> </message> </context> <context> + <name>CoinControlDialog</name> + <message> + <location filename="../forms/coincontroldialog.ui" line="+14"/> + <source>Coin Control Address Selection</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+34"/> + <source>Quantity:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+29"/> + <source>Bytes:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+45"/> + <source>Amount:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+29"/> + <source>Priority:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+45"/> + <source>Fee:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+32"/> + <source>Low Output:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+48"/> + <source>After Fee:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+32"/> + <source>Change:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+63"/> + <source>(un)select all</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+13"/> + <source>Tree mode</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> + <source>List mode</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+52"/> + <source>Amount</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+10"/> + <source>Address</source> + <translation>Alamat</translation> + </message> + <message> + <location line="+5"/> + <source>Date</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+5"/> + <source>Confirmations</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Confirmed</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+5"/> + <source>Priority</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../coincontroldialog.cpp" line="+42"/> + <source>Copy address</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy label</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <location line="+26"/> + <source>Copy amount</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-25"/> + <source>Copy transaction ID</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Lock unspent</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Unlock unspent</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+22"/> + <source>Copy quantity</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>Copy fee</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy after fee</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy bytes</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy priority</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy low output</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy change</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+323"/> + <source>highest</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>higher</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>high</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>medium-high</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>medium</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+4"/> + <source>low-medium</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>low</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>lower</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>lowest</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+11"/> + <source>(%1 locked)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+171"/> + <source>Dust</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>yes</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>no</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+10"/> + <source>This label turns red, if the transaction size is greater than 1000 bytes.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <location line="+5"/> + <source>This means a fee of at least %1 per kB is required.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-4"/> + <source>Can vary +/- 1 byte per input.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>Transactions with higher priority are more likely to get included into a block.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>This label turns red, if the priority is smaller than "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 type="unfinished"/> + </message> + <message> + <location line="-9"/> + <source>change from %1 (%2)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>(change)</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>EditAddressDialog</name> <message> <location filename="../forms/editaddressdialog.ui" line="+14"/> <source>Edit Address</source> - <translation type="unfinished"/> + <translation>Alamat</translation> </message> <message> <location line="+11"/> @@ -712,10 +1003,10 @@ Address: %4 <message> <location line="-10"/> <source>&Address</source> - <translation type="unfinished"/> + <translation>Alamat</translation> </message> <message> - <location filename="../editaddressdialog.cpp" line="+21"/> + <location filename="../editaddressdialog.cpp" line="+25"/> <source>New receiving address</source> <translation type="unfinished"/> </message> @@ -758,7 +1049,7 @@ Address: %4 <context> <name>FreespaceChecker</name> <message> - <location filename="../intro.cpp" line="+61"/> + <location filename="../intro.cpp" line="+65"/> <source>A new data directory will be created.</source> <translation type="unfinished"/> </message> @@ -786,18 +1077,18 @@ Address: %4 <context> <name>GUIUtil::HelpMessageBox</name> <message> - <location filename="../guiutil.cpp" line="+558"/> - <location line="+13"/> - <source>Bitcoin-Qt</source> + <location filename="../guiutil.cpp" line="+597"/> + <source>version</source> <translation type="unfinished"/> </message> <message> - <location line="-13"/> - <source>version</source> + <location line="+0"/> + <location line="+13"/> + <source>Bitcoin Core</source> <translation type="unfinished"/> </message> <message> - <location line="+2"/> + <location line="-11"/> <source>Usage:</source> <translation type="unfinished"/> </message> @@ -841,17 +1132,17 @@ Address: %4 </message> <message> <location line="+9"/> - <source>Welcome to Bitcoin-Qt.</source> + <source>Welcome to Bitcoin Core.</source> <translation type="unfinished"/> </message> <message> <location line="+26"/> - <source>As this is the first time the program is launched, you can choose where Bitcoin-Qt will store its data.</source> + <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source> <translation type="unfinished"/> </message> <message> <location line="+10"/> - <source>Bitcoin-Qt will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source> + <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source> <translation type="unfinished"/> </message> <message> @@ -865,7 +1156,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../intro.cpp" line="+105"/> + <location filename="../intro.cpp" line="+85"/> + <source>Bitcoin</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Error: Specified data directory "%1" can not be created.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+19"/> <source>Error</source> <translation type="unfinished"/> </message> @@ -881,6 +1182,34 @@ Address: %4 </message> </context> <context> + <name>OpenURIDialog</name> + <message> + <location filename="../forms/openuridialog.ui" line="+14"/> + <source>Open URI</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Open payment request from URI or file</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+9"/> + <source>URI:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+11"/> + <source>Select payment request file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../openuridialog.cpp" line="+47"/> + <source>Select payment request file to open</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OptionsDialog</name> <message> <location filename="../forms/optionsdialog.ui" line="+14"/> @@ -1038,6 +1367,16 @@ Address: %4 <translation type="unfinished"/> </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="+71"/> <source>&OK</source> <translation type="unfinished"/> @@ -1053,12 +1392,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../optionsdialog.cpp" line="+58"/> + <location filename="../optionsdialog.cpp" line="+63"/> <source>default</source> <translation type="unfinished"/> </message> <message> - <location line="+130"/> + <location line="+131"/> <source>Confirm options reset</source> <translation type="unfinished"/> </message> @@ -1099,17 +1438,17 @@ Address: %4 </message> <message> <location line="+50"/> - <location line="+202"/> + <location line="+214"/> <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source> <translation type="unfinished"/> </message> <message> - <location line="-131"/> + <location line="-140"/> <source>Unconfirmed:</source> <translation type="unfinished"/> </message> <message> - <location line="-78"/> + <location line="-81"/> <source>Wallet</source> <translation type="unfinished"/> </message> @@ -1124,12 +1463,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+29"/> + <location line="+32"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation type="unfinished"/> </message> <message> - <location line="+13"/> + <location line="+16"/> <source>Immature:</source> <translation type="unfinished"/> </message> @@ -1139,7 +1478,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+13"/> + <location line="+16"/> <source>Total:</source> <translation type="unfinished"/> </message> @@ -1149,12 +1488,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+53"/> + <location line="+56"/> <source><b>Recent transactions</b></source> <translation type="unfinished"/> </message> <message> - <location filename="../overviewpage.cpp" line="+116"/> + <location filename="../overviewpage.cpp" line="+120"/> <location line="+1"/> <source>out of sync</source> <translation type="unfinished"/> @@ -1163,7 +1502,7 @@ Address: %4 <context> <name>PaymentServer</name> <message> - <location filename="../paymentserver.cpp" line="+392"/> + <location filename="../paymentserver.cpp" line="+397"/> <source>URI handling</source> <translation type="unfinished"/> </message> @@ -1173,23 +1512,29 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+69"/> + <location line="+91"/> <source>Requested payment amount of %1 is too small (considered dust).</source> <translation type="unfinished"/> </message> <message> - <location line="+4"/> - <location line="+37"/> + <location line="-204"/> + <location line="+195"/> + <location line="+13"/> <source>Payment request error</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Insecure requests to custom payment scripts unsupported</source> + <location line="-207"/> + <source>Cannot start bitcoin: click-to-pay handler</source> <translation type="unfinished"/> </message> <message> - <location line="+38"/> + <location line="+195"/> + <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> @@ -1199,7 +1544,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>Bad response from server %1</source> <translation type="unfinished"/> </message> @@ -1209,8 +1554,8 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-58"/> - <location line="+30"/> + <location line="-55"/> + <location line="+27"/> <location line="+17"/> <source>Network request error</source> <translation type="unfinished"/> @@ -1219,9 +1564,8 @@ Address: %4 <context> <name>QObject</name> <message> - <location filename="../bitcoin.cpp" line="+114"/> + <location filename="../bitcoin.cpp" line="+119"/> <location line="+5"/> - <location filename="../intro.cpp" line="-32"/> <source>Bitcoin</source> <translation type="unfinished"/> </message> @@ -1235,16 +1579,11 @@ Address: %4 <source>Error: Invalid combination of -regtest and -testnet.</source> <translation type="unfinished"/> </message> - <message> - <location filename="../intro.cpp" line="+1"/> - <source>Error: Specified data directory "%1" can not be created.</source> - <translation type="unfinished"/> - </message> </context> <context> <name>QRImageWidget</name> <message> - <location filename="../receiverequestdialog.cpp" line="+32"/> + <location filename="../receiverequestdialog.cpp" line="+36"/> <source>&Save Image...</source> <translation type="unfinished"/> </message> @@ -1260,7 +1599,7 @@ Address: %4 </message> <message> <location line="+0"/> - <source>PNG Images (*.png)</source> + <source>PNG Image (*.png)</source> <translation type="unfinished"/> </message> </context> @@ -1281,7 +1620,7 @@ Address: %4 <location line="+53"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+352"/> + <location filename="../rpcconsole.cpp" line="+360"/> <source>N/A</source> <translation type="unfinished"/> </message> @@ -1296,7 +1635,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+68"/> + <location line="-10"/> + <source>Debug window</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+78"/> <source>Using OpenSSL version</source> <translation type="unfinished"/> </message> @@ -1351,12 +1695,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+7"/> - <source>Show the Bitcoin-Qt help message to get a list with possible Bitcoin command-line options.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> + <location line="+10"/> <source>&Show</source> <translation type="unfinished"/> </message> @@ -1396,12 +1735,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-104"/> - <source>Bitcoin - Debug window</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+25"/> + <location line="-79"/> <source>Bitcoin Core</source> <translation type="unfinished"/> </message> @@ -1416,7 +1750,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+102"/> + <location line="+26"/> + <source>Show the Bitcoin-Core help message to get a list with possible Bitcoin command-line options.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+76"/> <source>Clear console</source> <translation type="unfinished"/> </message> @@ -1474,37 +1813,32 @@ Address: %4 <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+22"/> + <location filename="../forms/receivecoinsdialog.ui" line="+83"/> <source>&Amount:</source> <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+19"/> <source>The amount to request</source> <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="-32"/> <source>&Label:</source> <translation type="unfinished"/> </message> <message> - <location line="+10"/> - <source>The label to associate with the receiving address</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+7"/> + <location line="-34"/> <source>&Message:</source> <translation type="unfinished"/> </message> <message> - <location line="+10"/> + <location line="+20"/> <source>The message to attach to payment request</source> <translation type="unfinished"/> </message> <message> - <location line="+14"/> + <location line="-37"/> <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> @@ -1514,12 +1848,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="+27"/> + <source>The label to associate with the new receiving address</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+14"/> <source>Use this form to request payments. All fields are optional.</source> <translation type="unfinished"/> </message> <message> - <location line="+17"/> + <location line="+56"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -1533,6 +1872,31 @@ Address: %4 <source>&Request payment</source> <translation type="unfinished"/> </message> + <message> + <location line="+47"/> + <source>Previously requested payments</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> + <source>Show the selected request (does the same as double clicking an entry)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Show</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+11"/> + <source>Remove the selected entries from the list</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Remove</source> + <translation type="unfinished"/> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -1553,16 +1917,11 @@ Address: %4 </message> <message> <location line="+7"/> - <source>&Copy Image</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+7"/> <source>&Save Image...</source> <translation type="unfinished"/> </message> <message> - <location filename="../receiverequestdialog.cpp" line="+58"/> + <location filename="../receiverequestdialog.cpp" line="+56"/> <source>Request payment to %1</source> <translation type="unfinished"/> </message> @@ -1579,7 +1938,7 @@ Address: %4 <message> <location line="+2"/> <source>Address</source> - <translation type="unfinished"/> + <translation>Alamat</translation> </message> <message> <location line="+2"/> @@ -1608,16 +1967,119 @@ Address: %4 </message> </context> <context> + <name>RecentRequestsTableModel</name> + <message> + <location filename="../recentrequeststablemodel.cpp" line="+14"/> + <source>Date</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>Label</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>Message</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>Amount</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+36"/> + <source>(no label)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+9"/> + <source>(no message)</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="+14"/> - <location filename="../sendcoinsdialog.cpp" line="+140"/> - <location line="+213"/> + <location filename="../sendcoinsdialog.cpp" line="+381"/> + <location line="+81"/> <source>Send Coins</source> <translation type="unfinished"/> </message> <message> - <location line="+50"/> + <location line="+76"/> + <source>Coin Control Features</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+20"/> + <source>Inputs...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> + <source>automatically selected</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+19"/> + <source>Insufficient funds!</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+89"/> + <source>Quantity:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+35"/> + <source>Bytes:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+48"/> + <source>Amount:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+32"/> + <source>Priority:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+48"/> + <source>Fee:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+32"/> + <source>Low Output:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+48"/> + <source>After Fee:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+32"/> + <source>Change:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+44"/> + <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Custom change address</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+115"/> <source>Send to multiple recipients at once</source> <translation type="unfinished"/> </message> @@ -1639,15 +2101,10 @@ Address: %4 <message> <location line="+22"/> <source>Balance:</source> - <translation type="unfinished"/> + <translation>Baki</translation> </message> <message> - <location line="+10"/> - <source>123.456 BTC</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+31"/> + <location line="+41"/> <source>Confirm the send action</source> <translation type="unfinished"/> </message> @@ -1657,69 +2114,135 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-154"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation type="unfinished"/> </message> <message> - <location line="-90"/> + <location line="-74"/> <location line="+5"/> <location line="+5"/> + <location line="+4"/> <source>%1 to %2</source> <translation type="unfinished"/> </message> <message> - <location line="+26"/> + <location line="-136"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+15"/> + <source>Copy quantity</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy fee</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy after fee</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy bytes</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy priority</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy low output</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy change</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+170"/> + <source>Total Amount %1 (= %2)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>or</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+202"/> <source>The recipient address is not valid, please recheck.</source> <translation type="unfinished"/> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>The amount to pay must be larger than 0.</source> <translation type="unfinished"/> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>The amount exceeds your balance.</source> <translation type="unfinished"/> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>The total exceeds your balance when the %1 transaction fee is included.</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+3"/> <source>Duplicate address found, can only send to each address once per send operation.</source> <translation type="unfinished"/> </message> <message> + <location line="+3"/> + <source>Transaction creation failed!</source> + <translation type="unfinished"/> + </message> + <message> <location line="+4"/> - <source>Error: Transaction creation failed!</source> + <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation type="unfinished"/> </message> <message> - <location line="+15"/> - <source>Are you sure you want to send?</source> + <location line="+113"/> + <source>Warning: Invalid Bitcoin address</source> <translation type="unfinished"/> </message> <message> - <location line="+9"/> - <source>added as transaction fee</source> + <location line="+13"/> + <source>(no label)</source> <translation type="unfinished"/> </message> <message> - <location line="+6"/> - <source>Total Amount %1</source> + <location line="+8"/> + <source>Warning: Unknown change address</source> <translation type="unfinished"/> </message> <message> - <location line="+20"/> - <source>Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> + <location line="-378"/> + <source>Are you sure you want to send?</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+9"/> + <source>added as transaction fee</source> <translation type="unfinished"/> </message> <message> - <location line="+144"/> + <location line="+170"/> <source>Payment request expired</source> <translation type="unfinished"/> </message> @@ -1732,39 +2255,44 @@ Address: %4 <context> <name>SendCoinsEntry</name> <message> - <location filename="../forms/sendcoinsentry.ui" line="+33"/> - <location line="+585"/> + <location filename="../forms/sendcoinsentry.ui" line="+131"/> + <location line="+501"/> + <location line="+536"/> <source>A&mount:</source> <translation type="unfinished"/> </message> <message> - <location line="-572"/> - <location line="+585"/> + <location line="-1132"/> <source>Pay &To:</source> <translation type="unfinished"/> </message> <message> - <location line="-551"/> + <location line="+18"/> <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation type="unfinished"/> </message> <message> - <location filename="../sendcoinsentry.cpp" line="+28"/> + <location filename="../sendcoinsentry.cpp" line="+30"/> <source>Enter a label for this address to add it to your address book</source> <translation type="unfinished"/> </message> <message> - <location filename="../forms/sendcoinsentry.ui" line="-18"/> + <location filename="../forms/sendcoinsentry.ui" line="+57"/> <source>&Label:</source> <translation type="unfinished"/> </message> <message> - <location line="+28"/> + <location line="-50"/> <source>Choose previously used address</source> <translation type="unfinished"/> </message> <message> - <location line="+10"/> + <location line="-40"/> + <source>This is a normal payment.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+50"/> <source>Alt+A</source> <translation type="unfinished"/> </message> @@ -1780,16 +2308,35 @@ Address: %4 </message> <message> <location line="+7"/> - <source>Remove this recipient</source> + <location line="+504"/> + <location line="+536"/> + <source>Remove this entry</source> <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="-40"/> + <source>This is a verified payment request.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-971"/> <source>Enter a label for this address to add it to the list of used addresses</source> <translation type="unfinished"/> </message> <message> - <location line="+465"/> + <location line="+439"/> + <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> @@ -1910,7 +2457,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../signverifymessagedialog.cpp" line="+27"/> + <location filename="../signverifymessagedialog.cpp" line="+29"/> <location line="+3"/> <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation type="unfinished"/> @@ -1926,7 +2473,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+85"/> + <location line="+84"/> <location line="+81"/> <source>The entered address is invalid.</source> <translation type="unfinished"/> @@ -1995,8 +2542,13 @@ Address: %4 <context> <name>SplashScreen</name> <message> - <location filename="../splashscreen.cpp" line="+23"/> - <source>The Bitcoin developers</source> + <location filename="../splashscreen.cpp" line="+26"/> + <source>Bitcoin Core</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>The Bitcoin Core developers</source> <translation type="unfinished"/> </message> <message> @@ -2008,7 +2560,7 @@ Address: %4 <context> <name>TrafficGraphWidget</name> <message> - <location filename="../trafficgraphwidget.cpp" line="+75"/> + <location filename="../trafficgraphwidget.cpp" line="+79"/> <source>KB/s</source> <translation type="unfinished"/> </message> @@ -2016,7 +2568,7 @@ Address: %4 <context> <name>TransactionDesc</name> <message> - <location filename="../transactiondesc.cpp" line="+22"/> + <location filename="../transactiondesc.cpp" line="+28"/> <source>Open until %1</source> <translation type="unfinished"/> </message> @@ -2208,7 +2760,7 @@ Address: %4 <context> <name>TransactionTableModel</name> <message> - <location filename="../transactiontablemodel.cpp" line="+227"/> + <location filename="../transactiontablemodel.cpp" line="+234"/> <source>Date</source> <translation type="unfinished"/> </message> @@ -2220,7 +2772,7 @@ Address: %4 <message> <location line="+0"/> <source>Address</source> - <translation type="unfinished"/> + <translation>Alamat</translation> </message> <message> <location line="+0"/> @@ -2326,7 +2878,7 @@ Address: %4 <context> <name>TransactionView</name> <message> - <location filename="../transactionview.cpp" line="+52"/> + <location filename="../transactionview.cpp" line="+57"/> <location line="+16"/> <source>All</source> <translation type="unfinished"/> @@ -2387,12 +2939,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>Enter address or label to search</source> <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>Min amount</source> <translation type="unfinished"/> </message> @@ -2427,17 +2979,37 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+143"/> - <source>Export Transaction Data</source> + <location line="+142"/> + <source>Export Transaction History</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Comma separated file (*.csv)</source> + <location line="+19"/> + <source>Exporting Failed</source> <translation type="unfinished"/> </message> <message> - <location line="+8"/> + <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>Fail yang dipisahkan dengan koma</translation> + </message> + <message> + <location line="+9"/> <source>Confirmed</source> <translation type="unfinished"/> </message> @@ -2459,7 +3031,7 @@ Address: %4 <message> <location line="+1"/> <source>Address</source> - <translation type="unfinished"/> + <translation>Alamat</translation> </message> <message> <location line="+1"/> @@ -2472,17 +3044,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+4"/> - <source>Error exporting</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+0"/> - <source>Could not write to file %1.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+100"/> + <location line="+107"/> <source>Range:</source> <translation type="unfinished"/> </message> @@ -2493,9 +3055,17 @@ Address: %4 </message> </context> <context> + <name>WalletFrame</name> + <message> + <location filename="../walletframe.cpp" line="+26"/> + <source>No wallet has been loaded.</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>WalletModel</name> <message> - <location filename="../walletmodel.cpp" line="+218"/> + <location filename="../walletmodel.cpp" line="+245"/> <source>Send Coins</source> <translation type="unfinished"/> </message> @@ -2503,7 +3073,7 @@ Address: %4 <context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+46"/> + <location filename="../walletview.cpp" line="+43"/> <source>&Export</source> <translation type="unfinished"/> </message> @@ -2513,65 +3083,60 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+183"/> + <location line="+181"/> <source>Backup Wallet</source> <translation type="unfinished"/> </message> <message> - <location line="+0"/> + <location line="+1"/> <source>Wallet Data (*.dat)</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Backup Failed</source> <translation type="unfinished"/> </message> <message> <location line="+0"/> - <source>There was an error trying to save the wallet data to the new location.</source> + <source>There was an error trying to save the wallet data to %1.</source> <translation type="unfinished"/> </message> <message> <location line="+4"/> - <source>Backup Successful</source> + <source>The wallet data was successfully saved to %1.</source> <translation type="unfinished"/> </message> <message> <location line="+0"/> - <source>The wallet data was successfully saved to the new location.</source> + <source>Backup Successful</source> <translation type="unfinished"/> </message> </context> <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+102"/> - <source>Bitcoin version</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+107"/> + <location filename="../bitcoinstrings.cpp" line="+217"/> <source>Usage:</source> <translation type="unfinished"/> </message> <message> - <location line="-55"/> + <location line="-54"/> <source>List commands</source> <translation type="unfinished"/> </message> <message> - <location line="-13"/> + <location line="-14"/> <source>Get help for a command</source> <translation type="unfinished"/> </message> <message> - <location line="+25"/> + <location line="+26"/> <source>Options:</source> <translation type="unfinished"/> </message> <message> - <location line="+24"/> + <location line="+23"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation type="unfinished"/> </message> @@ -2591,7 +3156,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-28"/> + <location line="-27"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation type="unfinished"/> </message> @@ -2601,7 +3166,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-49"/> + <location line="-50"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation type="unfinished"/> </message> @@ -2616,7 +3181,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-142"/> + <location line="-147"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"/> </message> @@ -2631,7 +3196,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+40"/> + <location line="+45"/> <source>Accept command line and JSON-RPC commands</source> <translation type="unfinished"/> </message> @@ -2641,17 +3206,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+40"/> + <location line="+39"/> <source>Use the test network</source> <translation type="unfinished"/> </message> <message> - <location line="-118"/> + <location line="-117"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> <message> - <location line="-87"/> + <location line="-92"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2706,17 +3271,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+11"/> - <source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source> + <location line="+18"/> + <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation type="unfinished"/> </message> <message> - <location line="+6"/> - <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> + <location line="+5"/> + <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+3"/> <source>Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source> <translation type="unfinished"/> </message> @@ -2746,17 +3311,27 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+14"/> + <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="+2"/> + <location line="+1"/> <source>Block creation options:</source> <translation type="unfinished"/> </message> @@ -2766,7 +3341,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+2"/> + <location line="+1"/> + <source>Connect through SOCKS proxy</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Connect to JSON-RPC on <port> (default: 8332 or testnet: 18332)</source> <translation type="unfinished"/> </message> @@ -2876,7 +3456,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+2"/> + <location line="+1"/> + <source>Fee per kB to add to transactions you send</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Find peers using DNS lookup (default: 1 unless -connect)</source> <translation type="unfinished"/> </message> @@ -2896,6 +3481,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <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"/> @@ -2911,17 +3501,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+8"/> + <location line="+5"/> + <source>Prepend debug output with timestamp (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>RPC client options:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+5"/> + <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Send command to Bitcoin server</source> <translation type="unfinished"/> </message> <message> - <location line="+10"/> + <location line="+8"/> + <source>Set maximum block size in bytes (default: %d)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>Set the number of threads to service RPC calls (default: 4)</source> <translation type="unfinished"/> </message> @@ -2941,7 +3551,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>Verifying blocks...</source> <translation type="unfinished"/> </message> @@ -2952,11 +3562,21 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> + <source>Wait for RPC server to start</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Wallet %s resides outside data directory %s</source> <translation type="unfinished"/> </message> <message> - <location line="+4"/> + <location line="+3"/> + <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> @@ -2966,17 +3586,27 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-98"/> + <location line="-104"/> <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> <translation type="unfinished"/> </message> <message> - <location line="+17"/> + <location line="+14"/> + <source>Output debugging information (default: 0, supplying <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="+83"/> + <location line="+88"/> <source>Information</source> <translation type="unfinished"/> </message> @@ -3016,32 +3646,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+2"/> - <source>Output extra debugging information. Implies all other -debug* options</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Output extra network debugging information</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> - <source>Prepend debug output with timestamp</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+5"/> + <location line="+9"/> <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Select the version of socks proxy to use (4-5, default: 5)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> + <location line="+4"/> <source>Send trace/debug info to console instead of debug.log file</source> <translation type="unfinished"/> </message> @@ -3051,12 +3661,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+5"/> - <source>Set maximum block size in bytes (default: 250000)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> + <location line="+6"/> <source>Set minimum block size in bytes (default: 0)</source> <translation type="unfinished"/> </message> @@ -3106,37 +3711,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Use proxy to reach tor hidden services (default: same as -proxy)</source> - <translation type="unfinished"/> - </message> - <message> <location line="+2"/> <source>Username for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Warning</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Warning: This version is obsolete, upgrade required!</source> <translation type="unfinished"/> </message> <message> <location line="+2"/> + <source>version</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>wallet.dat corrupt, salvage failed</source> <translation type="unfinished"/> </message> <message> - <location line="-54"/> + <location line="-57"/> <source>Password for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-70"/> + <location line="-69"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation type="unfinished"/> </message> @@ -3146,12 +3751,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-126"/> + <location line="-131"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+155"/> + <location line="+160"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"/> </message> @@ -3191,22 +3796,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-95"/> - <source>Connect through socks proxy</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-11"/> + <location line="-106"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation type="unfinished"/> </message> <message> - <location line="+58"/> + <location line="+59"/> <source>Loading addresses...</source> <translation type="unfinished"/> </message> <message> - <location line="-36"/> + <location line="-37"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation type="unfinished"/> </message> @@ -3226,12 +3826,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+30"/> + <location line="+31"/> <source>Invalid -proxy address: '%s'</source> <translation type="unfinished"/> </message> <message> - <location line="+57"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation type="unfinished"/> </message> @@ -3251,7 +3851,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+46"/> + <location line="+47"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation type="unfinished"/> </message> @@ -3271,27 +3871,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-60"/> + <location line="-61"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"/> </message> <message> - <location line="-28"/> + <location line="-32"/> <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source> <translation type="unfinished"/> </message> <message> - <location line="+69"/> - <source>Fee per KB to add to transactions you send</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+20"/> + <location line="+94"/> <source>Loading wallet...</source> <translation type="unfinished"/> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> @@ -3321,7 +3916,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-33"/> + <location line="-34"/> <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 0b627c2dd2..88ae1f40cc 100644 --- a/src/qt/locale/bitcoin_nb.ts +++ b/src/qt/locale/bitcoin_nb.ts @@ -3,13 +3,13 @@ <name>AboutDialog</name> <message> <location filename="../forms/aboutdialog.ui" line="+14"/> - <source>About Bitcoin</source> - <translation>Om Bitcoin</translation> + <source>About Bitcoin Core</source> + <translation>Om Bitcoin Core</translation> </message> <message> <location line="+39"/> - <source><b>Bitcoin</b> version</source> - <translation><b>Bitcoin</b> versjon</translation> + <source><b>Bitcoin Core</b> version</source> + <translation><b>Bitcoin Core</b> versjon</translation> </message> <message> <location line="+57"/> @@ -27,7 +27,7 @@ Distribuert under MIT/X11 programvarelisensen, se medfølgende fil COPYING eller Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i OpenSSL Toolkit (http://www.openssl.org/) og kryptografisk programvare skrevet av Eric Young (eay@cryptsoft.com) og UPnP programvare skrevet av Thomas Bernard.</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="+14"/> + <location filename="../aboutdialog.cpp" line="+19"/> <source>Copyright</source> <translation type="unfinished"/> </message> @@ -52,7 +52,7 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <message> <location line="+3"/> <source>&New</source> - <translation type="unfinished"/> + <translation>&Ny</translation> </message> <message> <location line="+11"/> @@ -62,15 +62,15 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <message> <location line="+3"/> <source>&Copy</source> - <translation type="unfinished"/> + <translation>&Kopier</translation> </message> <message> <location line="+52"/> <source>C&lose</source> - <translation type="unfinished"/> + <translation>&Lukk</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="+72"/> + <location filename="../addressbookpage.cpp" line="+74"/> <source>&Copy Address</source> <translation>&Kopier Adresse</translation> </message> @@ -97,37 +97,37 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <message> <location filename="../addressbookpage.cpp" line="-30"/> <source>Choose the address to send coins to</source> - <translation type="unfinished"/> + <translation>Velg adressen å sende mynter til</translation> </message> <message> <location line="+1"/> <source>Choose the address to receive coins with</source> - <translation type="unfinished"/> + <translation>Velg adressen til å motta mynter med</translation> </message> <message> <location line="+5"/> <source>C&hoose</source> - <translation type="unfinished"/> + <translation>&Velg</translation> </message> <message> <location line="+6"/> <source>Sending addresses</source> - <translation type="unfinished"/> + <translation>Utsendingsadresser</translation> </message> <message> <location line="+1"/> <source>Receiving addresses</source> - <translation type="unfinished"/> + <translation>Mottaksadresser</translation> </message> <message> <location line="+7"/> <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> - <translation type="unfinished"/> + <translation>Dette er dine Bitcoin adresser for å sende betalinger. Alltid sjekk mengden og mottaker adresse 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 type="unfinished"/> + <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"/> @@ -140,9 +140,9 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <translation>&Rediger</translation> </message> <message> - <location line="+197"/> + <location line="+194"/> <source>Export Address List</source> - <translation type="unfinished"/> + <translation>Ekporter Adresseliste</translation> </message> <message> <location line="+1"/> @@ -163,7 +163,7 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <context> <name>AddressTableModel</name> <message> - <location filename="../addresstablemodel.cpp" line="+164"/> + <location filename="../addresstablemodel.cpp" line="+168"/> <source>Label</source> <translation>Merkelapp</translation> </message> @@ -201,7 +201,7 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <translation>Gjenta ny adgangsfrase</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="+34"/> + <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>Skriv inn den nye adgangsfrasen for lommeboken.<br/>Vennligst bruk en adgangsfrase med <b>10 eller flere tilfeldige tegn</b>, eller <b>åtte eller flere ord</b>.</translation> </message> @@ -322,17 +322,17 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+250"/> + <location filename="../bitcoingui.cpp" line="+260"/> <source>Sign &message...</source> <translation>Signer &melding...</translation> </message> <message> - <location line="+254"/> + <location line="+290"/> <source>Synchronizing with network...</source> <translation>Synkroniserer med nettverk...</translation> </message> <message> - <location line="-324"/> + <location line="-360"/> <source>&Overview</source> <translation>&Oversikt</translation> </message> @@ -398,7 +398,7 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <translation>&Endre Adgangsfrase...</translation> </message> <message> - <location line="+259"/> + <location line="+295"/> <source>Importing blocks from disk...</source> <translation>Importere blokker...</translation> </message> @@ -408,7 +408,7 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <translation>Re-indekserer blokker på disk...</translation> </message> <message> - <location line="-322"/> + <location line="-358"/> <source>Send coins to a Bitcoin address</source> <translation>Send til en Bitcoin-adresse</translation> </message> @@ -443,20 +443,18 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <translation>&Verifiser melding...</translation> </message> <message> - <location line="-180"/> - <location line="+6"/> - <location line="+513"/> + <location line="+375"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-519"/> - <location line="+6"/> + <location line="-563"/> + <location line="+10"/> <source>Wallet</source> <translation>Lommebok</translation> </message> <message> - <location line="+109"/> + <location line="+113"/> <source>&Send</source> <translation>&Send</translation> </message> @@ -466,13 +464,7 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <translation>&Motta</translation> </message> <message> - <location line="+28"/> - <location line="+2"/> - <source>&About Bitcoin</source> - <translation>&Om Bitcoin</translation> - </message> - <message> - <location line="+14"/> + <location line="+44"/> <location line="+2"/> <source>&Show / Hide</source> <translation>&Gjem / vis</translation> @@ -498,12 +490,12 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <translation>Bekreft meldinger for å være sikker på at de ble signert av en angitt Bitcoin-adresse</translation> </message> <message> - <location line="+35"/> + <location line="+39"/> <source>&File</source> <translation>&Fil</translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>&Settings</source> <translation>&Innstillinger</translation> </message> @@ -518,44 +510,66 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <translation>Verktøylinje for faner</translation> </message> <message> - <location line="-235"/> - <location line="+294"/> + <location line="-244"/> + <location line="+321"/> <source>[testnet]</source> <translation>[testnett]</translation> </message> <message> - <location line="-177"/> + <location line="-331"/> + <location line="+10"/> + <source>Bitcoin Core</source> + <translation>Bitcoin Kjerne</translation> + </message> + <message> + <location line="+121"/> <source>Request payments (generates QR codes and bitcoin: URIs)</source> - <translation type="unfinished"/> + <translation>Forespør betalinger (genererer QR koder og bitcoin: URIs)</translation> </message> <message> - <location line="+63"/> + <location line="+27"/> + <location line="+2"/> + <source>&About Bitcoin Core</source> + <translation>&Om Bitcoin Core</translation> + </message> + <message> + <location line="+34"/> <source>&Used sending addresses...</source> - <translation type="unfinished"/> + <translation>Br&ukte utsendingsadresser...</translation> </message> <message> <location line="+1"/> <source>Show the list of used sending addresses and labels</source> - <translation type="unfinished"/> + <translation>Vis listen av brukte utsendingsadresser og merkelapper</translation> </message> <message> <location line="+1"/> <source>Used &receiving addresses...</source> - <translation type="unfinished"/> + <translation>B&rukte mottaksadresser...</translation> </message> <message> <location line="+1"/> <source>Show the list of used receiving addresses and labels</source> - <translation type="unfinished"/> + <translation>Vis listen over bruke mottaksadresser og merkelapper</translation> + </message> + <message> + <location line="+2"/> + <source>Open URI...</source> + <translation>Åpne URI...</translation> + </message> + <message> + <location line="+1"/> + <source>Open a bitcoin: URI or payment request</source> + <translation>Åpne en bitcoin: URI eller betalingsetterspørring</translation> </message> <message> - <location line="+106"/> + <location line="+126"/> <location line="+5"/> <source>Bitcoin client</source> <translation>Bitcoinklient</translation> </message> <message numerus="yes"> - <location line="+120"/> + <location line="+133"/> <source>%n active connection(s) to Bitcoin network</source> <translation><numerusform>%n aktiv forbindelse til Bitcoin-nettverket</numerusform><numerusform>%n aktive forbindelser til Bitcoin-nettverket</numerusform></translation> </message> @@ -567,7 +581,7 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <message> <location line="+12"/> <source>Processed %1 of %2 (estimated) blocks of transaction history.</source> - <translation type="unfinished"/> + <translation>Lastet %1 av %2 (estimert) blokker med transaksjonshistorikk.</translation> </message> <message> <location line="+4"/> @@ -592,7 +606,7 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <message> <location line="+4"/> <source>%1 behind</source> - <translation type="unfinished"/> + <translation>%1 bak</translation> </message> <message> <location line="+14"/> @@ -663,17 +677,7 @@ Adresse: %4 </translation> </message> <message> - <location line="+34"/> - <source>URI handling</source> - <translation>URI håndtering</translation> - </message> - <message> - <location line="+0"/> - <source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source> - <translation>URI kunne ikke tolkes! Dette kan forårsakes av en ugyldig Bitcoin-adresse eller feil i URI-parametere.</translation> - </message> - <message> - <location line="+45"/> + <location line="+67"/> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>Lommeboken er <b>kryptert</b> og for tiden <b>ulåst</b></translation> </message> @@ -683,7 +687,7 @@ Adresse: %4 <translation>Lommeboken er <b>kryptert</b> og for tiden <b>låst</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+110"/> + <location filename="../bitcoin.cpp" line="+116"/> <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> @@ -691,12 +695,299 @@ Adresse: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+115"/> + <location filename="../clientmodel.cpp" line="+119"/> <source>Network Alert</source> <translation>Nettverksvarsel</translation> </message> </context> <context> + <name>CoinControlDialog</name> + <message> + <location filename="../forms/coincontroldialog.ui" line="+14"/> + <source>Coin Control Address Selection</source> + <translation>Mynt Kontroll Adresse Valg</translation> + </message> + <message> + <location line="+34"/> + <source>Quantity:</source> + <translation>Mengde:</translation> + </message> + <message> + <location line="+29"/> + <source>Bytes:</source> + <translation>Bytes:</translation> + </message> + <message> + <location line="+45"/> + <source>Amount:</source> + <translation>Beløp:</translation> + </message> + <message> + <location line="+29"/> + <source>Priority:</source> + <translation>Prioritet:</translation> + </message> + <message> + <location line="+45"/> + <source>Fee:</source> + <translation>Avgift:</translation> + </message> + <message> + <location line="+32"/> + <source>Low Output:</source> + <translation>Lav Utdata:</translation> + </message> + <message> + <location line="+48"/> + <source>After Fee:</source> + <translation>Etter Avgift:</translation> + </message> + <message> + <location line="+32"/> + <source>Change:</source> + <translation>Endring:</translation> + </message> + <message> + <location line="+63"/> + <source>(un)select all</source> + <translation>Fjern alt valgt</translation> + </message> + <message> + <location line="+13"/> + <source>Tree mode</source> + <translation>Tre modus</translation> + </message> + <message> + <location line="+16"/> + <source>List mode</source> + <translation>Liste modus</translation> + </message> + <message> + <location line="+52"/> + <source>Amount</source> + <translation>Beløp</translation> + </message> + <message> + <location line="+10"/> + <source>Address</source> + <translation>Adresse</translation> + </message> + <message> + <location line="+5"/> + <source>Date</source> + <translation>Dato</translation> + </message> + <message> + <location line="+5"/> + <source>Confirmations</source> + <translation>Bekreftelser</translation> + </message> + <message> + <location line="+3"/> + <source>Confirmed</source> + <translation>Bekreftet</translation> + </message> + <message> + <location line="+5"/> + <source>Priority</source> + <translation>Prioritet</translation> + </message> + <message> + <location filename="../coincontroldialog.cpp" line="+42"/> + <source>Copy address</source> + <translation>Kopier adresse</translation> + </message> + <message> + <location line="+1"/> + <source>Copy label</source> + <translation>Kopier merkelapp</translation> + </message> + <message> + <location line="+1"/> + <location line="+26"/> + <source>Copy amount</source> + <translation>Kopiér beløp</translation> + </message> + <message> + <location line="-25"/> + <source>Copy transaction ID</source> + <translation>Kopier transaksjons-ID</translation> + </message> + <message> + <location line="+1"/> + <source>Lock unspent</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Unlock unspent</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+22"/> + <source>Copy quantity</source> + <translation>Kopier mengde</translation> + </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>høyest</translation> + </message> + <message> + <location line="+1"/> + <source>higher</source> + <translation>høyere</translation> + </message> + <message> + <location line="+1"/> + <source>high</source> + <translation>høy</translation> + </message> + <message> + <location line="+1"/> + <source>medium-high</source> + <translation>medium-høy</translation> + </message> + <message> + <location line="+1"/> + <source>medium</source> + <translation>medium</translation> + </message> + <message> + <location line="+4"/> + <source>low-medium</source> + <translation>lav-medium</translation> + </message> + <message> + <location line="+1"/> + <source>low</source> + <translation>lav</translation> + </message> + <message> + <location line="+1"/> + <source>lower</source> + <translation>lavere</translation> + </message> + <message> + <location line="+1"/> + <source>lowest</source> + <translation>lavest</translation> + </message> + <message> + <location line="+11"/> + <source>(%1 locked)</source> + <translation>(%1 låst)</translation> + </message> + <message> + <location line="+171"/> + <source>Dust</source> + <translation>Støv</translation> + </message> + <message> + <location line="+0"/> + <source>yes</source> + <translation>ja</translation> + </message> + <message> + <location line="+0"/> + <source>no</source> + <translation>nei</translation> + </message> + <message> + <location line="+10"/> + <source>This label turns red, if the transaction size is greater than 1000 bytes.</source> + <translation>Denne merkelappen blir rød, hvis transaksjonsstørrelsen er større enn 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>Dette betyr at en avgift på minst %1 per KB er påkrevd.</translation> + </message> + <message> + <location line="-4"/> + <source>Can vary +/- 1 byte per input.</source> + <translation>Kan variere +/- 1 byte per input.</translation> + </message> + <message> + <location line="+2"/> + <source>Transactions with higher priority are more likely to get included into a block.</source> + <translation>Transaksjoner med høyere prioritet har mer sannsynlighet for å bli inkludert i en blokk.</translation> + </message> + <message> + <location line="+1"/> + <source>This label turns red, if the priority is smaller than "medium"</source> + <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> + </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> + </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> + </message> + <message> + <location line="+2"/> + <source>This label turns red, if the change is smaller than %1.</source> + <translation>Denne merkelappen blir rød, hvis endringen er mindre enn %1.</translation> + </message> + <message> + <location line="+43"/> + <location line="+66"/> + <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> + </message> + <message> + <location line="+1"/> + <source>(change)</source> + <translation>(endring)</translation> + </message> +</context> +<context> <name>EditAddressDialog</name> <message> <location filename="../forms/editaddressdialog.ui" line="+14"/> @@ -711,12 +1002,12 @@ Adresse: %4 <message> <location line="+10"/> <source>The label associated with this address list entry</source> - <translation type="unfinished"/> + <translation>Merkelappen koblet til denne adresseliste oppføringen</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>Adressen til denne oppføringen i adresseboken. Denne kan kun endres for utsendingsadresser.</translation> </message> <message> <location line="-10"/> @@ -724,7 +1015,7 @@ Adresse: %4 <translation>&Adresse</translation> </message> <message> - <location filename="../editaddressdialog.cpp" line="+21"/> + <location filename="../editaddressdialog.cpp" line="+25"/> <source>New receiving address</source> <translation>Ny mottaksadresse</translation> </message> @@ -767,9 +1058,9 @@ Adresse: %4 <context> <name>FreespaceChecker</name> <message> - <location filename="../intro.cpp" line="+61"/> + <location filename="../intro.cpp" line="+65"/> <source>A new data directory will be created.</source> - <translation type="unfinished"/> + <translation>En ny data mappe vil bli laget.</translation> </message> <message> <location line="+22"/> @@ -779,34 +1070,34 @@ Adresse: %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>Mappe finnes allerede. Legg til %1 hvis du vil lage en ny mappe her.</translation> </message> <message> <location line="+3"/> <source>Path already exists, and is not a directory.</source> - <translation type="unfinished"/> + <translation>Sti finnes allerede, og er ikke en mappe.</translation> </message> <message> <location line="+7"/> <source>Cannot create data directory here.</source> - <translation type="unfinished"/> + <translation>Kan ikke laget data mappe her.</translation> </message> </context> <context> <name>GUIUtil::HelpMessageBox</name> <message> - <location filename="../guiutil.cpp" line="+558"/> - <location line="+13"/> - <source>Bitcoin-Qt</source> - <translation>Bitcoin-Qt</translation> - </message> - <message> - <location line="-13"/> + <location filename="../guiutil.cpp" line="+597"/> <source>version</source> <translation>versjon</translation> </message> <message> - <location line="+2"/> + <location line="+0"/> + <location line="+13"/> + <source>Bitcoin Core</source> + <translation>Bitcoin Kjerne</translation> + </message> + <message> + <location line="-11"/> <source>Usage:</source> <translation>Bruk:</translation> </message> @@ -839,7 +1130,7 @@ Adresse: %4 <message> <location line="+1"/> <source>Choose data directory on startup (default: 0)</source> - <translation type="unfinished"/> + <translation>Velg data mappe ved oppstart (standard: 0)</translation> </message> </context> <context> @@ -851,43 +1142,81 @@ Adresse: %4 </message> <message> <location line="+9"/> - <source>Welcome to Bitcoin-Qt.</source> - <translation>Velkommen til Bitcoin-Qt.</translation> + <source>Welcome to Bitcoin Core.</source> + <translation>Velkommen til Bitcoin Core.</translation> </message> <message> <location line="+26"/> - <source>As this is the first time the program is launched, you can choose where Bitcoin-Qt will store its data.</source> - <translation type="unfinished"/> + <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> </message> <message> <location line="+10"/> - <source>Bitcoin-Qt will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source> - <translation type="unfinished"/> + <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> </message> <message> <location line="+10"/> <source>Use the default data directory</source> - <translation type="unfinished"/> + <translation>Bruk standard data mappe</translation> </message> <message> <location line="+7"/> <source>Use a custom data directory:</source> - <translation type="unfinished"/> + <translation>Bruk en egendefinert data mappe:</translation> + </message> + <message> + <location filename="../intro.cpp" line="+85"/> + <source>Bitcoin</source> + <translation>Bitcoin</translation> </message> <message> - <location filename="../intro.cpp" line="+105"/> + <location line="+1"/> + <source>Error: Specified data directory "%1" can not be created.</source> + <translation>Feil: Spesifisert data mappe "%1" kan ikke opprettes.</translation> + </message> + <message> + <location line="+19"/> <source>Error</source> <translation>Feil</translation> </message> <message> <location line="+9"/> <source>GB of free space available</source> - <translation type="unfinished"/> + <translation>GB av ledig lagringsplass</translation> </message> <message> <location line="+3"/> <source>(of %1GB needed)</source> - <translation type="unfinished"/> + <translation>(av %1GB behøvd)</translation> + </message> +</context> +<context> + <name>OpenURIDialog</name> + <message> + <location filename="../forms/openuridialog.ui" line="+14"/> + <source>Open URI</source> + <translation>Open URI</translation> + </message> + <message> + <location line="+6"/> + <source>Open payment request from URI or file</source> + <translation>Åpne betalingsetterspørring fra URI eller fil</translation> + </message> + <message> + <location line="+9"/> + <source>URI:</source> + <translation>URI:</translation> + </message> + <message> + <location line="+11"/> + <source>Select payment request file</source> + <translation>Velg betalingsetterspørring fil</translation> + </message> + <message> + <location filename="../openuridialog.cpp" line="+47"/> + <source>Select payment request file to open</source> + <translation>Velg betalingsetterspørrings fil å åpne</translation> </message> </context> <context> @@ -905,7 +1234,7 @@ Adresse: %4 <message> <location line="+6"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> - <translation type="unfinished"/> + <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"/> @@ -925,12 +1254,12 @@ Adresse: %4 <message> <location line="+35"/> <source>Reset all client options to default.</source> - <translation type="unfinished"/> + <translation>Tilbakestill alle klient valg til standard</translation> </message> <message> <location line="+3"/> <source>&Reset Options</source> - <translation type="unfinished"/> + <translation>&Tilbakestill Instillinger</translation> </message> <message> <location line="+13"/> @@ -1048,6 +1377,16 @@ Adresse: %4 <translation>&Vis adresser i transaksjonslisten</translation> </message> <message> + <location line="+7"/> + <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> + </message> + <message> <location line="+71"/> <source>&OK</source> <translation>&OK</translation> @@ -1063,19 +1402,19 @@ Adresse: %4 <translation>&Bruk</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+58"/> + <location filename="../optionsdialog.cpp" line="+63"/> <source>default</source> <translation>standardverdi</translation> </message> <message> - <location line="+130"/> + <location line="+131"/> <source>Confirm options reset</source> - <translation type="unfinished"/> + <translation>Bekreft innstillings tilbakestilling</translation> </message> <message> <location line="+1"/> <source>Some settings may require a client restart to take effect.</source> - <translation type="unfinished"/> + <translation>Noen innstillinger kan kreve en gjenstart av klienten for å tas i bruk.</translation> </message> <message> <location line="+0"/> @@ -1109,17 +1448,17 @@ Adresse: %4 </message> <message> <location line="+50"/> - <location line="+202"/> + <location line="+214"/> <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source> <translation>Informasjonen som vises kan være foreldet. Din lommebok synkroniseres automatisk med Bitcoin-nettverket etter at tilkobling er opprettet, men denne prosessen er ikke ferdig enda.</translation> </message> <message> - <location line="-131"/> + <location line="-140"/> <source>Unconfirmed:</source> <translation>Ubekreftet</translation> </message> <message> - <location line="-78"/> + <location line="-81"/> <source>Wallet</source> <translation>Lommebok</translation> </message> @@ -1131,15 +1470,15 @@ Adresse: %4 <message> <location line="+16"/> <source>Your current spendable balance</source> - <translation type="unfinished"/> + <translation>Din nåværende saldo</translation> </message> <message> - <location line="+29"/> + <location line="+32"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> - <translation type="unfinished"/> + <translation>Totalt antall ubekreftede transaksjoner som ikke teller med i saldo</translation> </message> <message> - <location line="+13"/> + <location line="+16"/> <source>Immature:</source> <translation>Umoden:</translation> </message> @@ -1149,7 +1488,7 @@ Adresse: %4 <translation>Minet saldo har ikke modnet enda</translation> </message> <message> - <location line="+13"/> + <location line="+16"/> <source>Total:</source> <translation>Totalt:</translation> </message> @@ -1159,12 +1498,12 @@ Adresse: %4 <translation>Din nåværende saldo</translation> </message> <message> - <location line="+53"/> + <location line="+56"/> <source><b>Recent transactions</b></source> <translation><b>Siste transaksjoner</b></translation> </message> <message> - <location filename="../overviewpage.cpp" line="+116"/> + <location filename="../overviewpage.cpp" line="+120"/> <location line="+1"/> <source>out of sync</source> <translation>ute av synk</translation> @@ -1173,7 +1512,7 @@ Adresse: %4 <context> <name>PaymentServer</name> <message> - <location filename="../paymentserver.cpp" line="+392"/> + <location filename="../paymentserver.cpp" line="+397"/> <source>URI handling</source> <translation>URI håndtering</translation> </message> @@ -1183,85 +1522,85 @@ Adresse: %4 <translation>URI kunne ikke tolkes! Dette kan forårsakes av en ugyldig Bitcoin-adresse eller feil i URI-parametere.</translation> </message> <message> - <location line="+69"/> + <location line="+91"/> <source>Requested payment amount of %1 is too small (considered dust).</source> - <translation type="unfinished"/> + <translation>Forespurt betalingsmengde på %1 er for liten (betraktet som støv).</translation> </message> <message> - <location line="+4"/> - <location line="+37"/> + <location line="-204"/> + <location line="+195"/> + <location line="+13"/> <source>Payment request error</source> - <translation type="unfinished"/> + <translation>Betalingsforespørsel feil</translation> </message> <message> - <location line="+1"/> - <source>Insecure requests to custom payment scripts unsupported</source> + <location line="-207"/> + <source>Cannot start bitcoin: click-to-pay handler</source> + <translation>Kan ikke starte Bitcoin: klikk-og-betal håndterer</translation> + </message> + <message> + <location line="+195"/> + <source>Unverified payment requests to custom payment scripts are unsupported.</source> <translation type="unfinished"/> </message> <message> - <location line="+38"/> + <location line="+59"/> <source>Refund from %1</source> - <translation type="unfinished"/> + <translation>Refundering fra %1</translation> </message> <message> <location line="+42"/> <source>Error communicating with %1: %2</source> - <translation type="unfinished"/> + <translation>Feil ved å kommunisere med %1: %2</translation> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>Bad response from server %1</source> - <translation type="unfinished"/> + <translation>Dårlig svar fra server %1</translation> </message> <message> <location line="+32"/> <source>Payment acknowledged</source> - <translation type="unfinished"/> + <translation>Betaling erkjent</translation> </message> <message> - <location line="-58"/> - <location line="+30"/> + <location line="-55"/> + <location line="+27"/> <location line="+17"/> <source>Network request error</source> - <translation type="unfinished"/> + <translation>Nettverksforespørsel feil</translation> </message> </context> <context> <name>QObject</name> <message> - <location filename="../bitcoin.cpp" line="+114"/> + <location filename="../bitcoin.cpp" line="+119"/> <location line="+5"/> - <location filename="../intro.cpp" line="-32"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> <location line="-4"/> <source>Error: Specified data directory "%1" does not exist.</source> - <translation type="unfinished"/> + <translation>Feil: Spesifisert data mappe "%1" finnes ikke.</translation> </message> <message> <location line="+4"/> <source>Error: Invalid combination of -regtest and -testnet.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../intro.cpp" line="+1"/> - <source>Error: Specified data directory "%1" can not be created.</source> - <translation type="unfinished"/> + <translation>Feil: Ugyldig kombinasjon av -regtest og -testnet.</translation> </message> </context> <context> <name>QRImageWidget</name> <message> - <location filename="../receiverequestdialog.cpp" line="+32"/> + <location filename="../receiverequestdialog.cpp" line="+36"/> <source>&Save Image...</source> - <translation type="unfinished"/> + <translation>&Lagre bilde...</translation> </message> <message> <location line="+3"/> <source>&Copy Image</source> - <translation type="unfinished"/> + <translation>&Kopier Bilde</translation> </message> <message> <location line="+28"/> @@ -1270,8 +1609,8 @@ Adresse: %4 </message> <message> <location line="+0"/> - <source>PNG Images (*.png)</source> - <translation>PNG bilder (*.png)</translation> + <source>PNG Image (*.png)</source> + <translation>PNG Bilde (*.png)</translation> </message> </context> <context> @@ -1291,7 +1630,7 @@ Adresse: %4 <location line="+53"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+352"/> + <location filename="../rpcconsole.cpp" line="+360"/> <source>N/A</source> <translation>-</translation> </message> @@ -1306,7 +1645,12 @@ Adresse: %4 <translation>&Informasjon</translation> </message> <message> - <location line="+68"/> + <location line="-10"/> + <source>Debug window</source> + <translation>Debug vindu</translation> + </message> + <message> + <location line="+78"/> <source>Using OpenSSL version</source> <translation>Bruker OpenSSL versjon</translation> </message> @@ -1361,12 +1705,7 @@ Adresse: %4 <translation>Kommandolinjevalg</translation> </message> <message> - <location line="+7"/> - <source>Show the Bitcoin-Qt help message to get a list with possible Bitcoin command-line options.</source> - <translation>Vis Bitcoin-Qt hjelpemelding for å få en liste med mulige kommandolinjevalg.</translation> - </message> - <message> - <location line="+3"/> + <location line="+10"/> <source>&Show</source> <translation>&Vis</translation> </message> @@ -1378,17 +1717,17 @@ Adresse: %4 <message> <location line="+72"/> <source>&Network Traffic</source> - <translation type="unfinished"/> + <translation>&Nettverkstrafikk</translation> </message> <message> <location line="+52"/> <source>&Clear</source> - <translation type="unfinished"/> + <translation>&Fjern</translation> </message> <message> <location line="+13"/> <source>Totals</source> - <translation type="unfinished"/> + <translation>Totalt</translation> </message> <message> <location line="+64"/> @@ -1406,12 +1745,7 @@ Adresse: %4 <translation>Byggedato</translation> </message> <message> - <location line="-104"/> - <source>Bitcoin - Debug window</source> - <translation>Bitcoin - vindu for feilsøk</translation> - </message> - <message> - <location line="+25"/> + <location line="-79"/> <source>Bitcoin Core</source> <translation>Bitcoin Kjerne</translation> </message> @@ -1426,7 +1760,12 @@ Adresse: %4 <translation>Åpne Bitcoin loggfil for feilsøk fra datamappen. Dette kan ta noen sekunder for store loggfiler.</translation> </message> <message> - <location line="+102"/> + <location line="+26"/> + <source>Show the Bitcoin-Core help message to get a list with possible Bitcoin command-line options.</source> + <translation>Vis Bitcoin-Core hjelpemeldingen for å få en liste over mulig Bitcoin kommandolinje valg.</translation> + </message> + <message> + <location line="+76"/> <source>Clear console</source> <translation>Tøm konsoll</translation> </message> @@ -1448,22 +1787,22 @@ Adresse: %4 <message> <location line="+128"/> <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"/> @@ -1484,64 +1823,89 @@ Adresse: %4 <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+22"/> + <location filename="../forms/receivecoinsdialog.ui" line="+83"/> <source>&Amount:</source> - <translation type="unfinished"/> + <translation>&Beløp:</translation> </message> <message> - <location line="+16"/> + <location line="+19"/> <source>The amount to request</source> - <translation type="unfinished"/> + <translation>Mengden å forespør</translation> </message> <message> - <location line="+7"/> + <location line="-32"/> <source>&Label:</source> <translation>&Merkelapp:</translation> </message> <message> - <location line="+10"/> - <source>The label to associate with the receiving address</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+7"/> + <location line="-34"/> <source>&Message:</source> - <translation type="unfinished"/> + <translation>&Melding:</translation> </message> <message> - <location line="+10"/> + <location line="+20"/> <source>The message to attach to payment request</source> - <translation type="unfinished"/> + <translation>Meldingen å koblet til betalingsforespørsel</translation> </message> <message> - <location line="+14"/> + <location line="-37"/> <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>Gjenbruk en av de tidligere brukte mottaksadressene. Gjenbruk av adresser har sikkerhets og personverns utfordringer. Ikke bruk dette med unntak for å gjennopprette en betalingsforespørsel som ble gjort tidligere.</translation> </message> <message> <location line="+3"/> <source>R&euse an existing receiving address (not recommended)</source> - <translation type="unfinished"/> + <translation>Gj&enbruk en eksisterende mottaksadresse (ikke anbefalt)</translation> </message> <message> - <location line="+7"/> + <location line="+27"/> + <source>The label to associate with the new receiving address</source> + <translation>Merkelappen som skal kobles til den nye mottaksadressen</translation> + </message> + <message> + <location line="+14"/> <source>Use this form to request payments. All fields are optional.</source> - <translation type="unfinished"/> + <translation>Bruk denne formen for å etterspør betalinger. Alle felter er frivillige.</translation> </message> <message> - <location line="+17"/> + <location line="+56"/> <source>Clear all fields of the form.</source> - <translation type="unfinished"/> + <translation>Fjern alle felter fra formen.</translation> </message> <message> <location line="+3"/> <source>Clear</source> - <translation type="unfinished"/> + <translation>Fjern</translation> </message> <message> <location line="+36"/> <source>&Request payment</source> - <translation type="unfinished"/> + <translation>Ette&rspør betaling</translation> + </message> + <message> + <location line="+47"/> + <source>Previously requested payments</source> + <translation>Tidligere etterspurte betalinger</translation> + </message> + <message> + <location line="+12"/> + <source>Show the selected request (does the same as double clicking an entry)</source> + <translation>Vis den valgte etterspørringen (gjør det samme som å dobbelklikke en oppføring)</translation> + </message> + <message> + <location line="+3"/> + <source>Show</source> + <translation>Vis</translation> + </message> + <message> + <location line="+11"/> + <source>Remove the selected entries from the list</source> + <translation>Fjern den valgte oppføringen fra listen</translation> + </message> + <message> + <location line="+3"/> + <source>Remove</source> + <translation>Fjern</translation> </message> </context> <context> @@ -1554,37 +1918,32 @@ Adresse: %4 <message> <location line="+46"/> <source>Copy &URI</source> - <translation type="unfinished"/> + <translation>Kopier &URI</translation> </message> <message> <location line="+7"/> <source>Copy &Address</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+7"/> - <source>&Copy Image</source> - <translation type="unfinished"/> + <translation>Kopier &Adresse</translation> </message> <message> <location line="+7"/> <source>&Save Image...</source> - <translation type="unfinished"/> + <translation>&Lagre bilde...</translation> </message> <message> - <location filename="../receiverequestdialog.cpp" line="+58"/> + <location filename="../receiverequestdialog.cpp" line="+56"/> <source>Request payment to %1</source> - <translation type="unfinished"/> + <translation>Etterspør betaling til %1</translation> </message> <message> <location line="+6"/> <source>Payment information</source> - <translation type="unfinished"/> + <translation>Betalingsinformasjon</translation> </message> <message> <location line="+1"/> <source>URI</source> - <translation type="unfinished"/> + <translation>URI</translation> </message> <message> <location line="+2"/> @@ -1618,16 +1977,119 @@ Adresse: %4 </message> </context> <context> + <name>RecentRequestsTableModel</name> + <message> + <location filename="../recentrequeststablemodel.cpp" line="+14"/> + <source>Date</source> + <translation>Dato</translation> + </message> + <message> + <location line="+0"/> + <source>Label</source> + <translation>Merkelapp</translation> + </message> + <message> + <location line="+0"/> + <source>Message</source> + <translation>Melding</translation> + </message> + <message> + <location line="+0"/> + <source>Amount</source> + <translation>Beløp</translation> + </message> + <message> + <location line="+36"/> + <source>(no label)</source> + <translation>(ingen merkelapp)</translation> + </message> + <message> + <location line="+9"/> + <source>(no message)</source> + <translation>(ingen melding)</translation> + </message> +</context> +<context> <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="+14"/> - <location filename="../sendcoinsdialog.cpp" line="+140"/> - <location line="+213"/> + <location filename="../sendcoinsdialog.cpp" line="+381"/> + <location line="+81"/> <source>Send Coins</source> <translation>Send Bitcoins</translation> </message> <message> - <location line="+50"/> + <location line="+76"/> + <source>Coin Control Features</source> + <translation>Mynt Kontroll Funksjoner</translation> + </message> + <message> + <location line="+20"/> + <source>Inputs...</source> + <translation>Inndata...</translation> + </message> + <message> + <location line="+7"/> + <source>automatically selected</source> + <translation>automatisk valgte</translation> + </message> + <message> + <location line="+19"/> + <source>Insufficient funds!</source> + <translation>Utilstrekkelige midler!</translation> + </message> + <message> + <location line="+89"/> + <source>Quantity:</source> + <translation>Mengde:</translation> + </message> + <message> + <location line="+35"/> + <source>Bytes:</source> + <translation>Bytes:</translation> + </message> + <message> + <location line="+48"/> + <source>Amount:</source> + <translation>Beløp:</translation> + </message> + <message> + <location line="+32"/> + <source>Priority:</source> + <translation>Prioritet:</translation> + </message> + <message> + <location line="+48"/> + <source>Fee:</source> + <translation>Avgift:</translation> + </message> + <message> + <location line="+32"/> + <source>Low Output:</source> + <translation>Lav Utdata:</translation> + </message> + <message> + <location line="+48"/> + <source>After Fee:</source> + <translation>Etter Avgift:</translation> + </message> + <message> + <location line="+32"/> + <source>Change:</source> + <translation>Endring:</translation> + </message> + <message> + <location line="+44"/> + <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Custom change address</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+115"/> <source>Send to multiple recipients at once</source> <translation>Send til flere enn én mottaker</translation> </message> @@ -1639,7 +2101,7 @@ Adresse: %4 <message> <location line="+20"/> <source>Clear all fields of the form.</source> - <translation type="unfinished"/> + <translation>Fjern alle felter fra formen.</translation> </message> <message> <location line="+3"/> @@ -1652,12 +2114,7 @@ Adresse: %4 <translation>Saldo:</translation> </message> <message> - <location line="+10"/> - <source>123.456 BTC</source> - <translation>123.456 BTC</translation> - </message> - <message> - <location line="+31"/> + <location line="+41"/> <source>Confirm the send action</source> <translation>Bekreft sending</translation> </message> @@ -1667,114 +2124,185 @@ Adresse: %4 <translation>S&end</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-154"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation>Bekreft sending av bitcoins</translation> </message> <message> - <location line="-90"/> + <location line="-74"/> <location line="+5"/> <location line="+5"/> + <location line="+4"/> <source>%1 to %2</source> + <translation>%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"/> + <source>Copy quantity</source> + <translation>Kopier mengde</translation> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation>Kopiér beløp</translation> + </message> + <message> + <location line="+1"/> + <source>Copy fee</source> <translation type="unfinished"/> </message> <message> - <location line="+26"/> + <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>Total Mengde %1 (= %2)</translation> + </message> + <message> + <location line="+2"/> + <source>or</source> + <translation>eller</translation> + </message> + <message> + <location line="+202"/> <source>The recipient address is not valid, please recheck.</source> <translation>Adresse for mottaker er ugyldig.</translation> </message> <message> - <location line="+4"/> + <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> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>The amount exceeds your balance.</source> <translation>Beløpet overstiger saldo.</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>The total exceeds your balance when the %1 transaction fee is included.</source> <translation>Totalbeløpet overstiger saldo etter at %1 transaksjonsgebyr er lagt til.</translation> </message> <message> - <location line="+5"/> + <location line="+3"/> <source>Duplicate address found, can only send to each address once per send operation.</source> <translation>Duplikate adresser funnet. Kan bare sende én gang til hver adresse per operasjon.</translation> </message> <message> + <location line="+3"/> + <source>Transaction creation failed!</source> + <translation>Opprettelse av transaksjon feilet!</translation> + </message> + <message> <location line="+4"/> - <source>Error: Transaction creation failed!</source> - <translation>Feil: Opprettelse av transaksjon feilet </translation> + <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> + <translation>Transaksjonen ble avvist. Dette kan skje hvis noen av myntene i lommeboken allerede er brukt, f.eks. hvis du kopierte wallet.dat og mynter ble brukt i kopien uten å bli markert som brukt her.</translation> </message> <message> - <location line="+15"/> - <source>Are you sure you want to send?</source> - <translation type="unfinished"/> + <location line="+113"/> + <source>Warning: Invalid Bitcoin address</source> + <translation>Advarsel: Ugyldig Bitcoin adresse</translation> </message> <message> - <location line="+9"/> - <source>added as transaction fee</source> - <translation type="unfinished"/> + <location line="+13"/> + <source>(no label)</source> + <translation>(ingen merkelapp)</translation> </message> <message> - <location line="+6"/> - <source>Total Amount %1</source> + <location line="+8"/> + <source>Warning: Unknown change address</source> <translation type="unfinished"/> </message> <message> - <location line="+20"/> - <source>Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> - <translation>Feil: Transaksjonen ble avvist. Dette kan skje om noe av beløpet allerede var brukt, f.eks. hvis du kopierte wallet.dat og noen bitcoins ble brukt i kopien men ikke ble markert som brukt her.</translation> + <location line="-378"/> + <source>Are you sure you want to send?</source> + <translation>Er du sikker på at du vil sende?</translation> + </message> + <message> + <location line="+9"/> + <source>added as transaction fee</source> + <translation>lagt til som transaksjonsgebyr</translation> </message> <message> - <location line="+144"/> + <location line="+170"/> <source>Payment request expired</source> - <translation type="unfinished"/> + <translation>Betalingsforespørsel utgått</translation> </message> <message> <location line="+8"/> <source>Invalid payment address %1</source> - <translation type="unfinished"/> + <translation>Ugyldig betalingsadresse %1</translation> </message> </context> <context> <name>SendCoinsEntry</name> <message> - <location filename="../forms/sendcoinsentry.ui" line="+33"/> - <location line="+585"/> + <location filename="../forms/sendcoinsentry.ui" line="+131"/> + <location line="+501"/> + <location line="+536"/> <source>A&mount:</source> <translation>&Beløp:</translation> </message> <message> - <location line="-572"/> - <location line="+585"/> + <location line="-1132"/> <source>Pay &To:</source> <translation>Betal &Til:</translation> </message> <message> - <location line="-551"/> + <location line="+18"/> <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation>Adressen betalingen skal sendes til (f.eks. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location filename="../sendcoinsentry.cpp" line="+28"/> + <location filename="../sendcoinsentry.cpp" line="+30"/> <source>Enter a label for this address to add it to your address book</source> <translation>Skriv inn en merkelapp for denne adressen for å legge den til i din adressebok</translation> </message> <message> - <location filename="../forms/sendcoinsentry.ui" line="-18"/> + <location filename="../forms/sendcoinsentry.ui" line="+57"/> <source>&Label:</source> <translation>&Merkelapp:</translation> </message> <message> - <location line="+28"/> + <location line="-50"/> <source>Choose previously used address</source> - <translation type="unfinished"/> + <translation>Velg tidligere brukt adresse</translation> </message> <message> - <location line="+10"/> + <location line="-40"/> + <source>This is a normal payment.</source> + <translation>Dette er en normal betaling.</translation> + </message> + <message> + <location line="+50"/> <source>Alt+A</source> <translation>Alt+A</translation> </message> @@ -1790,16 +2318,35 @@ Adresse: %4 </message> <message> <location line="+7"/> - <source>Remove this recipient</source> - <translation>Fjern denne mottakeren</translation> + <location line="+504"/> + <location line="+536"/> + <source>Remove this entry</source> + <translation>Fjern denne oppføringen</translation> </message> <message> - <location line="+16"/> + <location line="-40"/> + <source>This is a verified payment request.</source> + <translation>Dette er en verifisert betalingsetterspørring</translation> + </message> + <message> + <location line="-971"/> <source>Enter a label for this address to add it to the list of used addresses</source> - <translation type="unfinished"/> + <translation>Skriv inn en merkelapp for denne adressen for å legge den til listen av brukte adresser</translation> </message> <message> - <location line="+465"/> + <location line="+439"/> + <source>This is an unverified payment request.</source> + <translation>Dette er en uverifisert betalingsetterspørring</translation> + </message> + <message> + <location line="+18"/> + <location line="+532"/> + <source>Pay To:</source> + <translation>Betal Til:</translation> + </message> + <message> + <location line="-498"/> + <location line="+536"/> <source>Memo:</source> <translation type="unfinished"/> </message> @@ -1835,7 +2382,7 @@ Adresse: %4 <location line="+10"/> <location line="+213"/> <source>Choose previously used address</source> - <translation type="unfinished"/> + <translation>Velg tidligere brukt adresse</translation> </message> <message> <location line="-203"/> @@ -1920,7 +2467,7 @@ Adresse: %4 <translation>Tilbakestill alle felter for meldingsverifikasjon</translation> </message> <message> - <location filename="../signverifymessagedialog.cpp" line="+27"/> + <location filename="../signverifymessagedialog.cpp" line="+29"/> <location line="+3"/> <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation>Skriv inn en Bitcoin adresse (f.eks. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> @@ -1936,7 +2483,7 @@ Adresse: %4 <translation>Angi Bitcoin signatur</translation> </message> <message> - <location line="+85"/> + <location line="+84"/> <location line="+81"/> <source>The entered address is invalid.</source> <translation>Angitt adresse er ugyldig.</translation> @@ -2005,9 +2552,14 @@ Adresse: %4 <context> <name>SplashScreen</name> <message> - <location filename="../splashscreen.cpp" line="+23"/> - <source>The Bitcoin developers</source> - <translation>Bitcoin utviklerne</translation> + <location filename="../splashscreen.cpp" line="+26"/> + <source>Bitcoin Core</source> + <translation>Bitcoin Kjerne</translation> + </message> + <message> + <location line="+2"/> + <source>The Bitcoin Core developers</source> + <translation>Bitcoin Core utviklerne</translation> </message> <message> <location line="+1"/> @@ -2018,7 +2570,7 @@ Adresse: %4 <context> <name>TrafficGraphWidget</name> <message> - <location filename="../trafficgraphwidget.cpp" line="+75"/> + <location filename="../trafficgraphwidget.cpp" line="+79"/> <source>KB/s</source> <translation type="unfinished"/> </message> @@ -2026,7 +2578,7 @@ Adresse: %4 <context> <name>TransactionDesc</name> <message> - <location filename="../transactiondesc.cpp" line="+22"/> + <location filename="../transactiondesc.cpp" line="+28"/> <source>Open until %1</source> <translation>Åpen til %1</translation> </message> @@ -2149,7 +2701,7 @@ Adresse: %4 <message> <location line="+13"/> <source>Merchant</source> - <translation type="unfinished"/> + <translation>Forhandler</translation> </message> <message> <location line="+7"/> @@ -2218,7 +2770,7 @@ Adresse: %4 <context> <name>TransactionTableModel</name> <message> - <location filename="../transactiontablemodel.cpp" line="+227"/> + <location filename="../transactiontablemodel.cpp" line="+234"/> <source>Date</source> <translation>Dato</translation> </message> @@ -2336,7 +2888,7 @@ Adresse: %4 <context> <name>TransactionView</name> <message> - <location filename="../transactionview.cpp" line="+52"/> + <location filename="../transactionview.cpp" line="+57"/> <location line="+16"/> <source>All</source> <translation>Alle</translation> @@ -2397,12 +2949,12 @@ Adresse: %4 <translation>Andre</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>Enter address or label to search</source> <translation>Skriv inn adresse eller merkelapp for søk</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>Min amount</source> <translation>Minimumsbeløp</translation> </message> @@ -2437,17 +2989,37 @@ Adresse: %4 <translation>Vis transaksjonsdetaljer</translation> </message> <message> - <location line="+143"/> - <source>Export Transaction Data</source> - <translation>Eksporter transaksjonsdata</translation> + <location line="+142"/> + <source>Export Transaction History</source> + <translation>Eksporter Transaksjonshistorikk</translation> </message> <message> - <location line="+1"/> + <location line="+19"/> + <source>Exporting Failed</source> + <translation>Ekport Feilet</translation> + </message> + <message> + <location line="+0"/> + <source>There was an error trying to save the transaction history to %1.</source> + <translation>En feil oppstod ved lagring av transaksjonshistorikken til %1.</translation> + </message> + <message> + <location line="+4"/> + <source>Exporting Successful</source> + <translation>Ekport Fullført</translation> + </message> + <message> + <location line="+0"/> + <source>The transaction history was successfully saved to %1.</source> + <translation>Transaksjonshistorikken ble lagret til %1.</translation> + </message> + <message> + <location line="-22"/> <source>Comma separated file (*.csv)</source> <translation>Kommaseparert fil (*.csv)</translation> </message> <message> - <location line="+8"/> + <location line="+9"/> <source>Confirmed</source> <translation>Bekreftet</translation> </message> @@ -2482,17 +3054,7 @@ Adresse: %4 <translation>ID</translation> </message> <message> - <location line="+4"/> - <source>Error exporting</source> - <translation>Feil ved eksport</translation> - </message> - <message> - <location line="+0"/> - <source>Could not write to file %1.</source> - <translation>Kunne ikke skrive til filen %1.</translation> - </message> - <message> - <location line="+100"/> + <location line="+107"/> <source>Range:</source> <translation>Intervall:</translation> </message> @@ -2503,9 +3065,17 @@ Adresse: %4 </message> </context> <context> + <name>WalletFrame</name> + <message> + <location filename="../walletframe.cpp" line="+26"/> + <source>No wallet has been loaded.</source> + <translation>Ingen lommebok har blitt lastet.</translation> + </message> +</context> +<context> <name>WalletModel</name> <message> - <location filename="../walletmodel.cpp" line="+218"/> + <location filename="../walletmodel.cpp" line="+245"/> <source>Send Coins</source> <translation>Send Bitcoins</translation> </message> @@ -2513,7 +3083,7 @@ Adresse: %4 <context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+46"/> + <location filename="../walletview.cpp" line="+43"/> <source>&Export</source> <translation>&Eksporter...</translation> </message> @@ -2523,65 +3093,60 @@ Adresse: %4 <translation>Eksporter data fra nåværende fane til fil</translation> </message> <message> - <location line="+183"/> + <location line="+181"/> <source>Backup Wallet</source> <translation>Sikkerhetskopier lommebok</translation> </message> <message> - <location line="+0"/> + <location line="+1"/> <source>Wallet Data (*.dat)</source> <translation>Lommebokdata (*.dat)</translation> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Backup Failed</source> <translation>Sikkerhetskopiering feilet</translation> </message> <message> <location line="+0"/> - <source>There was an error trying to save the wallet data to the new location.</source> - <translation>En feil oppstod under lagringen av lommeboken til den nye plasseringen.</translation> + <source>There was an error trying to save the wallet data to %1.</source> + <translation>En feil oppstod ved lagring av lommebok til %1.</translation> </message> <message> <location line="+4"/> - <source>Backup Successful</source> - <translation>Sikkerhetskopiering fullført</translation> + <source>The wallet data was successfully saved to %1.</source> + <translation>Lommeboken ble lagret til %1.</translation> </message> <message> <location line="+0"/> - <source>The wallet data was successfully saved to the new location.</source> - <translation>Lommebokdata ble lagret til den nye plasseringen. </translation> + <source>Backup Successful</source> + <translation>Sikkerhetskopiering fullført</translation> </message> </context> <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+102"/> - <source>Bitcoin version</source> - <translation>Bitcoin versjon</translation> - </message> - <message> - <location line="+107"/> + <location filename="../bitcoinstrings.cpp" line="+217"/> <source>Usage:</source> <translation>Bruk:</translation> </message> <message> - <location line="-55"/> + <location line="-54"/> <source>List commands</source> <translation>List opp kommandoer</translation> </message> <message> - <location line="-13"/> + <location line="-14"/> <source>Get help for a command</source> <translation>Vis hjelpetekst for en kommando</translation> </message> <message> - <location line="+25"/> + <location line="+26"/> <source>Options:</source> <translation>Innstillinger:</translation> </message> <message> - <location line="+24"/> + <location line="+23"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Angi konfigurasjonsfil (standardverdi: bitcoin.conf)</translation> </message> @@ -2601,7 +3166,7 @@ Adresse: %4 <translation>Sett størrelse på mellomlager for database i megabytes (standardverdi: 25)</translation> </message> <message> - <location line="-28"/> + <location line="-27"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>Lytt etter tilkoblinger på <port> (standardverdi: 8333 eller testnet: 18333)</translation> </message> @@ -2611,7 +3176,7 @@ Adresse: %4 <translation>Hold maks <n> koblinger åpne til andre noder (standardverdi: 125)</translation> </message> <message> - <location line="-49"/> + <location line="-50"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation>Koble til node for å hente adresser til andre noder, koble så fra igjen</translation> </message> @@ -2626,7 +3191,7 @@ Adresse: %4 <translation>Grenseverdi for å koble fra noder med dårlig oppførsel (standardverdi: 100)</translation> </message> <message> - <location line="-142"/> + <location line="-147"/> <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> @@ -2641,7 +3206,7 @@ Adresse: %4 <translation>Lytt etter JSON-RPC tilkoblinger på <port> (standardverdi: 8332 or testnet: 18332)</translation> </message> <message> - <location line="+40"/> + <location line="+45"/> <source>Accept command line and JSON-RPC commands</source> <translation>Ta imot kommandolinje- og JSON-RPC-kommandoer</translation> </message> @@ -2651,17 +3216,17 @@ Adresse: %4 <translation>Kjør i bakgrunnen som daemon og ta imot kommandoer</translation> </message> <message> - <location line="+40"/> + <location line="+39"/> <source>Use the test network</source> <translation>Bruk testnettverket</translation> </message> <message> - <location line="-118"/> + <location line="-117"/> <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="-87"/> + <location line="-92"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2687,7 +3252,7 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <message> <location line="+12"/> <source>Acceptable ciphers (default: TLSv1.2+HIGH:TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!3DES:@STRENGTH)</source> - <translation type="unfinished"/> + <translation>Akseptable krypteringsmetoder (standardverdi: TLSv1.2+HIGH:TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!3DES:@STRENGTH)</translation> </message> <message> <location line="+5"/> @@ -2725,17 +3290,17 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <translation>Kjør kommando når en lommeboktransaksjon endres (%s i cmd er erstattet med TxID)</translation> </message> <message> - <location line="+11"/> - <source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source> - <translation>Sett maks størrelse for transaksjoner med høy prioritet / lavt gebyr, i bytes (standardverdi: 27000)</translation> - </message> - <message> - <location line="+6"/> + <location line="+18"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation>Dette er en forhånds-sluppet test versjon - bruk på egen risiko - ikke for bruk av "Mining" (utvinning) eller markedsføring applikasjoner.</translation> </message> <message> <location line="+5"/> + <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> + <message> + <location line="+3"/> <source>Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source> <translation>Advarsel: -paytxfee er satt veldig høyt! Dette er transaksjonsgebyret du betaler når du sender transaksjoner.</translation> </message> @@ -2747,12 +3312,12 @@ 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 type="unfinished"/> + <translation>Advarsel: Nettverket ser ikke ut til å vær 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 type="unfinished"/> + <translation>Advarsel: Vi ser ikke ut til å være enige med våre noder! Du må oppgradere, eller andre nodes må oppgradere.</translation> </message> <message> <location line="+3"/> @@ -2765,17 +3330,27 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <translation type="unfinished"/> </message> <message> - <location line="+14"/> + <location line="+9"/> + <source><category> can be:</source> + <translation><category> kan være:</translation> + </message> + <message> + <location line="+6"/> <source>Attempt to recover private keys from a corrupt wallet.dat</source> + <translation>Forsøk å berge private nøkler fra en korrupt wallet.dat</translation> + </message> + <message> + <location line="+1"/> + <source>Bitcoin Core Daemon</source> <translation type="unfinished"/> </message> <message> <location line="+1"/> <source>Bitcoin RPC client version</source> - <translation type="unfinished"/> + <translation>Bitcoin RPC klientversjon</translation> </message> <message> - <location line="+2"/> + <location line="+1"/> <source>Block creation options:</source> <translation>Valg for opprettelse av blokker:</translation> </message> @@ -2785,9 +3360,14 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <translation>Koble kun til angitt(e) node(r)</translation> </message> <message> - <location line="+2"/> + <location line="+1"/> + <source>Connect through SOCKS proxy</source> + <translation>Koble til via SOCKS proxy</translation> + </message> + <message> + <location line="+1"/> <source>Connect to JSON-RPC on <port> (default: 8332 or testnet: 18332)</source> - <translation type="unfinished"/> + <translation>Koble til JSON-RPC på <port> (default: 8332 eller testnet: 18332)</translation> </message> <message> <location line="+2"/> @@ -2832,7 +3412,7 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <message> <location line="+1"/> <source>Error: Wallet locked, unable to create transaction!</source> - <translation type="unfinished"/> + <translation>Feil: Lommebok låst, kan ikke opprette transaksjon!</translation> </message> <message> <location line="+1"/> @@ -2895,7 +3475,12 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <translation>Feil ved skriving av angre-data</translation> </message> <message> - <location line="+2"/> + <location line="+1"/> + <source>Fee per kB to add to transactions you send</source> + <translation>Gebyr per kB for transaksjoner du sender</translation> + </message> + <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> </message> @@ -2912,17 +3497,22 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <message> <location line="+1"/> <source>How thorough the block verification is (0-4, default: 3)</source> + <translation>Hvor grundig verifisering av blokker gjøres (0-4, standardverdi: 3)</translation> + </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"/> + <translation>Ugyldig eller ingen skaperblokk funnet. Feil datadir for nettverk?</translation> </message> <message> <location line="+3"/> <source>Invalid -onion address: '%s'</source> - <translation type="unfinished"/> + <translation>Ugyldig -onion adresse: '%s'</translation> </message> <message> <location line="+15"/> @@ -2930,29 +3520,49 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <translation type="unfinished"/> </message> <message> - <location line="+8"/> + <location line="+5"/> + <source>Prepend debug output with timestamp (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>RPC client options:</source> + <translation>RPC klient innstillinger:</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> </message> <message> - <location line="+6"/> + <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> + </message> + <message> + <location line="+1"/> <source>Send command to Bitcoin server</source> - <translation type="unfinished"/> + <translation>Send kommando til Bitcoin tjener</translation> </message> <message> - <location line="+10"/> + <location line="+8"/> + <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 type="unfinished"/> + <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 type="unfinished"/> + <translation>Angi lommebok fil (inne i data mappe)</translation> </message> <message> <location line="+2"/> <source>Start Bitcoin server</source> - <translation type="unfinished"/> + <translation>Start Bitcoin tjener</translation> </message> <message> <location line="+12"/> @@ -2960,7 +3570,7 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <translation type="unfinished"/> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>Verifying blocks...</source> <translation>Verifiserer blokker...</translation> </message> @@ -2971,13 +3581,23 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ </message> <message> <location line="+1"/> + <source>Wait for RPC server to start</source> + <translation>Vent på start av RPV 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> + </message> + <message> + <location line="+3"/> + <source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source> <translation type="unfinished"/> </message> <message> - <location line="+4"/> + <location line="+2"/> <source>You need to rebuild the database using -reindex to change -txindex</source> - <translation type="unfinished"/> + <translation>Du må gjenoppbygge databasen med å bruke -reindex for å endre -txindex</translation> </message> <message> <location line="-78"/> @@ -2985,34 +3605,44 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <translation>Importerer blokker fra ekstern blk000?.dat fil</translation> </message> <message> - <location line="-98"/> + <location line="-104"/> <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> <translation type="unfinished"/> </message> <message> - <location line="+17"/> + <location line="+14"/> + <source>Output debugging information (default: 0, supplying <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="+83"/> + <location line="+88"/> <source>Information</source> <translation>Informasjon</translation> </message> <message> <location line="+4"/> <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> - <translation type="unfinished"/> + <translation>Ugyldig mengde for -minrelaytxfee=<amount>: '%s'</translation> </message> <message> <location line="+1"/> <source>Invalid amount for -mintxfee=<amount>: '%s'</source> - <translation type="unfinished"/> + <translation>Ugyldig mengde for -mintxfee=<amount>: '%s'</translation> </message> <message> <location line="+8"/> <source>Maintain a full transaction index (default: 0)</source> - <translation type="unfinished"/> + <translation>Oppretthold en full transaksjonsindeks (standard: 0)</translation> </message> <message> <location line="+2"/> @@ -3035,32 +3665,12 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <translation>Koble kun til noder i nettverket <nett> (IPv4, IPv6 eller Tor)</translation> </message> <message> - <location line="+2"/> - <source>Output extra debugging information. Implies all other -debug* options</source> - <translation>Skriv ekstra informasjon for feilsøk. Medfører at alle -debug* valg tas med</translation> - </message> - <message> - <location line="+1"/> - <source>Output extra network debugging information</source> - <translation>Skriv ekstra informasjon for feilsøk av nettverk</translation> - </message> - <message> - <location line="+2"/> - <source>Prepend debug output with timestamp</source> - <translation>Sett tidsstempel på debugmeldinger</translation> - </message> - <message> - <location line="+5"/> + <location line="+9"/> <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation>SSL valg: (se Bitcoin Wiki for instruksjoner for oppsett av SSL)</translation> </message> <message> - <location line="+1"/> - <source>Select the version of socks proxy to use (4-5, default: 5)</source> - <translation>Velg versjon av socks proxy (4-5, standardverdi 5)</translation> - </message> - <message> - <location line="+3"/> + <location line="+4"/> <source>Send trace/debug info to console instead of debug.log file</source> <translation>Send spor/debug informasjon til konsollet istedenfor debug.log filen</translation> </message> @@ -3070,12 +3680,7 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <translation>Send spor/debug informasjon til debugger</translation> </message> <message> - <location line="+5"/> - <source>Set maximum block size in bytes (default: 250000)</source> - <translation>Sett maks blokkstørrelse i bytes (standardverdi: 250000)</translation> - </message> - <message> - <location line="+1"/> + <location line="+6"/> <source>Set minimum block size in bytes (default: 0)</source> <translation>Sett minimum blokkstørrelse i bytes (standardverdi: 0)</translation> </message> @@ -3102,12 +3707,12 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <message> <location line="+4"/> <source>Transaction amount too small</source> - <translation type="unfinished"/> + <translation>Transaksjonen er for liten</translation> </message> <message> <location line="+1"/> <source>Transaction amounts must be positive</source> - <translation type="unfinished"/> + <translation>Transaksjonsmengden må være positiv</translation> </message> <message> <location line="+1"/> @@ -3125,37 +3730,37 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <translation>Bruk UPnP for lytteport (standardverdi: 1 ved lytting)</translation> </message> <message> - <location line="+1"/> - <source>Use proxy to reach tor hidden services (default: same as -proxy)</source> - <translation>Bruk en proxy for å nå skjulte tor tjenester (standardverdi: samme som -proxy)</translation> - </message> - <message> <location line="+2"/> <source>Username for JSON-RPC connections</source> <translation>Brukernavn for JSON-RPC forbindelser</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Warning</source> <translation>Advarsel</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Warning: This version is obsolete, upgrade required!</source> <translation>Advarsel: Denne versjonen er foreldet, oppgradering kreves!</translation> </message> <message> <location line="+2"/> + <source>version</source> + <translation>versjon</translation> + </message> + <message> + <location line="+1"/> <source>wallet.dat corrupt, salvage failed</source> - <translation type="unfinished"/> + <translation>wallet.dat korrupt, bergning feilet</translation> </message> <message> - <location line="-54"/> + <location line="-57"/> <source>Password for JSON-RPC connections</source> <translation>Passord for JSON-RPC forbindelser</translation> </message> <message> - <location line="-70"/> + <location line="-69"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Tillat JSON-RPC tilkoblinger fra angitt IP-adresse</translation> </message> @@ -3165,12 +3770,12 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <translation>Send kommandoer til node på <ip> (standardverdi: 127.0.0.1)</translation> </message> <message> - <location line="-126"/> + <location line="-131"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>Eksekvér kommando når beste blokk endrer seg (%s i kommandoen erstattes med blokkens hash)</translation> </message> <message> - <location line="+155"/> + <location line="+160"/> <source>Upgrade wallet to latest format</source> <translation>Oppgradér lommebok til nyeste format</translation> </message> @@ -3210,22 +3815,17 @@ 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="-95"/> - <source>Connect through socks proxy</source> - <translation>Koble til gjennom socks proxy</translation> - </message> - <message> - <location line="-11"/> + <location line="-106"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>Tillat DNS oppslag for -addnode, -seednode og -connect</translation> </message> <message> - <location line="+58"/> + <location line="+59"/> <source>Loading addresses...</source> <translation>Laster adresser...</translation> </message> <message> - <location line="-36"/> + <location line="-37"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>Feil ved lasting av wallet.dat: Lommeboken er skadet</translation> </message> @@ -3245,12 +3845,12 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <translation>Feil ved lasting av wallet.dat</translation> </message> <message> - <location line="+30"/> + <location line="+31"/> <source>Invalid -proxy address: '%s'</source> <translation>Ugyldig -proxy adresse: '%s'</translation> </message> <message> - <location line="+57"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Ukjent nettverk angitt i -onlynet '%s'</translation> </message> @@ -3270,7 +3870,7 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <translation>Kunne ikke slå opp -externalip adresse: '%s'</translation> </message> <message> - <location line="+46"/> + <location line="+47"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>Ugyldig beløp for -paytxfee=<beløp>: '%s'</translation> </message> @@ -3290,27 +3890,22 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <translation>Laster blokkindeks...</translation> </message> <message> - <location line="-60"/> + <location line="-61"/> <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="-28"/> + <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="+69"/> - <source>Fee per KB to add to transactions you send</source> - <translation>Gebyr per KB for transaksjoner du sender</translation> - </message> - <message> - <location line="+20"/> + <location line="+94"/> <source>Loading wallet...</source> <translation>Laster lommebok...</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>Cannot downgrade wallet</source> <translation>Kan ikke nedgradere lommebok</translation> </message> @@ -3340,7 +3935,7 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <translation>Feil</translation> </message> <message> - <location line="-33"/> + <location line="-34"/> <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 new file mode 100644 index 0000000000..c81146fb1e --- /dev/null +++ b/src/qt/locale/bitcoin_pam.ts @@ -0,0 +1,3935 @@ +<?xml version="1.0" ?><!DOCTYPE TS><TS language="pam" 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> +Metung ya ining experimental software. +Me-distribute ya lalam na ning lisensya na ning MIT/X11 software, lawan ye ing makayabeng file COPYING o http://www.opensource.org/licenses/mit-license.php. +Ing produktung ini atin yang makayabeng software a gewa dareng OpenSSL Project para gamit king OpenSSL Toolkit(http://www.openssl.org/) at cryptographic software a sinulat ng Eric Young (eay@cryptsoft.com) at UPnp software a sinulat ng Thomas Bernard.</translation> + </message> + <message> + <location filename="../aboutdialog.cpp" line="+19"/> + <source>Copyright</source> + <translation>Karapatan ning Pamangopya</translation> + </message> + <message> + <location line="+0"/> + <source>The Bitcoin developers</source> + <translation>Reng ginawa keng Bitcoins</translation> + </message> +</context> +<context> + <name>AddressBookPage</name> + <message> + <location filename="../forms/addressbookpage.ui" line="+30"/> + <source>Double-click to edit address or label</source> + <translation>Pindutan meng makatidduang besis ban ayalilan me ing address o label</translation> + </message> + <message> + <location line="+27"/> + <source>Create a new address</source> + <translation>Maglalang kang bayung address</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>Kopyan me ing salukuyan at makipiling address keng system clipboard</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>&Kopyan ing address</translation> + </message> + <message> + <location filename="../forms/addressbookpage.ui" line="-41"/> + <source>Delete the currently selected address from the list</source> + <translation>Ilako ya ing kasalungsungan makapiling address keng listahan</translation> + </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>&Ilako</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>Reni reng kekang Bitcoin address king pamagpadalang kabayaran. Lawan mulang masalese reng alaga ampo ing address na ning tumanggap bayu ka magpadalang barya.</translation> + </message> + <message> + <location line="+4"/> + <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> + <source>Copy &Label</source> + <translation>Kopyan ing &Label</translation> + </message> + <message> + <location line="+1"/> + <source>&Edit</source> + <translation>&Alilan</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>Comma separated file (*.csv)</translation> + </message> + <message> + <location line="+13"/> + <source>Error exporting</source> + <translation>Atin mali king pamaglipat</translation> + </message> + <message> + <location line="+0"/> + <source>Could not write to file %1.</source> + <translation>E ya misulat king file %1.</translation> + </message> +</context> +<context> + <name>AddressTableModel</name> + <message> + <location filename="../addresstablemodel.cpp" line="+168"/> + <source>Label</source> + <translation>Label</translation> + </message> + <message> + <location line="+0"/> + <source>Address</source> + <translation>Address</translation> + </message> + <message> + <location line="+36"/> + <source>(no label)</source> + <translation>(alang label)</translation> + </message> +</context> +<context> + <name>AskPassphraseDialog</name> + <message> + <location filename="../forms/askpassphrasedialog.ui" line="+26"/> + <source>Passphrase Dialog</source> + <translation>Dialogo ning Passphrase</translation> + </message> + <message> + <location line="+21"/> + <source>Enter passphrase</source> + <translation>Mamalub kang passphrase</translation> + </message> + <message> + <location line="+14"/> + <source>New passphrase</source> + <translation>Panibayung passphrase</translation> + </message> + <message> + <location line="+14"/> + <source>Repeat new passphrase</source> + <translation>Pasibayuan ya ing bayung passphrase</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>Palub ye ing bayung passphrase king wallet.<br/>Maliari pu sanang gumamit kayung passphrase a maki</b> 10 or dakal pang miyayaliuang characters</b>, o ualu o dakal pang salita</b></translation> + </message> + <message> + <location line="+1"/> + <source>Encrypt wallet</source> + <translation>I-encrypt ye ing wallet</translation> + </message> + <message> + <location line="+3"/> + <source>This operation needs your wallet passphrase to unlock the wallet.</source> + <translation>Ing operasyun a ini kailangan ne ing kekayung wallet passphrase, ban a-unlock ya ing wallet</translation> + </message> + <message> + <location line="+5"/> + <source>Unlock wallet</source> + <translation>Unlock ya ing wallet</translation> + </message> + <message> + <location line="+3"/> + <source>This operation needs your wallet passphrase to decrypt the wallet.</source> + <translation>Ing operasyun a ini kailangan ne ing kekang wallet passphrase ban a-decrypt ne ing wallet.</translation> + </message> + <message> + <location line="+5"/> + <source>Decrypt wallet</source> + <translation>I-decrypt ya ing wallet</translation> + </message> + <message> + <location line="+3"/> + <source>Change passphrase</source> + <translation>Alilan ya ing passphrase</translation> + </message> + <message> + <location line="+1"/> + <source>Enter the old and new passphrase to the wallet.</source> + <translation>Palub ye ing luma ampo ing bayung passphrase king wallet.</translation> + </message> + <message> + <location line="+46"/> + <source>Confirm wallet encryption</source> + <translation>Kumpirman ya ing wallet encryption</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>Kapabaluan: Istung in-encrypt me ing kekang wallet at meala ya ing passphrase na, ma-<b>ALA NO NGAN RING KEKANG BITCOINS</b></translation> + </message> + <message> + <location line="+0"/> + <source>Are you sure you wish to encrypt your wallet?</source> + <translation>Siguradu na kang buri meng i-encrypt ing kekang wallet?</translation> + </message> + <message> + <location line="+15"/> + <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> + <translation>Mayalaga: Reng milabas a backups a gewa mu gamit ing wallet file mu dapat lamung mialilan bayung gawang encrypted wallet file. Para keng seguridad , reng milabas a backups dareng ali maka encrypt a wallet file ma-ala nala istung inumpisan mu nalang gamitan reng bayu, at me encrypt a wallet. </translation> + </message> + <message> + <location line="+100"/> + <location line="+24"/> + <source>Warning: The Caps Lock key is on!</source> + <translation>Kapabaluan: Makabuklat ya ing Caps Lock key!</translation> + </message> + <message> + <location line="-130"/> + <location line="+58"/> + <source>Wallet encrypted</source> + <translation>Me-encrypt ne ing wallet</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>Ing Bitcoin ngeni magsara ya ban ayari ing proseso ning pamag-encrypt. Tandanan yu king pamag-encrypt wallet, ali nala aprotektan king kabuuan reng bitcoins yu kareng malware a kasalunsungan atiu kareng computer yu.</translation> + </message> + <message> + <location line="+13"/> + <location line="+7"/> + <location line="+42"/> + <location line="+6"/> + <source>Wallet encryption failed</source> + <translation>Memali ya ing pamag-encrypt king wallet </translation> + </message> + <message> + <location line="-54"/> + <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> + <translation>Memali ya ing encryption uli na ning ausan dang internal error. E ya me-encrypt ing wallet yu.</translation> + </message> + <message> + <location line="+7"/> + <location line="+48"/> + <source>The supplied passphrases do not match.</source> + <translation>E la mitutugma ring mibieng passphrase</translation> + </message> + <message> + <location line="-37"/> + <source>Wallet unlock failed</source> + <translation>Memali ya ing pamag-unlock king wallet </translation> + </message> + <message> + <location line="+1"/> + <location line="+11"/> + <location line="+19"/> + <source>The passphrase entered for the wallet decryption was incorrect.</source> + <translation>E ya istu ing passphrase a pepalub da para king wallet decryption</translation> + </message> + <message> + <location line="-20"/> + <source>Wallet decryption failed</source> + <translation>Me-mali ya ing pamag-decrypt king wallet</translation> + </message> + <message> + <location line="+14"/> + <source>Wallet passphrase was successfully changed.</source> + <translation>Mi-alilan ne ing passphrase na ning wallet.</translation> + </message> +</context> +<context> + <name>BitcoinGUI</name> + <message> + <location filename="../bitcoingui.cpp" line="+260"/> + <source>Sign &message...</source> + <translation>I-sign ing &mensayi</translation> + </message> + <message> + <location line="+290"/> + <source>Synchronizing with network...</source> + <translation>Mag-sychronize ne king network...</translation> + </message> + <message> + <location line="-360"/> + <source>&Overview</source> + <translation>&Overview</translation> + </message> + <message> + <location line="+1"/> + <source>Show general overview of wallet</source> + <translation>Ipakit ing kabuuang lawe ning wallet</translation> + </message> + <message> + <location line="+20"/> + <source>&Transactions</source> + <translation>&Transaksion</translation> + </message> + <message> + <location line="+1"/> + <source>Browse transaction history</source> + <translation>Lawan ing kasalesayan ning transaksion</translation> + </message> + <message> + <location line="+15"/> + <source>E&xit</source> + <translation>L&umwal</translation> + </message> + <message> + <location line="+1"/> + <source>Quit application</source> + <translation>Tuknangan ing aplikasyon</translation> + </message> + <message> + <location line="+7"/> + <source>Show information about Bitcoin</source> + <translation>Ipakit ing impormasyun tungkul king Bitcoin</translation> + </message> + <message> + <location line="+3"/> + <location line="+2"/> + <source>About &Qt</source> + <translation>Tungkul &Qt</translation> + </message> + <message> + <location line="+2"/> + <source>Show information about Qt</source> + <translation>Magpakit impormasion tungkul king Qt</translation> + </message> + <message> + <location line="+2"/> + <source>&Options...</source> + <translation>&Pipamilian...</translation> + </message> + <message> + <location line="+9"/> + <source>&Encrypt Wallet...</source> + <translation>I-&Encrypt in Wallet...</translation> + </message> + <message> + <location line="+3"/> + <source>&Backup Wallet...</source> + <translation>I-&Backup ing Wallet...</translation> + </message> + <message> + <location line="+2"/> + <source>&Change Passphrase...</source> + <translation>&Alilan ing Passphrase...</translation> + </message> + <message> + <location line="+295"/> + <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="-358"/> + <source>Send coins to a Bitcoin address</source> + <translation>Magpadalang barya king Bitcoin address</translation> + </message> + <message> + <location line="+47"/> + <source>Modify configuration options for Bitcoin</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> + <source>Backup wallet to another location</source> + <translation>I-backup ing wallet king aliwang lugal</translation> + </message> + <message> + <location line="+2"/> + <source>Change the passphrase used for wallet encryption</source> + <translation>Alilan ya ing passphrase a gagamitan para king wallet encryption</translation> + </message> + <message> + <location line="+6"/> + <source>&Debug window</source> + <translation>I-&Debug ing awang</translation> + </message> + <message> + <location line="+1"/> + <source>Open debugging and diagnostic console</source> + <translation>Ibuklat ing debugging at diagnostic console</translation> + </message> + <message> + <location line="-4"/> + <source>&Verify message...</source> + <translation>&Beripikan ing message...</translation> + </message> + <message> + <location line="+375"/> + <source>Bitcoin</source> + <translation>Bitcoin</translation> + </message> + <message> + <location line="-563"/> + <location line="+10"/> + <source>Wallet</source> + <translation>Wallet</translation> + </message> + <message> + <location line="+113"/> + <source>&Send</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> + <source>&Receive</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+44"/> + <location line="+2"/> + <source>&Show / Hide</source> + <translation>&Ipalto / Isalikut</translation> + </message> + <message> + <location line="+1"/> + <source>Show or hide the main Window</source> + <translation>Ipalto o isalikut ing pun a awang</translation> + </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="+39"/> + <source>&File</source> + <translation>&File</translation> + </message> + <message> + <location line="+11"/> + <source>&Settings</source> + <translation>&Pamag-ayus</translation> + </message> + <message> + <location line="+6"/> + <source>&Help</source> + <translation>&Saup</translation> + </message> + <message> + <location line="+9"/> + <source>Tabs toolbar</source> + <translation>Gamit para king Tabs</translation> + </message> + <message> + <location line="-244"/> + <location line="+321"/> + <source>[testnet]</source> + <translation>[testnet]</translation> + </message> + <message> + <location line="-331"/> + <location line="+10"/> + <source>Bitcoin Core</source> + <translation>Kapilubluban ning Bitcoin</translation> + </message> + <message> + <location line="+121"/> + <source>Request payments (generates QR codes and bitcoin: URIs)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+27"/> + <location line="+2"/> + <source>&About Bitcoin Core</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+34"/> + <source>&Used sending addresses...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Show the list of used sending addresses and labels</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Used &receiving addresses...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Show the list of used receiving addresses and labels</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>Open URI...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Open a bitcoin: URI or payment request</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+126"/> + <location line="+5"/> + <source>Bitcoin client</source> + <translation>Bitcoin client</translation> + </message> + <message numerus="yes"> + <location line="+133"/> + <source>%n active connection(s) to Bitcoin network</source> + <translation><numerusform>%n ya ing aktibong koneksion keng Bitcoin network</numerusform><numerusform>%n lareng aktibong koneksion keng Bitcoin network</numerusform></translation> + </message> + <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>Me-prosesu %1 kareng %2 (me-estima) blocks ning kasalesayan ning transaksion.</translation> + </message> + <message> + <location line="+4"/> + <source>Processed %1 blocks of transaction history.</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location line="+20"/> + <source>%n hour(s)</source> + <translation><numerusform>%n oras</numerusform><numerusform>%n oras</numerusform></translation> + </message> + <message numerus="yes"> + <location line="+4"/> + <source>%n day(s)</source> + <translation><numerusform>%n aldo</numerusform><numerusform>%n aldo</numerusform></translation> + </message> + <message numerus="yes"> + <location line="+4"/> + <source>%n week(s)</source> + <translation><numerusform>%n dominggu</numerusform><numerusform>%n dominggu</numerusform></translation> + </message> + <message> + <location line="+4"/> + <source>%1 behind</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+14"/> + <source>Last received block was generated %1 ago.</source> + <translation>Ing tatauling block a metanggap, me-generate ya %1 ing milabas</translation> + </message> + <message> + <location line="+2"/> + <source>Transactions after this will not yet be visible.</source> + <translation>Ing transaksion kaibat na nini ali yapa magsilbing ipakit.</translation> + </message> + <message> + <location line="+27"/> + <source>Error</source> + <translation>Mali</translation> + </message> + <message> + <location line="+3"/> + <source>Warning</source> + <translation>Kapabaluan</translation> + </message> + <message> + <location line="+3"/> + <source>Information</source> + <translation>Impormasion</translation> + </message> + <message> + <location line="+77"/> + <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source> + <translation>Ing transaksion a ini lampas ya king limitasion naning dagul. Maliari me pa naman ipadala ini,oneng atin bayad a %1, a miras king nodes a magprosesu king transaksion at miras ya naman keng pamaniaup at suporta king network. Buri meng bayaran ing bayad para king transaksion?</translation> + </message> + <message> + <location line="-152"/> + <source>Up to date</source> + <translation>Makatuki ya king aldo</translation> + </message> + <message> + <location line="+31"/> + <source>Catching up...</source> + <translation>Catching up...</translation> + </message> + <message> + <location line="+124"/> + <source>Confirm transaction fee</source> + <translation>Kumpirman ing bayad king transaksion</translation> + </message> + <message> + <location line="+8"/> + <source>Sent transaction</source> + <translation>Mipadalang transaksion</translation> + </message> + <message> + <location line="+0"/> + <source>Incoming transaction</source> + <translation>Paparatang a transaksion</translation> + </message> + <message> + <location line="+1"/> + <source>Date: %1 +Amount: %2 +Type: %3 +Address: %4 +</source> + <translation>Aldo: %1 +Alaga: %2 +Type: %3 +Address: %4 +</translation> + </message> + <message> + <location line="+67"/> + <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> + <translation>Maka-<b>encrypt</b> ya ing wallet at kasalukuyan yang maka-<b>unlocked</b></translation> + </message> + <message> + <location line="+8"/> + <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> + <translation>Maka-<b>encrypt</b> ya ing wallet at kasalukuyan yang maka-<b>locked</b></translation> + </message> + <message> + <location filename="../bitcoin.cpp" line="+116"/> + <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> +</context> +<context> + <name>ClientModel</name> + <message> + <location filename="../clientmodel.cpp" line="+119"/> + <source>Network Alert</source> + <translation>Alertu ning Network</translation> + </message> +</context> +<context> + <name>CoinControlDialog</name> + <message> + <location filename="../forms/coincontroldialog.ui" line="+14"/> + <source>Coin Control Address Selection</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+34"/> + <source>Quantity:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+29"/> + <source>Bytes:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+45"/> + <source>Amount:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+29"/> + <source>Priority:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+45"/> + <source>Fee:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+32"/> + <source>Low Output:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+48"/> + <source>After Fee:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+32"/> + <source>Change:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+63"/> + <source>(un)select all</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+13"/> + <source>Tree mode</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> + <source>List mode</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+52"/> + <source>Amount</source> + <translation>Alaga</translation> + </message> + <message> + <location line="+10"/> + <source>Address</source> + <translation>Address</translation> + </message> + <message> + <location line="+5"/> + <source>Date</source> + <translation>Kaaldauan</translation> + </message> + <message> + <location line="+5"/> + <source>Confirmations</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Confirmed</source> + <translation>Me-kumpirma</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>Kopyan ing address</translation> + </message> + <message> + <location line="+1"/> + <source>Copy label</source> + <translation>Kopyan ing label</translation> + </message> + <message> + <location line="+1"/> + <location line="+26"/> + <source>Copy amount</source> + <translation>Kopyan ing alaga</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="+171"/> + <source>Dust</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>yes</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>no</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+10"/> + <source>This label turns red, if the transaction size is greater than 1000 bytes.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <location line="+5"/> + <source>This means a fee of at least %1 per kB is required.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-4"/> + <source>Can vary +/- 1 byte per input.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>Transactions with higher priority are more likely to get included into a block.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>This label turns red, if the priority is smaller than "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>(alang label)</translation> + </message> + <message> + <location line="-9"/> + <source>change from %1 (%2)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>(change)</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>EditAddressDialog</name> + <message> + <location filename="../forms/editaddressdialog.ui" line="+14"/> + <source>Edit Address</source> + <translation>Alilan ing Address</translation> + </message> + <message> + <location line="+11"/> + <source>&Label</source> + <translation>&Label</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>&Address</translation> + </message> + <message> + <location filename="../editaddressdialog.cpp" line="+25"/> + <source>New receiving address</source> + <translation>Bayung address king pamagtanggap</translation> + </message> + <message> + <location line="+4"/> + <source>New sending address</source> + <translation>Bayung address king pamagpadala</translation> + </message> + <message> + <location line="+3"/> + <source>Edit receiving address</source> + <translation>Alilan ya ing address king pamagpadala</translation> + </message> + <message> + <location line="+4"/> + <source>Edit sending address</source> + <translation>Alilan ya ing address king pamagpadala</translation> + </message> + <message> + <location line="+76"/> + <source>The entered address "%1" is already in the address book.</source> + <translation>Ing pepalub yung address "%1" ati na yu king aklat dareng address</translation> + </message> + <message> + <location line="-5"/> + <source>The entered address "%1" is not a valid Bitcoin address.</source> + <translation>Ing pepalub yung address "%1" ali ya katanggap-tanggap a Bitcoin address.</translation> + </message> + <message> + <location line="+10"/> + <source>Could not unlock wallet.</source> + <translation>Ali ya bisang mag-unlock ing wallet</translation> + </message> + <message> + <location line="+5"/> + <source>New key generation failed.</source> + <translation>Memali ya ing pamangaua king key</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>GUIUtil::HelpMessageBox</name> + <message> + <location filename="../guiutil.cpp" line="+597"/> + <source>version</source> + <translation>bersion</translation> + </message> + <message> + <location line="+0"/> + <location line="+13"/> + <source>Bitcoin Core</source> + <translation>Kapilubluban ning Bitcoin</translation> + </message> + <message> + <location line="-11"/> + <source>Usage:</source> + <translation>Pamanggamit:</translation> + </message> + <message> + <location line="+1"/> + <source>command-line options</source> + <translation>pipamilian command-line</translation> + </message> + <message> + <location line="+4"/> + <source>UI options</source> + <translation>Pipamilian ning UI</translation> + </message> + <message> + <location line="+1"/> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation>Mamiling Amanu, alimbawa "de_DE"(default: system locale)</translation> + </message> + <message> + <location line="+1"/> + <source>Start minimized</source> + <translation>Umpisan ing pamaglati</translation> + </message> + <message> + <location line="+1"/> + <source>Show splash screen on startup (default: 1)</source> + <translation>Ipalto ing splash screen keng umpisa (default: 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>Malaus ka</translation> + </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>Mali</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>Pipamilian</translation> + </message> + <message> + <location line="+16"/> + <source>&Main</source> + <translation>&Pun</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>Mamayad &bayad para king transaksion </translation> + </message> + <message> + <location line="+31"/> + <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> + <message> + <location line="+3"/> + <source>&Start Bitcoin on system login</source> + <translation>&Umpisan ya ing Bitcoin king pamag-log-in na ning sistema.</translation> + </message> + <message> + <location line="+35"/> + <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="+13"/> + <source>&Network</source> + <translation>&Network</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>Ibuklat yang antimanu ing Bitcoin client port king router. Gagana yamu ini istung ing router mu susuporta yang UPnP at magsilbi ya.</translation> + </message> + <message> + <location line="+3"/> + <source>Map port using &UPnP</source> + <translation>Mapa ng ning port gamit ing &UPnP</translation> + </message> + <message> + <location line="+7"/> + <source>Connect to the Bitcoin network through a SOCKS proxy (e.g. when connecting through Tor).</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>&Connect through SOCKS proxy:</source> + <translation>&Kumunekta gamit ing SOCKS proxy:</translation> + </message> + <message> + <location line="+9"/> + <source>Proxy &IP:</source> + <translation>Proxy &IP:</translation> + </message> + <message> + <location line="+19"/> + <source>IP address of the proxy (e.g. 127.0.0.1)</source> + <translation>IP address na ning proxy(e.g. 127.0.0.1)</translation> + </message> + <message> + <location line="+7"/> + <source>&Port:</source> + <translation>&Port:</translation> + </message> + <message> + <location line="+19"/> + <source>Port of the proxy (e.g. 9050)</source> + <translation>Port na ning proxy(e.g. 9050)</translation> + </message> + <message> + <location line="+7"/> + <source>SOCKS &Version:</source> + <translation>&Bersion na ning SOCKS</translation> + </message> + <message> + <location line="+13"/> + <source>SOCKS version of the proxy (e.g. 5)</source> + <translation>Bersion a SOCKS ning proxy (e.g 5)</translation> + </message> + <message> + <location line="+36"/> + <source>&Window</source> + <translation>&Awang</translation> + </message> + <message> + <location line="+6"/> + <source>Show only a tray icon after minimizing the window.</source> + <translation>Ipakit mu ing tray icon kaibat meng pelatian ing awang.</translation> + </message> + <message> + <location line="+3"/> + <source>&Minimize to the tray instead of the taskbar</source> + <translation>&Latian ya ing tray kesa king 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>Palatian namu kesa king iluwal ya ing aplikasion istung makasara ya ing awang. Istung ing pipamilian a ini atiu king "magsilbi", ing aplikasion misara yamu kaibat meng pinili ing "Tuknangan" king menu.</translation> + </message> + <message> + <location line="+3"/> + <source>M&inimize on close</source> + <translation>P&alatian istung isara</translation> + </message> + <message> + <location line="+21"/> + <source>&Display</source> + <translation>&Ipalto</translation> + </message> + <message> + <location line="+8"/> + <source>User Interface &language:</source> + <translation>Amanu na ning user interface:</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>Ing amanu na ning user interface maliari yang i-ayus o ilage keni. Ing ayus a ini magsilbi yamu istung pesibayuan meng pasibayu ing Bitcoin.</translation> + </message> + <message> + <location line="+11"/> + <source>&Unit to show amounts in:</source> + <translation>Ing &Unit a ipakit king alaga ning:</translation> + </message> + <message> + <location line="+13"/> + <source>Choose the default subdivision unit to show in the interface and when sending coins.</source> + <translation>Pilinan ing default subdivision unit a ipalto o ipakit king interface at istung magpadala kang barya.</translation> + </message> + <message> + <location line="+9"/> + <source>Whether to show Bitcoin addresses in the transaction list or not.</source> + <translation>Ipakit man ing Bitcoin address king listahan naning transaksion o ali.</translation> + </message> + <message> + <location line="+3"/> + <source>&Display addresses in transaction list</source> + <translation>&Ipakit ing address king listahan naning transaksion</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="+71"/> + <source>&OK</source> + <translation>&OK</translation> + </message> + <message> + <location line="+7"/> + <source>&Cancel</source> + <translation>I-&Cancel</translation> + </message> + <message> + <location line="+10"/> + <source>&Apply</source> + <translation>&Ilage</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="+63"/> + <source>default</source> + <translation>default</translation> + </message> + <message> + <location line="+131"/> + <source>Confirm options reset</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Some settings may require a client restart to take effect.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>Do you want to proceed?</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+42"/> + <location line="+9"/> + <source>Warning</source> + <translation>Kapabaluan</translation> + </message> + <message> + <location line="-9"/> + <location line="+9"/> + <source>This setting will take effect after restarting Bitcoin.</source> + <translation>Ing ayus a ini magsilbi yamu kaibat meng pesibayuan umpisan ing Bitcoin.</translation> + </message> + <message> + <location line="+29"/> + <source>The supplied proxy address is invalid.</source> + <translation>Ing milageng proxy address eya katanggap-tanggap.</translation> + </message> +</context> +<context> + <name>OverviewPage</name> + <message> + <location filename="../forms/overviewpage.ui" line="+14"/> + <source>Form</source> + <translation>Form</translation> + </message> + <message> + <location line="+50"/> + <location line="+214"/> + <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source> + <translation>Ing makaltong impormasion mapalyaring luma ne. Ing kekang wallet otomatiku yang mag-synchronize keng Bitcoin network istung mekakonekta ne king network, oneng ing prosesung ini ali ya pa kumpletu.</translation> + </message> + <message> + <location line="-140"/> + <source>Unconfirmed:</source> + <translation>Ali pa me-kumpirma:</translation> + </message> + <message> + <location line="-81"/> + <source>Wallet</source> + <translation>Wallet</translation> + </message> + <message> + <location line="+49"/> + <source>Confirmed:</source> + <translation>Me-kumpirma:</translation> + </message> + <message> + <location line="+16"/> + <source>Your current spendable balance</source> + <translation>Ing kekang kasalungsungan balanse a malyari mung gastusan</translation> + </message> + <message> + <location line="+32"/> + <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> + <translation>Ing kabuuan dareng transaksion a kasalungsungan ali pa me-kumpirma, at kasalungsungan ali pa mebilang kareng kekang balanseng malyari mung gastusan</translation> + </message> + <message> + <location line="+16"/> + <source>Immature:</source> + <translation>Immature:</translation> + </message> + <message> + <location line="+13"/> + <source>Mined balance that has not yet matured</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> + <source>Total:</source> + <translation>Kabuuan:</translation> + </message> + <message> + <location line="+16"/> + <source>Your current total balance</source> + <translation>Ing kekang kasalungsungan kabuuang balanse</translation> + </message> + <message> + <location line="+56"/> + <source><b>Recent transactions</b></source> + <translation><b>Reng kapilan pamung transaksion</b></translation> + </message> + <message> + <location filename="../overviewpage.cpp" line="+120"/> + <location line="+1"/> + <source>out of sync</source> + <translation>ali ya maka-sync</translation> + </message> +</context> +<context> + <name>PaymentServer</name> + <message> + <location filename="../paymentserver.cpp" line="+397"/> + <source>URI handling</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+91"/> + <source>Requested payment amount of %1 is too small (considered dust).</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-204"/> + <location line="+195"/> + <location line="+13"/> + <source>Payment request error</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-207"/> + <source>Cannot start bitcoin: click-to-pay handler</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+195"/> + <source>Unverified payment requests to custom payment scripts are unsupported.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+59"/> + <source>Refund from %1</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+42"/> + <source>Error communicating with %1: %2</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+28"/> + <source>Bad response from server %1</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+32"/> + <source>Payment acknowledged</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-55"/> + <location line="+27"/> + <location line="+17"/> + <source>Network request error</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>QObject</name> + <message> + <location filename="../bitcoin.cpp" line="+119"/> + <location line="+5"/> + <source>Bitcoin</source> + <translation>Bitcoin</translation> + </message> + <message> + <location line="-4"/> + <source>Error: Specified data directory "%1" does not exist.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+4"/> + <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 type="unfinished"/> + </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>Lagyu ning kliente</translation> + </message> + <message> + <location line="+10"/> + <location line="+23"/> + <location line="+26"/> + <location line="+23"/> + <location line="+23"/> + <location line="+36"/> + <location line="+53"/> + <location line="+23"/> + <location line="+23"/> + <location filename="../rpcconsole.cpp" line="+360"/> + <source>N/A</source> + <translation>N/A</translation> + </message> + <message> + <location line="-217"/> + <source>Client version</source> + <translation>Bersion ning Cliente</translation> + </message> + <message> + <location line="-45"/> + <source>&Information</source> + <translation>&Impormasion</translation> + </message> + <message> + <location line="-10"/> + <source>Debug window</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+78"/> + <source>Using OpenSSL version</source> + <translation>Gagamit bersion na ning OpenSSL</translation> + </message> + <message> + <location line="+49"/> + <source>Startup time</source> + <translation>Oras ning umpisa</translation> + </message> + <message> + <location line="+29"/> + <source>Network</source> + <translation>Network</translation> + </message> + <message> + <location line="+7"/> + <source>Number of connections</source> + <translation>Bilang dareng koneksion</translation> + </message> + <message> + <location line="+23"/> + <source>On testnet</source> + <translation>King testnet</translation> + </message> + <message> + <location line="+23"/> + <source>Block chain</source> + <translation>Block chain</translation> + </message> + <message> + <location line="+7"/> + <source>Current number of blocks</source> + <translation>Kasalungsungan bilang dareng blocks</translation> + </message> + <message> + <location line="+23"/> + <source>Estimated total blocks</source> + <translation>Estima kareng kabuuan dareng blocks</translation> + </message> + <message> + <location line="+23"/> + <source>Last block time</source> + <translation>Tatauling oras na ning block</translation> + </message> + <message> + <location line="+52"/> + <source>&Open</source> + <translation>&Ibuklat</translation> + </message> + <message> + <location line="+16"/> + <source>Command-line options</source> + <translation>Pipamilian command-line</translation> + </message> + <message> + <location line="+10"/> + <source>&Show</source> + <translation>&Ipakit</translation> + </message> + <message> + <location line="+24"/> + <source>&Console</source> + <translation>&Console</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 type="unfinished"/> + </message> + <message> + <location line="+80"/> + <source>Out:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-541"/> + <source>Build date</source> + <translation>Kaaldauan ning pamaglalang</translation> + </message> + <message> + <location line="-79"/> + <source>Bitcoin Core</source> + <translation>Kapilubluban ning Bitcoin</translation> + </message> + <message> + <location line="+279"/> + <source>Debug log file</source> + <translation>Debug log file</translation> + </message> + <message> + <location line="+7"/> + <source>Open the Bitcoin debug log file from the current data directory. This can take a few seconds for large log files.</source> + <translation>Ibuklat ing Bitcoin debug log file menibat king kasalungsungan data directory. Magluat ya ining pilan segundu para kareng mamaragul a log files.</translation> + </message> + <message> + <location line="+26"/> + <source>Show the Bitcoin-Core help message to get a list with possible Bitcoin command-line options.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+76"/> + <source>Clear console</source> + <translation>I-Clear ing console</translation> + </message> + <message> + <location filename="../rpcconsole.cpp" line="-30"/> + <source>Welcome to the Bitcoin RPC console.</source> + <translation>Malaus kayu king Bitcoin RPC console.</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>Gamitan me ing patas at pababang arrow para alibut me ing kasalesayan, at <b>Ctrl-L</b> ban I-clear ya ing screen.</translation> + </message> + <message> + <location line="+1"/> + <source>Type <b>help</b> for an overview of available commands.</source> + <translation>I-type ing <b>help</b> ban akit la reng ati at magsilbing commands.</translation> + </message> + <message> + <location line="+128"/> + <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="+19"/> + <source>The amount to request</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-32"/> + <source>&Label:</source> + <translation>&Label:</translation> + </message> + <message> + <location line="-34"/> + <source>&Message:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+20"/> + <source>The message to attach to payment request</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-37"/> + <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>The label to associate with the new receiving address</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+14"/> + <source>Use this form to request payments. All fields are optional.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+56"/> + <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>Previously requested payments</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> + <source>Show the selected request (does the same as double clicking an entry)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Show</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+11"/> + <source>Remove the selected entries from the list</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Remove</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>ReceiveRequestDialog</name> + <message> + <location filename="../forms/receiverequestdialog.ui" line="+29"/> + <source>QR Code</source> + <translation type="unfinished"/> + </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>Address</translation> + </message> + <message> + <location line="+2"/> + <source>Amount</source> + <translation>Alaga</translation> + </message> + <message> + <location line="+2"/> + <source>Label</source> + <translation>Label</translation> + </message> + <message> + <location line="+2"/> + <source>Message</source> + <translation>Mensayi</translation> + </message> + <message> + <location line="+10"/> + <source>Resulting URI too long, try to reduce the text for label / message.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+5"/> + <source>Error encoding URI into QR Code.</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>RecentRequestsTableModel</name> + <message> + <location filename="../recentrequeststablemodel.cpp" line="+14"/> + <source>Date</source> + <translation>Kaaldauan</translation> + </message> + <message> + <location line="+0"/> + <source>Label</source> + <translation>Label</translation> + </message> + <message> + <location line="+0"/> + <source>Message</source> + <translation>Mensayi</translation> + </message> + <message> + <location line="+0"/> + <source>Amount</source> + <translation>Alaga</translation> + </message> + <message> + <location line="+36"/> + <source>(no label)</source> + <translation>(alang label)</translation> + </message> + <message> + <location line="+9"/> + <source>(no message)</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>SendCoinsDialog</name> + <message> + <location filename="../forms/sendcoinsdialog.ui" line="+14"/> + <location filename="../sendcoinsdialog.cpp" line="+381"/> + <location line="+81"/> + <source>Send Coins</source> + <translation>Magpadalang Barya</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 type="unfinished"/> + </message> + <message> + <location line="+35"/> + <source>Bytes:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+48"/> + <source>Amount:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+32"/> + <source>Priority:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+48"/> + <source>Fee:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+32"/> + <source>Low Output:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+48"/> + <source>After Fee:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+32"/> + <source>Change:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+44"/> + <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Custom change address</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+115"/> + <source>Send to multiple recipients at once</source> + <translation>Misanang magpadala kareng alialiuang tumanggap</translation> + </message> + <message> + <location line="+3"/> + <source>Add &Recipient</source> + <translation>Maglage &Tumanggap</translation> + </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>I-Clear &Eganagana</translation> + </message> + <message> + <location line="+22"/> + <source>Balance:</source> + <translation>Balanse:</translation> + </message> + <message> + <location line="+41"/> + <source>Confirm the send action</source> + <translation>Kumpirman ing aksion king pamagpadala</translation> + </message> + <message> + <location line="+3"/> + <source>S&end</source> + <translation>Ipadala</translation> + </message> + <message> + <location filename="../sendcoinsdialog.cpp" line="-229"/> + <source>Confirm send coins</source> + <translation>Kumpirman ing pamagpadalang barya</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>Magpalub kang Bitcoin address(e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> + <message> + <location line="+15"/> + <source>Copy quantity</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation>Kopyan ing alaga</translation> + </message> + <message> + <location line="+1"/> + <source>Copy fee</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy after fee</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy bytes</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy priority</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy low output</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy change</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+170"/> + <source>Total Amount %1 (= %2)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>or</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+202"/> + <source>The recipient address is not valid, please recheck.</source> + <translation>Ing address na ning tumanggap ali ya katanggap-tanggap, maliari pung pakilaue pasibayu.</translation> + </message> + <message> + <location line="+3"/> + <source>The amount to pay must be larger than 0.</source> + <translation>Ing alaga na ning bayaran dapat mung mas matas ya king 0.</translation> + </message> + <message> + <location line="+3"/> + <source>The amount exceeds your balance.</source> + <translation>Ing alaga mipasobra ya king kekang balanse.</translation> + </message> + <message> + <location line="+3"/> + <source>The total exceeds your balance when the %1 transaction fee is included.</source> + <translation>Ing kabuuan mipasobra ya king kekang balanse istung inabe ya ing %1 a bayad king transaksion </translation> + </message> + <message> + <location line="+3"/> + <source>Duplicate address found, can only send to each address once per send operation.</source> + <translation>Atin meakit a milupang address, maliari kamung magpadalang misan king metung a address king misan a pamagpadalang transaksion.</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="+113"/> + <source>Warning: Invalid Bitcoin address</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+13"/> + <source>(no label)</source> + <translation>(alang label)</translation> + </message> + <message> + <location line="+8"/> + <source>Warning: Unknown change address</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-378"/> + <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="+501"/> + <location line="+536"/> + <source>A&mount:</source> + <translation>A&laga:</translation> + </message> + <message> + <location line="-1132"/> + <source>Pay &To:</source> + <translation>Ibayad &kang:</translation> + </message> + <message> + <location line="+18"/> + <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>Ing address nung nokarin ipadala ya ing kabayaran (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> + <message> + <location filename="../sendcoinsentry.cpp" line="+30"/> + <source>Enter a label for this address to add it to your address book</source> + <translation>Magpalub kang label para king address a ini ban a-iabe me king aklat dareng address</translation> + </message> + <message> + <location filename="../forms/sendcoinsentry.ui" line="+57"/> + <source>&Label:</source> + <translation>&Label:</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>Idikit ing address menibat king clipboard</translation> + </message> + <message> + <location line="+10"/> + <source>Alt+P</source> + <translation>Alt+P</translation> + </message> + <message> + <location line="+7"/> + <location line="+504"/> + <location line="+536"/> + <source>Remove this entry</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-40"/> + <source>This is a verified payment request.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-971"/> + <source>Enter a label for this address to add it to the list of used addresses</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+439"/> + <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>Magpalub kang Bitcoin address(e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> +</context> +<context> + <name>SignVerifyMessageDialog</name> + <message> + <location filename="../forms/signverifymessagedialog.ui" line="+14"/> + <source>Signatures - Sign / Verify a Message</source> + <translation>Pirma - Pirman / I-beripika ing mensayi</translation> + </message> + <message> + <location line="+13"/> + <source>&Sign Message</source> + <translation>&Pirman ing Mensayi</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>Maliari kang mamirmang mensayi king kekang address bilang patune na keka ya ini. Mimingat mu king pamag-pirmang e malino uling mapalyari kang mabiktimang phishing attack a manloku keka na pirman me ing sarili mu para king karela. Only sign fully-detailed statements you agree to.</translation> + </message> + <message> + <location line="+18"/> + <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>Ing address ban a -pirman ya ing mensayi kayabe ning (e.g.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>Idikit ing address menibat clipboard</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>Ipalub ing mensayi a buri mung pirman keni</translation> + </message> + <message> + <location line="+7"/> + <source>Signature</source> + <translation>Pirma</translation> + </message> + <message> + <location line="+27"/> + <source>Copy the current signature to the system clipboard</source> + <translation>Kopyan ing kasalungsungan pirma king system clipboard</translation> + </message> + <message> + <location line="+21"/> + <source>Sign the message to prove you own this Bitcoin address</source> + <translation>Pirman ing mensayi ban patune na keka ya ining Bitcoin address</translation> + </message> + <message> + <location line="+3"/> + <source>Sign &Message</source> + <translation>Pirman ing &Mensayi</translation> + </message> + <message> + <location line="+14"/> + <source>Reset all sign message fields</source> + <translation>Ibalik keng dati reng ngan fields keng pamamirmang mensayi</translation> + </message> + <message> + <location line="+3"/> + <location line="+146"/> + <source>Clear &All</source> + <translation>I-Clear &Eganagana</translation> + </message> + <message> + <location line="-87"/> + <source>&Verify Message</source> + <translation>&Beripikan ing Mensayi</translation> + </message> + <message> + <location line="+6"/> + <source>Enter the signing address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+21"/> + <source>The address the message was signed with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>Ing address na ning mensayi nung nokarin me pirma ya ini (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> + <message> + <location line="+40"/> + <source>Verify the message to ensure it was signed with the specified Bitcoin address</source> + <translation>Beripikan ing mensayi ban asiguradu a me pirma ya ini gamit ing mepiling Bitcoin address</translation> + </message> + <message> + <location line="+3"/> + <source>Verify &Message</source> + <translation>Beripikan ing &Mensayi</translation> + </message> + <message> + <location line="+14"/> + <source>Reset all verify message fields</source> + <translation>Ibalik king dati reng ngan fields na ning pamag beripikang mensayi</translation> + </message> + <message> + <location filename="../signverifymessagedialog.cpp" line="+29"/> + <location line="+3"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>Magpalub kang Bitcoin address(e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> + <message> + <location line="-2"/> + <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"/> + <source>The entered address is invalid.</source> + <translation>Ing milub a address e ya katanggap-tanggap.</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>Maliaring pakilawe pasibayu ing address at pasibayuan ya iti.</translation> + </message> + <message> + <location line="-81"/> + <location line="+81"/> + <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"/> + <source>Wallet unlock was cancelled.</source> + <translation>Me-kansela ya ing pamag-unlock king wallet.</translation> + </message> + <message> + <location line="+8"/> + <source>Private key for the entered address is not available.</source> + <translation>Ing private key para king milub a address, ala ya.</translation> + </message> + <message> + <location line="+12"/> + <source>Message signing failed.</source> + <translation>Me-mali ya ing pamag-pirma king mensayi .</translation> + </message> + <message> + <location line="+5"/> + <source>Message signed.</source> + <translation>Me-pirman ne ing mensayi.</translation> + </message> + <message> + <location line="+59"/> + <source>The signature could not be decoded.</source> + <translation>Ing pirma ali ya bisang ma-decode.</translation> + </message> + <message> + <location line="+0"/> + <location line="+13"/> + <source>Please check the signature and try again.</source> + <translation>Maliaring pakilawe pasibayu ing pirma kaibat pasibayuan ya iti.</translation> + </message> + <message> + <location line="+0"/> + <source>The signature did not match the message digest.</source> + <translation>Ing pirma ali ya makatugma king message digest.</translation> + </message> + <message> + <location line="+7"/> + <source>Message verification failed.</source> + <translation>Me-mali ya ing pamag-beripika king mensayi.</translation> + </message> + <message> + <location line="+5"/> + <source>Message verified.</source> + <translation>Me-beripika ne ing mensayi.</translation> + </message> +</context> +<context> + <name>SplashScreen</name> + <message> + <location filename="../splashscreen.cpp" line="+26"/> + <source>Bitcoin Core</source> + <translation>Kapilubluban ning Bitcoin</translation> + </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>Makabuklat anggang %1</translation> + </message> + <message> + <location line="+6"/> + <source>%1/offline</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>%1/unconfirmed</source> + <translation>%1/ali me-kumpirma</translation> + </message> + <message> + <location line="+2"/> + <source>%1 confirmations</source> + <translation>%1 kumpirmasion</translation> + </message> + <message> + <location line="+18"/> + <source>Status</source> + <translation>Kabilian</translation> + </message> + <message numerus="yes"> + <location line="+7"/> + <source>, broadcast through %n node(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> + <location line="+4"/> + <source>Date</source> + <translation>Kaaldauan</translation> + </message> + <message> + <location line="+7"/> + <source>Source</source> + <translation>Pikuanan</translation> + </message> + <message> + <location line="+0"/> + <source>Generated</source> + <translation>Megawa</translation> + </message> + <message> + <location line="+5"/> + <location line="+17"/> + <source>From</source> + <translation>Menibat</translation> + </message> + <message> + <location line="+1"/> + <location line="+22"/> + <location line="+58"/> + <source>To</source> + <translation>Para kang</translation> + </message> + <message> + <location line="-77"/> + <location line="+2"/> + <source>own address</source> + <translation>sariling address</translation> + </message> + <message> + <location line="-2"/> + <source>label</source> + <translation>label</translation> + </message> + <message> + <location line="+37"/> + <location line="+12"/> + <location line="+45"/> + <location line="+17"/> + <location line="+48"/> + <source>Credit</source> + <translation>Credit</translation> + </message> + <message numerus="yes"> + <location line="-120"/> + <source>matures in %n more block(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> + <location line="+2"/> + <source>not accepted</source> + <translation>ali metanggap</translation> + </message> + <message> + <location line="+44"/> + <location line="+8"/> + <location line="+15"/> + <location line="+48"/> + <source>Debit</source> + <translation>Debit</translation> + </message> + <message> + <location line="-57"/> + <source>Transaction fee</source> + <translation>Bayad king Transaksion</translation> + </message> + <message> + <location line="+16"/> + <source>Net amount</source> + <translation>Alaga dareng eganagana</translation> + </message> + <message> + <location line="+6"/> + <source>Message</source> + <translation>Mensayi</translation> + </message> + <message> + <location line="+2"/> + <source>Comment</source> + <translation>Komentu</translation> + </message> + <message> + <location line="+2"/> + <source>Transaction ID</source> + <translation>ID ning Transaksion</translation> + </message> + <message> + <location line="+13"/> + <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>Impormasion ning Debug</translation> + </message> + <message> + <location line="+8"/> + <source>Transaction</source> + <translation>Transaksion</translation> + </message> + <message> + <location line="+3"/> + <source>Inputs</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+23"/> + <source>Amount</source> + <translation>Alaga</translation> + </message> + <message> + <location line="+1"/> + <source>true</source> + <translation>tutu</translation> + </message> + <message> + <location line="+0"/> + <source>false</source> + <translation>e tutu</translation> + </message> + <message> + <location line="-227"/> + <source>, has not been successfully broadcast yet</source> + <translation>, eya matagumpeng mibalita</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>e miya balu</translation> + </message> +</context> +<context> + <name>TransactionDescDialog</name> + <message> + <location filename="../forms/transactiondescdialog.ui" line="+14"/> + <source>Transaction details</source> + <translation>Detalye ning Transaksion</translation> + </message> + <message> + <location line="+6"/> + <source>This pane shows a detailed description of the transaction</source> + <translation>Ining pane a ini magpakit yang detalyadung description ning transaksion</translation> + </message> +</context> +<context> + <name>TransactionTableModel</name> + <message> + <location filename="../transactiontablemodel.cpp" line="+234"/> + <source>Date</source> + <translation>Kaaldauan</translation> + </message> + <message> + <location line="+0"/> + <source>Type</source> + <translation>Klase</translation> + </message> + <message> + <location line="+0"/> + <source>Address</source> + <translation>Address</translation> + </message> + <message> + <location line="+0"/> + <source>Amount</source> + <translation>Alaga</translation> + </message> + <message numerus="yes"> + <location line="+57"/> + <source>Open for %n more block(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> + <location line="+3"/> + <source>Open until %1</source> + <translation>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="+3"/> + <source>Confirmed (%1 confirmations)</source> + <translation>Me-kumpirma(%1 kumpirmasion)</translation> + </message> + <message numerus="yes"> + <location line="+8"/> + <source>Mined balance will be available when it matures in %n more block(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> + <location line="+5"/> + <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> + <message> + <location line="+3"/> + <source>Generated but not accepted</source> + <translation>Me-generate ya oneng ali ya metanggap</translation> + </message> + <message> + <location line="+43"/> + <source>Received with</source> + <translation>Atanggap kayabe ning</translation> + </message> + <message> + <location line="+2"/> + <source>Received from</source> + <translation>Atanggap menibat kang</translation> + </message> + <message> + <location line="+3"/> + <source>Sent to</source> + <translation>Mipadala kang</translation> + </message> + <message> + <location line="+2"/> + <source>Payment to yourself</source> + <translation>Kabayaran keka</translation> + </message> + <message> + <location line="+2"/> + <source>Mined</source> + <translation>Me-mina</translation> + </message> + <message> + <location line="+38"/> + <source>(n/a)</source> + <translation>(n/a)</translation> + </message> + <message> + <location line="+199"/> + <source>Transaction status. Hover over this field to show number of confirmations.</source> + <translation>Status ning Transaksion: Itapat me babo na ning field a ini ban ipakit dala reng bilang dareng me-kumpirma na</translation> + </message> + <message> + <location line="+2"/> + <source>Date and time that the transaction was received.</source> + <translation>Aldo at oras nung kapilan me tanggap ya ing transaksion</translation> + </message> + <message> + <location line="+2"/> + <source>Type of transaction.</source> + <translation>Klase ning transaksion</translation> + </message> + <message> + <location line="+2"/> + <source>Destination address of transaction.</source> + <translation>Kepuntalan a address ning transaksion</translation> + </message> + <message> + <location line="+2"/> + <source>Amount removed from or added to balance.</source> + <translation>Alagang milako o miragdag king balanse.</translation> + </message> +</context> +<context> + <name>TransactionView</name> + <message> + <location filename="../transactionview.cpp" line="+57"/> + <location line="+16"/> + <source>All</source> + <translation>Eganagana</translation> + </message> + <message> + <location line="-15"/> + <source>Today</source> + <translation>Aldo iti</translation> + </message> + <message> + <location line="+1"/> + <source>This week</source> + <translation>Paruminggung iti</translation> + </message> + <message> + <location line="+1"/> + <source>This month</source> + <translation>Bulan a iti</translation> + </message> + <message> + <location line="+1"/> + <source>Last month</source> + <translation>Milabas a bulan</translation> + </message> + <message> + <location line="+1"/> + <source>This year</source> + <translation>Banuang iti</translation> + </message> + <message> + <location line="+1"/> + <source>Range...</source> + <translation>Angganan...</translation> + </message> + <message> + <location line="+11"/> + <source>Received with</source> + <translation>Atanggap kayabe ning</translation> + </message> + <message> + <location line="+2"/> + <source>Sent to</source> + <translation>Mipadala kang</translation> + </message> + <message> + <location line="+2"/> + <source>To yourself</source> + <translation>Keng sarili mu</translation> + </message> + <message> + <location line="+1"/> + <source>Mined</source> + <translation>Me-mina</translation> + </message> + <message> + <location line="+1"/> + <source>Other</source> + <translation>Aliwa</translation> + </message> + <message> + <location line="+6"/> + <source>Enter address or label to search</source> + <translation>Magpalub kang address o label para pantunan</translation> + </message> + <message> + <location line="+6"/> + <source>Min amount</source> + <translation>Pekaditak a alaga</translation> + </message> + <message> + <location line="+34"/> + <source>Copy address</source> + <translation>Kopyan ing address</translation> + </message> + <message> + <location line="+1"/> + <source>Copy label</source> + <translation>Kopyan ing label</translation> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation>Kopyan ing alaga</translation> + </message> + <message> + <location line="+1"/> + <source>Copy transaction ID</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Edit label</source> + <translation>Alilan ing label</translation> + </message> + <message> + <location line="+1"/> + <source>Show transaction details</source> + <translation>Ipakit ing detalye ning transaksion</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>Comma separated file (*.csv)</translation> + </message> + <message> + <location line="+9"/> + <source>Confirmed</source> + <translation>Me-kumpirma</translation> + </message> + <message> + <location line="+1"/> + <source>Date</source> + <translation>Kaaldauan</translation> + </message> + <message> + <location line="+1"/> + <source>Type</source> + <translation>Klase</translation> + </message> + <message> + <location line="+1"/> + <source>Label</source> + <translation>Label</translation> + </message> + <message> + <location line="+1"/> + <source>Address</source> + <translation>Address</translation> + </message> + <message> + <location line="+1"/> + <source>Amount</source> + <translation>Alaga</translation> + </message> + <message> + <location line="+1"/> + <source>ID</source> + <translation>ID</translation> + </message> + <message> + <location line="+107"/> + <source>Range:</source> + <translation>Angga:</translation> + </message> + <message> + <location line="+8"/> + <source>to</source> + <translation>para kang</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>Magpadalang Barya</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="+217"/> + <source>Usage:</source> + <translation>Pamanggamit:</translation> + </message> + <message> + <location line="-54"/> + <source>List commands</source> + <translation>Listahan dareng commands</translation> + </message> + <message> + <location line="-14"/> + <source>Get help for a command</source> + <translation>Maniauad saup para kareng command</translation> + </message> + <message> + <location line="+26"/> + <source>Options:</source> + <translation>Pipamilian:</translation> + </message> + <message> + <location line="+23"/> + <source>Specify configuration file (default: bitcoin.conf)</source> + <translation>Pilinan ing configuration file(default: bitcoin.conf)</translation> + </message> + <message> + <location line="+3"/> + <source>Specify pid file (default: bitcoind.pid)</source> + <translation>Pilinan ing pid file(default: bitcoind.pid)</translation> + </message> + <message> + <location line="-1"/> + <source>Specify data directory</source> + <translation>Pilinan ing data directory</translation> + </message> + <message> + <location line="-9"/> + <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="-27"/> + <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> + <translation>Makiramdam king koneksion king <port>(default: 8333 o testnet: 18333)</translation> + </message> + <message> + <location line="+5"/> + <source>Maintain at most <n> connections to peers (default: 125)</source> + <translation>Mag-maintain peka <n> koneksion keng peers (default: 125)</translation> + </message> + <message> + <location line="-50"/> + <source>Connect to a node to retrieve peer addresses, and disconnect</source> + <translation>Kumunekta king note ban ayakua mula reng peer address, at mako king panga konekta</translation> + </message> + <message> + <location line="+84"/> + <source>Specify your own public address</source> + <translation>Sabyan me ing kekang pampublikong address</translation> + </message> + <message> + <location line="+4"/> + <source>Threshold for disconnecting misbehaving peers (default: 100)</source> + <translation>Threshold for disconnecting misbehaving peers (default: 100)</translation> + </message> + <message> + <location line="-147"/> + <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> + <translation>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</translation> + </message> + <message> + <location line="-33"/> + <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> + <translation>Atin kamalian a milyari kabang ayusan ya ing RPC port %u para keng pamakiramdam king IPv4: %s</translation> + </message> + <message> + <location line="+31"/> + <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>Tumanggap command line at JSON-RPC commands</translation> + </message> + <message> + <location line="+79"/> + <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"/> + <source>Use the test network</source> + <translation>Gamitan ing test network</translation> + </message> + <message> + <location line="-117"/> + <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> + <translation>Tumanggap koneksion menibat king kilwal (default: 1 if no -proxy or -connect)</translation> + </message> + <message> + <location line="-92"/> + <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>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 type="unfinished"/> + </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>Kapabaluan: Sobra ya katas ing makalage king -paytxfee. Ini ing maging bayad mu para king bayad na ning transaksion istung pepadala me ing transaksion a ini.</translation> + </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>Kapabaluan: Maliaring pakilawe ing oras at aldo a makalage king kekayung kompyuter nung istu la! Istung ing oras yu mali ya ali ya gumanang masalese ing Bitcoin.</translation> + </message> + <message> + <location line="+3"/> + <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> + <translation type="unfinished"/> + </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>Pipamilian king pamag-gawang block:</translation> + </message> + <message> + <location line="+5"/> + <source>Connect only to the specified node(s)</source> + <translation>Kumunekta mu king mepiling node(s)</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>Mekapansin lang me-corrupt a block database</translation> + </message> + <message> + <location line="+1"/> + <source>Discover own IP address (default: 1 when listening and no -externalip)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Do you want to rebuild the block database now?</source> + <translation>Buri meng buuan pasibayu ing block database ngene?</translation> + </message> + <message> + <location line="+2"/> + <source>Error initializing block database</source> + <translation>Kamalian king pamag-initialize king block na ning database</translation> + </message> + <message> + <location line="+1"/> + <source>Error initializing wallet database environment %s!</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Error loading block database</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+4"/> + <source>Error opening block database</source> + <translation>Kamalian king pamag buklat king block database</translation> + </message> + <message> + <location line="+2"/> + <source>Error: Disk space is low!</source> + <translation>Kamalian: Mababa ne ing espasyu king disk!</translation> + </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>Kamalian: kamalian na ning sistema:</translation> + </message> + <message> + <location line="+1"/> + <source>Failed to listen on any port. Use -listen=0 if you want this.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Failed to read block info</source> + <translation>Me-mali king pamagbasa king impormasion ning block</translation> + </message> + <message> + <location line="+1"/> + <source>Failed to read block</source> + <translation>Me-mali king pamagbasa keng block</translation> + </message> + <message> + <location line="+1"/> + <source>Failed to sync block index</source> + <translation>Me-mali para i-sync ing block index</translation> + </message> + <message> + <location line="+1"/> + <source>Failed to write block index</source> + <translation>Me-mali king pamanyulat king block index</translation> + </message> + <message> + <location line="+1"/> + <source>Failed to write block info</source> + <translation>Me-mali king pamanyulat king block info</translation> + </message> + <message> + <location line="+1"/> + <source>Failed to write block</source> + <translation>Me-mali king pamanyulat block</translation> + </message> + <message> + <location line="+1"/> + <source>Failed to write file info</source> + <translation>Me-mali king pamanyulat king file info</translation> + </message> + <message> + <location line="+1"/> + <source>Failed to write to coin database</source> + <translation>Me-mali king pamanyulat king coin database</translation> + </message> + <message> + <location line="+1"/> + <source>Failed to write transaction index</source> + <translation>Me-mali king pamanyulat king index ning transaksion</translation> + </message> + <message> + <location line="+1"/> + <source>Failed to write undo data</source> + <translation>Me-mali king pamanyulat king undo data</translation> + </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>Mantun peers gamit ing pamamantun DNS (default: 1 unless -connect)</translation> + </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>Pilan la reng block a lawan keng umpisa (default: 288, 0 = all)</translation> + </message> + <message> + <location line="+1"/> + <source>How thorough the block verification is (0-4, default: 3)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>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="+8"/> + <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="+12"/> + <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="+3"/> + <source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>You need to rebuild the database using -reindex to change -txindex</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-78"/> + <source>Imports blocks from external blk000??.dat file</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-104"/> + <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+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="+88"/> + <source>Information</source> + <translation>&Impormasion</translation> + </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>Pipamilian ning SSL: (lawen ye ing Bitcoin Wiki para king SSL setup instructions)</translation> + </message> + <message> + <location line="+4"/> + <source>Send trace/debug info to console instead of debug.log file</source> + <translation>Magpadalang trace/debug info okeng console kesa keng debug.log file</translation> + </message> + <message> + <location line="+1"/> + <source>Send trace/debug info to debugger</source> + <translation>Ipadala ing impormasion dareng trace/debug king debugger</translation> + </message> + <message> + <location line="+6"/> + <source>Set minimum block size in bytes (default: 0)</source> + <translation>Ilage ing pekaditak a dagul na ning block king bytes (default: 0)</translation> + </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>Kamalian ning sistema:</translation> + </message> + <message> + <location line="+4"/> + <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 type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Use UPnP to map the listening port (default: 1 when listening)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>Username for JSON-RPC connections</source> + <translation>Username para king JSON-RPC koneksion</translation> + </message> + <message> + <location line="+6"/> + <source>Warning</source> + <translation>Kapabaluan</translation> + </message> + <message> + <location line="+2"/> + <source>Warning: This version is obsolete, upgrade required!</source> + <translation>Kapabaluan: Ing bersioin a ini laus ne, kailangan nang mag-upgrade!</translation> + </message> + <message> + <location line="+2"/> + <source>version</source> + <translation>bersion</translation> + </message> + <message> + <location line="+1"/> + <source>wallet.dat corrupt, salvage failed</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-57"/> + <source>Password for JSON-RPC connections</source> + <translation>Password para king JSON-RPC koneksion</translation> + </message> + <message> + <location line="-69"/> + <source>Allow JSON-RPC connections from specified IP address</source> + <translation>Payagan ya i JSON-RPC koneksion para king metung a IP address</translation> + </message> + <message> + <location line="+79"/> + <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="-131"/> + <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+160"/> + <source>Upgrade wallet to latest format</source> + <translation>I-upgrade ing wallet king pekabayung porma</translation> + </message> + <message> + <location line="-23"/> + <source>Set key pool size to <n> (default: 100)</source> + <translation>I-set ing key pool size king <n>(default: 100)</translation> + </message> + <message> + <location line="-12"/> + <source>Rescan the block chain for missing wallet transactions</source> + <translation>I-scan pasibayu ing block chain para kareng mauaualang transaksion</translation> + </message> + <message> + <location line="+38"/> + <source>Use OpenSSL (https) for JSON-RPC connections</source> + <translation>Gumamit OpenSSL(https) para king JSON-RPC koneksion</translation> + </message> + <message> + <location line="-29"/> + <source>Server certificate file (default: server.cert)</source> + <translation>Server certificate file (default: server.cert)</translation> + </message> + <message> + <location line="+1"/> + <source>Server private key (default: server.pem)</source> + <translation>Server private key (default: server.pem)</translation> + </message> + <message> + <location line="+16"/> + <source>This help message</source> + <translation>Ining saup a mensayi</translation> + </message> + <message> + <location line="+6"/> + <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> + <translation>Ali ya magsilbing mag-bind keng %s kening kompyuter a ini (bind returned error %d, %s)</translation> + </message> + <message> + <location line="-106"/> + <source>Allow DNS lookups for -addnode, -seednode and -connect</source> + <translation>Payagan ing pamaglawe DNS para king -addnode, -seednode and -connect</translation> + </message> + <message> + <location line="+59"/> + <source>Loading addresses...</source> + <translation>Lo-load da ne ing address...</translation> + </message> + <message> + <location line="-37"/> + <source>Error loading wallet.dat: Wallet corrupted</source> + <translation>Me-mali ya ing pamag-load king wallet.dat: Me-corrupt ya ing wallet</translation> + </message> + <message> + <location line="+1"/> + <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source> + <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"/> + <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"/> + <source>Error loading wallet.dat</source> + <translation>Me-mali ya ing pamag-load king wallet.dat</translation> + </message> + <message> + <location line="+31"/> + <source>Invalid -proxy address: '%s'</source> + <translation>Ali katanggap-tanggap a -proxy addresss: '%s'</translation> + </message> + <message> + <location line="+56"/> + <source>Unknown network specified in -onlynet: '%s'</source> + <translation>E kilalang network ing mepili king -onlynet: '%s'</translation> + </message> + <message> + <location line="-1"/> + <source>Unknown -socks proxy version requested: %i</source> + <translation>E kilalang -socks proxy version requested: %i</translation> + </message> + <message> + <location line="-100"/> + <source>Cannot resolve -bind address: '%s'</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Cannot resolve -externalip address: '%s'</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+47"/> + <source>Invalid amount for -paytxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Invalid amount</source> + <translation>Ing alaga e ya katanggap-tanggap</translation> + </message> + <message> + <location line="-6"/> + <source>Insufficient funds</source> + <translation>Kulang a pondo</translation> + </message> + <message> + <location line="+10"/> + <source>Loading block index...</source> + <translation>Lo-load dane ing block index...</translation> + </message> + <message> + <location line="-61"/> + <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> + <message> + <location line="-32"/> + <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source> + <translation>Eya megsilbing idikit king %s na ning kompyuter a ini. Mapaliaring mamandar ne ing Bitcoin.</translation> + </message> + <message> + <location line="+94"/> + <source>Loading wallet...</source> + <translation>Lo-load dane ing wallet...</translation> + </message> + <message> + <location line="-55"/> + <source>Cannot downgrade wallet</source> + <translation>Ali ya magsilbing i-downgrade ing wallet</translation> + </message> + <message> + <location line="+3"/> + <source>Cannot write default address</source> + <translation>Eya misulat ing default address</translation> + </message> + <message> + <location line="+66"/> + <source>Rescanning...</source> + <translation>I-scan deng pasibayu...</translation> + </message> + <message> + <location line="-58"/> + <source>Done loading</source> + <translation>Yari ne ing pamag-load</translation> + </message> + <message> + <location line="+85"/> + <source>To use the %s option</source> + <translation>Para agamit ing %s a pimamilian</translation> + </message> + <message> + <location line="-77"/> + <source>Error</source> + <translation>Mali</translation> + </message> + <message> + <location line="-34"/> + <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>Dapat meng ilage ing rpcpassword=<password> king configuration file: +%s +Nung ing file ala ya, gawa ka gamit ing owner-readable-only file permissions.</translation> + </message> +</context> +</TS>
\ No newline at end of file diff --git a/src/qt/locale/bitcoin_pl.ts b/src/qt/locale/bitcoin_pl.ts index b01fd8691f..bd18fa3b73 100644 --- a/src/qt/locale/bitcoin_pl.ts +++ b/src/qt/locale/bitcoin_pl.ts @@ -3,13 +3,13 @@ <name>AboutDialog</name> <message> <location filename="../forms/aboutdialog.ui" line="+14"/> - <source>About Bitcoin</source> - <translation>O Bitcoin</translation> + <source>About Bitcoin Core</source> + <translation>O Bitcoin Core</translation> </message> <message> <location line="+39"/> - <source><b>Bitcoin</b> version</source> - <translation>Wersja <b>Bitcoin</b></translation> + <source><b>Bitcoin Core</b> version</source> + <translation>Wersja <b>Bitcoin Core</b></translation> </message> <message> <location line="+57"/> @@ -27,7 +27,7 @@ Distributed under the MIT/X11 software license, see the accompanying file COPYIN This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="+14"/> + <location filename="../aboutdialog.cpp" line="+19"/> <source>Copyright</source> <translation>Prawo autorskie</translation> </message> @@ -52,7 +52,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>&Nowy</translation> </message> <message> <location line="+11"/> @@ -62,15 +62,15 @@ 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>&Kopiuj</translation> </message> <message> <location line="+52"/> <source>C&lose</source> - <translation type="unfinished"/> + <translation>Z&amknij</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="+72"/> + <location filename="../addressbookpage.cpp" line="+74"/> <source>&Copy Address</source> <translation>&Kopiuj adres</translation> </message> @@ -102,22 +102,22 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+1"/> <source>Choose the address to receive coins with</source> - <translation type="unfinished"/> + <translation>Wybierz adres do otrzymania monet.</translation> </message> <message> <location line="+5"/> <source>C&hoose</source> - <translation type="unfinished"/> + <translation>W&ybierz</translation> </message> <message> <location line="+6"/> <source>Sending addresses</source> - <translation type="unfinished"/> + <translation>Adres wysyłania</translation> </message> <message> <location line="+1"/> <source>Receiving addresses</source> - <translation type="unfinished"/> + <translation>Adres odbiorczy</translation> </message> <message> <location line="+7"/> @@ -127,7 +127,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+4"/> <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source> - <translation type="unfinished"/> + <translation>To twoje adresy bitcoin do odbierania płatności. Zaleca się używanie nowych adresów odbiorczych dla każdej tranzakcji.</translation> </message> <message> <location line="+7"/> @@ -140,9 +140,9 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Edytuj</translation> </message> <message> - <location line="+197"/> + <location line="+194"/> <source>Export Address List</source> - <translation type="unfinished"/> + <translation>Eksportuj listę adresową</translation> </message> <message> <location line="+1"/> @@ -163,7 +163,7 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>AddressTableModel</name> <message> - <location filename="../addresstablemodel.cpp" line="+164"/> + <location filename="../addresstablemodel.cpp" line="+168"/> <source>Label</source> <translation>Etykieta</translation> </message> @@ -201,7 +201,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Powtórz nowe hasło</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="+34"/> + <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>Wprowadź nowe hasło dla portfela.<br/>Proszę użyć hasła składającego się z <b>10 lub więcej losowych znaków</b> lub <b>ośmiu lub więcej słów</b>.</translation> </message> @@ -322,17 +322,17 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+250"/> + <location filename="../bitcoingui.cpp" line="+260"/> <source>Sign &message...</source> <translation>Podpisz wiado&mość...</translation> </message> <message> - <location line="+254"/> + <location line="+290"/> <source>Synchronizing with network...</source> <translation>Synchronizacja z siecią...</translation> </message> <message> - <location line="-324"/> + <location line="-360"/> <source>&Overview</source> <translation>P&odsumowanie</translation> </message> @@ -398,7 +398,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Zmień hasło...</translation> </message> <message> - <location line="+259"/> + <location line="+295"/> <source>Importing blocks from disk...</source> <translation>Importowanie bloków z dysku...</translation> </message> @@ -408,7 +408,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Ponowne indeksowanie bloków na dysku...</translation> </message> <message> - <location line="-322"/> + <location line="-358"/> <source>Send coins to a Bitcoin address</source> <translation>Wyślij monety na adres Bitcoin</translation> </message> @@ -443,20 +443,18 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Zweryfikuj wiadomość...</translation> </message> <message> - <location line="-180"/> - <location line="+6"/> - <location line="+513"/> + <location line="+375"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-519"/> - <location line="+6"/> + <location line="-563"/> + <location line="+10"/> <source>Wallet</source> <translation>Portfel</translation> </message> <message> - <location line="+109"/> + <location line="+113"/> <source>&Send</source> <translation>Wyślij</translation> </message> @@ -466,13 +464,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Odbie&rz</translation> </message> <message> - <location line="+28"/> - <location line="+2"/> - <source>&About Bitcoin</source> - <translation>O Bitcoin</translation> - </message> - <message> - <location line="+14"/> + <location line="+44"/> <location line="+2"/> <source>&Show / Hide</source> <translation>&Pokaż / Ukryj</translation> @@ -498,12 +490,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Zweryfikuj wiadomość, aby upewnić się, że została podpisana odpowiednim adresem Bitcoin.</translation> </message> <message> - <location line="+35"/> + <location line="+39"/> <source>&File</source> <translation>&Plik</translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>&Settings</source> <translation>P&referencje</translation> </message> @@ -518,44 +510,66 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Pasek zakładek</translation> </message> <message> - <location line="-235"/> - <location line="+294"/> + <location line="-244"/> + <location line="+321"/> <source>[testnet]</source> <translation>[testnet]</translation> </message> <message> - <location line="-177"/> + <location line="-331"/> + <location line="+10"/> + <source>Bitcoin Core</source> + <translation>Rdzeń BitCoin</translation> + </message> + <message> + <location line="+121"/> <source>Request payments (generates QR codes and bitcoin: URIs)</source> - <translation type="unfinished"/> + <translation>Żądaj płatności (generuje kod QR oraz bitcoin URI)</translation> </message> <message> - <location line="+63"/> + <location line="+27"/> + <location line="+2"/> + <source>&About Bitcoin Core</source> + <translation>&O Bitcoin Core</translation> + </message> + <message> + <location line="+34"/> <source>&Used sending addresses...</source> - <translation type="unfinished"/> + <translation>&Użyte adresy wysyłające</translation> </message> <message> <location line="+1"/> <source>Show the list of used sending addresses and labels</source> - <translation type="unfinished"/> + <translation>Pokaż listę użytych adresów wysyłających i etykiety</translation> </message> <message> <location line="+1"/> <source>Used &receiving addresses...</source> - <translation type="unfinished"/> + <translation>Użyte &adresy odbiorcze</translation> </message> <message> <location line="+1"/> <source>Show the list of used receiving addresses and labels</source> + <translation>Pokaż listę użytych adresów odbiorczych i etykiety</translation> + </message> + <message> + <location line="+2"/> + <source>Open URI...</source> + <translation>Otwórz URI...</translation> + </message> + <message> + <location line="+1"/> + <source>Open a bitcoin: URI or payment request</source> <translation type="unfinished"/> </message> <message> - <location line="+106"/> + <location line="+126"/> <location line="+5"/> <source>Bitcoin client</source> <translation>Bitcoin klient</translation> </message> <message numerus="yes"> - <location line="+120"/> + <location line="+133"/> <source>%n active connection(s) to Bitcoin network</source> <translation><numerusform>%n aktywne połączenie do sieci Bitcoin</numerusform><numerusform>%n aktywne połączenia do sieci Bitcoin</numerusform><numerusform>%n aktywnych połączeń do sieci Bitcoin</numerusform></translation> </message> @@ -663,17 +677,7 @@ Adres: %4 </translation> </message> <message> - <location line="+34"/> - <source>URI handling</source> - <translation>Obsługa URI</translation> - </message> - <message> - <location line="+0"/> - <source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source> - <translation>URI nie może zostać przetworzony! Prawdopodobnie błędny adres Bitcoin bądź nieprawidłowe parametry URI.</translation> - </message> - <message> - <location line="+45"/> + <location line="+67"/> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>Portfel jest <b>zaszyfrowany</b> i obecnie <b>niezablokowany</b></translation> </message> @@ -683,7 +687,7 @@ Adres: %4 <translation>Portfel jest <b>zaszyfrowany</b> i obecnie <b>zablokowany</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+110"/> + <location filename="../bitcoin.cpp" line="+116"/> <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> @@ -691,12 +695,299 @@ Adres: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+115"/> + <location filename="../clientmodel.cpp" line="+119"/> <source>Network Alert</source> <translation>Sieć Alert</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>Ilość:</translation> + </message> + <message> + <location line="+29"/> + <source>Bytes:</source> + <translation>Bajtów:</translation> + </message> + <message> + <location line="+45"/> + <source>Amount:</source> + <translation>Kwota:</translation> + </message> + <message> + <location line="+29"/> + <source>Priority:</source> + <translation>Priorytet:</translation> + </message> + <message> + <location line="+45"/> + <source>Fee:</source> + <translation>Opłata:</translation> + </message> + <message> + <location line="+32"/> + <source>Low Output:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+48"/> + <source>After Fee:</source> + <translation>Po opłacie:</translation> + </message> + <message> + <location line="+32"/> + <source>Change:</source> + <translation>Reszta:</translation> + </message> + <message> + <location line="+63"/> + <source>(un)select all</source> + <translation>Zaznacz/Odznacz wszystko</translation> + </message> + <message> + <location line="+13"/> + <source>Tree mode</source> + <translation>Widok drzewa</translation> + </message> + <message> + <location line="+16"/> + <source>List mode</source> + <translation>Widok listy</translation> + </message> + <message> + <location line="+52"/> + <source>Amount</source> + <translation>Kwota</translation> + </message> + <message> + <location line="+10"/> + <source>Address</source> + <translation>Adres</translation> + </message> + <message> + <location line="+5"/> + <source>Date</source> + <translation>Data</translation> + </message> + <message> + <location line="+5"/> + <source>Confirmations</source> + <translation>Potwierdzenia</translation> + </message> + <message> + <location line="+3"/> + <source>Confirmed</source> + <translation>Potwierdzony</translation> + </message> + <message> + <location line="+5"/> + <source>Priority</source> + <translation>Priorytet</translation> + </message> + <message> + <location filename="../coincontroldialog.cpp" line="+42"/> + <source>Copy address</source> + <translation>Kopiuj adres</translation> + </message> + <message> + <location line="+1"/> + <source>Copy label</source> + <translation>Kopiuj etykietę</translation> + </message> + <message> + <location line="+1"/> + <location line="+26"/> + <source>Copy amount</source> + <translation>Kopiuj kwotę</translation> + </message> + <message> + <location line="-25"/> + <source>Copy transaction ID</source> + <translation>Skopiuj ID transakcji</translation> + </message> + <message> + <location line="+1"/> + <source>Lock unspent</source> + <translation>Zablokuj</translation> + </message> + <message> + <location line="+1"/> + <source>Unlock unspent</source> + <translation>Odblokuj</translation> + </message> + <message> + <location line="+22"/> + <source>Copy quantity</source> + <translation>Skopiuj ilość</translation> + </message> + <message> + <location line="+2"/> + <source>Copy fee</source> + <translation>Skopiuj opłatę</translation> + </message> + <message> + <location line="+1"/> + <source>Copy after fee</source> + <translation>Skopiuj ilość po opłacie</translation> + </message> + <message> + <location line="+1"/> + <source>Copy bytes</source> + <translation>Skopiuj ilość bajtów</translation> + </message> + <message> + <location line="+1"/> + <source>Copy priority</source> + <translation>Skopiuj priorytet</translation> + </message> + <message> + <location line="+1"/> + <source>Copy low output</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy change</source> + <translation>Skopiuj resztę</translation> + </message> + <message> + <location line="+323"/> + <source>highest</source> + <translation>najwyższa</translation> + </message> + <message> + <location line="+1"/> + <source>higher</source> + <translation>wyższa</translation> + </message> + <message> + <location line="+1"/> + <source>high</source> + <translation>wysoka</translation> + </message> + <message> + <location line="+1"/> + <source>medium-high</source> + <translation>średnio wysoki</translation> + </message> + <message> + <location line="+1"/> + <source>medium</source> + <translation>średnia</translation> + </message> + <message> + <location line="+4"/> + <source>low-medium</source> + <translation>średnio niski</translation> + </message> + <message> + <location line="+1"/> + <source>low</source> + <translation>niski</translation> + </message> + <message> + <location line="+1"/> + <source>lower</source> + <translation>niższy</translation> + </message> + <message> + <location line="+1"/> + <source>lowest</source> + <translation>najniższy</translation> + </message> + <message> + <location line="+11"/> + <source>(%1 locked)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+171"/> + <source>Dust</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>yes</source> + <translation>tak</translation> + </message> + <message> + <location line="+0"/> + <source>no</source> + <translation>nie</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>(bez etykiety)</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"/> @@ -711,12 +1002,12 @@ Adres: %4 <message> <location line="+10"/> <source>The label associated with this address list entry</source> - <translation type="unfinished"/> + <translation>Etykieta skojarzona z tym wpisem na liście adresów</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>Ten adres jest skojarzony z wpisem na liście adresów. Może być zmodyfikowany jedynie dla adresów wysyłających.</translation> </message> <message> <location line="-10"/> @@ -724,7 +1015,7 @@ Adres: %4 <translation>&Adres</translation> </message> <message> - <location filename="../editaddressdialog.cpp" line="+21"/> + <location filename="../editaddressdialog.cpp" line="+25"/> <source>New receiving address</source> <translation>Nowy adres odbiorczy</translation> </message> @@ -767,19 +1058,19 @@ Adres: %4 <context> <name>FreespaceChecker</name> <message> - <location filename="../intro.cpp" line="+61"/> + <location filename="../intro.cpp" line="+65"/> <source>A new data directory will be created.</source> <translation>Utworzono nowy folder danych.</translation> </message> <message> <location line="+22"/> <source>name</source> - <translation type="unfinished"/> + <translation>nazwa</translation> </message> <message> <location line="+2"/> <source>Directory already exists. Add %1 if you intend to create a new directory here.</source> - <translation type="unfinished"/> + <translation>Katalog już istnieje. Dodaj %1 jeśli masz zamiar utworzyć tutaj nowy katalog.</translation> </message> <message> <location line="+3"/> @@ -795,18 +1086,18 @@ Adres: %4 <context> <name>GUIUtil::HelpMessageBox</name> <message> - <location filename="../guiutil.cpp" line="+558"/> - <location line="+13"/> - <source>Bitcoin-Qt</source> - <translation>Bitcoin-Qt</translation> - </message> - <message> - <location line="-13"/> + <location filename="../guiutil.cpp" line="+597"/> <source>version</source> <translation>wersja</translation> </message> <message> - <location line="+2"/> + <location line="+0"/> + <location line="+13"/> + <source>Bitcoin Core</source> + <translation>Rdzeń BitCoin</translation> + </message> + <message> + <location line="-11"/> <source>Usage:</source> <translation>Użycie:</translation> </message> @@ -850,18 +1141,18 @@ Adres: %4 </message> <message> <location line="+9"/> - <source>Welcome to Bitcoin-Qt.</source> - <translation>Witam w Bitcoin-Qt</translation> + <source>Welcome to Bitcoin Core.</source> + <translation type="unfinished"/> </message> <message> <location line="+26"/> - <source>As this is the first time the program is launched, you can choose where Bitcoin-Qt will store its data.</source> - <translation>Jeżeli to twoje pierwsze uruchomienie programu, możesz wybrać gdzie Bitcoin-Qt będzie zapisywał swoje dane.</translation> + <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source> + <translation type="unfinished"/> </message> <message> <location line="+10"/> - <source>Bitcoin-Qt will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source> - <translation>Bitcoin-Qt będzie pobierać i zapisywać kopie łańcucha bloku Bitcoin. Co najmniej %1GB danych będzie tam zapisanych, a ich ilość będzie rosła z czasem. W tym folderze jest również przechowywany portfel.</translation> + <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source> + <translation type="unfinished"/> </message> <message> <location line="+10"/> @@ -874,7 +1165,17 @@ Adres: %4 <translation>Użyj wybranego folderu dla danych</translation> </message> <message> - <location filename="../intro.cpp" line="+105"/> + <location filename="../intro.cpp" line="+85"/> + <source>Bitcoin</source> + <translation>Bitcoin</translation> + </message> + <message> + <location line="+1"/> + <source>Error: Specified data directory "%1" can not be created.</source> + <translation>Błąd: Określony folder danych "%1" nie mógł zostać utworzony.</translation> + </message> + <message> + <location line="+19"/> <source>Error</source> <translation>Błąd</translation> </message> @@ -890,6 +1191,34 @@ Adres: %4 </message> </context> <context> + <name>OpenURIDialog</name> + <message> + <location filename="../forms/openuridialog.ui" line="+14"/> + <source>Open URI</source> + <translation>Otwórz URI:</translation> + </message> + <message> + <location line="+6"/> + <source>Open payment request from URI or file</source> + <translation>Otwórz żądanie zapłaty z URI lub pliku</translation> + </message> + <message> + <location line="+9"/> + <source>URI:</source> + <translation>URI:</translation> + </message> + <message> + <location line="+11"/> + <source>Select payment request file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../openuridialog.cpp" line="+47"/> + <source>Select payment request file to open</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OptionsDialog</name> <message> <location filename="../forms/optionsdialog.ui" line="+14"/> @@ -1047,6 +1376,16 @@ Adres: %4 <translation>&Wyświetlaj adresy w liście transakcji</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="+71"/> <source>&OK</source> <translation>&OK</translation> @@ -1062,12 +1401,12 @@ Adres: %4 <translation>Z&astosuj</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+58"/> + <location filename="../optionsdialog.cpp" line="+63"/> <source>default</source> <translation>domyślny</translation> </message> <message> - <location line="+130"/> + <location line="+131"/> <source>Confirm options reset</source> <translation>Potwierdź reset ustawień</translation> </message> @@ -1108,17 +1447,17 @@ Adres: %4 </message> <message> <location line="+50"/> - <location line="+202"/> + <location line="+214"/> <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source> <translation>Wyświetlana informacja może być nieaktualna. Twój portfel synchronizuje się automatycznie z siecią bitcoin, zaraz po tym jak uzyskano połączenie, ale proces ten nie został jeszcze ukończony.</translation> </message> <message> - <location line="-131"/> + <location line="-140"/> <source>Unconfirmed:</source> <translation>Niepotwierdzone:</translation> </message> <message> - <location line="-78"/> + <location line="-81"/> <source>Wallet</source> <translation>Portfel</translation> </message> @@ -1133,12 +1472,12 @@ Adres: %4 <translation>Twoje obecne saldo</translation> </message> <message> - <location line="+29"/> + <location line="+32"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation>Suma transakcji, które nie zostały jeszcze potwierdzone, a które nie zostały wliczone do twojego obecnego salda</translation> </message> <message> - <location line="+13"/> + <location line="+16"/> <source>Immature:</source> <translation>Niedojrzały: </translation> </message> @@ -1148,7 +1487,7 @@ Adres: %4 <translation>Balans wydobycia, który jeszcze nie dojrzał</translation> </message> <message> - <location line="+13"/> + <location line="+16"/> <source>Total:</source> <translation>Wynosi ogółem:</translation> </message> @@ -1158,12 +1497,12 @@ Adres: %4 <translation>Twoje obecne saldo</translation> </message> <message> - <location line="+53"/> + <location line="+56"/> <source><b>Recent transactions</b></source> <translation><b>Ostatnie transakcje</b></translation> </message> <message> - <location filename="../overviewpage.cpp" line="+116"/> + <location filename="../overviewpage.cpp" line="+120"/> <location line="+1"/> <source>out of sync</source> <translation>desynchronizacja</translation> @@ -1172,7 +1511,7 @@ Adres: %4 <context> <name>PaymentServer</name> <message> - <location filename="../paymentserver.cpp" line="+392"/> + <location filename="../paymentserver.cpp" line="+397"/> <source>URI handling</source> <translation>Obsługa URI</translation> </message> @@ -1182,55 +1521,60 @@ Adres: %4 <translation>URI nie może zostać przetworzony! Prawdopodobnie błędny adres Bitcoin bądź nieprawidłowe parametry URI.</translation> </message> <message> - <location line="+69"/> + <location line="+91"/> <source>Requested payment amount of %1 is too small (considered dust).</source> - <translation type="unfinished"/> + <translation>Żądana kwota %1 jest za niska (uznano za kurz).</translation> </message> <message> - <location line="+4"/> - <location line="+37"/> + <location line="-204"/> + <location line="+195"/> + <location line="+13"/> <source>Payment request error</source> - <translation type="unfinished"/> + <translation>Błąd żądania płatności</translation> </message> <message> - <location line="+1"/> - <source>Insecure requests to custom payment scripts unsupported</source> + <location line="-207"/> + <source>Cannot start bitcoin: click-to-pay handler</source> + <translation>Nie można rozpocząć bitcoin: kliknij-by-zapłacić opiekunowi</translation> + </message> + <message> + <location line="+195"/> + <source>Unverified payment requests to custom payment scripts are unsupported.</source> <translation type="unfinished"/> </message> <message> - <location line="+38"/> + <location line="+59"/> <source>Refund from %1</source> <translation>Zwrot z %1</translation> </message> <message> <location line="+42"/> <source>Error communicating with %1: %2</source> - <translation type="unfinished"/> + <translation>Błąd komunikacji z %1 : %2</translation> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>Bad response from server %1</source> - <translation type="unfinished"/> + <translation>Błędna odpowiedź z serwera %1</translation> </message> <message> <location line="+32"/> <source>Payment acknowledged</source> - <translation type="unfinished"/> + <translation>Płatność potwierdzona</translation> </message> <message> - <location line="-58"/> - <location line="+30"/> + <location line="-55"/> + <location line="+27"/> <location line="+17"/> <source>Network request error</source> - <translation type="unfinished"/> + <translation>Błąd żądania sieci</translation> </message> </context> <context> <name>QObject</name> <message> - <location filename="../bitcoin.cpp" line="+114"/> + <location filename="../bitcoin.cpp" line="+119"/> <location line="+5"/> - <location filename="../intro.cpp" line="-32"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> @@ -1242,25 +1586,20 @@ Adres: %4 <message> <location line="+4"/> <source>Error: Invalid combination of -regtest and -testnet.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../intro.cpp" line="+1"/> - <source>Error: Specified data directory "%1" can not be created.</source> - <translation>Błąd: Określony folder danych "%1" nie mógł zostać utworzony.</translation> + <translation>Błąd: Niepoprawna kombinacja -regtest i -testnet.</translation> </message> </context> <context> <name>QRImageWidget</name> <message> - <location filename="../receiverequestdialog.cpp" line="+32"/> + <location filename="../receiverequestdialog.cpp" line="+36"/> <source>&Save Image...</source> - <translation type="unfinished"/> + <translation>&Zapisz obraz...</translation> </message> <message> <location line="+3"/> <source>&Copy Image</source> - <translation type="unfinished"/> + <translation>&Kopiuj obraz</translation> </message> <message> <location line="+28"/> @@ -1269,8 +1608,8 @@ Adres: %4 </message> <message> <location line="+0"/> - <source>PNG Images (*.png)</source> - <translation>Obraz PNG (*.png)</translation> + <source>PNG Image (*.png)</source> + <translation type="unfinished"/> </message> </context> <context> @@ -1290,7 +1629,7 @@ Adres: %4 <location line="+53"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+352"/> + <location filename="../rpcconsole.cpp" line="+360"/> <source>N/A</source> <translation>NIEDOSTĘPNE</translation> </message> @@ -1305,7 +1644,12 @@ Adres: %4 <translation>&Informacje</translation> </message> <message> - <location line="+68"/> + <location line="-10"/> + <source>Debug window</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+78"/> <source>Using OpenSSL version</source> <translation>Używana wersja OpenSSL</translation> </message> @@ -1360,12 +1704,7 @@ Adres: %4 <translation>Opcje konsoli</translation> </message> <message> - <location line="+7"/> - <source>Show the Bitcoin-Qt help message to get a list with possible Bitcoin command-line options.</source> - <translation>Pokaż pomoc Bitcoin-Qt, aby zobaczyć listę wszystkich opcji linii poleceń</translation> - </message> - <message> - <location line="+3"/> + <location line="+10"/> <source>&Show</source> <translation>&Pokaż</translation> </message> @@ -1377,12 +1716,12 @@ Adres: %4 <message> <location line="+72"/> <source>&Network Traffic</source> - <translation type="unfinished"/> + <translation>$Ruch sieci</translation> </message> <message> <location line="+52"/> <source>&Clear</source> - <translation type="unfinished"/> + <translation>&Wyczyść</translation> </message> <message> <location line="+13"/> @@ -1392,12 +1731,12 @@ Adres: %4 <message> <location line="+64"/> <source>In:</source> - <translation type="unfinished"/> + <translation>Wejście:</translation> </message> <message> <location line="+80"/> <source>Out:</source> - <translation type="unfinished"/> + <translation>Wyjście:</translation> </message> <message> <location line="-541"/> @@ -1405,12 +1744,7 @@ Adres: %4 <translation>Data kompilacji</translation> </message> <message> - <location line="-104"/> - <source>Bitcoin - Debug window</source> - <translation>Bitcoin - Okno debugowania</translation> - </message> - <message> - <location line="+25"/> + <location line="-79"/> <source>Bitcoin Core</source> <translation>Rdzeń BitCoin</translation> </message> @@ -1425,7 +1759,12 @@ Adres: %4 <translation>Otwórz plik logowania debugowania Bitcoin z obecnego katalogu z danymi. Może to potrwać kilka sekund przy większych plikach.</translation> </message> <message> - <location line="+102"/> + <location line="+26"/> + <source>Show the Bitcoin-Core help message to get a list with possible Bitcoin command-line options.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+76"/> <source>Clear console</source> <translation>Wyczyść konsolę</translation> </message> @@ -1447,99 +1786,124 @@ Adres: %4 <message> <location line="+128"/> <source>%1 B</source> - <translation type="unfinished"/> + <translation>%1 B</translation> </message> <message> <location line="+2"/> <source>%1 KB</source> - <translation type="unfinished"/> + <translation>%1 KB</translation> </message> <message> <location line="+2"/> <source>%1 MB</source> - <translation type="unfinished"/> + <translation>%1 MB</translation> </message> <message> <location line="+2"/> <source>%1 GB</source> - <translation type="unfinished"/> + <translation>%1 GB</translation> </message> <message> <location line="+7"/> <source>%1 m</source> - <translation type="unfinished"/> + <translation>%1 m</translation> </message> <message> <location line="+5"/> <source>%1 h</source> - <translation type="unfinished"/> + <translation>%1 h</translation> </message> <message> <location line="+2"/> <source>%1 h %2 m</source> - <translation type="unfinished"/> + <translation>%1 h %2 m</translation> </message> </context> <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+22"/> + <location filename="../forms/receivecoinsdialog.ui" line="+83"/> <source>&Amount:</source> - <translation type="unfinished"/> + <translation>&Ilość:</translation> </message> <message> - <location line="+16"/> + <location line="+19"/> <source>The amount to request</source> - <translation type="unfinished"/> + <translation>Żądana ilość</translation> </message> <message> - <location line="+7"/> + <location line="-32"/> <source>&Label:</source> <translation>&Etykieta:</translation> </message> <message> - <location line="+10"/> - <source>The label to associate with the receiving address</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+7"/> + <location line="-34"/> <source>&Message:</source> - <translation type="unfinished"/> + <translation>&Wiadomość:</translation> </message> <message> - <location line="+10"/> + <location line="+20"/> <source>The message to attach to payment request</source> - <translation type="unfinished"/> + <translation>Wiadomość dołączana do żądania płatności</translation> </message> <message> - <location line="+14"/> + <location line="-37"/> <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>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> <message> <location line="+3"/> <source>R&euse an existing receiving address (not recommended)</source> + <translation>U%żyj ponownie istniejący adres odbiorczy (niepolecane)</translation> + </message> + <message> + <location line="+27"/> + <source>The label to associate with the new receiving address</source> <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="+14"/> <source>Use this form to request payments. All fields are optional.</source> - <translation type="unfinished"/> + <translation>Użyj tego formularza, aby zażądać płatności. Wszystkie pola są opcjonalne.</translation> </message> <message> - <location line="+17"/> + <location line="+56"/> <source>Clear all fields of the form.</source> - <translation type="unfinished"/> + <translation>Wyczyść pola formularza</translation> </message> <message> <location line="+3"/> <source>Clear</source> - <translation type="unfinished"/> + <translation>Wyczyść</translation> </message> <message> <location line="+36"/> <source>&Request payment</source> + <translation>&Żądaj płatności</translation> + </message> + <message> + <location line="+47"/> + <source>Previously requested payments</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> + <source>Show the selected request (does the same as double clicking an entry)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Show</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+11"/> + <source>Remove the selected entries from the list</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Remove</source> <translation type="unfinished"/> </message> </context> @@ -1553,37 +1917,32 @@ Adres: %4 <message> <location line="+46"/> <source>Copy &URI</source> - <translation type="unfinished"/> + <translation>Kopiuj &URI</translation> </message> <message> <location line="+7"/> <source>Copy &Address</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+7"/> - <source>&Copy Image</source> - <translation type="unfinished"/> + <translation>Kopiuj &adres</translation> </message> <message> <location line="+7"/> <source>&Save Image...</source> - <translation type="unfinished"/> + <translation>&Zapisz obraz...</translation> </message> <message> - <location filename="../receiverequestdialog.cpp" line="+58"/> + <location filename="../receiverequestdialog.cpp" line="+56"/> <source>Request payment to %1</source> - <translation type="unfinished"/> + <translation>Żądaj płatności do %1</translation> </message> <message> <location line="+6"/> <source>Payment information</source> - <translation type="unfinished"/> + <translation>Informacje o płatności</translation> </message> <message> <location line="+1"/> <source>URI</source> - <translation type="unfinished"/> + <translation>URI</translation> </message> <message> <location line="+2"/> @@ -1617,16 +1976,119 @@ Adres: %4 </message> </context> <context> + <name>RecentRequestsTableModel</name> + <message> + <location filename="../recentrequeststablemodel.cpp" line="+14"/> + <source>Date</source> + <translation>Data</translation> + </message> + <message> + <location line="+0"/> + <source>Label</source> + <translation>Etykieta</translation> + </message> + <message> + <location line="+0"/> + <source>Message</source> + <translation>Wiadomość</translation> + </message> + <message> + <location line="+0"/> + <source>Amount</source> + <translation>Kwota</translation> + </message> + <message> + <location line="+36"/> + <source>(no label)</source> + <translation>(bez etykiety)</translation> + </message> + <message> + <location line="+9"/> + <source>(no message)</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="+14"/> - <location filename="../sendcoinsdialog.cpp" line="+140"/> - <location line="+213"/> + <location filename="../sendcoinsdialog.cpp" line="+381"/> + <location line="+81"/> <source>Send Coins</source> <translation>Wyślij Monety</translation> </message> <message> - <location line="+50"/> + <location line="+76"/> + <source>Coin Control Features</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+20"/> + <source>Inputs...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> + <source>automatically selected</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+19"/> + <source>Insufficient funds!</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+89"/> + <source>Quantity:</source> + <translation>Ilość:</translation> + </message> + <message> + <location line="+35"/> + <source>Bytes:</source> + <translation>Bajtów:</translation> + </message> + <message> + <location line="+48"/> + <source>Amount:</source> + <translation>Kwota:</translation> + </message> + <message> + <location line="+32"/> + <source>Priority:</source> + <translation>Priorytet:</translation> + </message> + <message> + <location line="+48"/> + <source>Fee:</source> + <translation>Opłata:</translation> + </message> + <message> + <location line="+32"/> + <source>Low Output:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+48"/> + <source>After Fee:</source> + <translation>Po opłacie:</translation> + </message> + <message> + <location line="+32"/> + <source>Change:</source> + <translation>Reszta:</translation> + </message> + <message> + <location line="+44"/> + <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Custom change address</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+115"/> <source>Send to multiple recipients at once</source> <translation>Wyślij do wielu odbiorców na raz</translation> </message> @@ -1638,7 +2100,7 @@ Adres: %4 <message> <location line="+20"/> <source>Clear all fields of the form.</source> - <translation type="unfinished"/> + <translation>Wyczyść wszystkie pola formularza</translation> </message> <message> <location line="+3"/> @@ -1651,12 +2113,7 @@ Adres: %4 <translation>Saldo:</translation> </message> <message> - <location line="+10"/> - <source>123.456 BTC</source> - <translation>123.456 BTC</translation> - </message> - <message> - <location line="+31"/> + <location line="+41"/> <source>Confirm the send action</source> <translation>Potwierdź akcję wysyłania</translation> </message> @@ -1666,114 +2123,185 @@ Adres: %4 <translation>Wy&syłka</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-154"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation>Potwierdź wysyłanie monet</translation> </message> <message> - <location line="-90"/> + <location line="-74"/> <location line="+5"/> <location line="+5"/> + <location line="+4"/> <source>%1 to %2</source> + <translation>%1 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"/> + <source>Copy quantity</source> + <translation>Skopiuj ilość</translation> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation>Kopiuj kwotę</translation> + </message> + <message> + <location line="+1"/> + <source>Copy fee</source> + <translation>Skopiuj opłatę</translation> + </message> + <message> + <location line="+1"/> + <source>Copy after fee</source> + <translation>Skopiuj ilość po opłacie</translation> + </message> + <message> + <location line="+1"/> + <source>Copy bytes</source> + <translation>Skopiuj ilość bajtów</translation> + </message> + <message> + <location line="+1"/> + <source>Copy priority</source> + <translation>Skopiuj priorytet</translation> + </message> + <message> + <location line="+1"/> + <source>Copy low output</source> <translation type="unfinished"/> </message> <message> - <location line="+26"/> + <location line="+1"/> + <source>Copy change</source> + <translation>Skopiuj resztę</translation> + </message> + <message> + <location line="+170"/> + <source>Total Amount %1 (= %2)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>or</source> + <translation>lub</translation> + </message> + <message> + <location line="+202"/> <source>The recipient address is not valid, please recheck.</source> <translation>Adres odbiorcy jest nieprawidłowy, proszę poprawić</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>The amount to pay must be larger than 0.</source> <translation>Kwota do zapłacenia musi być większa od 0.</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>The amount exceeds your balance.</source> <translation>Kwota przekracza twoje saldo.</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>The total exceeds your balance when the %1 transaction fee is included.</source> <translation>Suma przekracza twoje saldo, gdy doliczymy %1 prowizji transakcyjnej.</translation> </message> <message> - <location line="+5"/> + <location line="+3"/> <source>Duplicate address found, can only send to each address once per send operation.</source> <translation>Znaleziono powtórzony adres, można wysłać tylko raz na każdy adres podczas operacji wysyłania.</translation> </message> <message> - <location line="+4"/> - <source>Error: Transaction creation failed!</source> - <translation>Błąd: Tworzenie transakcji zakończone niepowodzeniem!</translation> + <location line="+3"/> + <source>Transaction creation failed!</source> + <translation type="unfinished"/> </message> <message> - <location line="+15"/> - <source>Are you sure you want to send?</source> + <location line="+4"/> + <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation type="unfinished"/> </message> <message> - <location line="+9"/> - <source>added as transaction fee</source> - <translation type="unfinished"/> + <location line="+113"/> + <source>Warning: Invalid Bitcoin address</source> + <translation>Ostrzeżenie: nieprawidłowy adres Bitcoin</translation> </message> <message> - <location line="+6"/> - <source>Total Amount %1</source> - <translation>Łączna kwota %1</translation> + <location line="+13"/> + <source>(no label)</source> + <translation>(bez etykiety)</translation> </message> <message> - <location line="+20"/> - <source>Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> - <translation>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> + <location line="+8"/> + <source>Warning: Unknown change address</source> + <translation>Ostrzeżenie: Nieznany adres</translation> </message> <message> - <location line="+144"/> + <location line="-378"/> + <source>Are you sure you want to send?</source> + <translation>Czy na pewno chcesz wysłać?</translation> + </message> + <message> + <location line="+9"/> + <source>added as transaction fee</source> + <translation>dodano jako opłata transakcyjna</translation> + </message> + <message> + <location line="+170"/> <source>Payment request expired</source> <translation>Zażądanie płatności upłynęło</translation> </message> <message> <location line="+8"/> <source>Invalid payment address %1</source> - <translation type="unfinished"/> + <translation>błędny adres płatności %1</translation> </message> </context> <context> <name>SendCoinsEntry</name> <message> - <location filename="../forms/sendcoinsentry.ui" line="+33"/> - <location line="+585"/> + <location filename="../forms/sendcoinsentry.ui" line="+131"/> + <location line="+501"/> + <location line="+536"/> <source>A&mount:</source> <translation>Su&ma:</translation> </message> <message> - <location line="-572"/> - <location line="+585"/> + <location line="-1132"/> <source>Pay &To:</source> <translation>Zapłać &dla:</translation> </message> <message> - <location line="-551"/> + <location line="+18"/> <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation>Adres, na który wysłasz płatności (np. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location filename="../sendcoinsentry.cpp" line="+28"/> + <location filename="../sendcoinsentry.cpp" line="+30"/> <source>Enter a label for this address to add it to your address book</source> <translation>Wprowadź etykietę dla tego adresu by dodać go do książki adresowej</translation> </message> <message> - <location filename="../forms/sendcoinsentry.ui" line="-18"/> + <location filename="../forms/sendcoinsentry.ui" line="+57"/> <source>&Label:</source> <translation>&Etykieta:</translation> </message> <message> - <location line="+28"/> + <location line="-50"/> <source>Choose previously used address</source> - <translation type="unfinished"/> + <translation>Wybierz wcześniej użyty adres </translation> </message> <message> - <location line="+10"/> + <location line="-40"/> + <source>This is a normal payment.</source> + <translation>To jest standardowa płatność</translation> + </message> + <message> + <location line="+50"/> <source>Alt+A</source> <translation>Alt+A</translation> </message> @@ -1789,18 +2317,37 @@ Adres: %4 </message> <message> <location line="+7"/> - <source>Remove this recipient</source> - <translation>Usuń tego odbiorce</translation> + <location line="+504"/> + <location line="+536"/> + <source>Remove this entry</source> + <translation>Usuń ten wpis</translation> </message> <message> - <location line="+16"/> + <location line="-40"/> + <source>This is a verified payment request.</source> + <translation>Zweryfikowano żądanie zapłaty.</translation> + </message> + <message> + <location line="-971"/> <source>Enter a label for this address to add it to the list of used addresses</source> - <translation type="unfinished"/> + <translation>Wprowadź etykietę dla tego adresu by dodać go do listy użytych adresów</translation> </message> <message> - <location line="+465"/> + <location line="+439"/> + <source>This is an unverified payment request.</source> + <translation>To żądanie zapłaty nie zostało zweryfikowane.</translation> + </message> + <message> + <location line="+18"/> + <location line="+532"/> + <source>Pay To:</source> + <translation>Wpłać do:</translation> + </message> + <message> + <location line="-498"/> + <location line="+536"/> <source>Memo:</source> - <translation type="unfinished"/> + <translation>Notatka:</translation> </message> <message> <location filename="../sendcoinsentry.cpp" line="+1"/> @@ -1834,7 +2381,7 @@ Adres: %4 <location line="+10"/> <location line="+213"/> <source>Choose previously used address</source> - <translation type="unfinished"/> + <translation>Wybierz wcześniej użyty adres</translation> </message> <message> <location line="-203"/> @@ -1919,7 +2466,7 @@ Adres: %4 <translation>Resetuje wszystkie pola weryfikacji wiadomości</translation> </message> <message> - <location filename="../signverifymessagedialog.cpp" line="+27"/> + <location filename="../signverifymessagedialog.cpp" line="+29"/> <location line="+3"/> <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation>Wprowadź adres Bitcoin (np. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> @@ -1935,7 +2482,7 @@ Adres: %4 <translation>Wprowadź podpis Bitcoin</translation> </message> <message> - <location line="+85"/> + <location line="+84"/> <location line="+81"/> <source>The entered address is invalid.</source> <translation>Podany adres jest nieprawidłowy.</translation> @@ -2004,9 +2551,14 @@ Adres: %4 <context> <name>SplashScreen</name> <message> - <location filename="../splashscreen.cpp" line="+23"/> - <source>The Bitcoin developers</source> - <translation>Deweloperzy Bitcoin</translation> + <location filename="../splashscreen.cpp" line="+26"/> + <source>Bitcoin Core</source> + <translation>Rdzeń BitCoin</translation> + </message> + <message> + <location line="+2"/> + <source>The Bitcoin Core developers</source> + <translation>Deweloperzy Bitcoin Core</translation> </message> <message> <location line="+1"/> @@ -2017,15 +2569,15 @@ Adres: %4 <context> <name>TrafficGraphWidget</name> <message> - <location filename="../trafficgraphwidget.cpp" line="+75"/> + <location filename="../trafficgraphwidget.cpp" line="+79"/> <source>KB/s</source> - <translation type="unfinished"/> + <translation>KB/s</translation> </message> </context> <context> <name>TransactionDesc</name> <message> - <location filename="../transactiondesc.cpp" line="+22"/> + <location filename="../transactiondesc.cpp" line="+28"/> <source>Open until %1</source> <translation>Otwórz do %1</translation> </message> @@ -2153,7 +2705,7 @@ Adres: %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>Wygenerowane monety muszą dojrzeć przez %1 bloków zanim będzie można je wysłać. Gdy wygenerowałeś ten blok został on ogłoszony w sieci i dodany do łańcucha bloków. Jeżeli nie uda mu się wejść do łańcucha jego status zostanie zmieniony na "nie zaakceptowano" i nie będzie można go wydać. To czasem zdarza się gdy inny węzeł wygeneruje blok w kilka sekund od twojego.</translation> </message> <message> <location line="+8"/> @@ -2217,7 +2769,7 @@ Adres: %4 <context> <name>TransactionTableModel</name> <message> - <location filename="../transactiontablemodel.cpp" line="+227"/> + <location filename="../transactiontablemodel.cpp" line="+234"/> <source>Date</source> <translation>Data</translation> </message> @@ -2335,7 +2887,7 @@ Adres: %4 <context> <name>TransactionView</name> <message> - <location filename="../transactionview.cpp" line="+52"/> + <location filename="../transactionview.cpp" line="+57"/> <location line="+16"/> <source>All</source> <translation>Wszystko</translation> @@ -2396,12 +2948,12 @@ Adres: %4 <translation>Inne</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>Enter address or label to search</source> <translation>Wprowadź adres albo etykietę żeby wyszukać</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>Min amount</source> <translation>Min suma</translation> </message> @@ -2436,17 +2988,37 @@ Adres: %4 <translation>Pokaż szczegóły transakcji</translation> </message> <message> - <location line="+143"/> - <source>Export Transaction Data</source> - <translation>Eksportuj Dane Transakcyjne</translation> + <location line="+142"/> + <source>Export Transaction History</source> + <translation>Eksport historii transakcji</translation> </message> <message> - <location line="+1"/> + <location line="+19"/> + <source>Exporting Failed</source> + <translation>Błąd przy próbie eksportu</translation> + </message> + <message> + <location line="+0"/> + <source>There was an error trying to save the transaction history to %1.</source> + <translation>Wystąpił błąd przy próbie zapisu historii transakcji do %1.</translation> + </message> + <message> + <location line="+4"/> + <source>Exporting Successful</source> + <translation>Eksport powiódł się</translation> + </message> + <message> + <location line="+0"/> + <source>The transaction history was successfully saved to %1.</source> + <translation>Historia transakcji została zapisana do %1.</translation> + </message> + <message> + <location line="-22"/> <source>Comma separated file (*.csv)</source> <translation>CSV (rozdzielany przecinkami)</translation> </message> <message> - <location line="+8"/> + <location line="+9"/> <source>Confirmed</source> <translation>Potwierdzony</translation> </message> @@ -2481,17 +3053,7 @@ Adres: %4 <translation>ID</translation> </message> <message> - <location line="+4"/> - <source>Error exporting</source> - <translation>Błąd podczas eksportowania</translation> - </message> - <message> - <location line="+0"/> - <source>Could not write to file %1.</source> - <translation>Błąd zapisu do pliku %1.</translation> - </message> - <message> - <location line="+100"/> + <location line="+107"/> <source>Range:</source> <translation>Zakres:</translation> </message> @@ -2502,9 +3064,17 @@ Adres: %4 </message> </context> <context> + <name>WalletFrame</name> + <message> + <location filename="../walletframe.cpp" line="+26"/> + <source>No wallet has been loaded.</source> + <translation>Nie załadowano żadnego portfela.</translation> + </message> +</context> +<context> <name>WalletModel</name> <message> - <location filename="../walletmodel.cpp" line="+218"/> + <location filename="../walletmodel.cpp" line="+245"/> <source>Send Coins</source> <translation>Wyślij płatność</translation> </message> @@ -2512,7 +3082,7 @@ Adres: %4 <context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+46"/> + <location filename="../walletview.cpp" line="+43"/> <source>&Export</source> <translation>&Eksportuj</translation> </message> @@ -2522,65 +3092,60 @@ Adres: %4 <translation>Eksportuj dane z aktywnej karty do pliku</translation> </message> <message> - <location line="+183"/> + <location line="+181"/> <source>Backup Wallet</source> <translation>Kopia Zapasowa Portfela</translation> </message> <message> - <location line="+0"/> + <location line="+1"/> <source>Wallet Data (*.dat)</source> <translation>Dane Portfela (*.dat)</translation> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Backup Failed</source> <translation>Nie udało się wykonać kopii zapasowej</translation> </message> <message> <location line="+0"/> - <source>There was an error trying to save the wallet data to the new location.</source> - <translation>Wystąpił błąd przy zapisywaniu portfela do nowej lokalizacji.</translation> + <source>There was an error trying to save the wallet data to %1.</source> + <translation type="unfinished"/> </message> <message> <location line="+4"/> - <source>Backup Successful</source> - <translation>Wykonano Kopię Zapasową</translation> + <source>The wallet data was successfully saved to %1.</source> + <translation type="unfinished"/> </message> <message> <location line="+0"/> - <source>The wallet data was successfully saved to the new location.</source> - <translation>Dane portfela zostały poprawnie zapisane w nowym miejscu.</translation> + <source>Backup Successful</source> + <translation>Wykonano Kopię Zapasową</translation> </message> </context> <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+102"/> - <source>Bitcoin version</source> - <translation>Wersja Bitcoin</translation> - </message> - <message> - <location line="+107"/> + <location filename="../bitcoinstrings.cpp" line="+217"/> <source>Usage:</source> <translation>Użycie:</translation> </message> <message> - <location line="-55"/> + <location line="-54"/> <source>List commands</source> <translation>Lista poleceń</translation> </message> <message> - <location line="-13"/> + <location line="-14"/> <source>Get help for a command</source> <translation>Uzyskaj pomoc do polecenia</translation> </message> <message> - <location line="+25"/> + <location line="+26"/> <source>Options:</source> <translation>Opcje:</translation> </message> <message> - <location line="+24"/> + <location line="+23"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Wskaż plik konfiguracyjny (domyślnie: bitcoin.conf)</translation> </message> @@ -2600,7 +3165,7 @@ Adres: %4 <translation>Ustaw rozmiar w megabajtach cache-u bazy danych (domyślnie: 25)</translation> </message> <message> - <location line="-28"/> + <location line="-27"/> <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> @@ -2610,7 +3175,7 @@ Adres: %4 <translation>Utrzymuj maksymalnie <n> połączeń z peerami (domyślnie: 125)</translation> </message> <message> - <location line="-49"/> + <location line="-50"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation>Podłącz się do węzła aby otrzymać adresy peerów i rozłącz</translation> </message> @@ -2625,7 +3190,7 @@ Adres: %4 <translation>Próg po którym nastąpi rozłączenie nietrzymających się zasad peerów (domyślnie: 100)</translation> </message> <message> - <location line="-142"/> + <location line="-147"/> <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> @@ -2640,7 +3205,7 @@ Adres: %4 <translation>Nasłuchuj połączeń JSON-RPC na <port> (domyślnie: 8332 or testnet: 18332)</translation> </message> <message> - <location line="+40"/> + <location line="+45"/> <source>Accept command line and JSON-RPC commands</source> <translation>Akceptuj linię poleceń oraz polecenia JSON-RPC</translation> </message> @@ -2650,17 +3215,17 @@ Adres: %4 <translation>Uruchom w tle jako daemon i przyjmuj polecenia</translation> </message> <message> - <location line="+40"/> + <location line="+39"/> <source>Use the test network</source> <translation>Użyj sieci testowej</translation> </message> <message> - <location line="-118"/> + <location line="-117"/> <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="-87"/> + <location line="-92"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2686,7 +3251,7 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" 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>Dopuszczalne szyfry (domyślnie: TLSv1.2+HIGH:TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!3DES:@STRENGTH)</translation> </message> <message> <location line="+5"/> @@ -2724,17 +3289,17 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo <translation>Wykonaj polecenie, kiedy transakcja portfela ulegnie zmianie (%s w poleceniu zostanie zastąpione przez TxID)</translation> </message> <message> - <location line="+11"/> - <source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source> - <translation>Ustaw maksymalny rozmiar transakcji o wysokim priorytecie/niskiej prowizji w bajtach (domyślnie: 27000)</translation> - </message> - <message> - <location line="+6"/> + <location line="+18"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation>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"/> + <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>Ostrzeżenie: -paytxfee jest bardzo duży. To jest prowizja za transakcje, którą płacisz, gdy wysyłasz monety.</translation> </message> @@ -2746,12 +3311,12 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm 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 type="unfinished"/> + <translation>Ostrzeżenie: Sieć nie wydaje się w pełni zgodna! Niektórzy górnicy wydają się doświadczać problemów.</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>Uwaga: Wygląda na to, że nie ma pełnej zgodności z naszymi peerami! Możliwe, że potrzebujesz aktualizacji bądź inne węzły jej potrzebują</translation> </message> <message> <location line="+3"/> @@ -2764,17 +3329,27 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo <translation>Ostrzeżenie: Odtworzono dane z uszkodzonego pliku wallet.dat! Oryginalny wallet.dat został zapisany jako wallet.{timestamp}.bak w %s; jeśli twoje saldo lub transakcje są niepoprawne powinieneś odtworzyć kopię zapasową.</translation> </message> <message> - <location line="+14"/> + <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>Próbuj odzyskać klucze prywatne z uszkodzonego wallet.dat</translation> </message> <message> <location line="+1"/> - <source>Bitcoin RPC client version</source> + <source>Bitcoin Core Daemon</source> <translation type="unfinished"/> </message> <message> - <location line="+2"/> + <location line="+1"/> + <source>Bitcoin RPC client version</source> + <translation>wersja klienta RPC bitcoin</translation> + </message> + <message> + <location line="+1"/> <source>Block creation options:</source> <translation>Opcje tworzenia bloku:</translation> </message> @@ -2784,9 +3359,14 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo <translation>Łącz tylko do wskazanego węzła</translation> </message> <message> - <location line="+2"/> + <location line="+1"/> + <source>Connect through SOCKS proxy</source> + <translation>Połącz przez SOCKS proxy</translation> + </message> + <message> + <location line="+1"/> <source>Connect to JSON-RPC on <port> (default: 8332 or testnet: 18332)</source> - <translation type="unfinished"/> + <translation>podłącz do JSON-RPC na <port> (domyślnie: 8332 lub sieć testowa: 18332)</translation> </message> <message> <location line="+2"/> @@ -2894,7 +3474,12 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo <translation>Nie udało się zapisać danych odtwarzających</translation> </message> <message> - <location line="+2"/> + <location line="+1"/> + <source>Fee per kB to add to transactions you send</source> + <translation>Prowizja za kB dodawana do wysyłanej transakcji</translation> + </message> + <message> + <location line="+1"/> <source>Find peers using DNS lookup (default: 1 unless -connect)</source> <translation>Wyszukaj połączenia wykorzystując zapytanie DNS (domyślnie 1 jeśli nie użyto -connect)</translation> </message> @@ -2914,6 +3499,11 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo <translation>Jak dokładna jest weryfikacja bloku (0-4, domyślnie: 3)</translation> </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>Nieprawidłowy lub brak bloku genezy. Błędny folder_danych dla sieci?</translation> @@ -2921,7 +3511,7 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo <message> <location line="+3"/> <source>Invalid -onion address: '%s'</source> - <translation type="unfinished"/> + <translation>Nieprawidłowy adres -onion: '%s'</translation> </message> <message> <location line="+15"/> @@ -2929,24 +3519,44 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo <translation>Brak wystarczającej liczby deskryptorów plików. </translation> </message> <message> - <location line="+8"/> + <location line="+5"/> + <source>Prepend debug output with timestamp (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>RPC client options:</source> + <translation>Opcje klienta RPC:</translation> + </message> + <message> + <location line="+1"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation>Odbuduj indeks łańcucha bloków z obecnych plików blk000??.dat</translation> </message> <message> - <location line="+6"/> + <location line="+5"/> + <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source> + <translation>Wybierz wersję proxy SOCKS (4 lub 5, domyślnie 5)</translation> + </message> + <message> + <location line="+1"/> <source>Send command to Bitcoin server</source> <translation>Wyślij polecenie do serwera Bitcoin</translation> </message> <message> - <location line="+10"/> + <location line="+8"/> + <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>Ustaw liczbę wątków do odwołań RPC (domyślnie: 4)</translation> </message> <message> <location line="+7"/> <source>Specify wallet file (within data directory)</source> - <translation type="unfinished"/> + <translation>Określ plik portfela (w obrębie folderu danych)</translation> </message> <message> <location line="+2"/> @@ -2956,10 +3566,10 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo <message> <location line="+12"/> <source>Usage (deprecated, use bitcoin-cli):</source> - <translation type="unfinished"/> + <translation>Użycie (przestarzałe, użyj bitcoin-cli):</translation> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>Verifying blocks...</source> <translation>Weryfikacja bloków...</translation> </message> @@ -2970,11 +3580,21 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo </message> <message> <location line="+1"/> + <source>Wait for RPC server to start</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Wallet %s resides outside data directory %s</source> + <translation>Portfel %s znajduje się poza folderem danych %s</translation> + </message> + <message> + <location line="+3"/> + <source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source> <translation type="unfinished"/> </message> <message> - <location line="+4"/> + <location line="+2"/> <source>You need to rebuild the database using -reindex to change -txindex</source> <translation>Musisz przebudować bazę używając parametru -reindex aby zmienić -txindex</translation> </message> @@ -2984,17 +3604,27 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo <translation>Importuj bloki z zewnętrznego pliku blk000??.dat</translation> </message> <message> - <location line="-98"/> + <location line="-104"/> <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> + <message> + <location line="+14"/> + <source>Output debugging information (default: 0, supplying <category> is optional)</source> <translation type="unfinished"/> </message> <message> - <location line="+17"/> + <location line="+2"/> + <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> <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="+83"/> + <location line="+88"/> <source>Information</source> <translation>Informacja</translation> </message> @@ -3034,32 +3664,12 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo <translation>Łącz z węzłami tylko w sieci <net> (IPv4, IPv6 lub Tor)</translation> </message> <message> - <location line="+2"/> - <source>Output extra debugging information. Implies all other -debug* options</source> - <translation>Wyświetl dodatkowe informacje debugowania. Oznacza włączenie wszystkich opcji -debug*</translation> - </message> - <message> - <location line="+1"/> - <source>Output extra network debugging information</source> - <translation>Wyświetl dodatkowe informacje debugowania sieci</translation> - </message> - <message> - <location line="+2"/> - <source>Prepend debug output with timestamp</source> - <translation>Poprzedź informacje debugowania znacznikiem czasowym</translation> - </message> - <message> - <location line="+5"/> + <location line="+9"/> <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation>Opcje SSL: (odwiedź Bitcoin Wiki w celu uzyskania instrukcji)</translation> </message> <message> - <location line="+1"/> - <source>Select the version of socks proxy to use (4-5, default: 5)</source> - <translation>Wybierz używaną wersje socks serwera proxy (4-5, domyślnie:5)</translation> - </message> - <message> - <location line="+3"/> + <location line="+4"/> <source>Send trace/debug info to console instead of debug.log file</source> <translation>Wyślij informację/raport do konsoli zamiast do pliku debug.log.</translation> </message> @@ -3069,12 +3679,7 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo <translation>Wyślij informację/raport do debuggera.</translation> </message> <message> - <location line="+5"/> - <source>Set maximum block size in bytes (default: 250000)</source> - <translation>Ustaw maksymalny rozmiar bloku w bajtach (domyślnie: 250000)</translation> - </message> - <message> - <location line="+1"/> + <location line="+6"/> <source>Set minimum block size in bytes (default: 0)</source> <translation>Ustaw minimalny rozmiar bloku w bajtach (domyślnie: 0)</translation> </message> @@ -3124,37 +3729,37 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo <translation>Używaj UPnP do mapowania portu nasłuchu (domyślnie: 1 gdy nasłuchuje)</translation> </message> <message> - <location line="+1"/> - <source>Use proxy to reach tor hidden services (default: same as -proxy)</source> - <translation>Użyj proxy by połączyć się z ukrytymi serwisami tor (standardowo: identycznie jak w przypadku -proxy)</translation> - </message> - <message> <location line="+2"/> <source>Username for JSON-RPC connections</source> <translation>Nazwa użytkownika dla połączeń JSON-RPC</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Warning</source> <translation>Ostrzeżenie</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Warning: This version is obsolete, upgrade required!</source> <translation>Uwaga: Ta wersja jest przestarzała, aktualizacja wymagana!</translation> </message> <message> <location line="+2"/> + <source>version</source> + <translation>wersja</translation> + </message> + <message> + <location line="+1"/> <source>wallet.dat corrupt, salvage failed</source> <translation>wallet.dat uszkodzony, odtworzenie się nie powiodło</translation> </message> <message> - <location line="-54"/> + <location line="-57"/> <source>Password for JSON-RPC connections</source> <translation>Hasło do połączeń JSON-RPC</translation> </message> <message> - <location line="-70"/> + <location line="-69"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Przyjmuj połączenia JSON-RPC ze wskazanego adresu IP</translation> </message> @@ -3164,12 +3769,12 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo <translation>Wysyłaj polecenia do węzła działającego na <ip> (domyślnie: 127.0.0.1)</translation> </message> <message> - <location line="-126"/> + <location line="-131"/> <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="+155"/> + <location line="+160"/> <source>Upgrade wallet to latest format</source> <translation>Zaktualizuj portfel do najnowszego formatu.</translation> </message> @@ -3209,22 +3814,17 @@ 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="-95"/> - <source>Connect through socks proxy</source> - <translation>Łączy przez proxy socks</translation> - </message> - <message> - <location line="-11"/> + <location line="-106"/> <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="+58"/> + <location line="+59"/> <source>Loading addresses...</source> <translation>Wczytywanie adresów...</translation> </message> <message> - <location line="-36"/> + <location line="-37"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>Błąd ładowania wallet.dat: Uszkodzony portfel</translation> </message> @@ -3244,12 +3844,12 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo <translation>Błąd ładowania wallet.dat</translation> </message> <message> - <location line="+30"/> + <location line="+31"/> <source>Invalid -proxy address: '%s'</source> <translation>Nieprawidłowy adres -proxy: '%s'</translation> </message> <message> - <location line="+57"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Nieznana sieć w -onlynet: '%s'</translation> </message> @@ -3269,7 +3869,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="+46"/> + <location line="+47"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>Nieprawidłowa kwota dla -paytxfee=<amount>: '%s'</translation> </message> @@ -3289,28 +3889,22 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo <translation>Ładowanie indeksu bloku...</translation> </message> <message> - <location line="-60"/> + <location line="-61"/> <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="-28"/> + <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="+69"/> - <source>Fee per KB to add to transactions you send</source> - <translation> -</translation> - </message> - <message> - <location line="+20"/> + <location line="+94"/> <source>Loading wallet...</source> <translation>Wczytywanie portfela...</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>Cannot downgrade wallet</source> <translation>Nie można dezaktualizować portfela</translation> </message> @@ -3340,7 +3934,7 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo <translation>Błąd</translation> </message> <message> - <location line="-33"/> + <location line="-34"/> <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 d37d834d11..983eb86e3b 100644 --- a/src/qt/locale/bitcoin_pt_PT.ts +++ b/src/qt/locale/bitcoin_pt_PT.ts @@ -3,13 +3,13 @@ <name>AboutDialog</name> <message> <location filename="../forms/aboutdialog.ui" line="+14"/> - <source>About Bitcoin</source> - <translation>Sobre o Bitcoin</translation> + <source>About Bitcoin Core</source> + <translation>Sobre o Núcleo Bitcoin</translation> </message> <message> <location line="+39"/> - <source><b>Bitcoin</b> version</source> - <translation>Versão do <b>Bitcoin</b></translation> + <source><b>Bitcoin Core</b> version</source> + <translation><b>Bitcoin Core</b> versão</translation> </message> <message> <location line="+57"/> @@ -27,7 +27,7 @@ Distribuído sob uma licença de software MIT/X11, por favor verifique o ficheir Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no OpenSSL Toolkit (http://www.openssl.org/), software criptográfico escrito por Eric Young (eay@cryptsoft.com) e software UPnP escrito por Thomas Bernard.</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="+14"/> + <location filename="../aboutdialog.cpp" line="+19"/> <source>Copyright</source> <translation>Copyright</translation> </message> @@ -70,7 +70,7 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open <translation>F&echar</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="+72"/> + <location filename="../addressbookpage.cpp" line="+74"/> <source>&Copy Address</source> <translation>&Copiar Endereço</translation> </message> @@ -97,12 +97,12 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open <message> <location filename="../addressbookpage.cpp" line="-30"/> <source>Choose the address to send coins to</source> - <translation type="unfinished"/> + <translation>Escolha o endereço com que pretende enviar</translation> </message> <message> <location line="+1"/> <source>Choose the address to receive coins with</source> - <translation type="unfinished"/> + <translation>Escolha o endereço com que pretende receber</translation> </message> <message> <location line="+5"/> @@ -140,7 +140,7 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open <translation>&Editar</translation> </message> <message> - <location line="+197"/> + <location line="+194"/> <source>Export Address List</source> <translation>Exportar Lista de Endereços</translation> </message> @@ -163,7 +163,7 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open <context> <name>AddressTableModel</name> <message> - <location filename="../addresstablemodel.cpp" line="+164"/> + <location filename="../addresstablemodel.cpp" line="+168"/> <source>Label</source> <translation>Rótulo</translation> </message> @@ -201,7 +201,7 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open <translation>Repita a nova frase de segurança</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="+34"/> + <location filename="../askpassphrasedialog.cpp" line="+40"/> <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>10 or more random characters</b>, or <b>eight or more words</b>.</source> <translation>Escreva a nova frase de seguraça da sua carteira. <br/> Por favor, use uma frase de <b>10 ou mais caracteres aleatórios,</b> ou <b>oito ou mais palavras</b>.</translation> </message> @@ -322,17 +322,17 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+250"/> + <location filename="../bitcoingui.cpp" line="+260"/> <source>Sign &message...</source> <translation>Assinar &mensagem...</translation> </message> <message> - <location line="+254"/> + <location line="+290"/> <source>Synchronizing with network...</source> <translation>Sincronizando com a rede...</translation> </message> <message> - <location line="-324"/> + <location line="-360"/> <source>&Overview</source> <translation>Visã&o geral</translation> </message> @@ -398,7 +398,7 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open <translation>Mudar &Palavra-passe...</translation> </message> <message> - <location line="+259"/> + <location line="+295"/> <source>Importing blocks from disk...</source> <translation>Importando blocos do disco...</translation> </message> @@ -408,7 +408,7 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open <translation>Reindexando blocos no disco...</translation> </message> <message> - <location line="-322"/> + <location line="-358"/> <source>Send coins to a Bitcoin address</source> <translation>Enviar moedas para um endereço bitcoin</translation> </message> @@ -443,20 +443,18 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open <translation>&Verificar mensagem...</translation> </message> <message> - <location line="-180"/> - <location line="+6"/> - <location line="+513"/> + <location line="+375"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-519"/> - <location line="+6"/> + <location line="-563"/> + <location line="+10"/> <source>Wallet</source> <translation>Carteira</translation> </message> <message> - <location line="+109"/> + <location line="+113"/> <source>&Send</source> <translation>&Enviar</translation> </message> @@ -466,13 +464,7 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open <translation>&Receber</translation> </message> <message> - <location line="+28"/> - <location line="+2"/> - <source>&About Bitcoin</source> - <translation>&Sobre o Bitcoin</translation> - </message> - <message> - <location line="+14"/> + <location line="+44"/> <location line="+2"/> <source>&Show / Hide</source> <translation>Mo&strar / Ocultar</translation> @@ -498,12 +490,12 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open <translation>Verifique mensagens para assegurar que foram assinadas com o endereço Bitcoin especificado</translation> </message> <message> - <location line="+35"/> + <location line="+39"/> <source>&File</source> <translation>&Ficheiro</translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>&Settings</source> <translation>Con&figurações</translation> </message> @@ -518,18 +510,30 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open <translation>Barra de separadores</translation> </message> <message> - <location line="-235"/> - <location line="+294"/> + <location line="-244"/> + <location line="+321"/> <source>[testnet]</source> <translation>[rede de testes]</translation> </message> <message> - <location line="-177"/> + <location line="-331"/> + <location line="+10"/> + <source>Bitcoin Core</source> + <translation>Núcleo Bitcoin</translation> + </message> + <message> + <location line="+121"/> <source>Request payments (generates QR codes and bitcoin: URIs)</source> - <translation type="unfinished"/> + <translation>Solicitar pagamentos (gera códigos QR)</translation> </message> <message> - <location line="+63"/> + <location line="+27"/> + <location line="+2"/> + <source>&About Bitcoin Core</source> + <translation>&Sobre o Núcleo Bitcoin</translation> + </message> + <message> + <location line="+34"/> <source>&Used sending addresses...</source> <translation>Endereços de envio &usados</translation> </message> @@ -549,13 +553,23 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open <translation>Mostrar a lista de endereços para receber pagamentos e rótulos usados</translation> </message> <message> - <location line="+106"/> + <location line="+2"/> + <source>Open URI...</source> + <translation>Abrir link...</translation> + </message> + <message> + <location line="+1"/> + <source>Open a bitcoin: URI or payment request</source> + <translation>Abrir bitcoin: link ou pedido de pagamento</translation> + </message> + <message> + <location line="+126"/> <location line="+5"/> <source>Bitcoin client</source> <translation>Cliente Bitcoin</translation> </message> <message numerus="yes"> - <location line="+120"/> + <location line="+133"/> <source>%n active connection(s) to Bitcoin network</source> <translation><numerusform>%n ligação ativa à rede Bitcoin</numerusform><numerusform>%n ligações ativas à rede Bitcoin</numerusform></translation> </message> @@ -663,17 +677,7 @@ Endereço: %4 </translation> </message> <message> - <location line="+34"/> - <source>URI handling</source> - <translation>Manuseamento URI</translation> - </message> - <message> - <location line="+0"/> - <source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source> - <translation>URI não foi lido correctamente! Isto pode ser causado por um endereço Bitcoin inválido ou por parâmetros URI malformados.</translation> - </message> - <message> - <location line="+45"/> + <location line="+67"/> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>A carteira está <b>encriptada</b> e atualmente <b>desbloqueada</b></translation> </message> @@ -683,7 +687,7 @@ Endereço: %4 <translation>A carteira está <b>encriptada</b> e atualmente <b>bloqueada</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+110"/> + <location filename="../bitcoin.cpp" line="+116"/> <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> @@ -691,12 +695,299 @@ Endereço: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+115"/> + <location filename="../clientmodel.cpp" line="+119"/> <source>Network Alert</source> <translation>Alerta da Rede</translation> </message> </context> <context> + <name>CoinControlDialog</name> + <message> + <location filename="../forms/coincontroldialog.ui" line="+14"/> + <source>Coin Control Address Selection</source> + <translation>Controlo de selecção de endereço "Coin".</translation> + </message> + <message> + <location line="+34"/> + <source>Quantity:</source> + <translation>Quantidade:</translation> + </message> + <message> + <location line="+29"/> + <source>Bytes:</source> + <translation>Bytes:</translation> + </message> + <message> + <location line="+45"/> + <source>Amount:</source> + <translation>Quantia:</translation> + </message> + <message> + <location line="+29"/> + <source>Priority:</source> + <translation>Prioridade:</translation> + </message> + <message> + <location line="+45"/> + <source>Fee:</source> + <translation>Taxa:</translation> + </message> + <message> + <location line="+32"/> + <source>Low Output:</source> + <translation>Output Baixo:</translation> + </message> + <message> + <location line="+48"/> + <source>After Fee:</source> + <translation>Depois de taxas:</translation> + </message> + <message> + <location line="+32"/> + <source>Change:</source> + <translation>Alteração:</translation> + </message> + <message> + <location line="+63"/> + <source>(un)select all</source> + <translation>(não)seleccionar todos</translation> + </message> + <message> + <location line="+13"/> + <source>Tree mode</source> + <translation>Modo de árvore</translation> + </message> + <message> + <location line="+16"/> + <source>List mode</source> + <translation>Modo lista</translation> + </message> + <message> + <location line="+52"/> + <source>Amount</source> + <translation>Quantia</translation> + </message> + <message> + <location line="+10"/> + <source>Address</source> + <translation>Endereço</translation> + </message> + <message> + <location line="+5"/> + <source>Date</source> + <translation>Data</translation> + </message> + <message> + <location line="+5"/> + <source>Confirmations</source> + <translation>Confirmados</translation> + </message> + <message> + <location line="+3"/> + <source>Confirmed</source> + <translation>Confirmada</translation> + </message> + <message> + <location line="+5"/> + <source>Priority</source> + <translation>Prioridade</translation> + </message> + <message> + <location filename="../coincontroldialog.cpp" line="+42"/> + <source>Copy address</source> + <translation>Copiar endereço</translation> + </message> + <message> + <location line="+1"/> + <source>Copy label</source> + <translation>Copiar rótulo</translation> + </message> + <message> + <location line="+1"/> + <location line="+26"/> + <source>Copy amount</source> + <translation>Copiar quantia</translation> + </message> + <message> + <location line="-25"/> + <source>Copy transaction ID</source> + <translation>Copiar ID da Transação</translation> + </message> + <message> + <location line="+1"/> + <source>Lock unspent</source> + <translation>Bloquear não-utilizados</translation> + </message> + <message> + <location line="+1"/> + <source>Unlock unspent</source> + <translation>Desbloquear não-utilizados</translation> + </message> + <message> + <location line="+22"/> + <source>Copy quantity</source> + <translation>Copiar quantidade</translation> + </message> + <message> + <location line="+2"/> + <source>Copy fee</source> + <translation>Taxa de cópia</translation> + </message> + <message> + <location line="+1"/> + <source>Copy after fee</source> + <translation>Taxa depois de cópia</translation> + </message> + <message> + <location line="+1"/> + <source>Copy bytes</source> + <translation>Copiar bytes</translation> + </message> + <message> + <location line="+1"/> + <source>Copy priority</source> + <translation>Prioridade de Cópia</translation> + </message> + <message> + <location line="+1"/> + <source>Copy low output</source> + <translation>Copiar output baixo</translation> + </message> + <message> + <location line="+1"/> + <source>Copy change</source> + <translation>Copiar alteração</translation> + </message> + <message> + <location line="+323"/> + <source>highest</source> + <translation>o maior</translation> + </message> + <message> + <location line="+1"/> + <source>higher</source> + <translation>maior</translation> + </message> + <message> + <location line="+1"/> + <source>high</source> + <translation>alto</translation> + </message> + <message> + <location line="+1"/> + <source>medium-high</source> + <translation>médio-alto</translation> + </message> + <message> + <location line="+1"/> + <source>medium</source> + <translation>médio</translation> + </message> + <message> + <location line="+4"/> + <source>low-medium</source> + <translation>baixo-médio</translation> + </message> + <message> + <location line="+1"/> + <source>low</source> + <translation>baixo</translation> + </message> + <message> + <location line="+1"/> + <source>lower</source> + <translation>mais baixo</translation> + </message> + <message> + <location line="+1"/> + <source>lowest</source> + <translation>O mais baixo</translation> + </message> + <message> + <location line="+11"/> + <source>(%1 locked)</source> + <translation>(%1 bloqueado)</translation> + </message> + <message> + <location line="+171"/> + <source>Dust</source> + <translation>Lixo</translation> + </message> + <message> + <location line="+0"/> + <source>yes</source> + <translation>sim</translation> + </message> + <message> + <location line="+0"/> + <source>no</source> + <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>Esta legenda fica vermelha se o tamanho de transacção exceder os 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>Isto 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>Pode variar +/- 1 byte por input.</translation> + </message> + <message> + <location line="+2"/> + <source>Transactions with higher priority are more likely to get included into a block.</source> + <translation>Transacções com prioridade mais alta estão mais sujeitas a serem incluídas num "bloco".</translation> + </message> + <message> + <location line="+1"/> + <source>This label turns red, if the priority is smaller than "medium"</source> + <translation>Esta legenda fica vermelha se a prioridade é menor do que "médio".</translation> + </message> + <message> + <location line="+3"/> + <source>This label turns red, if any recipient receives an amount smaller than %1.</source> + <translation>Esta legenda fica vermelho se algum recipiente receber uma quantidade 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>Isto 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>Quantias menores que 0.546 vezes a mínima taxa de retransmissão são mostradas como "lixo".</translation> + </message> + <message> + <location line="+2"/> + <source>This label turns red, if the change is smaller than %1.</source> + <translation>Esta legenda fica vermelha, se a mudança for menor do que %1.</translation> + </message> + <message> + <location line="+43"/> + <location line="+66"/> + <source>(no label)</source> + <translation>(Sem rótulo)</translation> + </message> + <message> + <location line="-9"/> + <source>change from %1 (%2)</source> + <translation>Alteração de %1 (%2)</translation> + </message> + <message> + <location line="+1"/> + <source>(change)</source> + <translation>(Alteração)</translation> + </message> +</context> +<context> <name>EditAddressDialog</name> <message> <location filename="../forms/editaddressdialog.ui" line="+14"/> @@ -716,7 +1007,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 type="unfinished"/> + <translation>O endereço associado com a entrada do registo desta lista. Isto só pode ser modificado para os endereços de envio.</translation> </message> <message> <location line="-10"/> @@ -724,7 +1015,7 @@ Endereço: %4 <translation>E&ndereço</translation> </message> <message> - <location filename="../editaddressdialog.cpp" line="+21"/> + <location filename="../editaddressdialog.cpp" line="+25"/> <source>New receiving address</source> <translation>Novo endereço de entrada</translation> </message> @@ -767,7 +1058,7 @@ Endereço: %4 <context> <name>FreespaceChecker</name> <message> - <location filename="../intro.cpp" line="+61"/> + <location filename="../intro.cpp" line="+65"/> <source>A new data directory will be created.</source> <translation>Uma nova pasta de dados será criada.</translation> </message> @@ -779,7 +1070,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 type="unfinished"/> + <translation>O directório já existe. Adicione %1 se pretender criar um novo directório aqui.</translation> </message> <message> <location line="+3"/> @@ -795,18 +1086,18 @@ Endereço: %4 <context> <name>GUIUtil::HelpMessageBox</name> <message> - <location filename="../guiutil.cpp" line="+558"/> - <location line="+13"/> - <source>Bitcoin-Qt</source> - <translation>Bitcoin-Qt</translation> - </message> - <message> - <location line="-13"/> + <location filename="../guiutil.cpp" line="+597"/> <source>version</source> <translation>versão</translation> </message> <message> - <location line="+2"/> + <location line="+0"/> + <location line="+13"/> + <source>Bitcoin Core</source> + <translation>Núcleo Bitcoin</translation> + </message> + <message> + <location line="-11"/> <source>Usage:</source> <translation>Utilização:</translation> </message> @@ -850,18 +1141,19 @@ Endereço: %4 </message> <message> <location line="+9"/> - <source>Welcome to Bitcoin-Qt.</source> - <translation>Bem-vindo ao Bitcoin-Qt.</translation> + <source>Welcome to Bitcoin Core.</source> + <translation>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-Qt will store its data.</source> - <translation type="unfinished"/> + <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source> + <translation>Sendo isto a primeira vez que o programa é iniciado, você pode escolher onde Bitcoin Core vai guardar os seus dados.</translation> </message> <message> <location line="+10"/> - <source>Bitcoin-Qt will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source> - <translation>O Bitcoin-QT irá transferir e armazenas uma cópia da transação. Pelo menos %1GB de dados serão armazenados neste diretório, sendo que o valor irá crescer ao longo do tempo. A carteira também será armazenada neste mesmo diretório.</translation> + <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source> + <translation>Bitcoin Core vai transferir e guardar uma cópia do Bitcoin "block chain" (cadeia de bloco). Pelo menos %1GB de dados será guardado neste directório, e vai crescer consoante o tempo. +A sua "carteira" também irá ser guardada neste directório.</translation> </message> <message> <location line="+10"/> @@ -874,7 +1166,17 @@ Endereço: %4 <translation>Use uma pasta de dados personalizada</translation> </message> <message> - <location filename="../intro.cpp" line="+105"/> + <location filename="../intro.cpp" line="+85"/> + <source>Bitcoin</source> + <translation>Bitcoin</translation> + </message> + <message> + <location line="+1"/> + <source>Error: Specified data directory "%1" can not be created.</source> + <translation>Erro: Pasta de dados especificada "%1" não pode ser criada.</translation> + </message> + <message> + <location line="+19"/> <source>Error</source> <translation>Erro</translation> </message> @@ -890,6 +1192,34 @@ Endereço: %4 </message> </context> <context> + <name>OpenURIDialog</name> + <message> + <location filename="../forms/openuridialog.ui" line="+14"/> + <source>Open URI</source> + <translation>URI Aberto</translation> + </message> + <message> + <location line="+6"/> + <source>Open payment request from URI or file</source> + <translation>Pedido de pagamento aberto de um URI or file</translation> + </message> + <message> + <location line="+9"/> + <source>URI:</source> + <translation>URI:</translation> + </message> + <message> + <location line="+11"/> + <source>Select payment request file</source> + <translation>Seleccione o ficheiro do pedido de pagamento</translation> + </message> + <message> + <location filename="../openuridialog.cpp" line="+47"/> + <source>Select payment request file to open</source> + <translation>Seleccione o ficheiro de pedido de pagamento para abrir</translation> + </message> +</context> +<context> <name>OptionsDialog</name> <message> <location filename="../forms/optionsdialog.ui" line="+14"/> @@ -1047,6 +1377,16 @@ Endereço: %4 <translation>Mostrar en&dereços na lista de transações</translation> </message> <message> + <location line="+7"/> + <source>Whether to show coin control features or not.</source> + <translation>Escolha para mostrar funcionalidades de controlo "coin" ou não.</translation> + </message> + <message> + <location line="+3"/> + <source>Display coin &control features (experts only)</source> + <translation>Mostrar coin & funcionalidades de controlo (apenas para utilizadores experientes)</translation> + </message> + <message> <location line="+71"/> <source>&OK</source> <translation>&OK</translation> @@ -1062,12 +1402,12 @@ Endereço: %4 <translation>&Aplicar</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+58"/> + <location filename="../optionsdialog.cpp" line="+63"/> <source>default</source> <translation>padrão</translation> </message> <message> - <location line="+130"/> + <location line="+131"/> <source>Confirm options reset</source> <translation>Confirme a reposição de opções</translation> </message> @@ -1108,17 +1448,17 @@ Endereço: %4 </message> <message> <location line="+50"/> - <location line="+202"/> + <location line="+214"/> <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source> <translation>A informação mostrada poderá estar desatualizada. A sua carteira sincroniza automaticamente com a rede Bitcoin depois de estabelecer ligação, mas este processo ainda não está completo.</translation> </message> <message> - <location line="-131"/> + <location line="-140"/> <source>Unconfirmed:</source> <translation>Não confirmado:</translation> </message> <message> - <location line="-78"/> + <location line="-81"/> <source>Wallet</source> <translation>Carteira</translation> </message> @@ -1133,12 +1473,12 @@ Endereço: %4 <translation>O seu saldo disponível para gastar</translation> </message> <message> - <location line="+29"/> + <location line="+32"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation>Total de transações ainda não confirmadas, e que não estão contabilizadas ainda no seu saldo actual</translation> </message> <message> - <location line="+13"/> + <location line="+16"/> <source>Immature:</source> <translation>Imaturo:</translation> </message> @@ -1148,7 +1488,7 @@ Endereço: %4 <translation>O saldo minado ainda não maturou</translation> </message> <message> - <location line="+13"/> + <location line="+16"/> <source>Total:</source> <translation>Total:</translation> </message> @@ -1158,12 +1498,12 @@ Endereço: %4 <translation>O seu saldo total actual</translation> </message> <message> - <location line="+53"/> + <location line="+56"/> <source><b>Recent transactions</b></source> <translation><b>Transações recentes</b></translation> </message> <message> - <location filename="../overviewpage.cpp" line="+116"/> + <location filename="../overviewpage.cpp" line="+120"/> <location line="+1"/> <source>out of sync</source> <translation>fora de sincronia</translation> @@ -1172,7 +1512,7 @@ Endereço: %4 <context> <name>PaymentServer</name> <message> - <location filename="../paymentserver.cpp" line="+392"/> + <location filename="../paymentserver.cpp" line="+397"/> <source>URI handling</source> <translation>Manuseamento URI</translation> </message> @@ -1182,23 +1522,29 @@ Endereço: %4 <translation>URI não foi lido correctamente! Isto pode ser causado por um endereço Bitcoin inválido ou por parâmetros URI malformados.</translation> </message> <message> - <location line="+69"/> + <location line="+91"/> <source>Requested payment amount of %1 is too small (considered dust).</source> <translation>Quantia requisitada para pagamento de %1 é muito pequena (considerada pó).</translation> </message> <message> - <location line="+4"/> - <location line="+37"/> + <location line="-204"/> + <location line="+195"/> + <location line="+13"/> <source>Payment request error</source> <translation>Erro no pedido de pagamento</translation> </message> <message> - <location line="+1"/> - <source>Insecure requests to custom payment scripts unsupported</source> - <translation type="unfinished"/> + <location line="-207"/> + <source>Cannot start bitcoin: click-to-pay handler</source> + <translation>Impossível começar o modo clicar-para-pagar com bitcoin:</translation> </message> <message> - <location line="+38"/> + <location line="+195"/> + <source>Unverified payment requests to custom payment scripts are unsupported.</source> + <translation>Pedidos de pagamento não-verificados para scripts de pagamento personalizadas não é suportado.</translation> + </message> + <message> + <location line="+59"/> <source>Refund from %1</source> <translation>Reembolsar de %1</translation> </message> @@ -1208,7 +1554,7 @@ Endereço: %4 <translation>Erro ao comunicar com %1: %2</translation> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>Bad response from server %1</source> <translation>Má resposta do servidor %1</translation> </message> @@ -1218,8 +1564,8 @@ Endereço: %4 <translation>Pagamento confirmado</translation> </message> <message> - <location line="-58"/> - <location line="+30"/> + <location line="-55"/> + <location line="+27"/> <location line="+17"/> <source>Network request error</source> <translation>Erro de pedido de rede</translation> @@ -1228,9 +1574,8 @@ Endereço: %4 <context> <name>QObject</name> <message> - <location filename="../bitcoin.cpp" line="+114"/> + <location filename="../bitcoin.cpp" line="+119"/> <location line="+5"/> - <location filename="../intro.cpp" line="-32"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> @@ -1244,16 +1589,11 @@ Endereço: %4 <source>Error: Invalid combination of -regtest and -testnet.</source> <translation>Erro: Combinação inválida de -regtest e -testnet.</translation> </message> - <message> - <location filename="../intro.cpp" line="+1"/> - <source>Error: Specified data directory "%1" can not be created.</source> - <translation>Erro: Pasta de dados especificada "%1" não pode ser criada.</translation> - </message> </context> <context> <name>QRImageWidget</name> <message> - <location filename="../receiverequestdialog.cpp" line="+32"/> + <location filename="../receiverequestdialog.cpp" line="+36"/> <source>&Save Image...</source> <translation>&Salvar Imagem...</translation> </message> @@ -1269,8 +1609,8 @@ Endereço: %4 </message> <message> <location line="+0"/> - <source>PNG Images (*.png)</source> - <translation>Imagens PNG (*.png)</translation> + <source>PNG Image (*.png)</source> + <translation>Imagem PNG (*.png)</translation> </message> </context> <context> @@ -1290,7 +1630,7 @@ Endereço: %4 <location line="+53"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+352"/> + <location filename="../rpcconsole.cpp" line="+360"/> <source>N/A</source> <translation>N/D</translation> </message> @@ -1305,7 +1645,12 @@ Endereço: %4 <translation>&Informação</translation> </message> <message> - <location line="+68"/> + <location line="-10"/> + <source>Debug window</source> + <translation>Janela de depuração</translation> + </message> + <message> + <location line="+78"/> <source>Using OpenSSL version</source> <translation>Usando versão OpenSSL</translation> </message> @@ -1360,12 +1705,7 @@ Endereço: %4 <translation>Opções de linha de comandos</translation> </message> <message> - <location line="+7"/> - <source>Show the Bitcoin-Qt help message to get a list with possible Bitcoin command-line options.</source> - <translation>Mostrar a mensagem de ajuda do Bitcoin-Qt para obter uma lista com possíveis opções a usar na linha de comandos.</translation> - </message> - <message> - <location line="+3"/> + <location line="+10"/> <source>&Show</source> <translation>Mo&strar</translation> </message> @@ -1405,12 +1745,7 @@ Endereço: %4 <translation>Data de construção</translation> </message> <message> - <location line="-104"/> - <source>Bitcoin - Debug window</source> - <translation>Bitcoin - Janela de depuração</translation> - </message> - <message> - <location line="+25"/> + <location line="-79"/> <source>Bitcoin Core</source> <translation>Núcleo Bitcoin</translation> </message> @@ -1425,7 +1760,12 @@ Endereço: %4 <translation>Abrir o ficheiro de registo de depuração da pasta de dados actual. Isto pode demorar alguns segundos para ficheiros de registo maiores.</translation> </message> <message> - <location line="+102"/> + <location line="+26"/> + <source>Show the Bitcoin-Core help message to get a list with possible Bitcoin command-line options.</source> + <translation>Mostrar o Bitcoin-core mensagem de "ajuda" para obter uma lista com opções de linha-de-comandos para Bitcoin.</translation> + </message> + <message> + <location line="+76"/> <source>Clear console</source> <translation>Limpar consola</translation> </message> @@ -1483,52 +1823,52 @@ Endereço: %4 <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+22"/> + <location filename="../forms/receivecoinsdialog.ui" line="+83"/> <source>&Amount:</source> <translation>&Quantia:</translation> </message> <message> - <location line="+16"/> + <location line="+19"/> <source>The amount to request</source> - <translation type="unfinished"/> + <translation>Montante a solicitar</translation> </message> <message> - <location line="+7"/> + <location line="-32"/> <source>&Label:</source> <translation>Rótu&lo:</translation> </message> <message> - <location line="+10"/> - <source>The label to associate with the receiving address</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+7"/> + <location line="-34"/> <source>&Message:</source> <translation>&Mensagem:</translation> </message> <message> - <location line="+10"/> + <location line="+20"/> <source>The message to attach to payment request</source> - <translation type="unfinished"/> + <translation>A mensagem a anexar ao pedido de pagamento</translation> </message> <message> - <location line="+14"/> + <location line="-37"/> <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>Re-utilize uns dos anteriores endereços de recebimento. Reutilizar endereços pode levar a um risco de segurança e de privacidade. Não use isto a não ser que esteja a re-pedir uma solicitação de pagamento feito anteriormente.</translation> </message> <message> <location line="+3"/> <source>R&euse an existing receiving address (not recommended)</source> - <translation type="unfinished"/> + <translation>Reutilizar um endereço de recebimento existente (não recomendado)</translation> </message> <message> - <location line="+7"/> + <location line="+27"/> + <source>The label to associate with the new receiving address</source> + <translation>A legenda para associar com o novo endereço de recebimento.</translation> + </message> + <message> + <location line="+14"/> <source>Use this form to request payments. All fields are optional.</source> - <translation type="unfinished"/> + <translation>Utilize este formulário para solicitar pagamentos. Todos os campos são opcionais.</translation> </message> <message> - <location line="+17"/> + <location line="+56"/> <source>Clear all fields of the form.</source> <translation>Limpar todos os campos do formulário.</translation> </message> @@ -1542,6 +1882,31 @@ Endereço: %4 <source>&Request payment</source> <translation>&Requisitar Pagamento</translation> </message> + <message> + <location line="+47"/> + <source>Previously requested payments</source> + <translation>Anteriores pedidos de pagamentos.</translation> + </message> + <message> + <location line="+12"/> + <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> + <message> + <location line="+3"/> + <source>Show</source> + <translation>Mostrar</translation> + </message> + <message> + <location line="+11"/> + <source>Remove the selected entries from the list</source> + <translation>Remover a entrada seleccionada da lista</translation> + </message> + <message> + <location line="+3"/> + <source>Remove</source> + <translation>Remover</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -1562,16 +1927,11 @@ Endereço: %4 </message> <message> <location line="+7"/> - <source>&Copy Image</source> - <translation>&Copiar Imagem</translation> - </message> - <message> - <location line="+7"/> <source>&Save Image...</source> <translation>&Salvar Imagem...</translation> </message> <message> - <location filename="../receiverequestdialog.cpp" line="+58"/> + <location filename="../receiverequestdialog.cpp" line="+56"/> <source>Request payment to %1</source> <translation>Requisitar Pagamento para %1</translation> </message> @@ -1617,16 +1977,119 @@ Endereço: %4 </message> </context> <context> + <name>RecentRequestsTableModel</name> + <message> + <location filename="../recentrequeststablemodel.cpp" line="+14"/> + <source>Date</source> + <translation>Data</translation> + </message> + <message> + <location line="+0"/> + <source>Label</source> + <translation>Rótulo</translation> + </message> + <message> + <location line="+0"/> + <source>Message</source> + <translation>Mensagem</translation> + </message> + <message> + <location line="+0"/> + <source>Amount</source> + <translation>Quantia</translation> + </message> + <message> + <location line="+36"/> + <source>(no label)</source> + <translation>(Sem rótulo)</translation> + </message> + <message> + <location line="+9"/> + <source>(no message)</source> + <translation>(Sem mensagem)</translation> + </message> +</context> +<context> <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="+14"/> - <location filename="../sendcoinsdialog.cpp" line="+140"/> - <location line="+213"/> + <location filename="../sendcoinsdialog.cpp" line="+381"/> + <location line="+81"/> <source>Send Coins</source> <translation>Enviar Moedas</translation> </message> <message> - <location line="+50"/> + <location line="+76"/> + <source>Coin Control Features</source> + <translation>Funcionalidades de Coin Controlo:</translation> + </message> + <message> + <location line="+20"/> + <source>Inputs...</source> + <translation>Entradas</translation> + </message> + <message> + <location line="+7"/> + <source>automatically selected</source> + <translation>Selecção automática</translation> + </message> + <message> + <location line="+19"/> + <source>Insufficient funds!</source> + <translation>Fundos insuficientes!</translation> + </message> + <message> + <location line="+89"/> + <source>Quantity:</source> + <translation>Quantidade:</translation> + </message> + <message> + <location line="+35"/> + <source>Bytes:</source> + <translation>Bytes:</translation> + </message> + <message> + <location line="+48"/> + <source>Amount:</source> + <translation>Quantia:</translation> + </message> + <message> + <location line="+32"/> + <source>Priority:</source> + <translation>Prioridade:</translation> + </message> + <message> + <location line="+48"/> + <source>Fee:</source> + <translation>Taxa:</translation> + </message> + <message> + <location line="+32"/> + <source>Low Output:</source> + <translation>Output Baixo:</translation> + </message> + <message> + <location line="+48"/> + <source>After Fee:</source> + <translation>Depois de taxas:</translation> + </message> + <message> + <location line="+32"/> + <source>Change:</source> + <translation>Alteração:</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>Se activar isto, mas o endereço de alteração estiver vazio ou for inválido, a alteração irá ser enviada para um novo endereço gerado.</translation> + </message> + <message> + <location line="+3"/> + <source>Custom change address</source> + <translation>Personalização de endereço de alteração</translation> + </message> + <message> + <location line="+115"/> <source>Send to multiple recipients at once</source> <translation>Enviar para múltiplos destinatários de uma vez</translation> </message> @@ -1651,12 +2114,7 @@ Endereço: %4 <translation>Saldo:</translation> </message> <message> - <location line="+10"/> - <source>123.456 BTC</source> - <translation>123.456 BTC</translation> - </message> - <message> - <location line="+31"/> + <location line="+41"/> <source>Confirm the send action</source> <translation>Confirme ação de envio</translation> </message> @@ -1666,49 +2124,125 @@ Endereço: %4 <translation>&Enviar</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-154"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation>Confirme envio de moedas</translation> </message> <message> - <location line="-90"/> + <location line="-74"/> <location line="+5"/> <location line="+5"/> + <location line="+4"/> <source>%1 to %2</source> <translation>%1 para %2</translation> </message> <message> - <location line="+26"/> + <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"/> + <source>Copy quantity</source> + <translation>Copiar quantidade</translation> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation>Copiar quantia</translation> + </message> + <message> + <location line="+1"/> + <source>Copy fee</source> + <translation>Taxa de cópia</translation> + </message> + <message> + <location line="+1"/> + <source>Copy after fee</source> + <translation>Taxa depois de cópia</translation> + </message> + <message> + <location line="+1"/> + <source>Copy bytes</source> + <translation>Copiar bytes</translation> + </message> + <message> + <location line="+1"/> + <source>Copy priority</source> + <translation>Prioridade de Cópia</translation> + </message> + <message> + <location line="+1"/> + <source>Copy low output</source> + <translation>Copiar output baixo</translation> + </message> + <message> + <location line="+1"/> + <source>Copy change</source> + <translation>Copiar alteração</translation> + </message> + <message> + <location line="+170"/> + <source>Total Amount %1 (= %2)</source> + <translation>Quantia Total %1 (= %2)</translation> + </message> + <message> + <location line="+2"/> + <source>or</source> + <translation>ou</translation> + </message> + <message> + <location line="+202"/> <source>The recipient address is not valid, please recheck.</source> <translation>O endereço de destino não é válido, por favor verifique.</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>The amount to pay must be larger than 0.</source> <translation>A quantia a pagar deverá ser maior que 0.</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>The amount exceeds your balance.</source> <translation>A quantia excede o seu saldo.</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>The total exceeds your balance when the %1 transaction fee is included.</source> <translation>O total excede o seu saldo quando a taxa de transação de %1 for incluída.</translation> </message> <message> - <location line="+5"/> + <location line="+3"/> <source>Duplicate address found, can only send to each address once per send operation.</source> <translation>Endereço duplicado encontrado, apenas poderá enviar uma vez para cada endereço por cada operação de envio.</translation> </message> <message> - <location line="+4"/> - <source>Error: Transaction creation failed!</source> + <location line="+3"/> + <source>Transaction creation failed!</source> <translation>Erro: A criação da transacção falhou! </translation> </message> <message> - <location line="+15"/> + <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>Erro: A transação foi rejeitada. Isso poderá acontecer se algumas das moedas na sua carteira já tiverem sido gastas, se por exemplo tiver usado uma cópia do ficheiro wallet.dat e as moedas foram gastas na cópia mas não foram marcadas como gastas aqui.</translation> + </message> + <message> + <location line="+113"/> + <source>Warning: Invalid Bitcoin address</source> + <translation>Aviso: Endereço Bitcoin inválido</translation> + </message> + <message> + <location line="+13"/> + <source>(no label)</source> + <translation>(Sem rótulo)</translation> + </message> + <message> + <location line="+8"/> + <source>Warning: Unknown change address</source> + <translation>Aviso: Endereço de alteração desconhecido</translation> + </message> + <message> + <location line="-378"/> <source>Are you sure you want to send?</source> <translation>Tem a certeza que deseja enviar?</translation> </message> @@ -1718,17 +2252,7 @@ Endereço: %4 <translation>adicionados como taxa de transação</translation> </message> <message> - <location line="+6"/> - <source>Total Amount %1</source> - <translation>Quantia Total %1</translation> - </message> - <message> - <location line="+20"/> - <source>Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> - <translation>Erro: A transação foi rejeitada. Isso 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="+144"/> + <location line="+170"/> <source>Payment request expired</source> <translation>Pedido de pagamento expirou</translation> </message> @@ -1741,39 +2265,44 @@ Endereço: %4 <context> <name>SendCoinsEntry</name> <message> - <location filename="../forms/sendcoinsentry.ui" line="+33"/> - <location line="+585"/> + <location filename="../forms/sendcoinsentry.ui" line="+131"/> + <location line="+501"/> + <location line="+536"/> <source>A&mount:</source> <translation>Qu&antia:</translation> </message> <message> - <location line="-572"/> - <location line="+585"/> + <location line="-1132"/> <source>Pay &To:</source> <translation>&Pagar A:</translation> </message> <message> - <location line="-551"/> + <location line="+18"/> <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation>O endereço para onde enviar o pagamento (p.ex. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location filename="../sendcoinsentry.cpp" line="+28"/> + <location filename="../sendcoinsentry.cpp" line="+30"/> <source>Enter a label for this address to add it to your address book</source> <translation>Escreva um rótulo para este endereço para o adicionar ao seu livro de endereços</translation> </message> <message> - <location filename="../forms/sendcoinsentry.ui" line="-18"/> + <location filename="../forms/sendcoinsentry.ui" line="+57"/> <source>&Label:</source> <translation>Rótu&lo:</translation> </message> <message> - <location line="+28"/> + <location line="-50"/> <source>Choose previously used address</source> <translation>Escolher endereço usado previamente</translation> </message> <message> - <location line="+10"/> + <location line="-40"/> + <source>This is a normal payment.</source> + <translation>Este é um pagamento normal.</translation> + </message> + <message> + <location line="+50"/> <source>Alt+A</source> <translation>Alt+A</translation> </message> @@ -1789,16 +2318,35 @@ Endereço: %4 </message> <message> <location line="+7"/> - <source>Remove this recipient</source> - <translation>Remover este destinatário</translation> + <location line="+504"/> + <location line="+536"/> + <source>Remove this entry</source> + <translation>Remover esta inscrição</translation> </message> <message> - <location line="+16"/> + <location line="-40"/> + <source>This is a verified payment request.</source> + <translation>Este é um pedido de verificação de pagamento.</translation> + </message> + <message> + <location line="-971"/> <source>Enter a label for this address to add it to the list of used addresses</source> <translation>Escreva um rótulo para este endereço para o adicionar à sua lista de endereços usados</translation> </message> <message> - <location line="+465"/> + <location line="+439"/> + <source>This is an unverified payment request.</source> + <translation>Este é um pedido de pagamento não-verificado.</translation> + </message> + <message> + <location line="+18"/> + <location line="+532"/> + <source>Pay To:</source> + <translation>&Pagar A:</translation> + </message> + <message> + <location line="-498"/> + <location line="+536"/> <source>Memo:</source> <translation>Memo:</translation> </message> @@ -1919,7 +2467,7 @@ Endereço: %4 <translation>Repôr todos os campos de verificação de mensagem</translation> </message> <message> - <location filename="../signverifymessagedialog.cpp" line="+27"/> + <location filename="../signverifymessagedialog.cpp" line="+29"/> <location line="+3"/> <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation>Introduza um endereço Bitcoin (p.ex. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> @@ -1935,7 +2483,7 @@ Endereço: %4 <translation>Introduza assinatura Bitcoin</translation> </message> <message> - <location line="+85"/> + <location line="+84"/> <location line="+81"/> <source>The entered address is invalid.</source> <translation>O endereço introduzido é inválido. </translation> @@ -2004,8 +2552,13 @@ Endereço: %4 <context> <name>SplashScreen</name> <message> - <location filename="../splashscreen.cpp" line="+23"/> - <source>The Bitcoin developers</source> + <location filename="../splashscreen.cpp" line="+26"/> + <source>Bitcoin Core</source> + <translation>Núcleo Bitcoin</translation> + </message> + <message> + <location line="+2"/> + <source>The Bitcoin Core developers</source> <translation>Os programadores Bitcoin</translation> </message> <message> @@ -2017,7 +2570,7 @@ Endereço: %4 <context> <name>TrafficGraphWidget</name> <message> - <location filename="../trafficgraphwidget.cpp" line="+75"/> + <location filename="../trafficgraphwidget.cpp" line="+79"/> <source>KB/s</source> <translation>KB/s</translation> </message> @@ -2025,7 +2578,7 @@ Endereço: %4 <context> <name>TransactionDesc</name> <message> - <location filename="../transactiondesc.cpp" line="+22"/> + <location filename="../transactiondesc.cpp" line="+28"/> <source>Open until %1</source> <translation>Aberto até %1</translation> </message> @@ -2217,7 +2770,7 @@ Endereço: %4 <context> <name>TransactionTableModel</name> <message> - <location filename="../transactiontablemodel.cpp" line="+227"/> + <location filename="../transactiontablemodel.cpp" line="+234"/> <source>Date</source> <translation>Data</translation> </message> @@ -2335,7 +2888,7 @@ Endereço: %4 <context> <name>TransactionView</name> <message> - <location filename="../transactionview.cpp" line="+52"/> + <location filename="../transactionview.cpp" line="+57"/> <location line="+16"/> <source>All</source> <translation>Todas</translation> @@ -2396,12 +2949,12 @@ Endereço: %4 <translation>Outras</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>Enter address or label to search</source> <translation>Escreva endereço ou rótulo a procurar</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>Min amount</source> <translation>Quantia mínima</translation> </message> @@ -2436,17 +2989,37 @@ Endereço: %4 <translation>Mostrar detalhes da transação</translation> </message> <message> - <location line="+143"/> - <source>Export Transaction Data</source> - <translation>Exportar Dados das Transações</translation> + <location line="+142"/> + <source>Export Transaction History</source> + <translation>Exportar histórico de transacções</translation> </message> <message> - <location line="+1"/> + <location line="+19"/> + <source>Exporting Failed</source> + <translation>Exportação falhada</translation> + </message> + <message> + <location line="+0"/> + <source>There was an error trying to save the transaction history to %1.</source> + <translation>Ocorreu um erro ao tentar guardar o histórico de dados para %1.</translation> + </message> + <message> + <location line="+4"/> + <source>Exporting Successful</source> + <translation>Exportação bem sucedida</translation> + </message> + <message> + <location line="+0"/> + <source>The transaction history was successfully saved to %1.</source> + <translation>O histórico de transacções foi com sucesso salvo para %1.</translation> + </message> + <message> + <location line="-22"/> <source>Comma separated file (*.csv)</source> <translation>Ficheiro separado por vírgula (*.csv)</translation> </message> <message> - <location line="+8"/> + <location line="+9"/> <source>Confirmed</source> <translation>Confirmada</translation> </message> @@ -2481,17 +3054,7 @@ Endereço: %4 <translation>ID</translation> </message> <message> - <location line="+4"/> - <source>Error exporting</source> - <translation>Erro ao exportar</translation> - </message> - <message> - <location line="+0"/> - <source>Could not write to file %1.</source> - <translation>Impossível escrever para o ficheiro %1.</translation> - </message> - <message> - <location line="+100"/> + <location line="+107"/> <source>Range:</source> <translation>Período:</translation> </message> @@ -2502,9 +3065,17 @@ Endereço: %4 </message> </context> <context> + <name>WalletFrame</name> + <message> + <location filename="../walletframe.cpp" line="+26"/> + <source>No wallet has been loaded.</source> + <translation>Nenhuma carteira foi carregada.</translation> + </message> +</context> +<context> <name>WalletModel</name> <message> - <location filename="../walletmodel.cpp" line="+218"/> + <location filename="../walletmodel.cpp" line="+245"/> <source>Send Coins</source> <translation>Enviar Moedas</translation> </message> @@ -2512,7 +3083,7 @@ Endereço: %4 <context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+46"/> + <location filename="../walletview.cpp" line="+43"/> <source>&Export</source> <translation>&Exportar</translation> </message> @@ -2522,65 +3093,60 @@ Endereço: %4 <translation>Exportar os dados no separador actual para um ficheiro</translation> </message> <message> - <location line="+183"/> + <location line="+181"/> <source>Backup Wallet</source> <translation>Cópia de Segurança da Carteira</translation> </message> <message> - <location line="+0"/> + <location line="+1"/> <source>Wallet Data (*.dat)</source> <translation>Dados da Carteira (*.dat)</translation> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Backup Failed</source> <translation>Cópia de Segurança Falhou</translation> </message> <message> <location line="+0"/> - <source>There was an error trying to save the wallet data to the new location.</source> + <source>There was an error trying to save the wallet data to %1.</source> <translation>Ocorreu um erro ao tentar guardar os dados da carteira na nova localização.</translation> </message> <message> <location line="+4"/> - <source>Backup Successful</source> - <translation>Cópia de Segurança Bem Sucedida</translation> + <source>The wallet data was successfully saved to %1.</source> + <translation>Os dados da carteira foram salvos com sucesso para %1.</translation> </message> <message> <location line="+0"/> - <source>The wallet data was successfully saved to the new location.</source> - <translation>Os dados da carteira foram salvos com sucesso numa nova localização.</translation> + <source>Backup Successful</source> + <translation>Cópia de Segurança Bem Sucedida</translation> </message> </context> <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+102"/> - <source>Bitcoin version</source> - <translation>Versão Bitcoin</translation> - </message> - <message> - <location line="+107"/> + <location filename="../bitcoinstrings.cpp" line="+217"/> <source>Usage:</source> <translation>Utilização:</translation> </message> <message> - <location line="-55"/> + <location line="-54"/> <source>List commands</source> <translation>Listar comandos</translation> </message> <message> - <location line="-13"/> + <location line="-14"/> <source>Get help for a command</source> <translation>Obter ajuda para um comando</translation> </message> <message> - <location line="+25"/> + <location line="+26"/> <source>Options:</source> <translation>Opções:</translation> </message> <message> - <location line="+24"/> + <location line="+23"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Especificar ficheiro de configuração (por defeito: bitcoin.conf)</translation> </message> @@ -2600,7 +3166,7 @@ Endereço: %4 <translation>Definir o tamanho da cache de base de dados em megabytes (por defeito: 25)</translation> </message> <message> - <location line="-28"/> + <location line="-27"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>Escute por ligações em <port> (por defeito: 8333 ou testnet: 18333)</translation> </message> @@ -2610,7 +3176,7 @@ Endereço: %4 <translation>Manter no máximo <n> ligações a outros nós da rede (por defeito: 125)</translation> </message> <message> - <location line="-49"/> + <location line="-50"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation>Ligar a um nó para recuperar endereços de pares, e desligar</translation> </message> @@ -2625,7 +3191,7 @@ Endereço: %4 <translation>Tolerância para desligar nós mal-formados (por defeito: 100)</translation> </message> <message> - <location line="-142"/> + <location line="-147"/> <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> @@ -2640,7 +3206,7 @@ Endereço: %4 <translation>Escutar por ligações JSON-RPC em <port> (por defeito: 8332 ou rede de testes: 18332)</translation> </message> <message> - <location line="+40"/> + <location line="+45"/> <source>Accept command line and JSON-RPC commands</source> <translation>Aceitar comandos da consola e JSON-RPC</translation> </message> @@ -2650,17 +3216,17 @@ Endereço: %4 <translation>Correr o processo como um daemon e aceitar comandos</translation> </message> <message> - <location line="+40"/> + <location line="+39"/> <source>Use the test network</source> <translation>Utilizar a rede de testes - testnet</translation> </message> <message> - <location line="-118"/> + <location line="-117"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>Aceitar ligações externas (padrão: 1 sem -proxy ou -connect)</translation> </message> <message> - <location line="-87"/> + <location line="-92"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2707,7 +3273,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo <message> <location line="+3"/> <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly. This is intended for regression testing tools and app development.</source> - <translation type="unfinished"/> + <translation>Entre no modo de retrocesso, que usa uma cadeia especial cujos bloqueios podem ser resolvidos instantâneamente. Isto têm como fim para as ferramentas de retrocesso e desenvolvimento de aplicações.</translation> </message> <message> <location line="+4"/> @@ -2725,17 +3291,17 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo <translation>Executar comando quando uma das transações na carteira mudar (no comando, %s é substituído pelo ID da Transação)</translation> </message> <message> - <location line="+11"/> - <source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source> - <translation>Definir tamanho máximo de transações de alta-/baixa-prioridade em bytes (por defeito: 27000)</translation> - </message> - <message> - <location line="+6"/> + <location line="+18"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation>Esta é uma versão de pré-lançamento - use à sua responsabilidade - não usar para minar ou aplicações comerciais</translation> </message> <message> <location line="+5"/> + <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source> + <translation>Usar proxy SOCKS5 separado para aceder a pares P2P via rede Tor (Por defeito:-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>Atenção: -paytxfee está definida com um valor muito alto! Esta é a taxa que irá pagar se enviar uma transação.</translation> </message> @@ -2747,7 +3313,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 type="unfinished"/> + <translation>Aviso: A rede não parece estar completamente funcional! Parece que alguns bitcoiner's estão com dificuldades técnicas.</translation> </message> <message> <location line="+3"/> @@ -2765,17 +3331,27 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo <translation>Atenção: wallet.dat corrupto, dados recuperados! wallet.dat original salvo como wallet.{timestamp}.bak em %s; se o seu saldo ou transações estiverem incorrectos deverá recuperar de uma cópia de segurança.</translation> </message> <message> - <location line="+14"/> + <location line="+9"/> + <source><category> can be:</source> + <translation><category> pode ser:</translation> + </message> + <message> + <location line="+6"/> <source>Attempt to recover private keys from a corrupt wallet.dat</source> <translation>Tentar recuperar chaves privadas de um wallet.dat corrupto</translation> </message> <message> <location line="+1"/> + <source>Bitcoin Core Daemon</source> + <translation>Bitcoin Core Daemon</translation> + </message> + <message> + <location line="+1"/> <source>Bitcoin RPC client version</source> <translation>Versão do cliente Bitcoin RPC</translation> </message> <message> - <location line="+2"/> + <location line="+1"/> <source>Block creation options:</source> <translation>Opções de criação de bloco:</translation> </message> @@ -2785,7 +3361,12 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo <translation>Apenas ligar ao(s) nó(s) especificado(s)</translation> </message> <message> - <location line="+2"/> + <location line="+1"/> + <source>Connect through SOCKS proxy</source> + <translation>Ligar 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>Ligar ao JSON-RPC em <port> (por defeito: 8332 ou rede de testes: 18332)</translation> </message> @@ -2895,7 +3476,12 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo <translation>Falha ao escrever histórico de modificações</translation> </message> <message> - <location line="+2"/> + <location line="+1"/> + <source>Fee per kB to add to transactions you send</source> + <translation>Taxa por KB a adicionar a transações enviadas</translation> + </message> + <message> + <location line="+1"/> <source>Find peers using DNS lookup (default: 1 unless -connect)</source> <translation>Encontrar pares usando procura DNS (por defeito: 1 excepto -connect)</translation> </message> @@ -2915,9 +3501,14 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo <translation>Qual a minúcia na verificação de blocos (0-4, por defeito: 3)</translation> </message> <message> + <location line="+1"/> + <source>If <category> is not supplied, output all debugging information.</source> + <translation>Se <category> não é fornecida, toda a informação debug é "output".</translation> + </message> + <message> <location line="+2"/> <source>Incorrect or no genesis block found. Wrong datadir for network?</source> - <translation type="unfinished"/> + <translation>Incorrecto ou nenhum bloco de origem encontrado. Directório de dados errado para a rede?</translation> </message> <message> <location line="+3"/> @@ -2930,17 +3521,37 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo <translation>Descritores de ficheiros disponíveis são insuficientes.</translation> </message> <message> - <location line="+8"/> + <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> + </message> + <message> + <location line="+1"/> + <source>RPC client options:</source> + <translation>RPC opções de cliente:</translation> + </message> + <message> + <location line="+1"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation>Reconstruir a cadeia de blocos dos ficheiros blk000??.dat actuais</translation> </message> <message> - <location line="+6"/> + <location line="+5"/> + <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source> + <translation>Selecione a versão do proxy socks a usar (4-5, padrão: 5)</translation> + </message> + <message> + <location line="+1"/> <source>Send command to Bitcoin server</source> <translation>Enviar comando para servidor Bitcoin</translation> </message> <message> - <location line="+10"/> + <location line="+8"/> + <source>Set maximum block size in bytes (default: %d)</source> + <translation>Definir tamanho máximo de um bloco em bytes (por defeito: 250000)</translation> + </message> + <message> + <location line="+2"/> <source>Set the number of threads to service RPC calls (default: 4)</source> <translation>Defina o número de processos para servir as chamadas RPC (por defeito: 4)</translation> </message> @@ -2960,7 +3571,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo <translation>Utilização (deprecado, use bitcoin-cli)</translation> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>Verifying blocks...</source> <translation>Verificando blocos...</translation> </message> @@ -2971,11 +3582,21 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo </message> <message> <location line="+1"/> + <source>Wait for RPC server to start</source> + <translation>Esperar pelo ínicio do servidor RPC</translation> + </message> + <message> + <location line="+1"/> <source>Wallet %s resides outside data directory %s</source> <translation>A carteira %s reside fora da pasta de dados %s</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> + <source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source> + <translation>Aviso: Argumento obsolote -debugnet ignorado, usar -debug=net</translation> + </message> + <message> + <location line="+2"/> <source>You need to rebuild the database using -reindex to change -txindex</source> <translation>Necessita reconstruir as bases de dados usando -reindex para mudar -txindex</translation> </message> @@ -2985,17 +3606,27 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo <translation>Importar blocos de um ficheiro blk000??.dat externo</translation> </message> <message> - <location line="-98"/> + <location line="-104"/> <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> <message> - <location line="+17"/> + <location line="+14"/> + <source>Output debugging information (default: 0, supplying <category> is optional)</source> + <translation>Informação de depuração (default: 0, fornecer <category> é opcional)</translation> + </message> + <message> + <location line="+2"/> + <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source> + <translation>Definir tamanho máximo de transações de alta-/baixa-prioridade em bytes (por defeito: 27000)</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>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="+83"/> + <location line="+88"/> <source>Information</source> <translation>Informação</translation> </message> @@ -3035,32 +3666,12 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo <translation>Apenas ligar a nós na rede <net> (IPv4, IPv6 ou Tor)</translation> </message> <message> - <location line="+2"/> - <source>Output extra debugging information. Implies all other -debug* options</source> - <translation>Produzir informação de depuração extra. Implica todas as outras opções -debug*</translation> - </message> - <message> - <location line="+1"/> - <source>Output extra network debugging information</source> - <translation>Produzir informação de depuração extraordinária</translation> - </message> - <message> - <location line="+2"/> - <source>Prepend debug output with timestamp</source> - <translation>Preceder informação de depuração com selo temporal</translation> - </message> - <message> - <location line="+5"/> + <location line="+9"/> <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation>Opções SSL: (ver a Wiki Bitcoin para instruções de configuração SSL)</translation> </message> <message> - <location line="+1"/> - <source>Select the version of socks proxy to use (4-5, default: 5)</source> - <translation>Selecione a versão do proxy socks a usar (4-5, padrão: 5)</translation> - </message> - <message> - <location line="+3"/> + <location line="+4"/> <source>Send trace/debug info to console instead of debug.log file</source> <translation>Enviar informação de rastreio/depuração para a consola e não para o ficheiro debug.log</translation> </message> @@ -3070,12 +3681,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo <translation>Enviar informação de rastreio/depuração para o depurador</translation> </message> <message> - <location line="+5"/> - <source>Set maximum block size in bytes (default: 250000)</source> - <translation>Definir tamanho máximo de um bloco em bytes (por defeito: 250000)</translation> - </message> - <message> - <location line="+1"/> + <location line="+6"/> <source>Set minimum block size in bytes (default: 0)</source> <translation>Definir tamanho minímo de um bloco em bytes (por defeito: 0)</translation> </message> @@ -3125,37 +3731,37 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo <translation>Usar UPnP para mapear a porta de escuta (padrão: 1 ao escutar)</translation> </message> <message> - <location line="+1"/> - <source>Use proxy to reach tor hidden services (default: same as -proxy)</source> - <translation>Utilizar proxy para aceder a serviços escondidos Tor (por defeito: mesmo que -proxy)</translation> - </message> - <message> <location line="+2"/> <source>Username for JSON-RPC connections</source> <translation>Nome de utilizador para ligações JSON-RPC</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Warning</source> <translation>Aviso</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Warning: This version is obsolete, upgrade required!</source> <translation>Atenção: Esta versão está obsoleta, é necessário actualizar!</translation> </message> <message> <location line="+2"/> + <source>version</source> + <translation>versão</translation> + </message> + <message> + <location line="+1"/> <source>wallet.dat corrupt, salvage failed</source> <translation>wallet.dat corrupta, recuperação falhou</translation> </message> <message> - <location line="-54"/> + <location line="-57"/> <source>Password for JSON-RPC connections</source> <translation>Palavra-passe para ligações JSON-RPC</translation> </message> <message> - <location line="-70"/> + <location line="-69"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Permitir ligações JSON-RPC do endereço IP especificado</translation> </message> @@ -3165,12 +3771,12 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo <translation>Enviar comandos para o nó a correr em <ip> (por defeito: 127.0.0.1)</translation> </message> <message> - <location line="-126"/> + <location line="-131"/> <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="+155"/> + <location line="+160"/> <source>Upgrade wallet to latest format</source> <translation>Atualize a carteira para o formato mais recente</translation> </message> @@ -3210,22 +3816,17 @@ 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="-95"/> - <source>Connect through socks proxy</source> - <translation>Ligar através de um proxy socks</translation> - </message> - <message> - <location line="-11"/> + <location line="-106"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>Permitir procuras DNS para -addnode, -seednode e -connect</translation> </message> <message> - <location line="+58"/> + <location line="+59"/> <source>Loading addresses...</source> <translation>Carregar endereços...</translation> </message> <message> - <location line="-36"/> + <location line="-37"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>Erro ao carregar wallet.dat: Carteira danificada</translation> </message> @@ -3245,12 +3846,12 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo <translation>Erro ao carregar wallet.dat</translation> </message> <message> - <location line="+30"/> + <location line="+31"/> <source>Invalid -proxy address: '%s'</source> <translation>Endereço -proxy inválido: '%s'</translation> </message> <message> - <location line="+57"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Rede desconhecida especificada em -onlynet: '%s'</translation> </message> @@ -3270,7 +3871,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="+46"/> + <location line="+47"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>Quantia inválida para -paytxfee=<amount>: '%s'</translation> </message> @@ -3290,27 +3891,22 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo <translation>Carregar índice de blocos...</translation> </message> <message> - <location line="-60"/> + <location line="-61"/> <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> <message> - <location line="-28"/> + <location line="-32"/> <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source> <translation>Incapaz de vincular à porta %s neste computador. Provavelmente o Bitcoin já está a funcionar.</translation> </message> <message> - <location line="+69"/> - <source>Fee per KB to add to transactions you send</source> - <translation>Taxa por KB a adicionar a transações enviadas</translation> - </message> - <message> - <location line="+20"/> + <location line="+94"/> <source>Loading wallet...</source> <translation>Carregar carteira...</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>Cannot downgrade wallet</source> <translation>Impossível mudar a carteira para uma versão anterior</translation> </message> @@ -3340,7 +3936,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo <translation>Erro</translation> </message> <message> - <location line="-33"/> + <location line="-34"/> <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 12aa79fcd5..44e48d3543 100644 --- a/src/qt/locale/bitcoin_ru.ts +++ b/src/qt/locale/bitcoin_ru.ts @@ -3,13 +3,13 @@ <name>AboutDialog</name> <message> <location filename="../forms/aboutdialog.ui" line="+14"/> - <source>About Bitcoin</source> - <translation>&О Bitcoin</translation> + <source>About Bitcoin Core</source> + <translation>О Bitcoin Core</translation> </message> <message> <location line="+39"/> - <source><b>Bitcoin</b> version</source> - <translation><b>Bitcoin</b> версия</translation> + <source><b>Bitcoin Core</b> version</source> + <translation>версия <b>Bitcoin Core</b></translation> </message> <message> <location line="+57"/> @@ -27,7 +27,7 @@ This product includes software developed by the OpenSSL Project for use in the O Этот продукт включает ПО, разработанное OpenSSL Project для использования в OpenSSL Toolkit (http://www.openssl.org/) и криптографическое ПО, написанное Eric Young (eay@cryptsoft.com) и ПО для работы с UPnP, написанное Thomas Bernard.</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="+14"/> + <location filename="../aboutdialog.cpp" line="+19"/> <source>Copyright</source> <translation>Все права защищены</translation> </message> @@ -70,7 +70,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Закрыть</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="+72"/> + <location filename="../addressbookpage.cpp" line="+74"/> <source>&Copy Address</source> <translation>&Копировать адрес</translation> </message> @@ -140,7 +140,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Правка</translation> </message> <message> - <location line="+197"/> + <location line="+194"/> <source>Export Address List</source> <translation>Экспортировать список адресов</translation> </message> @@ -163,7 +163,7 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>AddressTableModel</name> <message> - <location filename="../addresstablemodel.cpp" line="+164"/> + <location filename="../addresstablemodel.cpp" line="+168"/> <source>Label</source> <translation>Метка</translation> </message> @@ -201,7 +201,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Повторите новый пароль</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="+34"/> + <location filename="../askpassphrasedialog.cpp" line="+40"/> <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>10 or more random characters</b>, or <b>eight or more words</b>.</source> <translation>Введите новый пароль для бумажника. <br/> Пожалуйста, используйте фразы из <b>10 или более случайных символов,</b> или <b>восьми и более слов.</b></translation> </message> @@ -228,7 +228,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+5"/> <source>Decrypt wallet</source> - <translation>Расшифровать бумажник</translation> + <translation>Зашифровать кошелёк</translation> </message> <message> <location line="+3"/> @@ -322,19 +322,19 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+250"/> + <location filename="../bitcoingui.cpp" line="+260"/> <source>Sign &message...</source> <translation>&Подписать сообщение...</translation> </message> <message> - <location line="+254"/> + <location line="+290"/> <source>Synchronizing with network...</source> <translation>Синхронизация с сетью...</translation> </message> <message> - <location line="-324"/> + <location line="-360"/> <source>&Overview</source> - <translation>О&бзор</translation> + <translation>&Обзор</translation> </message> <message> <location line="+1"/> @@ -380,7 +380,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+2"/> <source>&Options...</source> - <translation>Оп&ции...</translation> + <translation>Опции</translation> </message> <message> <location line="+9"/> @@ -398,7 +398,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Изменить пароль...</translation> </message> <message> - <location line="+259"/> + <location line="+295"/> <source>Importing blocks from disk...</source> <translation>Импортируются блоки с диска...</translation> </message> @@ -408,7 +408,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Идёт переиндексация блоков на диске...</translation> </message> <message> - <location line="-322"/> + <location line="-358"/> <source>Send coins to a Bitcoin address</source> <translation>Отправить монеты на указанный адрес Bitcoin</translation> </message> @@ -443,20 +443,18 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Проверить сообщение...</translation> </message> <message> - <location line="-180"/> - <location line="+6"/> - <location line="+513"/> + <location line="+375"/> <source>Bitcoin</source> <translation>Биткоин</translation> </message> <message> - <location line="-519"/> - <location line="+6"/> + <location line="-563"/> + <location line="+10"/> <source>Wallet</source> <translation>Бумажник</translation> </message> <message> - <location line="+109"/> + <location line="+113"/> <source>&Send</source> <translation>&Отправить</translation> </message> @@ -466,13 +464,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Получить</translation> </message> <message> - <location line="+28"/> - <location line="+2"/> - <source>&About Bitcoin</source> - <translation>&О Bitcoin</translation> - </message> - <message> - <location line="+14"/> + <location line="+44"/> <location line="+2"/> <source>&Show / Hide</source> <translation>&Показать / Скрыть</translation> @@ -498,12 +490,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Проверить сообщения, чтобы удостовериться, что они были подписаны определённым адресом Bitcoin</translation> </message> <message> - <location line="+35"/> + <location line="+39"/> <source>&File</source> <translation>&Файл</translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>&Settings</source> <translation>&Настройки</translation> </message> @@ -518,18 +510,30 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Панель вкладок</translation> </message> <message> - <location line="-235"/> - <location line="+294"/> + <location line="-244"/> + <location line="+321"/> <source>[testnet]</source> <translation>[тестовая сеть]</translation> </message> <message> - <location line="-177"/> + <location line="-331"/> + <location line="+10"/> + <source>Bitcoin Core</source> + <translation>Ядро Bitcoin</translation> + </message> + <message> + <location line="+121"/> <source>Request payments (generates QR codes and bitcoin: URIs)</source> <translation>Запросить платежи (создаёт QR-коды и bitcoin: ссылки)</translation> </message> <message> - <location line="+63"/> + <location line="+27"/> + <location line="+2"/> + <source>&About Bitcoin Core</source> + <translation>&О Bitcoin Core</translation> + </message> + <message> + <location line="+34"/> <source>&Used sending addresses...</source> <translation>&Использованные адреса отправки...</translation> </message> @@ -549,13 +553,23 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Показать список использованных адресов и меток получения</translation> </message> <message> - <location line="+106"/> + <location line="+2"/> + <source>Open URI...</source> + <translation>Открыть URI...</translation> + </message> + <message> + <location line="+1"/> + <source>Open a bitcoin: URI or payment request</source> + <translation>Открыть bitcoin: URI или запрос платежа</translation> + </message> + <message> + <location line="+126"/> <location line="+5"/> <source>Bitcoin client</source> <translation>Bitcoin клиент</translation> </message> <message numerus="yes"> - <location line="+120"/> + <location line="+133"/> <source>%n active connection(s) to Bitcoin network</source> <translation><numerusform>%n активное соединение с сетью</numerusform><numerusform>%n активных соединений с сетью</numerusform><numerusform>%n активных соединений с сетью</numerusform></translation> </message> @@ -602,7 +616,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>Транзакции после этой пока не будут видны.</translation> + <translation>Транзакции после него пока не будут видны.</translation> </message> <message> <location line="+27"/> @@ -663,17 +677,7 @@ Address: %4 </translation> </message> <message> - <location line="+34"/> - <source>URI handling</source> - <translation>Обработка URI</translation> - </message> - <message> - <location line="+0"/> - <source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source> - <translation>Не удалось обработать URI! Это может быть связано с неверным адресом Bitcoin или неправильными параметрами URI.</translation> - </message> - <message> - <location line="+45"/> + <location line="+67"/> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>Бумажник <b>зашифрован</b> и в настоящее время <b>разблокирован</b></translation> </message> @@ -683,7 +687,7 @@ Address: %4 <translation>Бумажник <b>зашифрован</b> и в настоящее время <b>заблокирован</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+110"/> + <location filename="../bitcoin.cpp" line="+116"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>Произошла неисправимая ошибка. Bitcoin не может безопасно продолжать работу и будет закрыт.</translation> </message> @@ -691,12 +695,299 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+115"/> + <location filename="../clientmodel.cpp" line="+119"/> <source>Network Alert</source> <translation>Сетевая Тревога</translation> </message> </context> <context> + <name>CoinControlDialog</name> + <message> + <location filename="../forms/coincontroldialog.ui" line="+14"/> + <source>Coin Control Address Selection</source> + <translation>Выбор адреса контроля монет</translation> + </message> + <message> + <location line="+34"/> + <source>Quantity:</source> + <translation>Количество:</translation> + </message> + <message> + <location line="+29"/> + <source>Bytes:</source> + <translation>Байт:</translation> + </message> + <message> + <location line="+45"/> + <source>Amount:</source> + <translation>Количество:</translation> + </message> + <message> + <location line="+29"/> + <source>Priority:</source> + <translation>Приоритет:</translation> + </message> + <message> + <location line="+45"/> + <source>Fee:</source> + <translation>Комиссия:</translation> + </message> + <message> + <location line="+32"/> + <source>Low Output:</source> + <translation>Малый выход:</translation> + </message> + <message> + <location line="+48"/> + <source>After Fee:</source> + <translation>После комиссии:</translation> + </message> + <message> + <location line="+32"/> + <source>Change:</source> + <translation>Сдача:</translation> + </message> + <message> + <location line="+63"/> + <source>(un)select all</source> + <translation>Отменить выбор всего</translation> + </message> + <message> + <location line="+13"/> + <source>Tree mode</source> + <translation>Режим дерева</translation> + </message> + <message> + <location line="+16"/> + <source>List mode</source> + <translation>Режим списка</translation> + </message> + <message> + <location line="+52"/> + <source>Amount</source> + <translation>Количество</translation> + </message> + <message> + <location line="+10"/> + <source>Address</source> + <translation>Адрес</translation> + </message> + <message> + <location line="+5"/> + <source>Date</source> + <translation>Дата</translation> + </message> + <message> + <location line="+5"/> + <source>Confirmations</source> + <translation>Подтверждений</translation> + </message> + <message> + <location line="+3"/> + <source>Confirmed</source> + <translation>Подтверждено</translation> + </message> + <message> + <location line="+5"/> + <source>Priority</source> + <translation>Приоритет</translation> + </message> + <message> + <location filename="../coincontroldialog.cpp" line="+42"/> + <source>Copy address</source> + <translation>Копировать адрес</translation> + </message> + <message> + <location line="+1"/> + <source>Copy label</source> + <translation>Копировать метку</translation> + </message> + <message> + <location line="+1"/> + <location line="+26"/> + <source>Copy amount</source> + <translation>Скопировать сумму</translation> + </message> + <message> + <location line="-25"/> + <source>Copy transaction ID</source> + <translation>Скопировать ID транзакции</translation> + </message> + <message> + <location line="+1"/> + <source>Lock unspent</source> + <translation>Заблокировать непотраченное</translation> + </message> + <message> + <location line="+1"/> + <source>Unlock unspent</source> + <translation>Разблокировать непотраченное</translation> + </message> + <message> + <location line="+22"/> + <source>Copy quantity</source> + <translation>Копировать количество</translation> + </message> + <message> + <location line="+2"/> + <source>Copy fee</source> + <translation>Копировать комиссию</translation> + </message> + <message> + <location line="+1"/> + <source>Copy after fee</source> + <translation>Копировать после комиссии</translation> + </message> + <message> + <location line="+1"/> + <source>Copy bytes</source> + <translation>Копировать байты</translation> + </message> + <message> + <location line="+1"/> + <source>Copy priority</source> + <translation>Копировать приоритет</translation> + </message> + <message> + <location line="+1"/> + <source>Copy low output</source> + <translation>Копировать малый выход</translation> + </message> + <message> + <location line="+1"/> + <source>Copy change</source> + <translation>Копировать сдачу</translation> + </message> + <message> + <location line="+323"/> + <source>highest</source> + <translation>самый высокий</translation> + </message> + <message> + <location line="+1"/> + <source>higher</source> + <translation>выше</translation> + </message> + <message> + <location line="+1"/> + <source>high</source> + <translation>высокий</translation> + </message> + <message> + <location line="+1"/> + <source>medium-high</source> + <translation>выше среднего</translation> + </message> + <message> + <location line="+1"/> + <source>medium</source> + <translation>средний</translation> + </message> + <message> + <location line="+4"/> + <source>low-medium</source> + <translation>ниже среднего</translation> + </message> + <message> + <location line="+1"/> + <source>low</source> + <translation>низкий</translation> + </message> + <message> + <location line="+1"/> + <source>lower</source> + <translation>ниже</translation> + </message> + <message> + <location line="+1"/> + <source>lowest</source> + <translation>самый низкий</translation> + </message> + <message> + <location line="+11"/> + <source>(%1 locked)</source> + <translation>(%1 заблокировано)</translation> + </message> + <message> + <location line="+171"/> + <source>Dust</source> + <translation>Пыль</translation> + </message> + <message> + <location line="+0"/> + <source>yes</source> + <translation>да</translation> + </message> + <message> + <location line="+0"/> + <source>no</source> + <translation>нет</translation> + </message> + <message> + <location line="+10"/> + <source>This label turns red, if the transaction size is greater than 1000 bytes.</source> + <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>Это значит, что требуется комиссия как минимум %1 на Кб.</translation> + </message> + <message> + <location line="-4"/> + <source>Can vary +/- 1 byte per input.</source> + <translation>Может отличаться на +/- 1 байт на вход.</translation> + </message> + <message> + <location line="+2"/> + <source>Transactions with higher priority are more likely to get included into a block.</source> + <translation>Транзакции с более высоким приоритетом будут вероятнее других включены в блок.</translation> + </message> + <message> + <location line="+1"/> + <source>This label turns red, if the priority is smaller than "medium"</source> + <translation>Эта пометка становится красной, если приоритет ниже, чем "средний"</translation> + </message> + <message> + <location line="+3"/> + <source>This label turns red, if any recipient receives an amount smaller than %1.</source> + <translation>Эта пометка становится красной, если какой-либо из адресатов получает сумму менее %1.</translation> + </message> + <message> + <location line="+1"/> + <location line="+4"/> + <source>This means a fee of at least %1 is required.</source> + <translation>Это значит, что требуется комиссия как минимум %1.</translation> + </message> + <message> + <location line="-3"/> + <source>Amounts below 0.546 times the minimum relay fee are shown as dust.</source> + <translation>Суммы ниже, чем 0.546 минимальных комиссий ретрансляции, показаны как пыль.</translation> + </message> + <message> + <location line="+2"/> + <source>This label turns red, if the change is smaller than %1.</source> + <translation>Эта пометка становится красной, если сдача меньше %1.</translation> + </message> + <message> + <location line="+43"/> + <location line="+66"/> + <source>(no label)</source> + <translation>[нет метки]</translation> + </message> + <message> + <location line="-9"/> + <source>change from %1 (%2)</source> + <translation>сдача с %1 (%2)</translation> + </message> + <message> + <location line="+1"/> + <source>(change)</source> + <translation>(размен)</translation> + </message> +</context> +<context> <name>EditAddressDialog</name> <message> <location filename="../forms/editaddressdialog.ui" line="+14"/> @@ -724,7 +1015,7 @@ Address: %4 <translation>&Адрес</translation> </message> <message> - <location filename="../editaddressdialog.cpp" line="+21"/> + <location filename="../editaddressdialog.cpp" line="+25"/> <source>New receiving address</source> <translation>Новый адрес для получения</translation> </message> @@ -767,7 +1058,7 @@ Address: %4 <context> <name>FreespaceChecker</name> <message> - <location filename="../intro.cpp" line="+61"/> + <location filename="../intro.cpp" line="+65"/> <source>A new data directory will be created.</source> <translation>Будет создан новый каталог данных.</translation> </message> @@ -795,18 +1086,18 @@ Address: %4 <context> <name>GUIUtil::HelpMessageBox</name> <message> - <location filename="../guiutil.cpp" line="+558"/> - <location line="+13"/> - <source>Bitcoin-Qt</source> - <translation>Bitcoin-Qt</translation> - </message> - <message> - <location line="-13"/> + <location filename="../guiutil.cpp" line="+597"/> <source>version</source> <translation>версия</translation> </message> <message> - <location line="+2"/> + <location line="+0"/> + <location line="+13"/> + <source>Bitcoin Core</source> + <translation>Ядро Bitcoin</translation> + </message> + <message> + <location line="-11"/> <source>Usage:</source> <translation>Использование:</translation> </message> @@ -850,18 +1141,18 @@ Address: %4 </message> <message> <location line="+9"/> - <source>Welcome to Bitcoin-Qt.</source> - <translation>Добро пожаловать в Bitcoin-Qt</translation> + <source>Welcome to Bitcoin Core.</source> + <translation>Добро пожаловать в Bitcoin Core.</translation> </message> <message> <location line="+26"/> - <source>As this is the first time the program is launched, you can choose where Bitcoin-Qt will store its data.</source> - <translation>Так как вы впервые запустили программу, вы можете выбрать, где Bitcoin-Qt будет хранить данные.</translation> + <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source> + <translation>Так как вы впервые запустили программу, вы можете выбрать, где Bitcoin Core будет хранить данные.</translation> </message> <message> <location line="+10"/> - <source>Bitcoin-Qt will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source> - <translation>Bitcoin-Qt скачает и сохранит копию цепи блоков. Как минимум, %1GB данных будет сохранено в этом каталоге, и со временем он будет расти. Бумажник будет также сохранён в этом каталоге.</translation> + <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source> + <translation>Bitcoin Core скачает и сохранит копию цепи блоков. Как минимум, %1GB данных будет храниться в этом каталоге, и со временем он будет расти. Бумажник будет также сохранён в этом каталоге.</translation> </message> <message> <location line="+10"/> @@ -874,7 +1165,17 @@ Address: %4 <translation>Использовать другой каталог данных:</translation> </message> <message> - <location filename="../intro.cpp" line="+105"/> + <location filename="../intro.cpp" line="+85"/> + <source>Bitcoin</source> + <translation>Биткоин</translation> + </message> + <message> + <location line="+1"/> + <source>Error: Specified data directory "%1" can not be created.</source> + <translation>Ошибка: не удалось создать указанный каталог данных "%1".</translation> + </message> + <message> + <location line="+19"/> <source>Error</source> <translation>Ошибка</translation> </message> @@ -890,6 +1191,34 @@ Address: %4 </message> </context> <context> + <name>OpenURIDialog</name> + <message> + <location filename="../forms/openuridialog.ui" line="+14"/> + <source>Open URI</source> + <translation>Открыть URI</translation> + </message> + <message> + <location line="+6"/> + <source>Open payment request from URI or file</source> + <translation>Открыть запрос платежа из URI или файла</translation> + </message> + <message> + <location line="+9"/> + <source>URI:</source> + <translation>URI:</translation> + </message> + <message> + <location line="+11"/> + <source>Select payment request file</source> + <translation>Выбрать файл запроса платежа</translation> + </message> + <message> + <location filename="../openuridialog.cpp" line="+47"/> + <source>Select payment request file to open</source> + <translation>Выберите файл запроса платежа</translation> + </message> +</context> +<context> <name>OptionsDialog</name> <message> <location filename="../forms/optionsdialog.ui" line="+14"/> @@ -1047,9 +1376,19 @@ Address: %4 <translation>&Показывать адреса в списке транзакций</translation> </message> <message> + <location line="+7"/> + <source>Whether to show coin control features or not.</source> + <translation>Показывать ли функции контроля монет или нет.</translation> + </message> + <message> + <location line="+3"/> + <source>Display coin &control features (experts only)</source> + <translation>Показать функции &контроля монет (только для экспертов)</translation> + </message> + <message> <location line="+71"/> <source>&OK</source> - <translation>О&К</translation> + <translation>&OK</translation> </message> <message> <location line="+7"/> @@ -1062,12 +1401,12 @@ Address: %4 <translation>&Применить</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+58"/> + <location filename="../optionsdialog.cpp" line="+63"/> <source>default</source> <translation>по умолчанию</translation> </message> <message> - <location line="+130"/> + <location line="+131"/> <source>Confirm options reset</source> <translation>Подтвердите сброс опций</translation> </message> @@ -1108,17 +1447,17 @@ Address: %4 </message> <message> <location line="+50"/> - <location line="+202"/> + <location line="+214"/> <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source> <translation>Отображаемая информация может быть устаревшей. Ваш бумажник автоматически синхронизируется с сетью Bitcoin после подключения, но этот процесс пока не завершён.</translation> </message> <message> - <location line="-131"/> + <location line="-140"/> <source>Unconfirmed:</source> <translation>Не подтверждено:</translation> </message> <message> - <location line="-78"/> + <location line="-81"/> <source>Wallet</source> <translation>Бумажник</translation> </message> @@ -1133,12 +1472,12 @@ Address: %4 <translation>Ваш текущий расходный баланс</translation> </message> <message> - <location line="+29"/> + <location line="+32"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation>Общая сумма всех транзакций, которые до сих пор не подтверждены, и до сих пор не учитываются в расходном балансе</translation> </message> <message> - <location line="+13"/> + <location line="+16"/> <source>Immature:</source> <translation>Незрелые:</translation> </message> @@ -1148,7 +1487,7 @@ Address: %4 <translation>Баланс добытых монет, который ещё не созрел</translation> </message> <message> - <location line="+13"/> + <location line="+16"/> <source>Total:</source> <translation>Итого:</translation> </message> @@ -1158,12 +1497,12 @@ Address: %4 <translation>Ваш текущий общий баланс</translation> </message> <message> - <location line="+53"/> + <location line="+56"/> <source><b>Recent transactions</b></source> <translation><b>Последние транзакции</b></translation> </message> <message> - <location filename="../overviewpage.cpp" line="+116"/> + <location filename="../overviewpage.cpp" line="+120"/> <location line="+1"/> <source>out of sync</source> <translation>не синхронизировано</translation> @@ -1172,7 +1511,7 @@ Address: %4 <context> <name>PaymentServer</name> <message> - <location filename="../paymentserver.cpp" line="+392"/> + <location filename="../paymentserver.cpp" line="+397"/> <source>URI handling</source> <translation>Обработка URI</translation> </message> @@ -1182,23 +1521,29 @@ Address: %4 <translation>Не удалось обработать URI! Это может быть связано с неверным адресом Bitcoin или неправильными параметрами URI.</translation> </message> <message> - <location line="+69"/> + <location line="+91"/> <source>Requested payment amount of %1 is too small (considered dust).</source> <translation>Запрошенный размер платежа %1 слишком мал (считается пылью).</translation> </message> <message> - <location line="+4"/> - <location line="+37"/> + <location line="-204"/> + <location line="+195"/> + <location line="+13"/> <source>Payment request error</source> <translation>Ошибка запроса платежа</translation> </message> <message> - <location line="+1"/> - <source>Insecure requests to custom payment scripts unsupported</source> - <translation>Небезопасные запросы к пользовательским платёжным скриптам не поддерживаются</translation> + <location line="-207"/> + <source>Cannot start bitcoin: click-to-pay handler</source> + <translation>Не удаётся запустить bitcoin: обработчик click-to-pay</translation> </message> <message> - <location line="+38"/> + <location line="+195"/> + <source>Unverified payment requests to custom payment scripts are unsupported.</source> + <translation>Непроверенные запросы платежей с нестандартными платёжными сценариями не поддерживаются.</translation> + </message> + <message> + <location line="+59"/> <source>Refund from %1</source> <translation>Возврат от %1</translation> </message> @@ -1208,7 +1553,7 @@ Address: %4 <translation>Ошибка связи с %1: %2</translation> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>Bad response from server %1</source> <translation>Плохой ответ от сервера %1</translation> </message> @@ -1218,8 +1563,8 @@ Address: %4 <translation>Платёж принят</translation> </message> <message> - <location line="-58"/> - <location line="+30"/> + <location line="-55"/> + <location line="+27"/> <location line="+17"/> <source>Network request error</source> <translation>Ошибка сетевого запроса</translation> @@ -1228,9 +1573,8 @@ Address: %4 <context> <name>QObject</name> <message> - <location filename="../bitcoin.cpp" line="+114"/> + <location filename="../bitcoin.cpp" line="+119"/> <location line="+5"/> - <location filename="../intro.cpp" line="-32"/> <source>Bitcoin</source> <translation>Биткоин</translation> </message> @@ -1244,16 +1588,11 @@ Address: %4 <source>Error: Invalid combination of -regtest and -testnet.</source> <translation>Ошибка: неверная комбинация -regtest и -testnet.</translation> </message> - <message> - <location filename="../intro.cpp" line="+1"/> - <source>Error: Specified data directory "%1" can not be created.</source> - <translation>Ошибка: не удалось создать указанный каталог данных "%1".</translation> - </message> </context> <context> <name>QRImageWidget</name> <message> - <location filename="../receiverequestdialog.cpp" line="+32"/> + <location filename="../receiverequestdialog.cpp" line="+36"/> <source>&Save Image...</source> <translation>&Сохранить изображение...</translation> </message> @@ -1269,8 +1608,8 @@ Address: %4 </message> <message> <location line="+0"/> - <source>PNG Images (*.png)</source> - <translation>PNG Изображения (*.png)</translation> + <source>PNG Image (*.png)</source> + <translation>Изображение PNG (*.png)</translation> </message> </context> <context> @@ -1290,7 +1629,7 @@ Address: %4 <location line="+53"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+352"/> + <location filename="../rpcconsole.cpp" line="+360"/> <source>N/A</source> <translation>Н/Д</translation> </message> @@ -1305,7 +1644,12 @@ Address: %4 <translation>&Информация</translation> </message> <message> - <location line="+68"/> + <location line="-10"/> + <source>Debug window</source> + <translation>Окно отладки</translation> + </message> + <message> + <location line="+78"/> <source>Using OpenSSL version</source> <translation>Используется версия OpenSSL</translation> </message> @@ -1360,12 +1704,7 @@ Address: %4 <translation>Параметры командной строки</translation> </message> <message> - <location line="+7"/> - <source>Show the Bitcoin-Qt help message to get a list with possible Bitcoin command-line options.</source> - <translation>Показать помощь по Bitcoin-Qt, чтобы получить список доступных параметров командной строки.</translation> - </message> - <message> - <location line="+3"/> + <location line="+10"/> <source>&Show</source> <translation>&Показать</translation> </message> @@ -1405,12 +1744,7 @@ Address: %4 <translation>Дата сборки</translation> </message> <message> - <location line="-104"/> - <source>Bitcoin - Debug window</source> - <translation>Bitcoin - Окно отладки</translation> - </message> - <message> - <location line="+25"/> + <location line="-79"/> <source>Bitcoin Core</source> <translation>Ядро Bitcoin</translation> </message> @@ -1425,7 +1759,12 @@ Address: %4 <translation>Открыть отладочный лог-файл Bitcoin из текущего каталога данных. Это может занять несколько секунд для больших лог-файлов.</translation> </message> <message> - <location line="+102"/> + <location line="+26"/> + <source>Show the Bitcoin-Core help message to get a list with possible Bitcoin command-line options.</source> + <translation>Показать помощь по Bitcoin Core, чтобы получить список доступных параметров командной строки.</translation> + </message> + <message> + <location line="+76"/> <source>Clear console</source> <translation>Очистить консоль</translation> </message> @@ -1483,37 +1822,32 @@ Address: %4 <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+22"/> + <location filename="../forms/receivecoinsdialog.ui" line="+83"/> <source>&Amount:</source> <translation>&Количество:</translation> </message> <message> - <location line="+16"/> + <location line="+19"/> <source>The amount to request</source> <translation>Объём запроса</translation> </message> <message> - <location line="+7"/> + <location line="-32"/> <source>&Label:</source> <translation>&Метка:</translation> </message> <message> - <location line="+10"/> - <source>The label to associate with the receiving address</source> - <translation>Метка, связанная с адресом получения</translation> - </message> - <message> - <location line="+7"/> + <location line="-34"/> <source>&Message:</source> <translation>&Сообщение</translation> </message> <message> - <location line="+10"/> + <location line="+20"/> <source>The message to attach to payment request</source> <translation>Прикрепить сообщение к запросу платежа</translation> </message> <message> - <location line="+14"/> + <location line="-37"/> <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> @@ -1523,12 +1857,17 @@ Address: %4 <translation>&Реиспользовать существующий адрес получения (не рекомендуется)</translation> </message> <message> - <location line="+7"/> + <location line="+27"/> + <source>The label to associate with the new receiving address</source> + <translation>Метка, связанная с новым адресом получения</translation> + </message> + <message> + <location line="+14"/> <source>Use this form to request payments. All fields are optional.</source> <translation>Используйте эту форму для запроса платежей. Все поля необязательны.</translation> </message> <message> - <location line="+17"/> + <location line="+56"/> <source>Clear all fields of the form.</source> <translation>Очистить все поля формы.</translation> </message> @@ -1542,6 +1881,31 @@ Address: %4 <source>&Request payment</source> <translation>&Запросить платёж</translation> </message> + <message> + <location line="+47"/> + <source>Previously requested payments</source> + <translation>Ранее запрошенные платежи</translation> + </message> + <message> + <location line="+12"/> + <source>Show the selected request (does the same as double clicking an entry)</source> + <translation>Показать выбранный запрос (то же самое, что и двойной клик по записи)</translation> + </message> + <message> + <location line="+3"/> + <source>Show</source> + <translation>Показать</translation> + </message> + <message> + <location line="+11"/> + <source>Remove the selected entries from the list</source> + <translation>Удалить выбранные записи из списка</translation> + </message> + <message> + <location line="+3"/> + <source>Remove</source> + <translation>Удалить</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -1562,16 +1926,11 @@ Address: %4 </message> <message> <location line="+7"/> - <source>&Copy Image</source> - <translation>Копировать &изображение</translation> - </message> - <message> - <location line="+7"/> <source>&Save Image...</source> <translation>&Сохранить изображение...</translation> </message> <message> - <location filename="../receiverequestdialog.cpp" line="+58"/> + <location filename="../receiverequestdialog.cpp" line="+56"/> <source>Request payment to %1</source> <translation>Запросить платёж на %1</translation> </message> @@ -1617,16 +1976,119 @@ Address: %4 </message> </context> <context> + <name>RecentRequestsTableModel</name> + <message> + <location filename="../recentrequeststablemodel.cpp" line="+14"/> + <source>Date</source> + <translation>Дата</translation> + </message> + <message> + <location line="+0"/> + <source>Label</source> + <translation>Метка</translation> + </message> + <message> + <location line="+0"/> + <source>Message</source> + <translation>Сообщение</translation> + </message> + <message> + <location line="+0"/> + <source>Amount</source> + <translation>Количество</translation> + </message> + <message> + <location line="+36"/> + <source>(no label)</source> + <translation>[нет метки]</translation> + </message> + <message> + <location line="+9"/> + <source>(no message)</source> + <translation>(нет сообщения)</translation> + </message> +</context> +<context> <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="+14"/> - <location filename="../sendcoinsdialog.cpp" line="+140"/> - <location line="+213"/> + <location filename="../sendcoinsdialog.cpp" line="+381"/> + <location line="+81"/> <source>Send Coins</source> <translation>Отправка</translation> </message> <message> - <location line="+50"/> + <location line="+76"/> + <source>Coin Control Features</source> + <translation>Функции Контроля Монет</translation> + </message> + <message> + <location line="+20"/> + <source>Inputs...</source> + <translation>Входы...</translation> + </message> + <message> + <location line="+7"/> + <source>automatically selected</source> + <translation>автоматически выбрано</translation> + </message> + <message> + <location line="+19"/> + <source>Insufficient funds!</source> + <translation>Недостаточно средств!</translation> + </message> + <message> + <location line="+89"/> + <source>Quantity:</source> + <translation>Количество:</translation> + </message> + <message> + <location line="+35"/> + <source>Bytes:</source> + <translation>Байт:</translation> + </message> + <message> + <location line="+48"/> + <source>Amount:</source> + <translation>Количество:</translation> + </message> + <message> + <location line="+32"/> + <source>Priority:</source> + <translation>Приоритет:</translation> + </message> + <message> + <location line="+48"/> + <source>Fee:</source> + <translation>Комиссия:</translation> + </message> + <message> + <location line="+32"/> + <source>Low Output:</source> + <translation>Малый выход:</translation> + </message> + <message> + <location line="+48"/> + <source>After Fee:</source> + <translation>После комиссии:</translation> + </message> + <message> + <location line="+32"/> + <source>Change:</source> + <translation>Размен:</translation> + </message> + <message> + <location line="+44"/> + <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source> + <translation>Если это выбрано, но адрес сдачи пустой или неверный, сдача будет отправлена на новый сгенерированный адрес.</translation> + </message> + <message> + <location line="+3"/> + <source>Custom change address</source> + <translation>Свой адрес для сдачи</translation> + </message> + <message> + <location line="+115"/> <source>Send to multiple recipients at once</source> <translation>Отправить нескольким получателям одновременно</translation> </message> @@ -1651,12 +2113,7 @@ Address: %4 <translation>Баланс:</translation> </message> <message> - <location line="+10"/> - <source>123.456 BTC</source> - <translation>123.456 BTC</translation> - </message> - <message> - <location line="+31"/> + <location line="+41"/> <source>Confirm the send action</source> <translation>Подтвердить отправку</translation> </message> @@ -1666,49 +2123,125 @@ Address: %4 <translation>&Отправить</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-154"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation>Подтвердите отправку монет</translation> </message> <message> - <location line="-90"/> + <location line="-74"/> <location line="+5"/> <location line="+5"/> + <location line="+4"/> <source>%1 to %2</source> <translation>С %1 на %2</translation> </message> <message> - <location line="+26"/> + <location line="-136"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>Введите адрес Bitcoin (напр. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> + <message> + <location line="+15"/> + <source>Copy quantity</source> + <translation>Копировать количество</translation> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation>Скопировать сумму</translation> + </message> + <message> + <location line="+1"/> + <source>Copy fee</source> + <translation>Копировать комиссию</translation> + </message> + <message> + <location line="+1"/> + <source>Copy after fee</source> + <translation>Копировать после комиссии</translation> + </message> + <message> + <location line="+1"/> + <source>Copy bytes</source> + <translation>Копировать байты</translation> + </message> + <message> + <location line="+1"/> + <source>Copy priority</source> + <translation>Копировать приоритет</translation> + </message> + <message> + <location line="+1"/> + <source>Copy low output</source> + <translation>Копировать малый выход</translation> + </message> + <message> + <location line="+1"/> + <source>Copy change</source> + <translation>Копировать размен</translation> + </message> + <message> + <location line="+170"/> + <source>Total Amount %1 (= %2)</source> + <translation>Обшая сумма %1 (= %2)</translation> + </message> + <message> + <location line="+2"/> + <source>or</source> + <translation>или</translation> + </message> + <message> + <location line="+202"/> <source>The recipient address is not valid, please recheck.</source> <translation>Адрес получателя неверный, пожалуйста, перепроверьте.</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>The amount to pay must be larger than 0.</source> <translation>Количество монет для отправки должно быть больше 0.</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>The amount exceeds your balance.</source> <translation>Количество отправляемых монет превышает Ваш баланс</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>The total exceeds your balance when the %1 transaction fee is included.</source> <translation>Сумма превысит Ваш баланс, если комиссия в размере %1 будет добавлена к транзакции</translation> </message> <message> - <location line="+5"/> + <location line="+3"/> <source>Duplicate address found, can only send to each address once per send operation.</source> <translation>Обнаружен дублирующийся адрес. Отправка на один и тот же адрес возможна только один раз за одну операцию отправки</translation> </message> <message> + <location line="+3"/> + <source>Transaction creation failed!</source> + <translation>Не удалось создать транзакцию!</translation> + </message> + <message> <location line="+4"/> - <source>Error: Transaction creation failed!</source> - <translation>Ошибка: не удалось создать транзакцию!</translation> + <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> + <translation>Транзакция была отклонена! Такое может произойти, если некоторые монеты уже были потрачены, например, если Вы используете одну копию бумажника (wallet.dat), а монеты были потрачены из другой копии, но не были отмечены как потраченные в этой.</translation> </message> <message> - <location line="+15"/> + <location line="+113"/> + <source>Warning: Invalid Bitcoin address</source> + <translation>Внимание: неверный адрес Bitcoin</translation> + </message> + <message> + <location line="+13"/> + <source>(no label)</source> + <translation>[нет метки]</translation> + </message> + <message> + <location line="+8"/> + <source>Warning: Unknown change address</source> + <translation>Внимание: неизвестный адрес сдачи</translation> + </message> + <message> + <location line="-378"/> <source>Are you sure you want to send?</source> <translation>Вы уверены, что хотите отправить?</translation> </message> @@ -1718,17 +2251,7 @@ Address: %4 <translation>добавлено как комиссия</translation> </message> <message> - <location line="+6"/> - <source>Total Amount %1</source> - <translation>Общая сумма %1</translation> - </message> - <message> - <location line="+20"/> - <source>Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> - <translation>Ошибка: В транзакции отказано. Такое может произойти, если некоторые монеты уже были потрачены, например, если Вы используете одну копию файла wallet.dat, а монеты были потрачены из другой копии, но не были отмечены как потраченные в этой.</translation> - </message> - <message> - <location line="+144"/> + <location line="+170"/> <source>Payment request expired</source> <translation>Запрос платежа просрочен</translation> </message> @@ -1741,39 +2264,44 @@ Address: %4 <context> <name>SendCoinsEntry</name> <message> - <location filename="../forms/sendcoinsentry.ui" line="+33"/> - <location line="+585"/> + <location filename="../forms/sendcoinsentry.ui" line="+131"/> + <location line="+501"/> + <location line="+536"/> <source>A&mount:</source> <translation>Ко&личество:</translation> </message> <message> - <location line="-572"/> - <location line="+585"/> + <location line="-1132"/> <source>Pay &To:</source> <translation>Полу&чатель:</translation> </message> <message> - <location line="-551"/> + <location line="+18"/> <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation>Адрес, на который будет выслан платёж (например 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location filename="../sendcoinsentry.cpp" line="+28"/> + <location filename="../sendcoinsentry.cpp" line="+30"/> <source>Enter a label for this address to add it to your address book</source> <translation>Введите метку для данного адреса (для добавления в адресную книгу)</translation> </message> <message> - <location filename="../forms/sendcoinsentry.ui" line="-18"/> + <location filename="../forms/sendcoinsentry.ui" line="+57"/> <source>&Label:</source> <translation>&Метка:</translation> </message> <message> - <location line="+28"/> + <location line="-50"/> <source>Choose previously used address</source> <translation>Выберите ранее использованный адрес</translation> </message> <message> - <location line="+10"/> + <location line="-40"/> + <source>This is a normal payment.</source> + <translation>Это нормальный платёж.</translation> + </message> + <message> + <location line="+50"/> <source>Alt+A</source> <translation>Alt+A</translation> </message> @@ -1789,16 +2317,35 @@ Address: %4 </message> <message> <location line="+7"/> - <source>Remove this recipient</source> - <translation>Удалить этого получателя</translation> + <location line="+504"/> + <location line="+536"/> + <source>Remove this entry</source> + <translation>Удалить эту запись</translation> </message> <message> - <location line="+16"/> + <location line="-40"/> + <source>This is a verified payment request.</source> + <translation>Это проверенный запрос платежа.</translation> + </message> + <message> + <location line="-971"/> <source>Enter a label for this address to add it to the list of used addresses</source> <translation>Введите метку для этого адреса, чтобы добавить его в список использованных</translation> </message> <message> - <location line="+465"/> + <location line="+439"/> + <source>This is an unverified payment request.</source> + <translation>Это непроверенный запрос платежа.</translation> + </message> + <message> + <location line="+18"/> + <location line="+532"/> + <source>Pay To:</source> + <translation>Получатель:</translation> + </message> + <message> + <location line="-498"/> + <location line="+536"/> <source>Memo:</source> <translation>Заметка:</translation> </message> @@ -1919,7 +2466,7 @@ Address: %4 <translation>Сбросить все поля проверки сообщения</translation> </message> <message> - <location filename="../signverifymessagedialog.cpp" line="+27"/> + <location filename="../signverifymessagedialog.cpp" line="+29"/> <location line="+3"/> <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation>Введите адрес Bitcoin (напр. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> @@ -1935,7 +2482,7 @@ Address: %4 <translation>Введите подпись Bitcoin</translation> </message> <message> - <location line="+85"/> + <location line="+84"/> <location line="+81"/> <source>The entered address is invalid.</source> <translation>Введённый адрес неверен</translation> @@ -2004,9 +2551,14 @@ Address: %4 <context> <name>SplashScreen</name> <message> - <location filename="../splashscreen.cpp" line="+23"/> - <source>The Bitcoin developers</source> - <translation>Разработчики Bitcoin</translation> + <location filename="../splashscreen.cpp" line="+26"/> + <source>Bitcoin Core</source> + <translation>Ядро Bitcoin</translation> + </message> + <message> + <location line="+2"/> + <source>The Bitcoin Core developers</source> + <translation>Разработчики Bitcoin Core</translation> </message> <message> <location line="+1"/> @@ -2017,7 +2569,7 @@ Address: %4 <context> <name>TrafficGraphWidget</name> <message> - <location filename="../trafficgraphwidget.cpp" line="+75"/> + <location filename="../trafficgraphwidget.cpp" line="+79"/> <source>KB/s</source> <translation>КБ/сек</translation> </message> @@ -2025,7 +2577,7 @@ Address: %4 <context> <name>TransactionDesc</name> <message> - <location filename="../transactiondesc.cpp" line="+22"/> + <location filename="../transactiondesc.cpp" line="+28"/> <source>Open until %1</source> <translation>Открыто до %1</translation> </message> @@ -2217,7 +2769,7 @@ Address: %4 <context> <name>TransactionTableModel</name> <message> - <location filename="../transactiontablemodel.cpp" line="+227"/> + <location filename="../transactiontablemodel.cpp" line="+234"/> <source>Date</source> <translation>Дата</translation> </message> @@ -2335,7 +2887,7 @@ Address: %4 <context> <name>TransactionView</name> <message> - <location filename="../transactionview.cpp" line="+52"/> + <location filename="../transactionview.cpp" line="+57"/> <location line="+16"/> <source>All</source> <translation>Все</translation> @@ -2396,12 +2948,12 @@ Address: %4 <translation>Другое</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>Enter address or label to search</source> <translation>Введите адрес или метку для поиска</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>Min amount</source> <translation>Мин. сумма</translation> </message> @@ -2436,17 +2988,37 @@ Address: %4 <translation>Показать подробности транзакции</translation> </message> <message> - <location line="+143"/> - <source>Export Transaction Data</source> - <translation>Экспортировать данные транзакций</translation> + <location line="+142"/> + <source>Export Transaction History</source> + <translation>Экспортировать историю транзакций</translation> </message> <message> - <location line="+1"/> + <location line="+19"/> + <source>Exporting Failed</source> + <translation>Экспорт не удался</translation> + </message> + <message> + <location line="+0"/> + <source>There was an error trying to save the transaction history to %1.</source> + <translation>Произошла ошибка при сохранении истории транзакций в %1.</translation> + </message> + <message> + <location line="+4"/> + <source>Exporting Successful</source> + <translation>Экспорт успешно завершён</translation> + </message> + <message> + <location line="+0"/> + <source>The transaction history was successfully saved to %1.</source> + <translation>История транзакций была успешно сохранена в %1.</translation> + </message> + <message> + <location line="-22"/> <source>Comma separated file (*.csv)</source> <translation>Текст, разделённый запятыми (*.csv)</translation> </message> <message> - <location line="+8"/> + <location line="+9"/> <source>Confirmed</source> <translation>Подтверждено</translation> </message> @@ -2481,17 +3053,7 @@ Address: %4 <translation>ID</translation> </message> <message> - <location line="+4"/> - <source>Error exporting</source> - <translation>Ошибка экспорта</translation> - </message> - <message> - <location line="+0"/> - <source>Could not write to file %1.</source> - <translation>Невозможно записать в файл %1.</translation> - </message> - <message> - <location line="+100"/> + <location line="+107"/> <source>Range:</source> <translation>Промежуток от:</translation> </message> @@ -2502,9 +3064,17 @@ Address: %4 </message> </context> <context> + <name>WalletFrame</name> + <message> + <location filename="../walletframe.cpp" line="+26"/> + <source>No wallet has been loaded.</source> + <translation>Не был загружен ни один бумажник.</translation> + </message> +</context> +<context> <name>WalletModel</name> <message> - <location filename="../walletmodel.cpp" line="+218"/> + <location filename="../walletmodel.cpp" line="+245"/> <source>Send Coins</source> <translation>Отправка</translation> </message> @@ -2512,7 +3082,7 @@ Address: %4 <context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+46"/> + <location filename="../walletview.cpp" line="+43"/> <source>&Export</source> <translation>&Экспорт</translation> </message> @@ -2522,66 +3092,61 @@ Address: %4 <translation>Экспортировать данные из вкладки в файл</translation> </message> <message> - <location line="+183"/> + <location line="+181"/> <source>Backup Wallet</source> <translation>Сделать резервную копию бумажника</translation> </message> <message> - <location line="+0"/> + <location line="+1"/> <source>Wallet Data (*.dat)</source> <translation>Данные бумажника (*.dat)</translation> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Backup Failed</source> <translation>Резервное копирование не удалось</translation> </message> <message> <location line="+0"/> - <source>There was an error trying to save the wallet data to the new location.</source> - <translation>При попытке сохранения данных бумажника в новое место произошла ошибка.</translation> + <source>There was an error trying to save the wallet data to %1.</source> + <translation>Произошла ошибка при сохранении данных бумажника в %1.</translation> </message> <message> <location line="+4"/> - <source>Backup Successful</source> - <translation>Резервное копирование успешно завершено</translation> + <source>The wallet data was successfully saved to %1.</source> + <translation>Данные бумажника были успешно сохранены в %1.</translation> </message> <message> <location line="+0"/> - <source>The wallet data was successfully saved to the new location.</source> - <translation>Данные бумажника успешно сохранены в новое место.</translation> + <source>Backup Successful</source> + <translation>Резервное копирование успешно завершено</translation> </message> </context> <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+102"/> - <source>Bitcoin version</source> - <translation>Версия</translation> - </message> - <message> - <location line="+107"/> + <location filename="../bitcoinstrings.cpp" line="+217"/> <source>Usage:</source> <translation>Использование:</translation> </message> <message> - <location line="-55"/> + <location line="-54"/> <source>List commands</source> <translation>Список команд </translation> </message> <message> - <location line="-13"/> + <location line="-14"/> <source>Get help for a command</source> <translation>Получить помощь по команде</translation> </message> <message> - <location line="+25"/> + <location line="+26"/> <source>Options:</source> <translation>Опции:</translation> </message> <message> - <location line="+24"/> + <location line="+23"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Указать конфигурационный файл (по умолчанию: bitcoin.conf)</translation> </message> @@ -2601,7 +3166,7 @@ Address: %4 <translation>Установить размер кэша базы данных в мегабайтах (по умолчанию: 25)</translation> </message> <message> - <location line="-28"/> + <location line="-27"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>Принимать входящие подключения на <port> (по умолчанию: 8333 или 18333 в тестовой сети)</translation> </message> @@ -2611,7 +3176,7 @@ Address: %4 <translation>Поддерживать не более <n> подключений к узлам (по умолчанию: 125)</translation> </message> <message> - <location line="-49"/> + <location line="-50"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation>Подключиться к узлу, чтобы получить список адресов других участников и отключиться</translation> </message> @@ -2626,7 +3191,7 @@ Address: %4 <translation>Порог для отключения неправильно ведущих себя узлов (по умолчанию: 100)</translation> </message> <message> - <location line="-142"/> + <location line="-147"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>Число секунд блокирования неправильно ведущих себя узлов (по умолчанию: 86400)</translation> </message> @@ -2641,7 +3206,7 @@ Address: %4 <translation>Прослушивать подключения JSON-RPC на <порту> (по умолчанию: 8332 или для testnet: 18332)</translation> </message> <message> - <location line="+40"/> + <location line="+45"/> <source>Accept command line and JSON-RPC commands</source> <translation>Принимать командную строку и команды JSON-RPC</translation> </message> @@ -2651,17 +3216,17 @@ Address: %4 <translation>Запускаться в фоне как демон и принимать команды</translation> </message> <message> - <location line="+40"/> + <location line="+39"/> <source>Use the test network</source> <translation>Использовать тестовую сеть</translation> </message> <message> - <location line="-118"/> + <location line="-117"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>Принимать подключения извне (по умолчанию: 1, если не используется -proxy или -connect)</translation> </message> <message> - <location line="-87"/> + <location line="-92"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2726,17 +3291,17 @@ rpcpassword=%s <translation>Выполнить команду, когда меняется транзакция в бумажнике (%s в команде заменяется на TxID)</translation> </message> <message> - <location line="+11"/> - <source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source> - <translation>Максимальный размер высокоприоритетных/низкокомиссионных транзакций в байтах (по умолчанию: 27000)</translation> - </message> - <message> - <location line="+6"/> + <location line="+18"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation>Это пре-релизная тестовая сборка - используйте на свой страх и риск - не используйте для добычи или торговых приложений</translation> </message> <message> <location line="+5"/> + <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source> + <translation>Использовать отдельный прокси SOCKS5 для соединения с участниками через скрытые сервисы Tor (по умолчанию: -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>Внимание: установлено очень большое значение -paytxfee. Это комиссия, которую вы заплатите при проведении транзакции.</translation> </message> @@ -2766,17 +3331,27 @@ rpcpassword=%s <translation>Внимание: wallet.dat повреждён, данные спасены! Оригинальный wallet.dat сохранён как wallet.{timestamp}.bak в %s; если ваш баланс или транзакции некорректны, вы должны восстановить файл из резервной копии.</translation> </message> <message> - <location line="+14"/> + <location line="+9"/> + <source><category> can be:</source> + <translation><category> может быть:</translation> + </message> + <message> + <location line="+6"/> <source>Attempt to recover private keys from a corrupt wallet.dat</source> <translation>Попытаться восстановить приватные ключи из повреждённого wallet.dat</translation> </message> <message> <location line="+1"/> + <source>Bitcoin Core Daemon</source> + <translation>Bitcoin Core демон</translation> + </message> + <message> + <location line="+1"/> <source>Bitcoin RPC client version</source> <translation>Версия Bitcoin RPC клиента</translation> </message> <message> - <location line="+2"/> + <location line="+1"/> <source>Block creation options:</source> <translation>Параметры создания блоков:</translation> </message> @@ -2786,7 +3361,12 @@ rpcpassword=%s <translation>Подключаться только к указанному узлу(ам)</translation> </message> <message> - <location line="+2"/> + <location line="+1"/> + <source>Connect through SOCKS proxy</source> + <translation>Подключаться через SOCKS прокси</translation> + </message> + <message> + <location line="+1"/> <source>Connect to JSON-RPC on <port> (default: 8332 or testnet: 18332)</source> <translation>Подключаться к JSON-RPC на <порт> (по умолчанию: 8332 или testnet: 18332)</translation> </message> @@ -2896,7 +3476,12 @@ rpcpassword=%s <translation>Не удалось записать данные для отмены</translation> </message> <message> - <location line="+2"/> + <location line="+1"/> + <source>Fee per kB to add to transactions you send</source> + <translation>Комиссия на Кб, добавляемая к вашим переводам</translation> + </message> + <message> + <location line="+1"/> <source>Find peers using DNS lookup (default: 1 unless -connect)</source> <translation>Искать узлы с помощью DNS (по умолчанию: 1, если не указан -connect)</translation> </message> @@ -2916,6 +3501,11 @@ rpcpassword=%s <translation>Насколько тщательно проверять блок (0-4, по умолчанию: 3)</translation> </message> <message> + <location line="+1"/> + <source>If <category> is not supplied, output all debugging information.</source> + <translation>Если <category> не предоставлена, выводить всю отладочную информацию.</translation> + </message> + <message> <location line="+2"/> <source>Incorrect or no genesis block found. Wrong datadir for network?</source> <translation>Неверный или отсутствующий начальный блок. Неправильный каталог данных для сети?</translation> @@ -2931,17 +3521,37 @@ rpcpassword=%s <translation>Недостаточно файловых дескрипторов.</translation> </message> <message> - <location line="+8"/> + <location line="+5"/> + <source>Prepend debug output with timestamp (default: 1)</source> + <translation>Дописывать отметки времени к отладочному выводу (по умолчанию: 1)</translation> + </message> + <message> + <location line="+1"/> + <source>RPC client options:</source> + <translation>Параметры RPC клиента:</translation> + </message> + <message> + <location line="+1"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation>Перестроить индекс цепи блоков из текущих файлов blk000??.dat</translation> </message> <message> - <location line="+6"/> + <location line="+5"/> + <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source> + <translation>Выбрать версию SOCKS для -proxy (4 или 5, по умолчанию: 5)</translation> + </message> + <message> + <location line="+1"/> <source>Send command to Bitcoin server</source> <translation>Отправлить команды на Bitcoin сервер</translation> </message> <message> - <location line="+10"/> + <location line="+8"/> + <source>Set maximum block size in bytes (default: %d)</source> + <translation>Задать максимальный размер блока в байтах (по умолчанию: %d)</translation> + </message> + <message> + <location line="+2"/> <source>Set the number of threads to service RPC calls (default: 4)</source> <translation>Задать число потоков выполнения(по умолчанию: 4)</translation> </message> @@ -2961,7 +3571,7 @@ rpcpassword=%s <translation>Использование (устарело, используйте bitcoin-cli):</translation> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>Verifying blocks...</source> <translation>Проверка блоков...</translation> </message> @@ -2972,11 +3582,21 @@ rpcpassword=%s </message> <message> <location line="+1"/> + <source>Wait for RPC server to start</source> + <translation>Ожидание запуска RPC сервера</translation> + </message> + <message> + <location line="+1"/> <source>Wallet %s resides outside data directory %s</source> <translation>Бумажник %s располагается вне каталога данных %s</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> + <source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source> + <translation>Внимание: устаревший аргумент -debugnet проигнорирован, используйте -debug=net</translation> + </message> + <message> + <location line="+2"/> <source>You need to rebuild the database using -reindex to change -txindex</source> <translation>Вам необходимо пересобрать базы данных с помощью -reindex, чтобы изменить -txindex</translation> </message> @@ -2986,17 +3606,27 @@ rpcpassword=%s <translation>Импортировать блоки из внешнего файла blk000??.dat</translation> </message> <message> - <location line="-98"/> + <location line="-104"/> <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> <translation>Выполнить команду, когда приходит соответствующее сообщение о тревоге или наблюдается очень длинное расщепление цепи (%s в команде заменяется на сообщение)</translation> </message> <message> - <location line="+17"/> + <location line="+14"/> + <source>Output debugging information (default: 0, supplying <category> is optional)</source> + <translation>Выводить отладочную информацию (по умолчанию: 0, указание <category> необязательно)</translation> + </message> + <message> + <location line="+2"/> + <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source> + <translation>Задать максимальный размер высокоприоритетных/низкокомиссионных транзакций в байтах (по умолчанию: %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>Задать число потоков проверки скрипта (вплоть до 16, 0=авто, <0 = оставить столько ядер свободными, по умолчанию: 0)</translation> </message> <message> - <location line="+83"/> + <location line="+88"/> <source>Information</source> <translation>Информация</translation> </message> @@ -3036,33 +3666,13 @@ rpcpassword=%s <translation>Подключаться только к узлам из сети <net> (IPv4, IPv6 или Tor)</translation> </message> <message> - <location line="+2"/> - <source>Output extra debugging information. Implies all other -debug* options</source> - <translation>Выводить больше отладочной информации. Включает все остальные опции -debug*</translation> - </message> - <message> - <location line="+1"/> - <source>Output extra network debugging information</source> - <translation>Выводить дополнительную сетевую отладочную информацию</translation> - </message> - <message> - <location line="+2"/> - <source>Prepend debug output with timestamp</source> - <translation>Дописывать отметки времени к отладочному выводу</translation> - </message> - <message> - <location line="+5"/> + <location line="+9"/> <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation> Параметры SSL: (см. Bitcoin Wiki для инструкций по настройке SSL)</translation> </message> <message> - <location line="+1"/> - <source>Select the version of socks proxy to use (4-5, default: 5)</source> - <translation>Выбрать версию SOCKS-прокси (4-5, по умолчанию: 5)</translation> - </message> - <message> - <location line="+3"/> + <location line="+4"/> <source>Send trace/debug info to console instead of debug.log file</source> <translation>Выводить информацию трассировки/отладки на консоль вместо файла debug.log</translation> </message> @@ -3072,12 +3682,7 @@ rpcpassword=%s <translation>Отправлять информацию трассировки/отладки в отладчик</translation> </message> <message> - <location line="+5"/> - <source>Set maximum block size in bytes (default: 250000)</source> - <translation>Максимальный размер блока в байтах (по умолчанию: 250000)</translation> - </message> - <message> - <location line="+1"/> + <location line="+6"/> <source>Set minimum block size in bytes (default: 0)</source> <translation>Минимальный размер блока в байтах (по умолчанию: 0)</translation> </message> @@ -3127,37 +3732,37 @@ rpcpassword=%s <translation>Использовать UPnP для проброса порта (по умолчанию: 1, если используется прослушивание)</translation> </message> <message> - <location line="+1"/> - <source>Use proxy to reach tor hidden services (default: same as -proxy)</source> - <translation>Использовать прокси для скрытых сервисов (по умолчанию: тот же, что и в -proxy)</translation> - </message> - <message> <location line="+2"/> <source>Username for JSON-RPC connections</source> <translation>Имя для подключений JSON-RPC</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Warning</source> <translation>Внимание</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Warning: This version is obsolete, upgrade required!</source> <translation>Внимание: эта версия устарела, требуется обновление!</translation> </message> <message> <location line="+2"/> + <source>version</source> + <translation>версия</translation> + </message> + <message> + <location line="+1"/> <source>wallet.dat corrupt, salvage failed</source> <translation>wallet.dat повреждён, спасение данных не удалось</translation> </message> <message> - <location line="-54"/> + <location line="-57"/> <source>Password for JSON-RPC connections</source> <translation>Пароль для подключений JSON-RPC</translation> </message> <message> - <location line="-70"/> + <location line="-69"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Разрешить подключения JSON-RPC с указанного IP</translation> </message> @@ -3167,12 +3772,12 @@ rpcpassword=%s <translation>Посылать команды узлу, запущенному на <ip> (по умолчанию: 127.0.0.1)</translation> </message> <message> - <location line="-126"/> + <location line="-131"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>Выполнить команду, когда появляется новый блок (%s в команде заменяется на хэш блока)</translation> </message> <message> - <location line="+155"/> + <location line="+160"/> <source>Upgrade wallet to latest format</source> <translation>Обновить бумажник до последнего формата</translation> </message> @@ -3212,22 +3817,17 @@ rpcpassword=%s <translation>Невозможно привязаться к %s на этом компьютере (bind вернул ошибку %d, %s)</translation> </message> <message> - <location line="-95"/> - <source>Connect through socks proxy</source> - <translation>Подключаться через socks прокси</translation> - </message> - <message> - <location line="-11"/> + <location line="-106"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>Разрешить поиск в DNS для -addnode, -seednode и -connect</translation> </message> <message> - <location line="+58"/> + <location line="+59"/> <source>Loading addresses...</source> <translation>Загрузка адресов...</translation> </message> <message> - <location line="-36"/> + <location line="-37"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>Ошибка загрузки wallet.dat: Бумажник поврежден</translation> </message> @@ -3247,12 +3847,12 @@ rpcpassword=%s <translation>Ошибка при загрузке wallet.dat</translation> </message> <message> - <location line="+30"/> + <location line="+31"/> <source>Invalid -proxy address: '%s'</source> <translation>Неверный адрес -proxy: '%s'</translation> </message> <message> - <location line="+57"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>В параметре -onlynet указана неизвестная сеть: '%s'</translation> </message> @@ -3272,7 +3872,7 @@ rpcpassword=%s <translation>Не удаётся разрешить адрес в параметре -externalip: '%s'</translation> </message> <message> - <location line="+46"/> + <location line="+47"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>Неверное количество в параметре -paytxfee=<кол-во>: '%s'</translation> </message> @@ -3292,27 +3892,22 @@ rpcpassword=%s <translation>Загрузка индекса блоков...</translation> </message> <message> - <location line="-60"/> + <location line="-61"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>Добавить узел для подключения и пытаться поддерживать соединение открытым</translation> </message> <message> - <location line="-28"/> + <location line="-32"/> <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source> <translation>Невозможно привязаться к %s на этом компьютере. Возможно, Bitcoin уже работает.</translation> </message> <message> - <location line="+69"/> - <source>Fee per KB to add to transactions you send</source> - <translation>Комиссия на килобайт, добавляемая к вашим транзакциям</translation> - </message> - <message> - <location line="+20"/> + <location line="+94"/> <source>Loading wallet...</source> <translation>Загрузка бумажника...</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>Cannot downgrade wallet</source> <translation>Не удаётся понизить версию бумажника</translation> </message> @@ -3342,7 +3937,7 @@ rpcpassword=%s <translation>Ошибка</translation> </message> <message> - <location line="-33"/> + <location line="-34"/> <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_sk.ts b/src/qt/locale/bitcoin_sk.ts index f36ab092ff..9df27a1701 100644 --- a/src/qt/locale/bitcoin_sk.ts +++ b/src/qt/locale/bitcoin_sk.ts @@ -3,13 +3,13 @@ <name>AboutDialog</name> <message> <location filename="../forms/aboutdialog.ui" line="+14"/> - <source>About Bitcoin</source> - <translation>O Bitcoin</translation> + <source>About Bitcoin Core</source> + <translation>O jadre Bitcoin</translation> </message> <message> <location line="+39"/> - <source><b>Bitcoin</b> version</source> - <translation><b>Bitcoin</b> verzia</translation> + <source><b>Bitcoin Core</b> version</source> + <translation>Verzia <b>Bitcoin jadra</b></translation> </message> <message> <location line="+57"/> @@ -22,14 +22,14 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="+14"/> + <location filename="../aboutdialog.cpp" line="+19"/> <source>Copyright</source> - <translation type="unfinished"/> + <translation>Autorské práva</translation> </message> <message> <location line="+0"/> <source>The Bitcoin developers</source> - <translation type="unfinished"/> + <translation>Vývojári Bitcoin</translation> </message> </context> <context> @@ -47,7 +47,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>&Nové</translation> </message> <message> <location line="+11"/> @@ -57,15 +57,15 @@ 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>&Kopírovať</translation> </message> <message> <location line="+52"/> <source>C&lose</source> - <translation type="unfinished"/> + <translation>Zatvoriť</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="+72"/> + <location filename="../addressbookpage.cpp" line="+74"/> <source>&Copy Address</source> <translation>&Kopírovať adresu</translation> </message> @@ -82,7 +82,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>&Exportovať...</translation> </message> <message> <location line="-27"/> @@ -102,17 +102,17 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+5"/> <source>C&hoose</source> - <translation type="unfinished"/> + <translation>Vybrať</translation> </message> <message> <location line="+6"/> <source>Sending addresses</source> - <translation type="unfinished"/> + <translation>Adresa odoslania</translation> </message> <message> <location line="+1"/> <source>Receiving addresses</source> - <translation type="unfinished"/> + <translation>Adresa prijatia</translation> </message> <message> <location line="+7"/> @@ -135,9 +135,9 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Upraviť</translation> </message> <message> - <location line="+197"/> + <location line="+194"/> <source>Export Address List</source> - <translation type="unfinished"/> + <translation>Exportovať zoznam adries</translation> </message> <message> <location line="+1"/> @@ -158,7 +158,7 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>AddressTableModel</name> <message> - <location filename="../addresstablemodel.cpp" line="+164"/> + <location filename="../addresstablemodel.cpp" line="+168"/> <source>Label</source> <translation>Popis</translation> </message> @@ -178,7 +178,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location filename="../forms/askpassphrasedialog.ui" line="+26"/> <source>Passphrase Dialog</source> - <translation type="unfinished"/> + <translation>Dialóg hesla</translation> </message> <message> <location line="+21"/> @@ -196,7 +196,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Zopakujte nové heslo</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="+34"/> + <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>Zadajte nové heslo k peňaženke.<br/>Prosím použite heslo s dĺžkou aspon <b>10 alebo viac náhodných znakov</b>, alebo <b>8 alebo viac slov</b>.</translation> </message> @@ -317,17 +317,17 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+250"/> + <location filename="../bitcoingui.cpp" line="+260"/> <source>Sign &message...</source> <translation>Podpísať &správu...</translation> </message> <message> - <location line="+254"/> + <location line="+290"/> <source>Synchronizing with network...</source> <translation>Synchronizácia so sieťou...</translation> </message> <message> - <location line="-324"/> + <location line="-360"/> <source>&Overview</source> <translation>&Prehľad</translation> </message> @@ -393,17 +393,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Zmena Hesla...</translation> </message> <message> - <location line="+259"/> + <location line="+295"/> <source>Importing blocks from disk...</source> - <translation type="unfinished"/> + <translation>Importujem bloky z disku...</translation> </message> <message> <location line="+3"/> <source>Reindexing blocks on disk...</source> - <translation type="unfinished"/> + <translation>Preindexúvam bloky na disku...</translation> </message> <message> - <location line="-322"/> + <location line="-358"/> <source>Send coins to a Bitcoin address</source> <translation>Poslať bitcoins na adresu</translation> </message> @@ -435,47 +435,39 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="-4"/> <source>&Verify message...</source> - <translation type="unfinished"/> + <translation>Overiť správu</translation> </message> <message> - <location line="-180"/> - <location line="+6"/> - <location line="+513"/> + <location line="+375"/> <source>Bitcoin</source> - <translation type="unfinished"/> + <translation>Bitcoin</translation> </message> <message> - <location line="-519"/> - <location line="+6"/> + <location line="-563"/> + <location line="+10"/> <source>Wallet</source> <translation>Peňaženka</translation> </message> <message> - <location line="+109"/> + <location line="+113"/> <source>&Send</source> - <translation type="unfinished"/> + <translation>&Odoslať</translation> </message> <message> <location line="+7"/> <source>&Receive</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+28"/> - <location line="+2"/> - <source>&About Bitcoin</source> - <translation>&O Bitcoin</translation> + <translation>&Prijať</translation> </message> <message> - <location line="+14"/> + <location line="+44"/> <location line="+2"/> <source>&Show / Hide</source> - <translation type="unfinished"/> + <translation>Zobraziť / skryť</translation> </message> <message> <location line="+1"/> <source>Show or hide the main Window</source> - <translation type="unfinished"/> + <translation>Zobraziť alebo skryť hlavné okno</translation> </message> <message> <location line="+3"/> @@ -493,12 +485,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+35"/> + <location line="+39"/> <source>&File</source> <translation>&Súbor</translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>&Settings</source> <translation>&Nastavenia</translation> </message> @@ -513,18 +505,30 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Lišta záložiek</translation> </message> <message> - <location line="-235"/> - <location line="+294"/> + <location line="-244"/> + <location line="+321"/> <source>[testnet]</source> <translation>[testovacia sieť]</translation> </message> <message> - <location line="-177"/> + <location line="-331"/> + <location line="+10"/> + <source>Bitcoin Core</source> + <translation>Jadro Bitcoin</translation> + </message> + <message> + <location line="+121"/> <source>Request payments (generates QR codes and bitcoin: URIs)</source> <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+27"/> + <location line="+2"/> + <source>&About Bitcoin Core</source> + <translation>O jadre Bitcoin</translation> + </message> + <message> + <location line="+34"/> <source>&Used sending addresses...</source> <translation type="unfinished"/> </message> @@ -544,60 +548,70 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+106"/> + <location line="+2"/> + <source>Open URI...</source> + <translation>Otvoriť URI...</translation> + </message> + <message> + <location line="+1"/> + <source>Open a bitcoin: URI or payment request</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+126"/> <location line="+5"/> <source>Bitcoin client</source> <translation>Bitcoin klient</translation> </message> <message numerus="yes"> - <location line="+120"/> + <location line="+133"/> <source>%n active connection(s) to Bitcoin network</source> <translation><numerusform>%n aktívne spojenie v Bitcoin sieti</numerusform><numerusform>%n aktívne spojenia v Bitcoin sieti</numerusform><numerusform>%n aktívnych spojení v Bitconi sieti</numerusform></translation> </message> <message> <location line="+22"/> <source>No block source available...</source> - <translation type="unfinished"/> + <translation>Nedostupný zdroj blokov...</translation> </message> <message> <location line="+12"/> <source>Processed %1 of %2 (estimated) blocks of transaction history.</source> - <translation type="unfinished"/> + <translation>Spracovaných %1 z %2 (odhadovaných) blokov transakčnej histórie.</translation> </message> <message> <location line="+4"/> <source>Processed %1 blocks of transaction history.</source> - <translation type="unfinished"/> + <translation>Spracovaných %1 blokov transakčnej histórie.</translation> </message> <message numerus="yes"> <location line="+20"/> <source>%n hour(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>%n hodina</numerusform><numerusform>%n hodiny</numerusform><numerusform>%n hodín</numerusform></translation> </message> <message numerus="yes"> <location line="+4"/> <source>%n day(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>%n deň</numerusform><numerusform>%n dni</numerusform><numerusform>%n dní</numerusform></translation> </message> <message numerus="yes"> <location line="+4"/> <source>%n week(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>%n týždeň</numerusform><numerusform>%n týždne</numerusform><numerusform>%n týždňov</numerusform></translation> </message> <message> <location line="+4"/> <source>%1 behind</source> - <translation type="unfinished"/> + <translation>%1 za</translation> </message> <message> <location line="+14"/> <source>Last received block was generated %1 ago.</source> - <translation type="unfinished"/> + <translation>Posledný prijatý blok bol vygenerovaný pred %1.</translation> </message> <message> <location line="+2"/> <source>Transactions after this will not yet be visible.</source> - <translation type="unfinished"/> + <translation>Transakcie potom nebudú ešte viditeľné.</translation> </message> <message> <location line="+27"/> @@ -607,12 +621,12 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+3"/> <source>Warning</source> - <translation type="unfinished"/> + <translation>Upozornenie</translation> </message> <message> <location line="+3"/> <source>Information</source> - <translation type="unfinished"/> + <translation>Informácia</translation> </message> <message> <location line="+77"/> @@ -657,17 +671,7 @@ Typ: %3 Adresa: %4</translation> </message> <message> - <location line="+34"/> - <source>URI handling</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+0"/> - <source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+45"/> + <location line="+67"/> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>Peňaženka je <b>zašifrovaná</b> a momentálne <b>odomknutá</b></translation> </message> @@ -677,7 +681,7 @@ Adresa: %4</translation> <translation>Peňaženka je <b>zašifrovaná</b> a momentálne <b>zamknutá</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+110"/> + <location filename="../bitcoin.cpp" line="+116"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -685,8 +689,295 @@ Adresa: %4</translation> <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+115"/> + <location filename="../clientmodel.cpp" line="+119"/> <source>Network Alert</source> + <translation>Výstraha siete</translation> + </message> +</context> +<context> + <name>CoinControlDialog</name> + <message> + <location filename="../forms/coincontroldialog.ui" line="+14"/> + <source>Coin Control Address Selection</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+34"/> + <source>Quantity:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+29"/> + <source>Bytes:</source> + <translation>Bajtov:</translation> + </message> + <message> + <location line="+45"/> + <source>Amount:</source> + <translation>Suma:</translation> + </message> + <message> + <location line="+29"/> + <source>Priority:</source> + <translation>Priorita:</translation> + </message> + <message> + <location line="+45"/> + <source>Fee:</source> + <translation>Poplatok:</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>Suma</translation> + </message> + <message> + <location line="+10"/> + <source>Address</source> + <translation>Adresa</translation> + </message> + <message> + <location line="+5"/> + <source>Date</source> + <translation>Dátum</translation> + </message> + <message> + <location line="+5"/> + <source>Confirmations</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Confirmed</source> + <translation>Potvrdené</translation> + </message> + <message> + <location line="+5"/> + <source>Priority</source> + <translation>Priorita</translation> + </message> + <message> + <location filename="../coincontroldialog.cpp" line="+42"/> + <source>Copy address</source> + <translation>Kopírovať adresu</translation> + </message> + <message> + <location line="+1"/> + <source>Copy label</source> + <translation>Kopírovať popis</translation> + </message> + <message> + <location line="+1"/> + <location line="+26"/> + <source>Copy amount</source> + <translation>Kopírovať sumu</translation> + </message> + <message> + <location line="-25"/> + <source>Copy transaction ID</source> + <translation>Kopírovať ID transakcie</translation> + </message> + <message> + <location line="+1"/> + <source>Lock unspent</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Unlock unspent</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+22"/> + <source>Copy quantity</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>Copy fee</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy after fee</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy bytes</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy priority</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy low output</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy change</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+323"/> + <source>highest</source> + <translation>najvyššie</translation> + </message> + <message> + <location line="+1"/> + <source>higher</source> + <translation>vyššie</translation> + </message> + <message> + <location line="+1"/> + <source>high</source> + <translation>vysoké</translation> + </message> + <message> + <location line="+1"/> + <source>medium-high</source> + <translation>stredne vysoké</translation> + </message> + <message> + <location line="+1"/> + <source>medium</source> + <translation>stredné</translation> + </message> + <message> + <location line="+4"/> + <source>low-medium</source> + <translation>stredne nízke</translation> + </message> + <message> + <location line="+1"/> + <source>low</source> + <translation>nízke</translation> + </message> + <message> + <location line="+1"/> + <source>lower</source> + <translation>nižšie</translation> + </message> + <message> + <location line="+1"/> + <source>lowest</source> + <translation>najnižšie</translation> + </message> + <message> + <location line="+11"/> + <source>(%1 locked)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+171"/> + <source>Dust</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>yes</source> + <translation>áno</translation> + </message> + <message> + <location line="+0"/> + <source>no</source> + <translation>nie</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>(bez popisu)</translation> + </message> + <message> + <location line="-9"/> + <source>change from %1 (%2)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>(change)</source> <translation type="unfinished"/> </message> </context> @@ -718,7 +1009,7 @@ Adresa: %4</translation> <translation>&Adresa</translation> </message> <message> - <location filename="../editaddressdialog.cpp" line="+21"/> + <location filename="../editaddressdialog.cpp" line="+25"/> <source>New receiving address</source> <translation>Nová adresa pre prijímanie</translation> </message> @@ -761,14 +1052,14 @@ Adresa: %4</translation> <context> <name>FreespaceChecker</name> <message> - <location filename="../intro.cpp" line="+61"/> + <location filename="../intro.cpp" line="+65"/> <source>A new data directory will be created.</source> - <translation type="unfinished"/> + <translation>Bude vytvorený nový dátový adresár.</translation> </message> <message> <location line="+22"/> <source>name</source> - <translation type="unfinished"/> + <translation>názov</translation> </message> <message> <location line="+2"/> @@ -778,36 +1069,36 @@ Adresa: %4</translation> <message> <location line="+3"/> <source>Path already exists, and is not a directory.</source> - <translation type="unfinished"/> + <translation>Cesta už existuje a nie je to adresár.</translation> </message> <message> <location line="+7"/> <source>Cannot create data directory here.</source> - <translation type="unfinished"/> + <translation>Tu nemôžem vytvoriť dátový adresár.</translation> </message> </context> <context> <name>GUIUtil::HelpMessageBox</name> <message> - <location filename="../guiutil.cpp" line="+558"/> - <location line="+13"/> - <source>Bitcoin-Qt</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-13"/> + <location filename="../guiutil.cpp" line="+597"/> <source>version</source> <translation>verzia</translation> </message> <message> - <location line="+2"/> + <location line="+0"/> + <location line="+13"/> + <source>Bitcoin Core</source> + <translation>Jadro Bitcoin</translation> + </message> + <message> + <location line="-11"/> <source>Usage:</source> <translation>Použitie:</translation> </message> <message> <location line="+1"/> <source>command-line options</source> - <translation type="unfinished"/> + <translation>voľby príkazového riadku</translation> </message> <message> <location line="+4"/> @@ -817,7 +1108,7 @@ Adresa: %4</translation> <message> <location line="+1"/> <source>Set language, for example "de_DE" (default: system locale)</source> - <translation type="unfinished"/> + <translation>Nastaviť jazyk, napríklad "sk_SK" (predvolené: systémový)</translation> </message> <message> <location line="+1"/> @@ -827,7 +1118,7 @@ Adresa: %4</translation> <message> <location line="+1"/> <source>Show splash screen on startup (default: 1)</source> - <translation type="unfinished"/> + <translation>Zobraziť splash screen pri spustení (predvolené: 1)</translation> </message> <message> <location line="+1"/> @@ -840,46 +1131,84 @@ Adresa: %4</translation> <message> <location filename="../forms/intro.ui" line="+14"/> <source>Welcome</source> - <translation type="unfinished"/> + <translation>Vitajte</translation> </message> <message> <location line="+9"/> - <source>Welcome to Bitcoin-Qt.</source> + <source>Welcome to Bitcoin Core.</source> <translation type="unfinished"/> </message> <message> <location line="+26"/> - <source>As this is the first time the program is launched, you can choose where Bitcoin-Qt will store its data.</source> + <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source> <translation type="unfinished"/> </message> <message> <location line="+10"/> - <source>Bitcoin-Qt will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source> + <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source> <translation type="unfinished"/> </message> <message> <location line="+10"/> <source>Use the default data directory</source> - <translation type="unfinished"/> + <translation>Použiť predvolený dátový adresár</translation> </message> <message> <location line="+7"/> <source>Use a custom data directory:</source> + <translation>Použiť vlastný dátový adresár:</translation> + </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 filename="../intro.cpp" line="+105"/> + <location line="+19"/> <source>Error</source> <translation>Chyba</translation> </message> <message> <location line="+9"/> <source>GB of free space available</source> - <translation type="unfinished"/> + <translation>GB dostupného voľného miesta</translation> </message> <message> <location line="+3"/> <source>(of %1GB needed)</source> + <translation>(z %1GB potrebných)</translation> + </message> +</context> +<context> + <name>OpenURIDialog</name> + <message> + <location filename="../forms/openuridialog.ui" line="+14"/> + <source>Open URI</source> + <translation>Otvoriť URI</translation> + </message> + <message> + <location line="+6"/> + <source>Open payment request from URI or file</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+9"/> + <source>URI:</source> + <translation>URI:</translation> + </message> + <message> + <location line="+11"/> + <source>Select payment request file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../openuridialog.cpp" line="+47"/> + <source>Select payment request file to open</source> <translation type="unfinished"/> </message> </context> @@ -918,17 +1247,17 @@ Adresa: %4</translation> <message> <location line="+35"/> <source>Reset all client options to default.</source> - <translation type="unfinished"/> + <translation>Vynulovať všetky voľby klienta na predvolené.</translation> </message> <message> <location line="+3"/> <source>&Reset Options</source> - <translation type="unfinished"/> + <translation>Vynulovať voľby</translation> </message> <message> <location line="+13"/> <source>&Network</source> - <translation type="unfinished"/> + <translation>Sieť</translation> </message> <message> <location line="+6"/> @@ -953,7 +1282,7 @@ Adresa: %4</translation> <message> <location line="+9"/> <source>Proxy &IP:</source> - <translation type="unfinished"/> + <translation>Proxy &IP:</translation> </message> <message> <location line="+19"/> @@ -963,7 +1292,7 @@ Adresa: %4</translation> <message> <location line="+7"/> <source>&Port:</source> - <translation type="unfinished"/> + <translation>&Port:</translation> </message> <message> <location line="+19"/> @@ -973,17 +1302,17 @@ Adresa: %4</translation> <message> <location line="+7"/> <source>SOCKS &Version:</source> - <translation type="unfinished"/> + <translation>Verzia SOCKS:</translation> </message> <message> <location line="+13"/> <source>SOCKS version of the proxy (e.g. 5)</source> - <translation type="unfinished"/> + <translation>SOCKS verzia proxy (napr. 5)</translation> </message> <message> <location line="+36"/> <source>&Window</source> - <translation type="unfinished"/> + <translation>Okno</translation> </message> <message> <location line="+6"/> @@ -1013,7 +1342,7 @@ Adresa: %4</translation> <message> <location line="+8"/> <source>User Interface &language:</source> - <translation type="unfinished"/> + <translation>Jazyk užívateľského rozhrania:</translation> </message> <message> <location line="+13"/> @@ -1041,27 +1370,37 @@ Adresa: %4</translation> <translation>&Zobraziť adresy zo zoznamu transakcií</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="+71"/> <source>&OK</source> - <translation type="unfinished"/> + <translation>&OK</translation> </message> <message> <location line="+7"/> <source>&Cancel</source> - <translation type="unfinished"/> + <translation>Zrušiť</translation> </message> <message> <location line="+10"/> <source>&Apply</source> - <translation type="unfinished"/> + <translation>Použiť</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+58"/> + <location filename="../optionsdialog.cpp" line="+63"/> <source>default</source> - <translation type="unfinished"/> + <translation>predvolené</translation> </message> <message> - <location line="+130"/> + <location line="+131"/> <source>Confirm options reset</source> <translation type="unfinished"/> </message> @@ -1073,7 +1412,7 @@ Adresa: %4</translation> <message> <location line="+0"/> <source>Do you want to proceed?</source> - <translation type="unfinished"/> + <translation>Chcete pokračovať?</translation> </message> <message> <location line="+42"/> @@ -1090,7 +1429,7 @@ Adresa: %4</translation> <message> <location line="+29"/> <source>The supplied proxy address is invalid.</source> - <translation type="unfinished"/> + <translation>Zadaná proxy adresa je neplatná.</translation> </message> </context> <context> @@ -1102,24 +1441,24 @@ Adresa: %4</translation> </message> <message> <location line="+50"/> - <location line="+202"/> + <location line="+214"/> <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source> <translation type="unfinished"/> </message> <message> - <location line="-131"/> + <location line="-140"/> <source>Unconfirmed:</source> <translation>Nepotvrdené:</translation> </message> <message> - <location line="-78"/> + <location line="-81"/> <source>Wallet</source> <translation>Peňaženka</translation> </message> <message> <location line="+49"/> <source>Confirmed:</source> - <translation type="unfinished"/> + <translation>Potvrdené:</translation> </message> <message> <location line="+16"/> @@ -1127,14 +1466,14 @@ Adresa: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+29"/> + <location line="+32"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation type="unfinished"/> </message> <message> - <location line="+13"/> + <location line="+16"/> <source>Immature:</source> - <translation type="unfinished"/> + <translation>Nezrelé:</translation> </message> <message> <location line="+13"/> @@ -1142,33 +1481,33 @@ Adresa: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+13"/> + <location line="+16"/> <source>Total:</source> - <translation type="unfinished"/> + <translation>Celkovo:</translation> </message> <message> <location line="+16"/> <source>Your current total balance</source> - <translation type="unfinished"/> + <translation>Váš súčasný celkový zostatok</translation> </message> <message> - <location line="+53"/> + <location line="+56"/> <source><b>Recent transactions</b></source> <translation><b>Nedávne transakcie</b></translation> </message> <message> - <location filename="../overviewpage.cpp" line="+116"/> + <location filename="../overviewpage.cpp" line="+120"/> <location line="+1"/> <source>out of sync</source> - <translation type="unfinished"/> + <translation>nesynchronizované</translation> </message> </context> <context> <name>PaymentServer</name> <message> - <location filename="../paymentserver.cpp" line="+392"/> + <location filename="../paymentserver.cpp" line="+397"/> <source>URI handling</source> - <translation type="unfinished"/> + <translation>Spracovanie URI</translation> </message> <message> <location line="+1"/> @@ -1176,23 +1515,29 @@ Adresa: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+69"/> + <location line="+91"/> <source>Requested payment amount of %1 is too small (considered dust).</source> <translation type="unfinished"/> </message> <message> - <location line="+4"/> - <location line="+37"/> + <location line="-204"/> + <location line="+195"/> + <location line="+13"/> <source>Payment request error</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Insecure requests to custom payment scripts unsupported</source> + <location line="-207"/> + <source>Cannot start bitcoin: click-to-pay handler</source> <translation type="unfinished"/> </message> <message> - <location line="+38"/> + <location line="+195"/> + <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> @@ -1202,9 +1547,9 @@ Adresa: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>Bad response from server %1</source> - <translation type="unfinished"/> + <translation>Zlá odpoveď zo servera %1</translation> </message> <message> <location line="+32"/> @@ -1212,8 +1557,8 @@ Adresa: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="-58"/> - <location line="+30"/> + <location line="-55"/> + <location line="+27"/> <location line="+17"/> <source>Network request error</source> <translation type="unfinished"/> @@ -1222,11 +1567,10 @@ Adresa: %4</translation> <context> <name>QObject</name> <message> - <location filename="../bitcoin.cpp" line="+114"/> + <location filename="../bitcoin.cpp" line="+119"/> <location line="+5"/> - <location filename="../intro.cpp" line="-32"/> <source>Bitcoin</source> - <translation type="unfinished"/> + <translation>Bitcoin</translation> </message> <message> <location line="-4"/> @@ -1238,23 +1582,18 @@ Adresa: %4</translation> <source>Error: Invalid combination of -regtest and -testnet.</source> <translation type="unfinished"/> </message> - <message> - <location filename="../intro.cpp" line="+1"/> - <source>Error: Specified data directory "%1" can not be created.</source> - <translation type="unfinished"/> - </message> </context> <context> <name>QRImageWidget</name> <message> - <location filename="../receiverequestdialog.cpp" line="+32"/> + <location filename="../receiverequestdialog.cpp" line="+36"/> <source>&Save Image...</source> - <translation type="unfinished"/> + <translation>Uložiť obrázok...</translation> </message> <message> <location line="+3"/> <source>&Copy Image</source> - <translation type="unfinished"/> + <translation>Kopírovať obrázok</translation> </message> <message> <location line="+28"/> @@ -1263,8 +1602,8 @@ Adresa: %4</translation> </message> <message> <location line="+0"/> - <source>PNG Images (*.png)</source> - <translation>PNG obrázky (*.png)</translation> + <source>PNG Image (*.png)</source> + <translation>PNG obrázok (*.png)</translation> </message> </context> <context> @@ -1284,7 +1623,7 @@ Adresa: %4</translation> <location line="+53"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+352"/> + <location filename="../rpcconsole.cpp" line="+360"/> <source>N/A</source> <translation>nie je k dispozícii</translation> </message> @@ -1296,17 +1635,22 @@ Adresa: %4</translation> <message> <location line="-45"/> <source>&Information</source> + <translation>&Informácia</translation> + </message> + <message> + <location line="-10"/> + <source>Debug window</source> <translation type="unfinished"/> </message> <message> - <location line="+68"/> + <location line="+78"/> <source>Using OpenSSL version</source> - <translation type="unfinished"/> + <translation>Používa OpenSSL verziu</translation> </message> <message> <location line="+49"/> <source>Startup time</source> - <translation type="unfinished"/> + <translation>Čas spustenia</translation> </message> <message> <location line="+29"/> @@ -1336,82 +1680,72 @@ Adresa: %4</translation> <message> <location line="+23"/> <source>Estimated total blocks</source> - <translation type="unfinished"/> + <translation>Očakávaných blokov celkovo</translation> </message> <message> <location line="+23"/> <source>Last block time</source> - <translation type="unfinished"/> + <translation>Čas posledného bloku</translation> </message> <message> <location line="+52"/> <source>&Open</source> - <translation type="unfinished"/> + <translation>&Otvoriť</translation> </message> <message> <location line="+16"/> <source>Command-line options</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+7"/> - <source>Show the Bitcoin-Qt help message to get a list with possible Bitcoin command-line options.</source> - <translation type="unfinished"/> + <translation>Voľby príkazového riadku</translation> </message> <message> - <location line="+3"/> + <location line="+10"/> <source>&Show</source> - <translation type="unfinished"/> + <translation>Zobraziť</translation> </message> <message> <location line="+24"/> <source>&Console</source> - <translation type="unfinished"/> + <translation>&Konzola</translation> </message> <message> <location line="+72"/> <source>&Network Traffic</source> - <translation type="unfinished"/> + <translation>Sieťová prevádzka</translation> </message> <message> <location line="+52"/> <source>&Clear</source> - <translation type="unfinished"/> + <translation>&Vyčistiť</translation> </message> <message> <location line="+13"/> <source>Totals</source> - <translation type="unfinished"/> + <translation>Celkovo</translation> </message> <message> <location line="+64"/> <source>In:</source> - <translation type="unfinished"/> + <translation>Dnu:</translation> </message> <message> <location line="+80"/> <source>Out:</source> - <translation type="unfinished"/> + <translation>Von:</translation> </message> <message> <location line="-541"/> <source>Build date</source> - <translation type="unfinished"/> + <translation>Dátum zostavenia</translation> </message> <message> - <location line="-104"/> - <source>Bitcoin - Debug window</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+25"/> + <location line="-79"/> <source>Bitcoin Core</source> - <translation type="unfinished"/> + <translation>Jadro Bitcoin</translation> </message> <message> <location line="+279"/> <source>Debug log file</source> - <translation type="unfinished"/> + <translation>Súbor záznamu ladenia</translation> </message> <message> <location line="+7"/> @@ -1419,11 +1753,16 @@ Adresa: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+102"/> - <source>Clear console</source> + <location line="+26"/> + <source>Show the Bitcoin-Core help message to get a list with possible Bitcoin command-line options.</source> <translation type="unfinished"/> </message> <message> + <location line="+76"/> + <source>Clear console</source> + <translation>Vymazať konzolu</translation> + </message> + <message> <location filename="../rpcconsole.cpp" line="-30"/> <source>Welcome to the Bitcoin RPC console.</source> <translation type="unfinished"/> @@ -1441,73 +1780,68 @@ Adresa: %4</translation> <message> <location line="+128"/> <source>%1 B</source> - <translation type="unfinished"/> + <translation>%1 B</translation> </message> <message> <location line="+2"/> <source>%1 KB</source> - <translation type="unfinished"/> + <translation>%1 KB</translation> </message> <message> <location line="+2"/> <source>%1 MB</source> - <translation type="unfinished"/> + <translation>%1 MB</translation> </message> <message> <location line="+2"/> <source>%1 GB</source> - <translation type="unfinished"/> + <translation>%1 GB</translation> </message> <message> <location line="+7"/> <source>%1 m</source> - <translation type="unfinished"/> + <translation>%1 m</translation> </message> <message> <location line="+5"/> <source>%1 h</source> - <translation type="unfinished"/> + <translation>%1 h</translation> </message> <message> <location line="+2"/> <source>%1 h %2 m</source> - <translation type="unfinished"/> + <translation>%1 h %2 m</translation> </message> </context> <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+22"/> + <location filename="../forms/receivecoinsdialog.ui" line="+83"/> <source>&Amount:</source> - <translation type="unfinished"/> + <translation>&Suma:</translation> </message> <message> - <location line="+16"/> + <location line="+19"/> <source>The amount to request</source> - <translation type="unfinished"/> + <translation>Suma na vyžiadanie</translation> </message> <message> - <location line="+7"/> + <location line="-32"/> <source>&Label:</source> <translation>&Popis:</translation> </message> <message> - <location line="+10"/> - <source>The label to associate with the receiving address</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+7"/> + <location line="-34"/> <source>&Message:</source> - <translation type="unfinished"/> + <translation>&Správa:</translation> </message> <message> - <location line="+10"/> + <location line="+20"/> <source>The message to attach to payment request</source> <translation type="unfinished"/> </message> <message> - <location line="+14"/> + <location line="-37"/> <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> @@ -1517,25 +1851,55 @@ Adresa: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="+27"/> + <source>The label to associate with the new receiving address</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+14"/> <source>Use this form to request payments. All fields are optional.</source> <translation type="unfinished"/> </message> <message> - <location line="+17"/> + <location line="+56"/> <source>Clear all fields of the form.</source> - <translation type="unfinished"/> + <translation>Vyčistiť všetky polia formulára.</translation> </message> <message> <location line="+3"/> <source>Clear</source> - <translation type="unfinished"/> + <translation>Vyčistiť</translation> </message> <message> <location line="+36"/> <source>&Request payment</source> + <translation>Vyžiadať platbu</translation> + </message> + <message> + <location line="+47"/> + <source>Previously requested payments</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> + <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>Zobraziť</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>Odstrániť</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -1547,37 +1911,32 @@ Adresa: %4</translation> <message> <location line="+46"/> <source>Copy &URI</source> - <translation type="unfinished"/> + <translation>Kopírovať &URI</translation> </message> <message> <location line="+7"/> <source>Copy &Address</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+7"/> - <source>&Copy Image</source> - <translation type="unfinished"/> + <translation>Kopírovať adresu</translation> </message> <message> <location line="+7"/> <source>&Save Image...</source> - <translation type="unfinished"/> + <translation>Uložiť obrázok...</translation> </message> <message> - <location filename="../receiverequestdialog.cpp" line="+58"/> + <location filename="../receiverequestdialog.cpp" line="+56"/> <source>Request payment to %1</source> - <translation type="unfinished"/> + <translation>Vyžiadať platbu pre %1</translation> </message> <message> <location line="+6"/> <source>Payment information</source> - <translation type="unfinished"/> + <translation>Informácia o platbe</translation> </message> <message> <location line="+1"/> <source>URI</source> - <translation type="unfinished"/> + <translation>URI</translation> </message> <message> <location line="+2"/> @@ -1611,16 +1970,119 @@ Adresa: %4</translation> </message> </context> <context> + <name>RecentRequestsTableModel</name> + <message> + <location filename="../recentrequeststablemodel.cpp" line="+14"/> + <source>Date</source> + <translation>Dátum</translation> + </message> + <message> + <location line="+0"/> + <source>Label</source> + <translation>Popis</translation> + </message> + <message> + <location line="+0"/> + <source>Message</source> + <translation>Správa</translation> + </message> + <message> + <location line="+0"/> + <source>Amount</source> + <translation>Suma</translation> + </message> + <message> + <location line="+36"/> + <source>(no label)</source> + <translation>(bez popisu)</translation> + </message> + <message> + <location line="+9"/> + <source>(no message)</source> + <translation>(žiadna správa)</translation> + </message> +</context> +<context> <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="+14"/> - <location filename="../sendcoinsdialog.cpp" line="+140"/> - <location line="+213"/> + <location filename="../sendcoinsdialog.cpp" line="+381"/> + <location line="+81"/> <source>Send Coins</source> <translation>Poslať Bitcoins</translation> </message> <message> - <location line="+50"/> + <location line="+76"/> + <source>Coin Control Features</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+20"/> + <source>Inputs...</source> + <translation>Vstupy...</translation> + </message> + <message> + <location line="+7"/> + <source>automatically selected</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+19"/> + <source>Insufficient funds!</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+89"/> + <source>Quantity:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+35"/> + <source>Bytes:</source> + <translation>Bajtov:</translation> + </message> + <message> + <location line="+48"/> + <source>Amount:</source> + <translation>Suma:</translation> + </message> + <message> + <location line="+32"/> + <source>Priority:</source> + <translation>Priorita:</translation> + </message> + <message> + <location line="+48"/> + <source>Fee:</source> + <translation>Poplatok:</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>Poslať viacerým príjemcom naraz</translation> </message> @@ -1632,7 +2094,7 @@ Adresa: %4</translation> <message> <location line="+20"/> <source>Clear all fields of the form.</source> - <translation type="unfinished"/> + <translation>Vyčistiť všetky polia formulára.</translation> </message> <message> <location line="+3"/> @@ -1645,12 +2107,7 @@ Adresa: %4</translation> <translation>Zostatok:</translation> </message> <message> - <location line="+10"/> - <source>123.456 BTC</source> - <translation>123.456 BTC</translation> - </message> - <message> - <location line="+31"/> + <location line="+41"/> <source>Confirm the send action</source> <translation>Potvrďte odoslanie</translation> </message> @@ -1660,114 +2117,185 @@ Adresa: %4</translation> <translation>&Odoslať</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-154"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation>Potvrdiť odoslanie bitcoins</translation> </message> <message> - <location line="-90"/> + <location line="-74"/> <location line="+5"/> <location line="+5"/> + <location line="+4"/> <source>%1 to %2</source> + <translation>%1 do %2</translation> + </message> + <message> + <location line="-136"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>Zadajte Bitcoin adresu (napr. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> + <message> + <location line="+15"/> + <source>Copy quantity</source> <translation type="unfinished"/> </message> <message> - <location line="+26"/> + <location line="+1"/> + <source>Copy amount</source> + <translation>Kopírovať sumu</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>alebo</translation> + </message> + <message> + <location line="+202"/> <source>The recipient address is not valid, please recheck.</source> <translation>Adresa príjemcu je neplatná, prosím, overte ju.</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>The amount to pay must be larger than 0.</source> <translation>Suma na úhradu musí byť väčšia ako 0.</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>The amount exceeds your balance.</source> <translation>Suma je vyššia ako Váš zostatok.</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>The total exceeds your balance when the %1 transaction fee is included.</source> <translation>Suma celkom prevyšuje Váš zostatok ak sú započítané %1 transakčné poplatky.</translation> </message> <message> - <location line="+5"/> + <location line="+3"/> <source>Duplicate address found, can only send to each address once per send operation.</source> <translation>Duplikát adresy objavený, je možné poslať na každú adresu len raz v jednej odchádzajúcej transakcii.</translation> </message> <message> - <location line="+4"/> - <source>Error: Transaction creation failed!</source> + <location line="+3"/> + <source>Transaction creation failed!</source> <translation type="unfinished"/> </message> <message> - <location line="+15"/> - <source>Are you sure you want to send?</source> + <location line="+4"/> + <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation type="unfinished"/> </message> <message> - <location line="+9"/> - <source>added as transaction fee</source> + <location line="+113"/> + <source>Warning: Invalid Bitcoin address</source> <translation type="unfinished"/> </message> <message> - <location line="+6"/> - <source>Total Amount %1</source> + <location line="+13"/> + <source>(no label)</source> + <translation>(bez popisu)</translation> + </message> + <message> + <location line="+8"/> + <source>Warning: Unknown change address</source> <translation type="unfinished"/> </message> <message> - <location line="+20"/> - <source>Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> - <translation>Chyba: Transakcia bola odmietnutá. Toto sa môže stať ak niektoré z mincí vo vašej peňaženke boli už utratené, napríklad ak používaš kópiu wallet.dat a mince označené v druhej kópií neboli označené ako utratené v tejto.</translation> + <location line="-378"/> + <source>Are you sure you want to send?</source> + <translation>Určite to chcete odoslať?</translation> </message> <message> - <location line="+144"/> + <location line="+9"/> + <source>added as transaction fee</source> + <translation>pridané ako transakčný poplatok</translation> + </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"/> + <translation>Neplatná adresa platby %1</translation> </message> </context> <context> <name>SendCoinsEntry</name> <message> - <location filename="../forms/sendcoinsentry.ui" line="+33"/> - <location line="+585"/> + <location filename="../forms/sendcoinsentry.ui" line="+131"/> + <location line="+501"/> + <location line="+536"/> <source>A&mount:</source> <translation>Su&ma:</translation> </message> <message> - <location line="-572"/> - <location line="+585"/> + <location line="-1132"/> <source>Pay &To:</source> <translation>Zapla&tiť:</translation> </message> <message> - <location line="-551"/> + <location line="+18"/> <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"/> + <translation>Adresa na odoslanie platby (napr. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location filename="../sendcoinsentry.cpp" line="+28"/> + <location filename="../sendcoinsentry.cpp" line="+30"/> <source>Enter a label for this address to add it to your address book</source> <translation>Vložte popis pre túto adresu aby sa pridala do adresára</translation> </message> <message> - <location filename="../forms/sendcoinsentry.ui" line="-18"/> + <location filename="../forms/sendcoinsentry.ui" line="+57"/> <source>&Label:</source> <translation>&Popis:</translation> </message> <message> - <location line="+28"/> + <location line="-50"/> <source>Choose previously used address</source> + <translation>Vybrať predtým použitú adresu</translation> + </message> + <message> + <location line="-40"/> + <source>This is a normal payment.</source> <translation type="unfinished"/> </message> <message> - <location line="+10"/> + <location line="+50"/> <source>Alt+A</source> <translation>Alt+A</translation> </message> @@ -1783,16 +2311,35 @@ Adresa: %4</translation> </message> <message> <location line="+7"/> - <source>Remove this recipient</source> - <translation>Odstrániť tohto príjemcu</translation> + <location line="+504"/> + <location line="+536"/> + <source>Remove this entry</source> + <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="-40"/> + <source>This is a verified payment request.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-971"/> <source>Enter a label for this address to add it to the list of used addresses</source> <translation type="unfinished"/> </message> <message> - <location line="+465"/> + <location line="+439"/> + <source>This is an unverified payment request.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+18"/> + <location line="+532"/> + <source>Pay To:</source> + <translation>Platba pre:</translation> + </message> + <message> + <location line="-498"/> + <location line="+536"/> <source>Memo:</source> <translation type="unfinished"/> </message> @@ -1828,7 +2375,7 @@ Adresa: %4</translation> <location line="+10"/> <location line="+213"/> <source>Choose previously used address</source> - <translation type="unfinished"/> + <translation>Vybrať predtým použitú adresu</translation> </message> <message> <location line="-203"/> @@ -1854,7 +2401,7 @@ Adresa: %4</translation> <message> <location line="+7"/> <source>Signature</source> - <translation type="unfinished"/> + <translation>Podpis</translation> </message> <message> <location line="+27"/> @@ -1869,7 +2416,7 @@ Adresa: %4</translation> <message> <location line="+3"/> <source>Sign &Message</source> - <translation type="unfinished"/> + <translation>Podpísať &správu</translation> </message> <message> <location line="+14"/> @@ -1885,7 +2432,7 @@ Adresa: %4</translation> <message> <location line="-87"/> <source>&Verify Message</source> - <translation type="unfinished"/> + <translation>Overiť správu...</translation> </message> <message> <location line="+6"/> @@ -1905,7 +2452,7 @@ Adresa: %4</translation> <message> <location line="+3"/> <source>Verify &Message</source> - <translation type="unfinished"/> + <translation>Overiť správu</translation> </message> <message> <location line="+14"/> @@ -1913,7 +2460,7 @@ Adresa: %4</translation> <translation type="unfinished"/> </message> <message> - <location filename="../signverifymessagedialog.cpp" line="+27"/> + <location filename="../signverifymessagedialog.cpp" line="+29"/> <location line="+3"/> <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation>Zadajte Bitcoin adresu (napr. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> @@ -1926,13 +2473,13 @@ Adresa: %4</translation> <message> <location line="+3"/> <source>Enter Bitcoin signature</source> - <translation type="unfinished"/> + <translation>Zadajte Bitcoin podpis</translation> </message> <message> - <location line="+85"/> + <location line="+84"/> <location line="+81"/> <source>The entered address is invalid.</source> - <translation type="unfinished"/> + <translation>Zadaná adresa je neplatná.</translation> </message> <message> <location line="-81"/> @@ -1940,7 +2487,7 @@ Adresa: %4</translation> <location line="+73"/> <location line="+8"/> <source>Please check the address and try again.</source> - <translation type="unfinished"/> + <translation>Prosím skontrolujte adresu a skúste znova.</translation> </message> <message> <location line="-81"/> @@ -1951,7 +2498,7 @@ Adresa: %4</translation> <message> <location line="-73"/> <source>Wallet unlock was cancelled.</source> - <translation type="unfinished"/> + <translation>Odomknutie peňaženky bolo zrušené.</translation> </message> <message> <location line="+8"/> @@ -1961,23 +2508,23 @@ Adresa: %4</translation> <message> <location line="+12"/> <source>Message signing failed.</source> - <translation type="unfinished"/> + <translation>Podpísanie správy zlyhalo.</translation> </message> <message> <location line="+5"/> <source>Message signed.</source> - <translation type="unfinished"/> + <translation>Správa podpísaná.</translation> </message> <message> <location line="+59"/> <source>The signature could not be decoded.</source> - <translation type="unfinished"/> + <translation>Podpis nie je možné dekódovať.</translation> </message> <message> <location line="+0"/> <location line="+13"/> <source>Please check the signature and try again.</source> - <translation type="unfinished"/> + <translation>Prosím skontrolujte podpis a skúste znova.</translation> </message> <message> <location line="+0"/> @@ -1987,19 +2534,24 @@ Adresa: %4</translation> <message> <location line="+7"/> <source>Message verification failed.</source> - <translation type="unfinished"/> + <translation>Overenie správy zlyhalo.</translation> </message> <message> <location line="+5"/> <source>Message verified.</source> - <translation type="unfinished"/> + <translation>Správa overená.</translation> </message> </context> <context> <name>SplashScreen</name> <message> - <location filename="../splashscreen.cpp" line="+23"/> - <source>The Bitcoin developers</source> + <location filename="../splashscreen.cpp" line="+26"/> + <source>Bitcoin Core</source> + <translation>Jadro Bitcoin</translation> + </message> + <message> + <location line="+2"/> + <source>The Bitcoin Core developers</source> <translation type="unfinished"/> </message> <message> @@ -2011,22 +2563,22 @@ Adresa: %4</translation> <context> <name>TrafficGraphWidget</name> <message> - <location filename="../trafficgraphwidget.cpp" line="+75"/> + <location filename="../trafficgraphwidget.cpp" line="+79"/> <source>KB/s</source> - <translation type="unfinished"/> + <translation>KB/s</translation> </message> </context> <context> <name>TransactionDesc</name> <message> - <location filename="../transactiondesc.cpp" line="+22"/> + <location filename="../transactiondesc.cpp" line="+28"/> <source>Open until %1</source> <translation>Otvorené do %1</translation> </message> <message> <location line="+6"/> <source>%1/offline</source> - <translation type="unfinished"/> + <translation>%1/offline</translation> </message> <message> <location line="+2"/> @@ -2056,12 +2608,12 @@ Adresa: %4</translation> <message> <location line="+7"/> <source>Source</source> - <translation type="unfinished"/> + <translation>Zdroj</translation> </message> <message> <location line="+0"/> <source>Generated</source> - <translation type="unfinished"/> + <translation>Vygenerované</translation> </message> <message> <location line="+5"/> @@ -2074,13 +2626,13 @@ Adresa: %4</translation> <location line="+22"/> <location line="+58"/> <source>To</source> - <translation type="unfinished"/> + <translation>Pre</translation> </message> <message> <location line="-77"/> <location line="+2"/> <source>own address</source> - <translation type="unfinished"/> + <translation>vlastná adresa</translation> </message> <message> <location line="-2"/> @@ -2142,7 +2694,7 @@ Adresa: %4</translation> <message> <location line="+13"/> <source>Merchant</source> - <translation type="unfinished"/> + <translation>Kupec</translation> </message> <message> <location line="+7"/> @@ -2152,7 +2704,7 @@ Adresa: %4</translation> <message> <location line="+8"/> <source>Debug information</source> - <translation type="unfinished"/> + <translation>Ladiace informácie</translation> </message> <message> <location line="+8"/> @@ -2162,7 +2714,7 @@ Adresa: %4</translation> <message> <location line="+3"/> <source>Inputs</source> - <translation type="unfinished"/> + <translation>Vstupy</translation> </message> <message> <location line="+23"/> @@ -2172,12 +2724,12 @@ Adresa: %4</translation> <message> <location line="+1"/> <source>true</source> - <translation type="unfinished"/> + <translation>pravda</translation> </message> <message> <location line="+0"/> <source>false</source> - <translation type="unfinished"/> + <translation>nepravda</translation> </message> <message> <location line="-227"/> @@ -2211,7 +2763,7 @@ Adresa: %4</translation> <context> <name>TransactionTableModel</name> <message> - <location filename="../transactiontablemodel.cpp" line="+227"/> + <location filename="../transactiontablemodel.cpp" line="+234"/> <source>Date</source> <translation>Dátum</translation> </message> @@ -2329,7 +2881,7 @@ Adresa: %4</translation> <context> <name>TransactionView</name> <message> - <location filename="../transactionview.cpp" line="+52"/> + <location filename="../transactionview.cpp" line="+57"/> <location line="+16"/> <source>All</source> <translation>Všetko</translation> @@ -2390,12 +2942,12 @@ Adresa: %4</translation> <translation>Iné</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>Enter address or label to search</source> <translation>Vložte adresu alebo popis pre vyhľadávanie</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>Min amount</source> <translation>Min množstvo</translation> </message> @@ -2417,7 +2969,7 @@ Adresa: %4</translation> <message> <location line="+1"/> <source>Copy transaction ID</source> - <translation type="unfinished"/> + <translation>Kopírovať ID transakcie</translation> </message> <message> <location line="+1"/> @@ -2427,20 +2979,40 @@ Adresa: %4</translation> <message> <location line="+1"/> <source>Show transaction details</source> + <translation>Zobraziť podrobnosti transakcie</translation> + </message> + <message> + <location line="+142"/> + <source>Export Transaction History</source> <translation type="unfinished"/> </message> <message> - <location line="+143"/> - <source>Export Transaction Data</source> - <translation>Exportovať transakčné dáta</translation> + <location line="+19"/> + <source>Exporting Failed</source> + <translation>Export zlyhal</translation> </message> <message> - <location line="+1"/> + <location line="+0"/> + <source>There was an error trying to save the transaction history to %1.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+4"/> + <source>Exporting Successful</source> + <translation>Export úspešný</translation> + </message> + <message> + <location line="+0"/> + <source>The transaction history was successfully saved to %1.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-22"/> <source>Comma separated file (*.csv)</source> <translation>Čiarkou oddelovaný súbor (*.csv)</translation> </message> <message> - <location line="+8"/> + <location line="+9"/> <source>Confirmed</source> <translation>Potvrdené</translation> </message> @@ -2475,17 +3047,7 @@ Adresa: %4</translation> <translation>ID</translation> </message> <message> - <location line="+4"/> - <source>Error exporting</source> - <translation>Chyba exportu</translation> - </message> - <message> - <location line="+0"/> - <source>Could not write to file %1.</source> - <translation>Nedalo sa zapisovať do súboru %1.</translation> - </message> - <message> - <location line="+100"/> + <location line="+107"/> <source>Range:</source> <translation>Rozsah:</translation> </message> @@ -2496,9 +3058,17 @@ Adresa: %4</translation> </message> </context> <context> + <name>WalletFrame</name> + <message> + <location filename="../walletframe.cpp" line="+26"/> + <source>No wallet has been loaded.</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>WalletModel</name> <message> - <location filename="../walletmodel.cpp" line="+218"/> + <location filename="../walletmodel.cpp" line="+245"/> <source>Send Coins</source> <translation>Poslať Bitcoins</translation> </message> @@ -2506,9 +3076,9 @@ Adresa: %4</translation> <context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+46"/> + <location filename="../walletview.cpp" line="+43"/> <source>&Export</source> - <translation type="unfinished"/> + <translation>&Exportovať...</translation> </message> <message> <location line="+1"/> @@ -2516,65 +3086,60 @@ Adresa: %4</translation> <translation>Exportovať tento náhľad do súboru</translation> </message> <message> - <location line="+183"/> + <location line="+181"/> <source>Backup Wallet</source> - <translation type="unfinished"/> + <translation>Zálohovať peňaženku</translation> </message> <message> - <location line="+0"/> + <location line="+1"/> <source>Wallet Data (*.dat)</source> - <translation type="unfinished"/> + <translation>Údaje peňaženky (*.dat)</translation> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Backup Failed</source> - <translation type="unfinished"/> + <translation>Záloha zlyhala</translation> </message> <message> <location line="+0"/> - <source>There was an error trying to save the wallet data to the new location.</source> + <source>There was an error trying to save the wallet data to %1.</source> <translation type="unfinished"/> </message> <message> <location line="+4"/> - <source>Backup Successful</source> + <source>The wallet data was successfully saved to %1.</source> <translation type="unfinished"/> </message> <message> <location line="+0"/> - <source>The wallet data was successfully saved to the new location.</source> - <translation type="unfinished"/> + <source>Backup Successful</source> + <translation>Záloha úspešná</translation> </message> </context> <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+102"/> - <source>Bitcoin version</source> - <translation>Bitcoin verzia</translation> - </message> - <message> - <location line="+107"/> + <location filename="../bitcoinstrings.cpp" line="+217"/> <source>Usage:</source> <translation>Použitie:</translation> </message> <message> - <location line="-55"/> + <location line="-54"/> <source>List commands</source> <translation>Zoznam príkazov</translation> </message> <message> - <location line="-13"/> + <location line="-14"/> <source>Get help for a command</source> <translation>Dostať pomoc pre príkaz</translation> </message> <message> - <location line="+25"/> + <location line="+26"/> <source>Options:</source> <translation>Možnosti:</translation> </message> <message> - <location line="+24"/> + <location line="+23"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Určiť súbor s nastaveniami (predvolené: bitcoin.conf)</translation> </message> @@ -2594,7 +3159,7 @@ Adresa: %4</translation> <translation>Veľkosť vyrovnávajúcej pamäte pre databázu v megabytoch (predvolené:25)</translation> </message> <message> - <location line="-28"/> + <location line="-27"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>Načúvať spojeniam na <port> (prednastavené: 8333 alebo testovacia sieť: 18333)</translation> </message> @@ -2604,14 +3169,14 @@ Adresa: %4</translation> <translation>Udržiavať maximálne <n> spojení (predvolené: 125)</translation> </message> <message> - <location line="-49"/> + <location line="-50"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation type="unfinished"/> </message> <message> <location line="+84"/> <source>Specify your own public address</source> - <translation type="unfinished"/> + <translation>Určite vašu vlastnú verejnú adresu</translation> </message> <message> <location line="+4"/> @@ -2619,7 +3184,7 @@ Adresa: %4</translation> <translation>Hranica pre odpojenie zle sa správajúcich peerov (predvolené: 100)</translation> </message> <message> - <location line="-142"/> + <location line="-147"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>Počet sekúnd kedy sa zabráni zle sa správajúcim peerom znovupripojenie (predvolené: 86400)</translation> </message> @@ -2634,7 +3199,7 @@ Adresa: %4</translation> <translation>Počúvať JSON-RPC spojeniam na <port> (predvolené: 8332 or testnet: 18332)</translation> </message> <message> - <location line="+40"/> + <location line="+45"/> <source>Accept command line and JSON-RPC commands</source> <translation>Prijímať príkazy z príkazového riadku a JSON-RPC</translation> </message> @@ -2644,17 +3209,17 @@ Adresa: %4</translation> <translation>Bežať na pozadí ako démon a prijímať príkazy</translation> </message> <message> - <location line="+40"/> + <location line="+39"/> <source>Use the test network</source> <translation>Použiť testovaciu sieť</translation> </message> <message> - <location line="-118"/> + <location line="-117"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> <message> - <location line="-87"/> + <location line="-92"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2709,17 +3274,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+11"/> - <source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source> + <location line="+18"/> + <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation type="unfinished"/> </message> <message> - <location line="+6"/> - <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> + <location line="+5"/> + <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+3"/> <source>Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source> <translation>Varovanie: -paytxfee je nastavené veľmi vysoko. Toto sú transakčné poplatky ktoré zaplatíte ak odošlete transakciu.</translation> </message> @@ -2749,19 +3314,29 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+14"/> + <location line="+9"/> + <source><category> can be:</source> + <translation><category> môže byť:</translation> + </message> + <message> + <location line="+6"/> <source>Attempt to recover private keys from a corrupt wallet.dat</source> <translation type="unfinished"/> </message> <message> <location line="+1"/> + <source>Bitcoin Core Daemon</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Bitcoin RPC client version</source> <translation type="unfinished"/> </message> <message> - <location line="+2"/> + <location line="+1"/> <source>Block creation options:</source> - <translation type="unfinished"/> + <translation>Voľby vytvorenia bloku:</translation> </message> <message> <location line="+5"/> @@ -2769,14 +3344,19 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Pripojiť sa len k určenej nóde</translation> </message> <message> - <location line="+2"/> + <location line="+1"/> + <source>Connect through SOCKS proxy</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Connect to JSON-RPC on <port> (default: 8332 or testnet: 18332)</source> <translation type="unfinished"/> </message> <message> <location line="+2"/> <source>Corrupted block database detected</source> - <translation type="unfinished"/> + <translation>Zistená poškodená databáza blokov</translation> </message> <message> <location line="+1"/> @@ -2786,12 +3366,12 @@ 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>Chcete znovu zostaviť databázu blokov?</translation> </message> <message> <location line="+2"/> <source>Error initializing block database</source> - <translation type="unfinished"/> + <translation>Chyba inicializácie databázy blokov</translation> </message> <message> <location line="+1"/> @@ -2801,27 +3381,27 @@ 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>Chyba načítania databázy blokov</translation> </message> <message> <location line="+4"/> <source>Error opening block database</source> - <translation type="unfinished"/> + <translation>Chyba otvárania databázy blokov</translation> </message> <message> <location line="+2"/> <source>Error: Disk space is low!</source> - <translation type="unfinished"/> + <translation>Chyba: Málo miesta na disku!</translation> </message> <message> <location line="+1"/> <source>Error: Wallet locked, unable to create transaction!</source> - <translation type="unfinished"/> + <translation>Chyba: Peňaženka je zamknutá, nemôžem vytvoriť transakciu!</translation> </message> <message> <location line="+1"/> <source>Error: system error: </source> - <translation type="unfinished"/> + <translation>Chyba: systémová chyba:</translation> </message> <message> <location line="+1"/> @@ -2831,12 +3411,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+1"/> <source>Failed to read block info</source> - <translation type="unfinished"/> + <translation>Zlyhalo čítanie info o bloku</translation> </message> <message> <location line="+1"/> <source>Failed to read block</source> - <translation type="unfinished"/> + <translation>Zlyhalo čítanie bloku</translation> </message> <message> <location line="+1"/> @@ -2851,12 +3431,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+1"/> <source>Failed to write block info</source> - <translation type="unfinished"/> + <translation>Zlyhal zápis info o bloku</translation> </message> <message> <location line="+1"/> <source>Failed to write block</source> - <translation type="unfinished"/> + <translation>Zlyhal zápis bloku</translation> </message> <message> <location line="+1"/> @@ -2879,7 +3459,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+2"/> + <location line="+1"/> + <source>Fee per kB to add to transactions you send</source> + <translation>Poplatok za kB ktorý treba pridať k odoslanej transakcii</translation> + </message> + <message> + <location line="+1"/> <source>Find peers using DNS lookup (default: 1 unless -connect)</source> <translation type="unfinished"/> </message> @@ -2899,6 +3484,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <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"/> @@ -2914,17 +3504,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+8"/> + <location line="+5"/> + <source>Prepend debug output with timestamp (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>RPC client options:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+5"/> + <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Send command to Bitcoin server</source> + <translation>Poslať príkaz Bitcoin serveru</translation> + </message> + <message> + <location line="+8"/> + <source>Set maximum block size in bytes (default: %d)</source> <translation type="unfinished"/> </message> <message> - <location line="+10"/> + <location line="+2"/> <source>Set the number of threads to service RPC calls (default: 4)</source> <translation type="unfinished"/> </message> @@ -2936,7 +3546,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+2"/> <source>Start Bitcoin server</source> - <translation type="unfinished"/> + <translation>Spustiť Bitcoin server</translation> </message> <message> <location line="+12"/> @@ -2944,13 +3554,18 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>Verifying blocks...</source> - <translation type="unfinished"/> + <translation>Overujem bloky...</translation> </message> <message> <location line="+1"/> <source>Verifying wallet...</source> + <translation>Overujem peňaženku...</translation> + </message> + <message> + <location line="+1"/> + <source>Wait for RPC server to start</source> <translation type="unfinished"/> </message> <message> @@ -2959,29 +3574,44 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+4"/> + <location line="+3"/> + <source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>You need to rebuild the database using -reindex to change -txindex</source> <translation type="unfinished"/> </message> <message> <location line="-78"/> <source>Imports blocks from external blk000??.dat file</source> - <translation type="unfinished"/> + <translation>Importuje bloky z externého súboru blk000??.dat</translation> </message> <message> - <location line="-98"/> + <location line="-104"/> <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> <translation type="unfinished"/> </message> <message> - <location line="+17"/> + <location line="+14"/> + <source>Output debugging information (default: 0, supplying <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="+83"/> + <location line="+88"/> <source>Information</source> - <translation type="unfinished"/> + <translation>Informácia</translation> </message> <message> <location line="+4"/> @@ -3019,32 +3649,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+2"/> - <source>Output extra debugging information. Implies all other -debug* options</source> - <translation>Produkovať extra ladiace informácie. Implies all other -debug* options</translation> - </message> - <message> - <location line="+1"/> - <source>Output extra network debugging information</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> - <source>Prepend debug output with timestamp</source> - <translation>Pridať na začiatok ladiaceho výstupu časový údaj</translation> - </message> - <message> - <location line="+5"/> + <location line="+9"/> <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation>SSL možnosť: (pozrite Bitcoin Wiki pre návod na nastavenie SSL)</translation> </message> <message> - <location line="+1"/> - <source>Select the version of socks proxy to use (4-5, default: 5)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> + <location line="+4"/> <source>Send trace/debug info to console instead of debug.log file</source> <translation>Odoslať trace/debug informácie na konzolu namiesto debug.info žurnálu</translation> </message> @@ -3054,12 +3664,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Odoslať trace/debug informácie do ladiaceho programu</translation> </message> <message> - <location line="+5"/> - <source>Set maximum block size in bytes (default: 250000)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> + <location line="+6"/> <source>Set minimum block size in bytes (default: 0)</source> <translation type="unfinished"/> </message> @@ -3071,7 +3676,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>Podpísanie správy zlyhalo</translation> </message> <message> <location line="+2"/> @@ -3081,12 +3686,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+6"/> <source>System error: </source> - <translation type="unfinished"/> + <translation>Systémová chyba:</translation> </message> <message> <location line="+4"/> <source>Transaction amount too small</source> - <translation type="unfinished"/> + <translation>Suma transakcie príliš malá</translation> </message> <message> <location line="+1"/> @@ -3096,7 +3701,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+1"/> <source>Transaction too large</source> - <translation type="unfinished"/> + <translation>Transakcia príliš veľká</translation> </message> <message> <location line="+8"/> @@ -3109,37 +3714,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Skúsiť použiť UPnP pre mapovanie počúvajúceho portu (default: 1 when listening)</translation> </message> <message> - <location line="+1"/> - <source>Use proxy to reach tor hidden services (default: same as -proxy)</source> - <translation type="unfinished"/> - </message> - <message> <location line="+2"/> <source>Username for JSON-RPC connections</source> <translation>Užívateľské meno pre JSON-RPC spojenia</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Warning</source> - <translation type="unfinished"/> + <translation>Upozornenie</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Warning: This version is obsolete, upgrade required!</source> - <translation type="unfinished"/> + <translation>Upozornenie: Táto verzia je zastaraná, vyžaduje sa aktualizácia!</translation> </message> <message> <location line="+2"/> + <source>version</source> + <translation>verzia</translation> + </message> + <message> + <location line="+1"/> <source>wallet.dat corrupt, salvage failed</source> - <translation type="unfinished"/> + <translation>wallet.dat je poškodený, záchrana zlyhala</translation> </message> <message> - <location line="-54"/> + <location line="-57"/> <source>Password for JSON-RPC connections</source> <translation>Heslo pre JSON-rPC spojenia</translation> </message> <message> - <location line="-70"/> + <location line="-69"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Povoliť JSON-RPC spojenia z určenej IP adresy.</translation> </message> @@ -3149,12 +3754,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Poslať príkaz nóde bežiacej na <ip> (predvolené: 127.0.0.1)</translation> </message> <message> - <location line="-126"/> + <location line="-131"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>Vykonaj príkaz, ak zmeny v najlepšom bloku (%s v príkaze nahradí blok hash)</translation> </message> <message> - <location line="+155"/> + <location line="+160"/> <source>Upgrade wallet to latest format</source> <translation>Aktualizuj peňaženku na najnovší formát.</translation> </message> @@ -3194,22 +3799,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-95"/> - <source>Connect through socks proxy</source> - <translation>Pripojenie cez socks proxy</translation> - </message> - <message> - <location line="-11"/> + <location line="-106"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>Povoliť vyhľadávanie DNS pre pridanie nódy a spojenie</translation> </message> <message> - <location line="+58"/> + <location line="+59"/> <source>Loading addresses...</source> <translation>Načítavanie adries...</translation> </message> <message> - <location line="-36"/> + <location line="-37"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>Chyba načítania wallet.dat: Peňaženka je poškodená</translation> </message> @@ -3229,12 +3829,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Chyba načítania wallet.dat</translation> </message> <message> - <location line="+30"/> + <location line="+31"/> <source>Invalid -proxy address: '%s'</source> <translation>Neplatná adresa proxy: '%s'</translation> </message> <message> - <location line="+57"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation type="unfinished"/> </message> @@ -3254,7 +3854,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+46"/> + <location line="+47"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>Neplatná suma pre -paytxfee=<amount>: '%s'</translation> </message> @@ -3274,27 +3874,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Načítavanie zoznamu blokov...</translation> </message> <message> - <location line="-60"/> + <location line="-61"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>Pridať nód na pripojenie a pokus o udržanie pripojenia otvoreného</translation> </message> <message> - <location line="-28"/> + <location line="-32"/> <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source> <translation type="unfinished"/> </message> <message> - <location line="+69"/> - <source>Fee per KB to add to transactions you send</source> - <translation>Poplatok za kB ktorý treba pridať k odoslanej transakcii</translation> - </message> - <message> - <location line="+20"/> + <location line="+94"/> <source>Loading wallet...</source> <translation>Načítavam peňaženku...</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>Cannot downgrade wallet</source> <translation>Nie je možné prejsť na nižšiu verziu peňaženky</translation> </message> @@ -3306,7 +3901,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+66"/> <source>Rescanning...</source> - <translation type="unfinished"/> + <translation>Nové prehľadávanie...</translation> </message> <message> <location line="-58"/> @@ -3324,7 +3919,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Chyba</translation> </message> <message> - <location line="-33"/> + <location line="-34"/> <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 f65a504d6d..11117f65f6 100644 --- a/src/qt/locale/bitcoin_sl_SI.ts +++ b/src/qt/locale/bitcoin_sl_SI.ts @@ -3,13 +3,13 @@ <name>AboutDialog</name> <message> <location filename="../forms/aboutdialog.ui" line="+14"/> - <source>About Bitcoin</source> - <translation>O Bitocinu</translation> + <source>About Bitcoin Core</source> + <translation type="unfinished"/> </message> <message> <location line="+39"/> - <source><b>Bitcoin</b> version</source> - <translation>Različica <b>Bitcoina</b></translation> + <source><b>Bitcoin Core</b> version</source> + <translation type="unfinished"/> </message> <message> <location line="+57"/> @@ -22,7 +22,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="+14"/> + <location filename="../aboutdialog.cpp" line="+19"/> <source>Copyright</source> <translation type="unfinished"/> </message> @@ -65,7 +65,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location filename="../addressbookpage.cpp" line="+72"/> + <location filename="../addressbookpage.cpp" line="+74"/> <source>&Copy Address</source> <translation>&Kopiraj naslov</translation> </message> @@ -135,7 +135,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Uredi</translation> </message> <message> - <location line="+197"/> + <location line="+194"/> <source>Export Address List</source> <translation type="unfinished"/> </message> @@ -158,7 +158,7 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>AddressTableModel</name> <message> - <location filename="../addresstablemodel.cpp" line="+164"/> + <location filename="../addresstablemodel.cpp" line="+168"/> <source>Label</source> <translation>Oznaka</translation> </message> @@ -196,7 +196,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Ponovite novo geslo</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="+34"/> + <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>Vnesite novo geslo za vstop v denarnico.<br/>Prosimo, da geslo sestavite iz <b> 10 ali več naključnih znakov</b> oz. <b>osem ali več besed</b>.</translation> </message> @@ -317,17 +317,17 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+250"/> + <location filename="../bitcoingui.cpp" line="+260"/> <source>Sign &message...</source> <translation>Podpiši &sporočilo ...</translation> </message> <message> - <location line="+254"/> + <location line="+290"/> <source>Synchronizing with network...</source> <translation>Sinhroniziranje z omrežjem ...</translation> </message> <message> - <location line="-324"/> + <location line="-360"/> <source>&Overview</source> <translation>&Pregled</translation> </message> @@ -393,7 +393,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Spremeni geslo ...</translation> </message> <message> - <location line="+259"/> + <location line="+295"/> <source>Importing blocks from disk...</source> <translation type="unfinished"/> </message> @@ -403,7 +403,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-322"/> + <location line="-358"/> <source>Send coins to a Bitcoin address</source> <translation type="unfinished"/> </message> @@ -438,20 +438,18 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>%Preveri sporočilo ...</translation> </message> <message> - <location line="-180"/> - <location line="+6"/> - <location line="+513"/> + <location line="+375"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-519"/> - <location line="+6"/> + <location line="-563"/> + <location line="+10"/> <source>Wallet</source> <translation>Denarnica</translation> </message> <message> - <location line="+109"/> + <location line="+113"/> <source>&Send</source> <translation type="unfinished"/> </message> @@ -461,13 +459,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+28"/> - <location line="+2"/> - <source>&About Bitcoin</source> - <translation>&O Bitcoinu</translation> - </message> - <message> - <location line="+14"/> + <location line="+44"/> <location line="+2"/> <source>&Show / Hide</source> <translation type="unfinished"/> @@ -493,12 +485,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+35"/> + <location line="+39"/> <source>&File</source> <translation>&Datoteka</translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>&Settings</source> <translation>&Nastavitve</translation> </message> @@ -513,18 +505,30 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Orodna vrstica zavihkov</translation> </message> <message> - <location line="-235"/> - <location line="+294"/> + <location line="-244"/> + <location line="+321"/> <source>[testnet]</source> <translation>[testnet]</translation> </message> <message> - <location line="-177"/> + <location line="-331"/> + <location line="+10"/> + <source>Bitcoin Core</source> + <translation>Jedro Bitcoina</translation> + </message> + <message> + <location line="+121"/> <source>Request payments (generates QR codes and bitcoin: URIs)</source> <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+27"/> + <location line="+2"/> + <source>&About Bitcoin Core</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+34"/> <source>&Used sending addresses...</source> <translation type="unfinished"/> </message> @@ -544,13 +548,23 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+106"/> + <location line="+2"/> + <source>Open URI...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Open a bitcoin: URI or payment request</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+126"/> <location line="+5"/> <source>Bitcoin client</source> <translation>Bitcoin odjemalec</translation> </message> <message numerus="yes"> - <location line="+120"/> + <location line="+133"/> <source>%n active connection(s) to Bitcoin network</source> <translation><numerusform>%n aktivna povezava v bitcoin omrežje</numerusform><numerusform>%n aktivni povezavi v bitcoin omrežje</numerusform><numerusform>%n aktivnih povezav v bitcoin omrežje</numerusform><numerusform>%n aktivnih povezav v bitcoin omrežje</numerusform></translation> </message> @@ -622,7 +636,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="-152"/> <source>Up to date</source> - <translation>V koraku s časom</translation> + <translation>Posodobljeno</translation> </message> <message> <location line="+31"/> @@ -658,17 +672,7 @@ Naslov: %4 </translation> </message> <message> - <location line="+34"/> - <source>URI handling</source> - <translation>Rokovanje z URI</translation> - </message> - <message> - <location line="+0"/> - <source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+45"/> + <location line="+67"/> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>Denarnica je <b>šifrirana</b> in trenutno <b>odklenjena</b></translation> </message> @@ -678,7 +682,7 @@ Naslov: %4 <translation>Denarnica je <b>šifrirana</b> in trenutno <b>zaklenjena</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+110"/> + <location filename="../bitcoin.cpp" line="+116"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -686,12 +690,299 @@ Naslov: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+115"/> + <location filename="../clientmodel.cpp" line="+119"/> <source>Network Alert</source> <translation type="unfinished"/> </message> </context> <context> + <name>CoinControlDialog</name> + <message> + <location filename="../forms/coincontroldialog.ui" line="+14"/> + <source>Coin Control Address Selection</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+34"/> + <source>Quantity:</source> + <translation>Količina:</translation> + </message> + <message> + <location line="+29"/> + <source>Bytes:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+45"/> + <source>Amount:</source> + <translation>Količina:</translation> + </message> + <message> + <location line="+29"/> + <source>Priority:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+45"/> + <source>Fee:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+32"/> + <source>Low Output:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+48"/> + <source>After Fee:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+32"/> + <source>Change:</source> + <translation>Sprememba:</translation> + </message> + <message> + <location line="+63"/> + <source>(un)select all</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+13"/> + <source>Tree mode</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> + <source>List mode</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+52"/> + <source>Amount</source> + <translation>Količina</translation> + </message> + <message> + <location line="+10"/> + <source>Address</source> + <translation>Naslov</translation> + </message> + <message> + <location line="+5"/> + <source>Date</source> + <translation>Datum</translation> + </message> + <message> + <location line="+5"/> + <source>Confirmations</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Confirmed</source> + <translation>Potrjeno</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>Kopiraj naslov</translation> + </message> + <message> + <location line="+1"/> + <source>Copy label</source> + <translation>Kopiraj oznako</translation> + </message> + <message> + <location line="+1"/> + <location line="+26"/> + <source>Copy amount</source> + <translation>Kopiraj količino</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="+171"/> + <source>Dust</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>yes</source> + <translation>da</translation> + </message> + <message> + <location line="+0"/> + <source>no</source> + <translation>ne</translation> + </message> + <message> + <location line="+10"/> + <source>This label turns red, if the transaction size is greater than 1000 bytes.</source> + <translation 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>(ni oznake)</translation> + </message> + <message> + <location line="-9"/> + <source>change from %1 (%2)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>(change)</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>EditAddressDialog</name> <message> <location filename="../forms/editaddressdialog.ui" line="+14"/> @@ -719,7 +1010,7 @@ Naslov: %4 <translation>&Naslov</translation> </message> <message> - <location filename="../editaddressdialog.cpp" line="+21"/> + <location filename="../editaddressdialog.cpp" line="+25"/> <source>New receiving address</source> <translation>Nov naslov za prilive</translation> </message> @@ -762,7 +1053,7 @@ Naslov: %4 <context> <name>FreespaceChecker</name> <message> - <location filename="../intro.cpp" line="+61"/> + <location filename="../intro.cpp" line="+65"/> <source>A new data directory will be created.</source> <translation type="unfinished"/> </message> @@ -790,18 +1081,18 @@ Naslov: %4 <context> <name>GUIUtil::HelpMessageBox</name> <message> - <location filename="../guiutil.cpp" line="+558"/> - <location line="+13"/> - <source>Bitcoin-Qt</source> - <translation>Bitcoin-Qt</translation> - </message> - <message> - <location line="-13"/> + <location filename="../guiutil.cpp" line="+597"/> <source>version</source> <translation>različica</translation> </message> <message> - <location line="+2"/> + <location line="+0"/> + <location line="+13"/> + <source>Bitcoin Core</source> + <translation>Jedro Bitcoina</translation> + </message> + <message> + <location line="-11"/> <source>Usage:</source> <translation>Uporaba:</translation> </message> @@ -845,17 +1136,17 @@ Naslov: %4 </message> <message> <location line="+9"/> - <source>Welcome to Bitcoin-Qt.</source> + <source>Welcome to Bitcoin Core.</source> <translation type="unfinished"/> </message> <message> <location line="+26"/> - <source>As this is the first time the program is launched, you can choose where Bitcoin-Qt will store its data.</source> + <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source> <translation type="unfinished"/> </message> <message> <location line="+10"/> - <source>Bitcoin-Qt will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source> + <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source> <translation type="unfinished"/> </message> <message> @@ -869,7 +1160,17 @@ Naslov: %4 <translation type="unfinished"/> </message> <message> - <location filename="../intro.cpp" line="+105"/> + <location filename="../intro.cpp" line="+85"/> + <source>Bitcoin</source> + <translation>Bitcoin</translation> + </message> + <message> + <location line="+1"/> + <source>Error: Specified data directory "%1" can not be created.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+19"/> <source>Error</source> <translation>Napaka</translation> </message> @@ -885,6 +1186,34 @@ Naslov: %4 </message> </context> <context> + <name>OpenURIDialog</name> + <message> + <location filename="../forms/openuridialog.ui" line="+14"/> + <source>Open URI</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Open payment request from URI or file</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+9"/> + <source>URI:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+11"/> + <source>Select payment request file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../openuridialog.cpp" line="+47"/> + <source>Select payment request file to open</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OptionsDialog</name> <message> <location filename="../forms/optionsdialog.ui" line="+14"/> @@ -1042,6 +1371,16 @@ Naslov: %4 <translation type="unfinished"/> </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="+71"/> <source>&OK</source> <translation>&Potrdi</translation> @@ -1057,12 +1396,12 @@ Naslov: %4 <translation>&Uporabi</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+58"/> + <location filename="../optionsdialog.cpp" line="+63"/> <source>default</source> <translation>privzeto</translation> </message> <message> - <location line="+130"/> + <location line="+131"/> <source>Confirm options reset</source> <translation type="unfinished"/> </message> @@ -1103,17 +1442,17 @@ Naslov: %4 </message> <message> <location line="+50"/> - <location line="+202"/> + <location line="+214"/> <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source> <translation type="unfinished"/> </message> <message> - <location line="-131"/> + <location line="-140"/> <source>Unconfirmed:</source> <translation>Nepotrjeno:</translation> </message> <message> - <location line="-78"/> + <location line="-81"/> <source>Wallet</source> <translation>Denarnica</translation> </message> @@ -1128,12 +1467,12 @@ Naslov: %4 <translation type="unfinished"/> </message> <message> - <location line="+29"/> + <location line="+32"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation type="unfinished"/> </message> <message> - <location line="+13"/> + <location line="+16"/> <source>Immature:</source> <translation type="unfinished"/> </message> @@ -1143,9 +1482,9 @@ Naslov: %4 <translation type="unfinished"/> </message> <message> - <location line="+13"/> + <location line="+16"/> <source>Total:</source> - <translation type="unfinished"/> + <translation>Skupaj:</translation> </message> <message> <location line="+16"/> @@ -1153,12 +1492,12 @@ Naslov: %4 <translation type="unfinished"/> </message> <message> - <location line="+53"/> + <location line="+56"/> <source><b>Recent transactions</b></source> <translation><b>Pogoste transakcije</></translation> </message> <message> - <location filename="../overviewpage.cpp" line="+116"/> + <location filename="../overviewpage.cpp" line="+120"/> <location line="+1"/> <source>out of sync</source> <translation type="unfinished"/> @@ -1167,7 +1506,7 @@ Naslov: %4 <context> <name>PaymentServer</name> <message> - <location filename="../paymentserver.cpp" line="+392"/> + <location filename="../paymentserver.cpp" line="+397"/> <source>URI handling</source> <translation>Rokovanje z URI</translation> </message> @@ -1177,23 +1516,29 @@ Naslov: %4 <translation type="unfinished"/> </message> <message> - <location line="+69"/> + <location line="+91"/> <source>Requested payment amount of %1 is too small (considered dust).</source> <translation type="unfinished"/> </message> <message> - <location line="+4"/> - <location line="+37"/> + <location line="-204"/> + <location line="+195"/> + <location line="+13"/> <source>Payment request error</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Insecure requests to custom payment scripts unsupported</source> + <location line="-207"/> + <source>Cannot start bitcoin: click-to-pay handler</source> <translation type="unfinished"/> </message> <message> - <location line="+38"/> + <location line="+195"/> + <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> @@ -1203,7 +1548,7 @@ Naslov: %4 <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>Bad response from server %1</source> <translation type="unfinished"/> </message> @@ -1213,8 +1558,8 @@ Naslov: %4 <translation type="unfinished"/> </message> <message> - <location line="-58"/> - <location line="+30"/> + <location line="-55"/> + <location line="+27"/> <location line="+17"/> <source>Network request error</source> <translation type="unfinished"/> @@ -1223,9 +1568,8 @@ Naslov: %4 <context> <name>QObject</name> <message> - <location filename="../bitcoin.cpp" line="+114"/> + <location filename="../bitcoin.cpp" line="+119"/> <location line="+5"/> - <location filename="../intro.cpp" line="-32"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> @@ -1239,16 +1583,11 @@ Naslov: %4 <source>Error: Invalid combination of -regtest and -testnet.</source> <translation type="unfinished"/> </message> - <message> - <location filename="../intro.cpp" line="+1"/> - <source>Error: Specified data directory "%1" can not be created.</source> - <translation type="unfinished"/> - </message> </context> <context> <name>QRImageWidget</name> <message> - <location filename="../receiverequestdialog.cpp" line="+32"/> + <location filename="../receiverequestdialog.cpp" line="+36"/> <source>&Save Image...</source> <translation type="unfinished"/> </message> @@ -1264,8 +1603,8 @@ Naslov: %4 </message> <message> <location line="+0"/> - <source>PNG Images (*.png)</source> - <translation>PNG slika (*.png)</translation> + <source>PNG Image (*.png)</source> + <translation type="unfinished"/> </message> </context> <context> @@ -1285,7 +1624,7 @@ Naslov: %4 <location line="+53"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+352"/> + <location filename="../rpcconsole.cpp" line="+360"/> <source>N/A</source> <translation type="unfinished"/> </message> @@ -1300,7 +1639,12 @@ Naslov: %4 <translation>&Informacije</translation> </message> <message> - <location line="+68"/> + <location line="-10"/> + <source>Debug window</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+78"/> <source>Using OpenSSL version</source> <translation>OpenSSL različica v rabi</translation> </message> @@ -1355,12 +1699,7 @@ Naslov: %4 <translation>Možnosti ukazne vrstice</translation> </message> <message> - <location line="+7"/> - <source>Show the Bitcoin-Qt help message to get a list with possible Bitcoin command-line options.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> + <location line="+10"/> <source>&Show</source> <translation type="unfinished"/> </message> @@ -1400,12 +1739,7 @@ Naslov: %4 <translation>Datum izgradnje</translation> </message> <message> - <location line="-104"/> - <source>Bitcoin - Debug window</source> - <translation>Bitcoin - Razhroščevalno okno</translation> - </message> - <message> - <location line="+25"/> + <location line="-79"/> <source>Bitcoin Core</source> <translation>Jedro Bitcoina</translation> </message> @@ -1420,7 +1754,12 @@ Naslov: %4 <translation type="unfinished"/> </message> <message> - <location line="+102"/> + <location line="+26"/> + <source>Show the Bitcoin-Core help message to get a list with possible Bitcoin command-line options.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+76"/> <source>Clear console</source> <translation>Počisti konzolo</translation> </message> @@ -1478,37 +1817,32 @@ Naslov: %4 <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+22"/> + <location filename="../forms/receivecoinsdialog.ui" line="+83"/> <source>&Amount:</source> <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+19"/> <source>The amount to request</source> <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="-32"/> <source>&Label:</source> <translation>&Oznaka:</translation> </message> <message> - <location line="+10"/> - <source>The label to associate with the receiving address</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+7"/> + <location line="-34"/> <source>&Message:</source> <translation type="unfinished"/> </message> <message> - <location line="+10"/> + <location line="+20"/> <source>The message to attach to payment request</source> <translation type="unfinished"/> </message> <message> - <location line="+14"/> + <location line="-37"/> <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> @@ -1518,12 +1852,17 @@ Naslov: %4 <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="+27"/> + <source>The label to associate with the new receiving address</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+14"/> <source>Use this form to request payments. All fields are optional.</source> <translation type="unfinished"/> </message> <message> - <location line="+17"/> + <location line="+56"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -1537,6 +1876,31 @@ Naslov: %4 <source>&Request payment</source> <translation type="unfinished"/> </message> + <message> + <location line="+47"/> + <source>Previously requested payments</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> + <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>Pokaži</translation> + </message> + <message> + <location line="+11"/> + <source>Remove the selected entries from the list</source> + <translation>Odstrani označene vnose iz seznama</translation> + </message> + <message> + <location line="+3"/> + <source>Remove</source> + <translation>Odstrani</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -1557,16 +1921,11 @@ Naslov: %4 </message> <message> <location line="+7"/> - <source>&Copy Image</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+7"/> <source>&Save Image...</source> <translation type="unfinished"/> </message> <message> - <location filename="../receiverequestdialog.cpp" line="+58"/> + <location filename="../receiverequestdialog.cpp" line="+56"/> <source>Request payment to %1</source> <translation type="unfinished"/> </message> @@ -1612,16 +1971,119 @@ Naslov: %4 </message> </context> <context> + <name>RecentRequestsTableModel</name> + <message> + <location filename="../recentrequeststablemodel.cpp" line="+14"/> + <source>Date</source> + <translation>Datum</translation> + </message> + <message> + <location line="+0"/> + <source>Label</source> + <translation>Oznaka</translation> + </message> + <message> + <location line="+0"/> + <source>Message</source> + <translation>Sporočilo</translation> + </message> + <message> + <location line="+0"/> + <source>Amount</source> + <translation>Količina</translation> + </message> + <message> + <location line="+36"/> + <source>(no label)</source> + <translation>(ni oznake)</translation> + </message> + <message> + <location line="+9"/> + <source>(no message)</source> + <translation>(ni sporočila)</translation> + </message> +</context> +<context> <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="+14"/> - <location filename="../sendcoinsdialog.cpp" line="+140"/> - <location line="+213"/> + <location filename="../sendcoinsdialog.cpp" line="+381"/> + <location line="+81"/> <source>Send Coins</source> <translation>Pošlji kovance</translation> </message> <message> - <location line="+50"/> + <location line="+76"/> + <source>Coin Control Features</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+20"/> + <source>Inputs...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> + <source>automatically selected</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+19"/> + <source>Insufficient funds!</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+89"/> + <source>Quantity:</source> + <translation>Količina:</translation> + </message> + <message> + <location line="+35"/> + <source>Bytes:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+48"/> + <source>Amount:</source> + <translation>Znesek:</translation> + </message> + <message> + <location line="+32"/> + <source>Priority:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+48"/> + <source>Fee:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+32"/> + <source>Low Output:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+48"/> + <source>After Fee:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+32"/> + <source>Change:</source> + <translation>Sprememba:</translation> + </message> + <message> + <location line="+44"/> + <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Custom change address</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+115"/> <source>Send to multiple recipients at once</source> <translation>Pošlji več prejemnikom hkrati</translation> </message> @@ -1646,12 +2108,7 @@ Naslov: %4 <translation>Dobroimetje:</translation> </message> <message> - <location line="+10"/> - <source>123.456 BTC</source> - <translation>123.456 BTC</translation> - </message> - <message> - <location line="+31"/> + <location line="+41"/> <source>Confirm the send action</source> <translation>Potrdi odlivno dejanje</translation> </message> @@ -1661,69 +2118,135 @@ Naslov: %4 <translation>P&ošlji</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-154"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation>Potrdi odliv kovancev </translation> </message> <message> - <location line="-90"/> + <location line="-74"/> <location line="+5"/> <location line="+5"/> + <location line="+4"/> <source>%1 to %2</source> <translation type="unfinished"/> </message> <message> - <location line="+26"/> + <location line="-136"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>Vnesite bitcoin naslov (npr.: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> + <message> + <location line="+15"/> + <source>Copy quantity</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation>Kopiraj količino</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>ali</translation> + </message> + <message> + <location line="+202"/> <source>The recipient address is not valid, please recheck.</source> <translation type="unfinished"/> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>The amount to pay must be larger than 0.</source> <translation>Količina za plačilo mora biti večja od 0.</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>The amount exceeds your balance.</source> <translation>Količina presega vaše dobroimetje</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>The total exceeds your balance when the %1 transaction fee is included.</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+3"/> <source>Duplicate address found, can only send to each address once per send operation.</source> <translation type="unfinished"/> </message> <message> - <location line="+4"/> - <source>Error: Transaction creation failed!</source> + <location line="+3"/> + <source>Transaction creation failed!</source> <translation type="unfinished"/> </message> <message> - <location line="+15"/> - <source>Are you sure you want to send?</source> + <location line="+4"/> + <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation type="unfinished"/> </message> <message> - <location line="+9"/> - <source>added as transaction fee</source> + <location line="+113"/> + <source>Warning: Invalid Bitcoin address</source> + <translation>Opozorilo: Neveljaven Bitcoin naslov</translation> + </message> + <message> + <location line="+13"/> + <source>(no label)</source> + <translation>(ni oznake)</translation> + </message> + <message> + <location line="+8"/> + <source>Warning: Unknown change address</source> <translation type="unfinished"/> </message> <message> - <location line="+6"/> - <source>Total Amount %1</source> + <location line="-378"/> + <source>Are you sure you want to send?</source> <translation type="unfinished"/> </message> <message> - <location line="+20"/> - <source>Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> + <location line="+9"/> + <source>added as transaction fee</source> <translation type="unfinished"/> </message> <message> - <location line="+144"/> + <location line="+170"/> <source>Payment request expired</source> <translation type="unfinished"/> </message> @@ -1736,39 +2259,44 @@ Naslov: %4 <context> <name>SendCoinsEntry</name> <message> - <location filename="../forms/sendcoinsentry.ui" line="+33"/> - <location line="+585"/> + <location filename="../forms/sendcoinsentry.ui" line="+131"/> + <location line="+501"/> + <location line="+536"/> <source>A&mount:</source> <translation>K&oličina:</translation> </message> <message> - <location line="-572"/> - <location line="+585"/> + <location line="-1132"/> <source>Pay &To:</source> <translation>Prejemnik &plačila:</translation> </message> <message> - <location line="-551"/> + <location line="+18"/> <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation type="unfinished"/> </message> <message> - <location filename="../sendcoinsentry.cpp" line="+28"/> + <location filename="../sendcoinsentry.cpp" line="+30"/> <source>Enter a label for this address to add it to your address book</source> <translation>Vnesite oznako za ta naslov, ki bo shranjena v imenik</translation> </message> <message> - <location filename="../forms/sendcoinsentry.ui" line="-18"/> + <location filename="../forms/sendcoinsentry.ui" line="+57"/> <source>&Label:</source> <translation>&Oznaka:</translation> </message> <message> - <location line="+28"/> + <location line="-50"/> <source>Choose previously used address</source> <translation type="unfinished"/> </message> <message> - <location line="+10"/> + <location line="-40"/> + <source>This is a normal payment.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+50"/> <source>Alt+A</source> <translation>Alt+A</translation> </message> @@ -1784,16 +2312,35 @@ Naslov: %4 </message> <message> <location line="+7"/> - <source>Remove this recipient</source> - <translation>Odstrani tega prejemnika</translation> + <location line="+504"/> + <location line="+536"/> + <source>Remove this entry</source> + <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="-40"/> + <source>This is a verified payment request.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-971"/> <source>Enter a label for this address to add it to the list of used addresses</source> <translation type="unfinished"/> </message> <message> - <location line="+465"/> + <location line="+439"/> + <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> @@ -1914,7 +2461,7 @@ Naslov: %4 <translation type="unfinished"/> </message> <message> - <location filename="../signverifymessagedialog.cpp" line="+27"/> + <location filename="../signverifymessagedialog.cpp" line="+29"/> <location line="+3"/> <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation>Vnesite bitcoin naslov (npr.: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> @@ -1930,7 +2477,7 @@ Naslov: %4 <translation type="unfinished"/> </message> <message> - <location line="+85"/> + <location line="+84"/> <location line="+81"/> <source>The entered address is invalid.</source> <translation type="unfinished"/> @@ -1999,8 +2546,13 @@ Naslov: %4 <context> <name>SplashScreen</name> <message> - <location filename="../splashscreen.cpp" line="+23"/> - <source>The Bitcoin developers</source> + <location filename="../splashscreen.cpp" line="+26"/> + <source>Bitcoin Core</source> + <translation>Jedro Bitcoina</translation> + </message> + <message> + <location line="+2"/> + <source>The Bitcoin Core developers</source> <translation type="unfinished"/> </message> <message> @@ -2012,7 +2564,7 @@ Naslov: %4 <context> <name>TrafficGraphWidget</name> <message> - <location filename="../trafficgraphwidget.cpp" line="+75"/> + <location filename="../trafficgraphwidget.cpp" line="+79"/> <source>KB/s</source> <translation type="unfinished"/> </message> @@ -2020,7 +2572,7 @@ Naslov: %4 <context> <name>TransactionDesc</name> <message> - <location filename="../transactiondesc.cpp" line="+22"/> + <location filename="../transactiondesc.cpp" line="+28"/> <source>Open until %1</source> <translation>Odpri enoto %1</translation> </message> @@ -2212,7 +2764,7 @@ Naslov: %4 <context> <name>TransactionTableModel</name> <message> - <location filename="../transactiontablemodel.cpp" line="+227"/> + <location filename="../transactiontablemodel.cpp" line="+234"/> <source>Date</source> <translation>Datum</translation> </message> @@ -2330,7 +2882,7 @@ Naslov: %4 <context> <name>TransactionView</name> <message> - <location filename="../transactionview.cpp" line="+52"/> + <location filename="../transactionview.cpp" line="+57"/> <location line="+16"/> <source>All</source> <translation>Vse</translation> @@ -2391,12 +2943,12 @@ Naslov: %4 <translation>Drugo</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>Enter address or label to search</source> <translation>Vnesite naslov ali oznako za iskanje</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>Min amount</source> <translation>Minimalna količina</translation> </message> @@ -2431,17 +2983,37 @@ Naslov: %4 <translation>Prikaži podrobnosti transakcije</translation> </message> <message> - <location line="+143"/> - <source>Export Transaction Data</source> - <translation>Izvozi podatke o transakcijah</translation> + <location line="+142"/> + <source>Export Transaction History</source> + <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+19"/> + <source>Exporting Failed</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>There was an error trying to save the transaction history to %1.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+4"/> + <source>Exporting Successful</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>The transaction history was successfully saved to %1.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-22"/> <source>Comma separated file (*.csv)</source> <translation>Datoteka s podatki, ločenimi z vejico (*.csv)</translation> </message> <message> - <location line="+8"/> + <location line="+9"/> <source>Confirmed</source> <translation>Potrjeno</translation> </message> @@ -2476,17 +3048,7 @@ Naslov: %4 <translation>ID</translation> </message> <message> - <location line="+4"/> - <source>Error exporting</source> - <translation>Napaka pri izvažanju</translation> - </message> - <message> - <location line="+0"/> - <source>Could not write to file %1.</source> - <translation>Ni bilo mogoče pisati v datoteko %1.</translation> - </message> - <message> - <location line="+100"/> + <location line="+107"/> <source>Range:</source> <translation>Območje:</translation> </message> @@ -2497,9 +3059,17 @@ Naslov: %4 </message> </context> <context> + <name>WalletFrame</name> + <message> + <location filename="../walletframe.cpp" line="+26"/> + <source>No wallet has been loaded.</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>WalletModel</name> <message> - <location filename="../walletmodel.cpp" line="+218"/> + <location filename="../walletmodel.cpp" line="+245"/> <source>Send Coins</source> <translation>Pošlji kovance</translation> </message> @@ -2507,7 +3077,7 @@ Naslov: %4 <context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+46"/> + <location filename="../walletview.cpp" line="+43"/> <source>&Export</source> <translation type="unfinished"/> </message> @@ -2517,65 +3087,60 @@ Naslov: %4 <translation type="unfinished"/> </message> <message> - <location line="+183"/> + <location line="+181"/> <source>Backup Wallet</source> <translation type="unfinished"/> </message> <message> - <location line="+0"/> + <location line="+1"/> <source>Wallet Data (*.dat)</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Backup Failed</source> <translation type="unfinished"/> </message> <message> <location line="+0"/> - <source>There was an error trying to save the wallet data to the new location.</source> + <source>There was an error trying to save the wallet data to %1.</source> <translation type="unfinished"/> </message> <message> <location line="+4"/> - <source>Backup Successful</source> + <source>The wallet data was successfully saved to %1.</source> <translation type="unfinished"/> </message> <message> <location line="+0"/> - <source>The wallet data was successfully saved to the new location.</source> + <source>Backup Successful</source> <translation type="unfinished"/> </message> </context> <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+102"/> - <source>Bitcoin version</source> - <translation>Verzija Bitcoina</translation> - </message> - <message> - <location line="+107"/> + <location filename="../bitcoinstrings.cpp" line="+217"/> <source>Usage:</source> <translation>Uporaba:</translation> </message> <message> - <location line="-55"/> + <location line="-54"/> <source>List commands</source> <translation>Prikaži ukaze</translation> </message> <message> - <location line="-13"/> + <location line="-14"/> <source>Get help for a command</source> <translation>Prikaži pomoč za ukaz</translation> </message> <message> - <location line="+25"/> + <location line="+26"/> <source>Options:</source> <translation>Možnosti:</translation> </message> <message> - <location line="+24"/> + <location line="+23"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Določi datoteko z nastavitvami (privzeta: bitcoin.conf)</translation> </message> @@ -2595,7 +3160,7 @@ Naslov: %4 <translation>Nastavi pomnilnik podatkovne zbirke v megabajtih (privzeto: 25)</translation> </message> <message> - <location line="-28"/> + <location line="-27"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>Sprejmi povezave na <port> (privzeta vrata: 8333 ali testnet: 18333)</translation> </message> @@ -2605,7 +3170,7 @@ Naslov: %4 <translation>Obdrži maksimalno število <n> povezav (privzeto: 125)</translation> </message> <message> - <location line="-49"/> + <location line="-50"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation type="unfinished"/> </message> @@ -2620,7 +3185,7 @@ Naslov: %4 <translation>Prag za prekinitev povezav s slabimi odjemalci (privzeto: 1000)</translation> </message> <message> - <location line="-142"/> + <location line="-147"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"/> </message> @@ -2635,7 +3200,7 @@ Naslov: %4 <translation type="unfinished"/> </message> <message> - <location line="+40"/> + <location line="+45"/> <source>Accept command line and JSON-RPC commands</source> <translation>Sprejmi ukaze iz ukazne vrstice in JSON-RPC</translation> </message> @@ -2645,17 +3210,17 @@ Naslov: %4 <translation>Teci v ozadju in sprejemaj ukaze</translation> </message> <message> - <location line="+40"/> + <location line="+39"/> <source>Use the test network</source> <translation>Uporabi testno omrežje</translation> </message> <message> - <location line="-118"/> + <location line="-117"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> <message> - <location line="-87"/> + <location line="-92"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2710,17 +3275,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+11"/> - <source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source> + <location line="+18"/> + <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation type="unfinished"/> </message> <message> - <location line="+6"/> - <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> + <location line="+5"/> + <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+3"/> <source>Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source> <translation type="unfinished"/> </message> @@ -2750,17 +3315,27 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+14"/> + <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="+2"/> + <location line="+1"/> <source>Block creation options:</source> <translation>Možnosti ustvarjanja blokov:</translation> </message> @@ -2770,7 +3345,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+2"/> + <location line="+1"/> + <source>Connect through SOCKS proxy</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Connect to JSON-RPC on <port> (default: 8332 or testnet: 18332)</source> <translation type="unfinished"/> </message> @@ -2880,7 +3460,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+2"/> + <location line="+1"/> + <source>Fee per kB to add to transactions you send</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Find peers using DNS lookup (default: 1 unless -connect)</source> <translation type="unfinished"/> </message> @@ -2900,6 +3485,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <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"/> @@ -2915,17 +3505,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+8"/> + <location line="+5"/> + <source>Prepend debug output with timestamp (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>RPC client options:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+5"/> + <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Send command to Bitcoin server</source> <translation type="unfinished"/> </message> <message> - <location line="+10"/> + <location line="+8"/> + <source>Set maximum block size in bytes (default: %d)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>Set the number of threads to service RPC calls (default: 4)</source> <translation type="unfinished"/> </message> @@ -2945,7 +3555,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>Verifying blocks...</source> <translation type="unfinished"/> </message> @@ -2956,11 +3566,21 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> + <source>Wait for RPC server to start</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Wallet %s resides outside data directory %s</source> <translation type="unfinished"/> </message> <message> - <location line="+4"/> + <location line="+3"/> + <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> @@ -2970,17 +3590,27 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-98"/> + <location line="-104"/> <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> <translation type="unfinished"/> </message> <message> - <location line="+17"/> + <location line="+14"/> + <source>Output debugging information (default: 0, supplying <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="+83"/> + <location line="+88"/> <source>Information</source> <translation type="unfinished"/> </message> @@ -3020,32 +3650,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+2"/> - <source>Output extra debugging information. Implies all other -debug* options</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Output extra network debugging information</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> - <source>Prepend debug output with timestamp</source> - <translation>Pripravi razhroščevalne podatke s časovnim žigom</translation> - </message> - <message> - <location line="+5"/> + <location line="+9"/> <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation>SSL možnosti: (glejte Bitcoin Wiki za navodla, kako nastaviti SSL)</translation> </message> <message> - <location line="+1"/> - <source>Select the version of socks proxy to use (4-5, default: 5)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> + <location line="+4"/> <source>Send trace/debug info to console instead of debug.log file</source> <translation>Pošlji sledilne/razhroščevalne informacije v konzolo namesto jih shraniti v debug.log datoteko</translation> </message> @@ -3055,12 +3665,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Pošlji sledilne/razhroščevalne podatke razhroščevalniku</translation> </message> <message> - <location line="+5"/> - <source>Set maximum block size in bytes (default: 250000)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> + <location line="+6"/> <source>Set minimum block size in bytes (default: 0)</source> <translation type="unfinished"/> </message> @@ -3110,37 +3715,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Use proxy to reach tor hidden services (default: same as -proxy)</source> - <translation type="unfinished"/> - </message> - <message> <location line="+2"/> <source>Username for JSON-RPC connections</source> <translation>Uporabniško ime za JSON-RPC povezave</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Warning</source> <translation>Opozorilo</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Warning: This version is obsolete, upgrade required!</source> <translation>Opozorilo: ta različica je zastarela, potrebna je nadgradnja!</translation> </message> <message> <location line="+2"/> + <source>version</source> + <translation>različica</translation> + </message> + <message> + <location line="+1"/> <source>wallet.dat corrupt, salvage failed</source> <translation type="unfinished"/> </message> <message> - <location line="-54"/> + <location line="-57"/> <source>Password for JSON-RPC connections</source> <translation>Geslo za JSON-RPC povezave</translation> </message> <message> - <location line="-70"/> + <location line="-69"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Dovoli JSON-RPC povezave z določenega IP naslova</translation> </message> @@ -3150,12 +3755,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Pošlji ukaze vozlišču na <ip> (privzet: 127.0.0.1)</translation> </message> <message> - <location line="-126"/> + <location line="-131"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+155"/> + <location line="+160"/> <source>Upgrade wallet to latest format</source> <translation>Posodobi denarnico v najnovejši zapis</translation> </message> @@ -3195,22 +3800,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-95"/> - <source>Connect through socks proxy</source> - <translation>Poveži prek SOCKS posredniškega strežnika</translation> - </message> - <message> - <location line="-11"/> + <location line="-106"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation type="unfinished"/> </message> <message> - <location line="+58"/> + <location line="+59"/> <source>Loading addresses...</source> <translation>Nalaganje naslovov ...</translation> </message> <message> - <location line="-36"/> + <location line="-37"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>Napaka pri nalaganju wallet.dat: denarnica pokvarjena</translation> </message> @@ -3230,12 +3830,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Napaka pri nalaganju wallet.dat</translation> </message> <message> - <location line="+30"/> + <location line="+31"/> <source>Invalid -proxy address: '%s'</source> <translation type="unfinished"/> </message> <message> - <location line="+57"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation type="unfinished"/> </message> @@ -3255,7 +3855,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+46"/> + <location line="+47"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation type="unfinished"/> </message> @@ -3275,27 +3875,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Nalaganje indeksa blokov ...</translation> </message> <message> - <location line="-60"/> + <location line="-61"/> <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> <message> - <location line="-28"/> + <location line="-32"/> <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source> <translation type="unfinished"/> </message> <message> - <location line="+69"/> - <source>Fee per KB to add to transactions you send</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+20"/> + <location line="+94"/> <source>Loading wallet...</source> <translation>Nalaganje denarnice ...</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>Cannot downgrade wallet</source> <translation>Ne morem </translation> </message> @@ -3325,7 +3920,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Napaka</translation> </message> <message> - <location line="-33"/> + <location line="-34"/> <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 62bb57c049..ab43083251 100644 --- a/src/qt/locale/bitcoin_sr.ts +++ b/src/qt/locale/bitcoin_sr.ts @@ -3,13 +3,13 @@ <name>AboutDialog</name> <message> <location filename="../forms/aboutdialog.ui" line="+14"/> - <source>About Bitcoin</source> - <translation>O Bitcoin-u</translation> + <source>About Bitcoin Core</source> + <translation type="unfinished"/> </message> <message> <location line="+39"/> - <source><b>Bitcoin</b> version</source> - <translation><b>Bitcoin</b> verzija</translation> + <source><b>Bitcoin Core</b> version</source> + <translation type="unfinished"/> </message> <message> <location line="+57"/> @@ -22,7 +22,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location filename="../aboutdialog.cpp" line="+14"/> + <location filename="../aboutdialog.cpp" line="+19"/> <source>Copyright</source> <translation type="unfinished"/> </message> @@ -65,7 +65,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location filename="../addressbookpage.cpp" line="+72"/> + <location filename="../addressbookpage.cpp" line="+74"/> <source>&Copy Address</source> <translation type="unfinished"/> </message> @@ -135,7 +135,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+197"/> + <location line="+194"/> <source>Export Address List</source> <translation type="unfinished"/> </message> @@ -158,7 +158,7 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>AddressTableModel</name> <message> - <location filename="../addresstablemodel.cpp" line="+164"/> + <location filename="../addresstablemodel.cpp" line="+168"/> <source>Label</source> <translation>Етикета</translation> </message> @@ -196,7 +196,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Поновите нову лозинку</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="+34"/> + <location filename="../askpassphrasedialog.cpp" line="+40"/> <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>10 or more random characters</b>, or <b>eight or more words</b>.</source> <translation>Унесите нову лозинку за приступ новчанику.<br/>Молимо Вас да лозинка буде <b>10 или више насумице одабраних знакова</b>, или <b>осам или више речи</b>.</translation> </message> @@ -317,17 +317,17 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+250"/> + <location filename="../bitcoingui.cpp" line="+260"/> <source>Sign &message...</source> <translation type="unfinished"/> </message> <message> - <location line="+254"/> + <location line="+290"/> <source>Synchronizing with network...</source> <translation>Синхронизација са мрежом у току...</translation> </message> <message> - <location line="-324"/> + <location line="-360"/> <source>&Overview</source> <translation>&Општи преглед</translation> </message> @@ -393,7 +393,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Промени &лозинку...</translation> </message> <message> - <location line="+259"/> + <location line="+295"/> <source>Importing blocks from disk...</source> <translation type="unfinished"/> </message> @@ -403,7 +403,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-322"/> + <location line="-358"/> <source>Send coins to a Bitcoin address</source> <translation>Пошаљите новац на bitcoin адресу</translation> </message> @@ -438,20 +438,18 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-180"/> - <location line="+6"/> - <location line="+513"/> + <location line="+375"/> <source>Bitcoin</source> <translation type="unfinished"/> </message> <message> - <location line="-519"/> - <location line="+6"/> + <location line="-563"/> + <location line="+10"/> <source>Wallet</source> <translation>новчаник</translation> </message> <message> - <location line="+109"/> + <location line="+113"/> <source>&Send</source> <translation type="unfinished"/> </message> @@ -461,13 +459,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+28"/> - <location line="+2"/> - <source>&About Bitcoin</source> - <translation>&О Bitcoin-у</translation> - </message> - <message> - <location line="+14"/> + <location line="+44"/> <location line="+2"/> <source>&Show / Hide</source> <translation type="unfinished"/> @@ -493,12 +485,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+35"/> + <location line="+39"/> <source>&File</source> <translation>&Фајл</translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>&Settings</source> <translation>&Подешавања</translation> </message> @@ -513,18 +505,30 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Трака са картицама</translation> </message> <message> - <location line="-235"/> - <location line="+294"/> + <location line="-244"/> + <location line="+321"/> <source>[testnet]</source> <translation>[testnet]</translation> </message> <message> - <location line="-177"/> + <location line="-331"/> + <location line="+10"/> + <source>Bitcoin Core</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+121"/> <source>Request payments (generates QR codes and bitcoin: URIs)</source> <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+27"/> + <location line="+2"/> + <source>&About Bitcoin Core</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+34"/> <source>&Used sending addresses...</source> <translation type="unfinished"/> </message> @@ -544,13 +548,23 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+106"/> + <location line="+2"/> + <source>Open URI...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Open a bitcoin: URI or payment request</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+126"/> <location line="+5"/> <source>Bitcoin client</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+120"/> + <location line="+133"/> <source>%n active connection(s) to Bitcoin network</source> <translation><numerusform>%n активна веза са Bitcoin мрежом</numerusform><numerusform>%n активне везе са Bitcoin мрежом</numerusform><numerusform>%n активних веза са Bitcoin мрежом</numerusform></translation> </message> @@ -654,17 +668,7 @@ Address: %4 <translation>Datum: %1⏎ Iznos: %2⏎ Tip: %3⏎ Adresa: %4⏎</translation> </message> <message> - <location line="+34"/> - <source>URI handling</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+0"/> - <source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+45"/> + <location line="+67"/> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>Новчаник јс <b>шифрован</b> и тренутно <b>откључан</b></translation> </message> @@ -674,7 +678,7 @@ Address: %4 <translation>Новчаник јс <b>шифрован</b> и тренутно <b>закључан</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+110"/> + <location filename="../bitcoin.cpp" line="+116"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -682,12 +686,299 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+115"/> + <location filename="../clientmodel.cpp" line="+119"/> <source>Network Alert</source> <translation type="unfinished"/> </message> </context> <context> + <name>CoinControlDialog</name> + <message> + <location filename="../forms/coincontroldialog.ui" line="+14"/> + <source>Coin Control Address Selection</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+34"/> + <source>Quantity:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+29"/> + <source>Bytes:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+45"/> + <source>Amount:</source> + <translation>Iznos:</translation> + </message> + <message> + <location line="+29"/> + <source>Priority:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+45"/> + <source>Fee:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+32"/> + <source>Low Output:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+48"/> + <source>After Fee:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+32"/> + <source>Change:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+63"/> + <source>(un)select all</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+13"/> + <source>Tree mode</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> + <source>List mode</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+52"/> + <source>Amount</source> + <translation>iznos</translation> + </message> + <message> + <location line="+10"/> + <source>Address</source> + <translation>Адреса</translation> + </message> + <message> + <location line="+5"/> + <source>Date</source> + <translation>datum</translation> + </message> + <message> + <location line="+5"/> + <source>Confirmations</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Confirmed</source> + <translation>Potvrdjen</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>kopiraj adresu</translation> + </message> + <message> + <location line="+1"/> + <source>Copy label</source> + <translation>kopiraj naziv</translation> + </message> + <message> + <location line="+1"/> + <location line="+26"/> + <source>Copy amount</source> + <translation>kopiraj iznos</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="+171"/> + <source>Dust</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>yes</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>no</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+10"/> + <source>This label turns red, if the transaction size is greater than 1000 bytes.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <location line="+5"/> + <source>This means a fee of at least %1 per kB is required.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-4"/> + <source>Can vary +/- 1 byte per input.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>Transactions with higher priority are more likely to get included into a block.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>This label turns red, if the priority is smaller than "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>(без етикете)</translation> + </message> + <message> + <location line="-9"/> + <source>change from %1 (%2)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>(change)</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>EditAddressDialog</name> <message> <location filename="../forms/editaddressdialog.ui" line="+14"/> @@ -715,7 +1006,7 @@ Address: %4 <translation>&Адреса</translation> </message> <message> - <location filename="../editaddressdialog.cpp" line="+21"/> + <location filename="../editaddressdialog.cpp" line="+25"/> <source>New receiving address</source> <translation type="unfinished"/> </message> @@ -758,7 +1049,7 @@ Address: %4 <context> <name>FreespaceChecker</name> <message> - <location filename="../intro.cpp" line="+61"/> + <location filename="../intro.cpp" line="+65"/> <source>A new data directory will be created.</source> <translation type="unfinished"/> </message> @@ -786,18 +1077,18 @@ Address: %4 <context> <name>GUIUtil::HelpMessageBox</name> <message> - <location filename="../guiutil.cpp" line="+558"/> - <location line="+13"/> - <source>Bitcoin-Qt</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-13"/> + <location filename="../guiutil.cpp" line="+597"/> <source>version</source> <translation>верзија</translation> </message> <message> - <location line="+2"/> + <location line="+0"/> + <location line="+13"/> + <source>Bitcoin Core</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-11"/> <source>Usage:</source> <translation>Korišćenje:</translation> </message> @@ -841,17 +1132,17 @@ Address: %4 </message> <message> <location line="+9"/> - <source>Welcome to Bitcoin-Qt.</source> + <source>Welcome to Bitcoin Core.</source> <translation type="unfinished"/> </message> <message> <location line="+26"/> - <source>As this is the first time the program is launched, you can choose where Bitcoin-Qt will store its data.</source> + <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source> <translation type="unfinished"/> </message> <message> <location line="+10"/> - <source>Bitcoin-Qt will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source> + <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source> <translation type="unfinished"/> </message> <message> @@ -865,7 +1156,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../intro.cpp" line="+105"/> + <location filename="../intro.cpp" line="+85"/> + <source>Bitcoin</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Error: Specified data directory "%1" can not be created.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+19"/> <source>Error</source> <translation type="unfinished"/> </message> @@ -881,6 +1182,34 @@ Address: %4 </message> </context> <context> + <name>OpenURIDialog</name> + <message> + <location filename="../forms/openuridialog.ui" line="+14"/> + <source>Open URI</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Open payment request from URI or file</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+9"/> + <source>URI:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+11"/> + <source>Select payment request file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../openuridialog.cpp" line="+47"/> + <source>Select payment request file to open</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OptionsDialog</name> <message> <location filename="../forms/optionsdialog.ui" line="+14"/> @@ -1038,9 +1367,19 @@ Address: %4 <translation type="unfinished"/> </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="+71"/> <source>&OK</source> - <translation type="unfinished"/> + <translation>&OK</translation> </message> <message> <location line="+7"/> @@ -1053,12 +1392,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../optionsdialog.cpp" line="+58"/> + <location filename="../optionsdialog.cpp" line="+63"/> <source>default</source> <translation type="unfinished"/> </message> <message> - <location line="+130"/> + <location line="+131"/> <source>Confirm options reset</source> <translation type="unfinished"/> </message> @@ -1099,17 +1438,17 @@ Address: %4 </message> <message> <location line="+50"/> - <location line="+202"/> + <location line="+214"/> <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source> <translation type="unfinished"/> </message> <message> - <location line="-131"/> + <location line="-140"/> <source>Unconfirmed:</source> <translation>Непотврђено:</translation> </message> <message> - <location line="-78"/> + <location line="-81"/> <source>Wallet</source> <translation>новчаник</translation> </message> @@ -1124,12 +1463,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+29"/> + <location line="+32"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation type="unfinished"/> </message> <message> - <location line="+13"/> + <location line="+16"/> <source>Immature:</source> <translation type="unfinished"/> </message> @@ -1139,7 +1478,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+13"/> + <location line="+16"/> <source>Total:</source> <translation type="unfinished"/> </message> @@ -1149,12 +1488,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+53"/> + <location line="+56"/> <source><b>Recent transactions</b></source> <translation><b>Недавне трансакције</b></translation> </message> <message> - <location filename="../overviewpage.cpp" line="+116"/> + <location filename="../overviewpage.cpp" line="+120"/> <location line="+1"/> <source>out of sync</source> <translation type="unfinished"/> @@ -1163,7 +1502,7 @@ Address: %4 <context> <name>PaymentServer</name> <message> - <location filename="../paymentserver.cpp" line="+392"/> + <location filename="../paymentserver.cpp" line="+397"/> <source>URI handling</source> <translation type="unfinished"/> </message> @@ -1173,23 +1512,29 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+69"/> + <location line="+91"/> <source>Requested payment amount of %1 is too small (considered dust).</source> <translation type="unfinished"/> </message> <message> - <location line="+4"/> - <location line="+37"/> + <location line="-204"/> + <location line="+195"/> + <location line="+13"/> <source>Payment request error</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Insecure requests to custom payment scripts unsupported</source> + <location line="-207"/> + <source>Cannot start bitcoin: click-to-pay handler</source> <translation type="unfinished"/> </message> <message> - <location line="+38"/> + <location line="+195"/> + <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> @@ -1199,7 +1544,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>Bad response from server %1</source> <translation type="unfinished"/> </message> @@ -1209,8 +1554,8 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-58"/> - <location line="+30"/> + <location line="-55"/> + <location line="+27"/> <location line="+17"/> <source>Network request error</source> <translation type="unfinished"/> @@ -1219,9 +1564,8 @@ Address: %4 <context> <name>QObject</name> <message> - <location filename="../bitcoin.cpp" line="+114"/> + <location filename="../bitcoin.cpp" line="+119"/> <location line="+5"/> - <location filename="../intro.cpp" line="-32"/> <source>Bitcoin</source> <translation type="unfinished"/> </message> @@ -1235,16 +1579,11 @@ Address: %4 <source>Error: Invalid combination of -regtest and -testnet.</source> <translation type="unfinished"/> </message> - <message> - <location filename="../intro.cpp" line="+1"/> - <source>Error: Specified data directory "%1" can not be created.</source> - <translation type="unfinished"/> - </message> </context> <context> <name>QRImageWidget</name> <message> - <location filename="../receiverequestdialog.cpp" line="+32"/> + <location filename="../receiverequestdialog.cpp" line="+36"/> <source>&Save Image...</source> <translation type="unfinished"/> </message> @@ -1260,7 +1599,7 @@ Address: %4 </message> <message> <location line="+0"/> - <source>PNG Images (*.png)</source> + <source>PNG Image (*.png)</source> <translation type="unfinished"/> </message> </context> @@ -1281,7 +1620,7 @@ Address: %4 <location line="+53"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+352"/> + <location filename="../rpcconsole.cpp" line="+360"/> <source>N/A</source> <translation type="unfinished"/> </message> @@ -1296,7 +1635,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+68"/> + <location line="-10"/> + <source>Debug window</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+78"/> <source>Using OpenSSL version</source> <translation type="unfinished"/> </message> @@ -1351,12 +1695,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+7"/> - <source>Show the Bitcoin-Qt help message to get a list with possible Bitcoin command-line options.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> + <location line="+10"/> <source>&Show</source> <translation type="unfinished"/> </message> @@ -1396,12 +1735,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-104"/> - <source>Bitcoin - Debug window</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+25"/> + <location line="-79"/> <source>Bitcoin Core</source> <translation type="unfinished"/> </message> @@ -1416,7 +1750,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+102"/> + <location line="+26"/> + <source>Show the Bitcoin-Core help message to get a list with possible Bitcoin command-line options.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+76"/> <source>Clear console</source> <translation type="unfinished"/> </message> @@ -1474,37 +1813,32 @@ Address: %4 <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+22"/> + <location filename="../forms/receivecoinsdialog.ui" line="+83"/> <source>&Amount:</source> <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+19"/> <source>The amount to request</source> <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="-32"/> <source>&Label:</source> <translation>&Етикета</translation> </message> <message> - <location line="+10"/> - <source>The label to associate with the receiving address</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+7"/> + <location line="-34"/> <source>&Message:</source> <translation type="unfinished"/> </message> <message> - <location line="+10"/> + <location line="+20"/> <source>The message to attach to payment request</source> <translation type="unfinished"/> </message> <message> - <location line="+14"/> + <location line="-37"/> <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> @@ -1514,12 +1848,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="+27"/> + <source>The label to associate with the new receiving address</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+14"/> <source>Use this form to request payments. All fields are optional.</source> <translation type="unfinished"/> </message> <message> - <location line="+17"/> + <location line="+56"/> <source>Clear all fields of the form.</source> <translation type="unfinished"/> </message> @@ -1533,6 +1872,31 @@ Address: %4 <source>&Request payment</source> <translation type="unfinished"/> </message> + <message> + <location line="+47"/> + <source>Previously requested payments</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> + <source>Show the selected request (does the same as double clicking an entry)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Show</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+11"/> + <source>Remove the selected entries from the list</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Remove</source> + <translation type="unfinished"/> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -1553,16 +1917,11 @@ Address: %4 </message> <message> <location line="+7"/> - <source>&Copy Image</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+7"/> <source>&Save Image...</source> <translation type="unfinished"/> </message> <message> - <location filename="../receiverequestdialog.cpp" line="+58"/> + <location filename="../receiverequestdialog.cpp" line="+56"/> <source>Request payment to %1</source> <translation type="unfinished"/> </message> @@ -1608,16 +1967,119 @@ Address: %4 </message> </context> <context> + <name>RecentRequestsTableModel</name> + <message> + <location filename="../recentrequeststablemodel.cpp" line="+14"/> + <source>Date</source> + <translation>datum</translation> + </message> + <message> + <location line="+0"/> + <source>Label</source> + <translation>Етикета</translation> + </message> + <message> + <location line="+0"/> + <source>Message</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>Amount</source> + <translation>iznos</translation> + </message> + <message> + <location line="+36"/> + <source>(no label)</source> + <translation>(без етикете)</translation> + </message> + <message> + <location line="+9"/> + <source>(no message)</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="+14"/> - <location filename="../sendcoinsdialog.cpp" line="+140"/> - <location line="+213"/> + <location filename="../sendcoinsdialog.cpp" line="+381"/> + <location line="+81"/> <source>Send Coins</source> <translation>Слање новца</translation> </message> <message> - <location line="+50"/> + <location line="+76"/> + <source>Coin Control Features</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+20"/> + <source>Inputs...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> + <source>automatically selected</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+19"/> + <source>Insufficient funds!</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+89"/> + <source>Quantity:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+35"/> + <source>Bytes:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+48"/> + <source>Amount:</source> + <translation>Iznos:</translation> + </message> + <message> + <location line="+32"/> + <source>Priority:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+48"/> + <source>Fee:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+32"/> + <source>Low Output:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+48"/> + <source>After Fee:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+32"/> + <source>Change:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+44"/> + <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Custom change address</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+115"/> <source>Send to multiple recipients at once</source> <translation type="unfinished"/> </message> @@ -1642,12 +2104,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+10"/> - <source>123.456 BTC</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+31"/> + <location line="+41"/> <source>Confirm the send action</source> <translation>Потврди акцију слања</translation> </message> @@ -1657,69 +2114,135 @@ Address: %4 <translation>&Пошаљи</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-154"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation type="unfinished"/> </message> <message> - <location line="-90"/> + <location line="-74"/> <location line="+5"/> <location line="+5"/> + <location line="+4"/> <source>%1 to %2</source> <translation type="unfinished"/> </message> <message> - <location line="+26"/> + <location line="-136"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>Unesite Bitcoin adresu (n.pr. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> + <message> + <location line="+15"/> + <source>Copy quantity</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation>kopiraj iznos</translation> + </message> + <message> + <location line="+1"/> + <source>Copy fee</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy after fee</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy bytes</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy priority</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy low output</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy change</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+170"/> + <source>Total Amount %1 (= %2)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>or</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+202"/> <source>The recipient address is not valid, please recheck.</source> <translation type="unfinished"/> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>The amount to pay must be larger than 0.</source> <translation type="unfinished"/> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>The amount exceeds your balance.</source> <translation type="unfinished"/> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>The total exceeds your balance when the %1 transaction fee is included.</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+3"/> <source>Duplicate address found, can only send to each address once per send operation.</source> <translation type="unfinished"/> </message> <message> + <location line="+3"/> + <source>Transaction creation failed!</source> + <translation type="unfinished"/> + </message> + <message> <location line="+4"/> - <source>Error: Transaction creation failed!</source> + <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation type="unfinished"/> </message> <message> - <location line="+15"/> - <source>Are you sure you want to send?</source> + <location line="+113"/> + <source>Warning: Invalid Bitcoin address</source> <translation type="unfinished"/> </message> <message> - <location line="+9"/> - <source>added as transaction fee</source> + <location line="+13"/> + <source>(no label)</source> + <translation>(без етикете)</translation> + </message> + <message> + <location line="+8"/> + <source>Warning: Unknown change address</source> <translation type="unfinished"/> </message> <message> - <location line="+6"/> - <source>Total Amount %1</source> + <location line="-378"/> + <source>Are you sure you want to send?</source> <translation type="unfinished"/> </message> <message> - <location line="+20"/> - <source>Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> + <location line="+9"/> + <source>added as transaction fee</source> <translation type="unfinished"/> </message> <message> - <location line="+144"/> + <location line="+170"/> <source>Payment request expired</source> <translation type="unfinished"/> </message> @@ -1732,43 +2255,48 @@ Address: %4 <context> <name>SendCoinsEntry</name> <message> - <location filename="../forms/sendcoinsentry.ui" line="+33"/> - <location line="+585"/> + <location filename="../forms/sendcoinsentry.ui" line="+131"/> + <location line="+501"/> + <location line="+536"/> <source>A&mount:</source> <translation type="unfinished"/> </message> <message> - <location line="-572"/> - <location line="+585"/> + <location line="-1132"/> <source>Pay &To:</source> <translation type="unfinished"/> </message> <message> - <location line="-551"/> + <location line="+18"/> <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation type="unfinished"/> </message> <message> - <location filename="../sendcoinsentry.cpp" line="+28"/> + <location filename="../sendcoinsentry.cpp" line="+30"/> <source>Enter a label for this address to add it to your address book</source> <translation type="unfinished"/> </message> <message> - <location filename="../forms/sendcoinsentry.ui" line="-18"/> + <location filename="../forms/sendcoinsentry.ui" line="+57"/> <source>&Label:</source> <translation>&Етикета</translation> </message> <message> - <location line="+28"/> + <location line="-50"/> <source>Choose previously used address</source> <translation type="unfinished"/> </message> <message> - <location line="+10"/> - <source>Alt+A</source> + <location line="-40"/> + <source>This is a normal payment.</source> <translation type="unfinished"/> </message> <message> + <location line="+50"/> + <source>Alt+A</source> + <translation>Alt+</translation> + </message> + <message> <location line="+7"/> <source>Paste address from clipboard</source> <translation type="unfinished"/> @@ -1776,20 +2304,39 @@ Address: %4 <message> <location line="+10"/> <source>Alt+P</source> - <translation type="unfinished"/> + <translation>Alt+П</translation> </message> <message> <location line="+7"/> - <source>Remove this recipient</source> + <location line="+504"/> + <location line="+536"/> + <source>Remove this entry</source> <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="-40"/> + <source>This is a verified payment request.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-971"/> <source>Enter a label for this address to add it to the list of used addresses</source> <translation type="unfinished"/> </message> <message> - <location line="+465"/> + <location line="+439"/> + <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> @@ -1831,7 +2378,7 @@ Address: %4 <location line="-203"/> <location line="+213"/> <source>Alt+A</source> - <translation type="unfinished"/> + <translation>Alt+A</translation> </message> <message> <location line="-203"/> @@ -1841,7 +2388,7 @@ Address: %4 <message> <location line="+10"/> <source>Alt+P</source> - <translation type="unfinished"/> + <translation>Alt+П</translation> </message> <message> <location line="+12"/> @@ -1910,7 +2457,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../signverifymessagedialog.cpp" line="+27"/> + <location filename="../signverifymessagedialog.cpp" line="+29"/> <location line="+3"/> <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation>Unesite Bitcoin adresu (n.pr. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> @@ -1926,7 +2473,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+85"/> + <location line="+84"/> <location line="+81"/> <source>The entered address is invalid.</source> <translation type="unfinished"/> @@ -1995,8 +2542,13 @@ Address: %4 <context> <name>SplashScreen</name> <message> - <location filename="../splashscreen.cpp" line="+23"/> - <source>The Bitcoin developers</source> + <location filename="../splashscreen.cpp" line="+26"/> + <source>Bitcoin Core</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>The Bitcoin Core developers</source> <translation type="unfinished"/> </message> <message> @@ -2008,7 +2560,7 @@ Address: %4 <context> <name>TrafficGraphWidget</name> <message> - <location filename="../trafficgraphwidget.cpp" line="+75"/> + <location filename="../trafficgraphwidget.cpp" line="+79"/> <source>KB/s</source> <translation type="unfinished"/> </message> @@ -2016,7 +2568,7 @@ Address: %4 <context> <name>TransactionDesc</name> <message> - <location filename="../transactiondesc.cpp" line="+22"/> + <location filename="../transactiondesc.cpp" line="+28"/> <source>Open until %1</source> <translation>Otvorite do %1</translation> </message> @@ -2208,7 +2760,7 @@ Address: %4 <context> <name>TransactionTableModel</name> <message> - <location filename="../transactiontablemodel.cpp" line="+227"/> + <location filename="../transactiontablemodel.cpp" line="+234"/> <source>Date</source> <translation>datum</translation> </message> @@ -2326,7 +2878,7 @@ Address: %4 <context> <name>TransactionView</name> <message> - <location filename="../transactionview.cpp" line="+52"/> + <location filename="../transactionview.cpp" line="+57"/> <location line="+16"/> <source>All</source> <translation>Sve</translation> @@ -2387,12 +2939,12 @@ Address: %4 <translation>Drugi</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>Enter address or label to search</source> <translation>Navedite adresu ili naziv koji bi ste potražili</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>Min amount</source> <translation>Min iznos</translation> </message> @@ -2427,17 +2979,37 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+143"/> - <source>Export Transaction Data</source> - <translation>Izvezi podatke o transakcijama</translation> + <location line="+142"/> + <source>Export Transaction History</source> + <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+19"/> + <source>Exporting Failed</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>There was an error trying to save the transaction history to %1.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+4"/> + <source>Exporting Successful</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>The transaction history was successfully saved to %1.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-22"/> <source>Comma separated file (*.csv)</source> <translation>Зарезом одвојене вредности (*.csv)</translation> </message> <message> - <location line="+8"/> + <location line="+9"/> <source>Confirmed</source> <translation>Potvrdjen</translation> </message> @@ -2472,17 +3044,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+4"/> - <source>Error exporting</source> - <translation>Грешка током извоза</translation> - </message> - <message> - <location line="+0"/> - <source>Could not write to file %1.</source> - <translation>Није могуће писати у фајл %1.</translation> - </message> - <message> - <location line="+100"/> + <location line="+107"/> <source>Range:</source> <translation>Opseg:</translation> </message> @@ -2493,9 +3055,17 @@ Address: %4 </message> </context> <context> + <name>WalletFrame</name> + <message> + <location filename="../walletframe.cpp" line="+26"/> + <source>No wallet has been loaded.</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>WalletModel</name> <message> - <location filename="../walletmodel.cpp" line="+218"/> + <location filename="../walletmodel.cpp" line="+245"/> <source>Send Coins</source> <translation>Слање новца</translation> </message> @@ -2503,7 +3073,7 @@ Address: %4 <context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+46"/> + <location filename="../walletview.cpp" line="+43"/> <source>&Export</source> <translation type="unfinished"/> </message> @@ -2513,65 +3083,60 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+183"/> + <location line="+181"/> <source>Backup Wallet</source> <translation type="unfinished"/> </message> <message> - <location line="+0"/> + <location line="+1"/> <source>Wallet Data (*.dat)</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Backup Failed</source> <translation type="unfinished"/> </message> <message> <location line="+0"/> - <source>There was an error trying to save the wallet data to the new location.</source> + <source>There was an error trying to save the wallet data to %1.</source> <translation type="unfinished"/> </message> <message> <location line="+4"/> - <source>Backup Successful</source> + <source>The wallet data was successfully saved to %1.</source> <translation type="unfinished"/> </message> <message> <location line="+0"/> - <source>The wallet data was successfully saved to the new location.</source> + <source>Backup Successful</source> <translation type="unfinished"/> </message> </context> <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+102"/> - <source>Bitcoin version</source> - <translation>Bitcoin верзија</translation> - </message> - <message> - <location line="+107"/> + <location filename="../bitcoinstrings.cpp" line="+217"/> <source>Usage:</source> <translation>Korišćenje:</translation> </message> <message> - <location line="-55"/> + <location line="-54"/> <source>List commands</source> <translation>Listaj komande</translation> </message> <message> - <location line="-13"/> + <location line="-14"/> <source>Get help for a command</source> <translation>Zatraži pomoć za komande</translation> </message> <message> - <location line="+25"/> + <location line="+26"/> <source>Options:</source> <translation>Opcije</translation> </message> <message> - <location line="+24"/> + <location line="+23"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Potvrdi željeni konfiguracioni fajl (podrazumevani:bitcoin.conf)</translation> </message> @@ -2591,7 +3156,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-28"/> + <location line="-27"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>Slušaj konekcije na <port> (default: 8333 or testnet: 18333)</translation> </message> @@ -2602,7 +3167,7 @@ Address: %4 </translation> </message> <message> - <location line="-49"/> + <location line="-50"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation type="unfinished"/> </message> @@ -2617,7 +3182,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-142"/> + <location line="-147"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"/> </message> @@ -2632,7 +3197,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+40"/> + <location line="+45"/> <source>Accept command line and JSON-RPC commands</source> <translation>Prihvati komandnu liniju i JSON-RPC komande</translation> </message> @@ -2642,17 +3207,17 @@ Address: %4 <translation>Radi u pozadini kao daemon servis i prihvati komande</translation> </message> <message> - <location line="+40"/> + <location line="+39"/> <source>Use the test network</source> <translation>Koristi testnu mrežu</translation> </message> <message> - <location line="-118"/> + <location line="-117"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> <message> - <location line="-87"/> + <location line="-92"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2707,17 +3272,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+11"/> - <source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source> + <location line="+18"/> + <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation type="unfinished"/> </message> <message> - <location line="+6"/> - <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> + <location line="+5"/> + <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+3"/> <source>Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source> <translation type="unfinished"/> </message> @@ -2747,17 +3312,27 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+14"/> + <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="+2"/> + <location line="+1"/> <source>Block creation options:</source> <translation type="unfinished"/> </message> @@ -2767,7 +3342,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+2"/> + <location line="+1"/> + <source>Connect through SOCKS proxy</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Connect to JSON-RPC on <port> (default: 8332 or testnet: 18332)</source> <translation type="unfinished"/> </message> @@ -2877,7 +3457,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+2"/> + <location line="+1"/> + <source>Fee per kB to add to transactions you send</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Find peers using DNS lookup (default: 1 unless -connect)</source> <translation type="unfinished"/> </message> @@ -2897,6 +3482,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <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"/> @@ -2912,17 +3502,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+8"/> + <location line="+5"/> + <source>Prepend debug output with timestamp (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>RPC client options:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+5"/> + <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Send command to Bitcoin server</source> <translation type="unfinished"/> </message> <message> - <location line="+10"/> + <location line="+8"/> + <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> @@ -2942,7 +3552,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>Verifying blocks...</source> <translation type="unfinished"/> </message> @@ -2953,11 +3563,21 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> + <source>Wait for RPC server to start</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Wallet %s resides outside data directory %s</source> <translation type="unfinished"/> </message> <message> - <location line="+4"/> + <location line="+3"/> + <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> @@ -2967,17 +3587,27 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-98"/> + <location line="-104"/> <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> <translation type="unfinished"/> </message> <message> - <location line="+17"/> + <location line="+14"/> + <source>Output debugging information (default: 0, supplying <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="+83"/> + <location line="+88"/> <source>Information</source> <translation type="unfinished"/> </message> @@ -3017,32 +3647,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+2"/> - <source>Output extra debugging information. Implies all other -debug* options</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Output extra network debugging information</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> - <source>Prepend debug output with timestamp</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+5"/> + <location line="+9"/> <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Select the version of socks proxy to use (4-5, default: 5)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> + <location line="+4"/> <source>Send trace/debug info to console instead of debug.log file</source> <translation type="unfinished"/> </message> @@ -3052,12 +3662,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+5"/> - <source>Set maximum block size in bytes (default: 250000)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> + <location line="+6"/> <source>Set minimum block size in bytes (default: 0)</source> <translation type="unfinished"/> </message> @@ -3107,37 +3712,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Use proxy to reach tor hidden services (default: same as -proxy)</source> - <translation type="unfinished"/> - </message> - <message> <location line="+2"/> <source>Username for JSON-RPC connections</source> <translation>Korisničko ime za JSON-RPC konekcije</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Warning</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Warning: This version is obsolete, upgrade required!</source> <translation type="unfinished"/> </message> <message> <location line="+2"/> + <source>version</source> + <translation>верзија</translation> + </message> + <message> + <location line="+1"/> <source>wallet.dat corrupt, salvage failed</source> <translation type="unfinished"/> </message> <message> - <location line="-54"/> + <location line="-57"/> <source>Password for JSON-RPC connections</source> <translation>Lozinka za JSON-RPC konekcije</translation> </message> <message> - <location line="-70"/> + <location line="-69"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Dozvoli JSON-RPC konekcije sa posebne IP adrese</translation> </message> @@ -3147,12 +3752,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Pošalji komande to nodu koji radi na <ip> (default: 127.0.0.1)</translation> </message> <message> - <location line="-126"/> + <location line="-131"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+155"/> + <location line="+160"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"/> </message> @@ -3192,22 +3797,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-95"/> - <source>Connect through socks proxy</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-11"/> + <location line="-106"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation type="unfinished"/> </message> <message> - <location line="+58"/> + <location line="+59"/> <source>Loading addresses...</source> <translation>učitavam adrese....</translation> </message> <message> - <location line="-36"/> + <location line="-37"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation type="unfinished"/> </message> @@ -3227,12 +3827,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+30"/> + <location line="+31"/> <source>Invalid -proxy address: '%s'</source> <translation type="unfinished"/> </message> <message> - <location line="+57"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation type="unfinished"/> </message> @@ -3252,7 +3852,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+46"/> + <location line="+47"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation type="unfinished"/> </message> @@ -3272,27 +3872,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Učitavam blok indeksa...</translation> </message> <message> - <location line="-60"/> + <location line="-61"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"/> </message> <message> - <location line="-28"/> + <location line="-32"/> <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source> <translation type="unfinished"/> </message> <message> - <location line="+69"/> - <source>Fee per KB to add to transactions you send</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+20"/> + <location line="+94"/> <source>Loading wallet...</source> <translation>Новчаник се учитава...</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> @@ -3322,7 +3917,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-33"/> + <location line="-34"/> <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 d8622a52f5..41dcd4b0aa 100644 --- a/src/qt/locale/bitcoin_uk.ts +++ b/src/qt/locale/bitcoin_uk.ts @@ -3,13 +3,13 @@ <name>AboutDialog</name> <message> <location filename="../forms/aboutdialog.ui" line="+14"/> - <source>About Bitcoin</source> - <translation>Про Bitcoin</translation> + <source>About Bitcoin Core</source> + <translation type="unfinished"/> </message> <message> <location line="+39"/> - <source><b>Bitcoin</b> version</source> - <translation>Версія <b>Bitcoin'a<b></translation> + <source><b>Bitcoin Core</b> version</source> + <translation type="unfinished"/> </message> <message> <location line="+57"/> @@ -27,14 +27,14 @@ This product includes software developed by the OpenSSL Project for use in the O Цей продукт включає в себе програмне забезпечення, розроблене в рамках проекту OpenSSL (http://www.openssl.org/), криптографічне програмне забезпечення, написане Еріком Янгом (eay@cryptsoft.com), та функції для роботи з UPnP, написані Томасом Бернардом.</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="+14"/> + <location filename="../aboutdialog.cpp" line="+19"/> <source>Copyright</source> <translation>Авторське право</translation> </message> <message> <location line="+0"/> <source>The Bitcoin developers</source> - <translation type="unfinished"/> + <translation>Розробники Bitcoin</translation> </message> </context> <context> @@ -70,7 +70,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location filename="../addressbookpage.cpp" line="+72"/> + <location filename="../addressbookpage.cpp" line="+74"/> <source>&Copy Address</source> <translation>&Скопіювати адресу</translation> </message> @@ -87,7 +87,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>& Експорт</translation> </message> <message> <location line="-27"/> @@ -122,7 +122,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 type="unfinished"/> + <translation>Це ваші Bitcoin адреси для відправки платежів. Перед відправкою монети Завжди перевіряйте суму та адресу прийому.</translation> </message> <message> <location line="+4"/> @@ -140,7 +140,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Редагувати</translation> </message> <message> - <location line="+197"/> + <location line="+194"/> <source>Export Address List</source> <translation type="unfinished"/> </message> @@ -163,7 +163,7 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>AddressTableModel</name> <message> - <location filename="../addresstablemodel.cpp" line="+164"/> + <location filename="../addresstablemodel.cpp" line="+168"/> <source>Label</source> <translation>Назва</translation> </message> @@ -201,7 +201,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Повторіть пароль</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="+34"/> + <location filename="../askpassphrasedialog.cpp" line="+40"/> <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>10 or more random characters</b>, or <b>eight or more words</b>.</source> <translation>Введіть новий пароль для гаманця.<br/>Будь ласка, використовуйте паролі що містять <b>як мінімум 10 випадкових символів</b>, або <b>як мінімум 8 слів</b>.</translation> </message> @@ -258,7 +258,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+15"/> <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> - <translation type="unfinished"/> + <translation>ВАЖЛИВО: Всі попередні резервні копії, які ви зробили з вашого гаманця файл повинен бути замінений новоствореному, зашифрованому файлі гаманця. З міркувань безпеки, попередні резервні копії в незашифрованому файлі гаманець стане марним, як тільки ви починаєте використовувати нову, зашифрований гаманець.</translation> </message> <message> <location line="+100"/> @@ -322,17 +322,17 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+250"/> + <location filename="../bitcoingui.cpp" line="+260"/> <source>Sign &message...</source> <translation>&Підписати повідомлення...</translation> </message> <message> - <location line="+254"/> + <location line="+290"/> <source>Synchronizing with network...</source> <translation>Синхронізація з мережею...</translation> </message> <message> - <location line="-324"/> + <location line="-360"/> <source>&Overview</source> <translation>&Огляд</translation> </message> @@ -398,17 +398,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Змінити парол&ь...</translation> </message> <message> - <location line="+259"/> + <location line="+295"/> <source>Importing blocks from disk...</source> <translation>Імпорт блоків з диску...</translation> </message> <message> <location line="+3"/> <source>Reindexing blocks on disk...</source> - <translation type="unfinished"/> + <translation>Переіндексація блоків на диску ...</translation> </message> <message> - <location line="-322"/> + <location line="-358"/> <source>Send coins to a Bitcoin address</source> <translation>Відправити монети на вказану адресу</translation> </message> @@ -443,36 +443,28 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Перевірити повідомлення...</translation> </message> <message> - <location line="-180"/> - <location line="+6"/> - <location line="+513"/> + <location line="+375"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-519"/> - <location line="+6"/> + <location line="-563"/> + <location line="+10"/> <source>Wallet</source> <translation>Гаманець</translation> </message> <message> - <location line="+109"/> + <location line="+113"/> <source>&Send</source> - <translation type="unfinished"/> + <translation>&Відправити</translation> </message> <message> <location line="+7"/> <source>&Receive</source> - <translation type="unfinished"/> + <translation>&Отримати</translation> </message> <message> - <location line="+28"/> - <location line="+2"/> - <source>&About Bitcoin</source> - <translation>&Про Bitcoin</translation> - </message> - <message> - <location line="+14"/> + <location line="+44"/> <location line="+2"/> <source>&Show / Hide</source> <translation>Показати / Приховати</translation> @@ -485,7 +477,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+3"/> <source>Encrypt the private keys that belong to your wallet</source> - <translation type="unfinished"/> + <translation>Шифрування закритих ключів, які належать вашому гаманці</translation> </message> <message> <location line="+7"/> @@ -498,12 +490,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Перевірте повідомлення для впевненості, що воно підписано вказаною Bitcoin-адресою</translation> </message> <message> - <location line="+35"/> + <location line="+39"/> <source>&File</source> <translation>&Файл</translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>&Settings</source> <translation>&Налаштування</translation> </message> @@ -518,18 +510,30 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Панель вкладок</translation> </message> <message> - <location line="-235"/> - <location line="+294"/> + <location line="-244"/> + <location line="+321"/> <source>[testnet]</source> <translation>[тестова мережа]</translation> </message> <message> - <location line="-177"/> + <location line="-331"/> + <location line="+10"/> + <source>Bitcoin Core</source> + <translation>Bitcoin Ядро</translation> + </message> + <message> + <location line="+121"/> <source>Request payments (generates QR codes and bitcoin: URIs)</source> <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+27"/> + <location line="+2"/> + <source>&About Bitcoin Core</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+34"/> <source>&Used sending addresses...</source> <translation type="unfinished"/> </message> @@ -549,20 +553,30 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+106"/> + <location line="+2"/> + <source>Open URI...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Open a bitcoin: URI or payment request</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+126"/> <location line="+5"/> <source>Bitcoin client</source> <translation>Bitcoin-клієнт</translation> </message> <message numerus="yes"> - <location line="+120"/> + <location line="+133"/> <source>%n active connection(s) to Bitcoin network</source> <translation><numerusform>%n активне з'єднання з мережею</numerusform><numerusform>%n активні з'єднання з мережею</numerusform><numerusform>%n активних з'єднань з мережею</numerusform></translation> </message> <message> <location line="+22"/> <source>No block source available...</source> - <translation type="unfinished"/> + <translation>Ні блок джерела доступні ...</translation> </message> <message> <location line="+12"/> @@ -602,7 +616,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>Угоди після цього буде ще не буде видно.</translation> </message> <message> <location line="+27"/> @@ -622,7 +636,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+77"/> <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source> - <translation type="unfinished"/> + <translation>Ця угода є понад ліміт розміру. Ви все ще можете відправити його за плату% +1, який йде у вузлах, які обробляють транзакції і допомагає підтримувати мережу. Ви хочете оплатити гонорар?</translation> </message> <message> <location line="-152"/> @@ -663,17 +677,7 @@ Address: %4 </translation> </message> <message> - <location line="+34"/> - <source>URI handling</source> - <translation>Обробка URI</translation> - </message> - <message> - <location line="+0"/> - <source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source> - <translation>Неможливо обробити URI! Це може бути викликано неправильною Bitcoin-адресою, чи невірними параметрами URI.</translation> - </message> - <message> - <location line="+45"/> + <location line="+67"/> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation><b>Зашифрований</b> гаманець <b>розблоковано</b></translation> </message> @@ -683,20 +687,307 @@ Address: %4 <translation><b>Зашифрований</b> гаманець <b>заблоковано</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+110"/> + <location filename="../bitcoin.cpp" line="+116"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> - <translation type="unfinished"/> + <translation>Сталася фатальна помилка. Bitcoin більше не може продовжувати безпечно і піде.</translation> </message> </context> <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+115"/> + <location filename="../clientmodel.cpp" line="+119"/> <source>Network Alert</source> <translation>Сповіщення мережі</translation> </message> </context> <context> + <name>CoinControlDialog</name> + <message> + <location filename="../forms/coincontroldialog.ui" line="+14"/> + <source>Coin Control Address Selection</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+34"/> + <source>Quantity:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+29"/> + <source>Bytes:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+45"/> + <source>Amount:</source> + <translation>Кількість:</translation> + </message> + <message> + <location line="+29"/> + <source>Priority:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+45"/> + <source>Fee:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+32"/> + <source>Low Output:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+48"/> + <source>After Fee:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+32"/> + <source>Change:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+63"/> + <source>(un)select all</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+13"/> + <source>Tree mode</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> + <source>List mode</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+52"/> + <source>Amount</source> + <translation>Кількість</translation> + </message> + <message> + <location line="+10"/> + <source>Address</source> + <translation>Адреса</translation> + </message> + <message> + <location line="+5"/> + <source>Date</source> + <translation>Дата</translation> + </message> + <message> + <location line="+5"/> + <source>Confirmations</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Confirmed</source> + <translation>Підтверджені</translation> + </message> + <message> + <location line="+5"/> + <source>Priority</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../coincontroldialog.cpp" line="+42"/> + <source>Copy address</source> + <translation>Скопіювати адресу</translation> + </message> + <message> + <location line="+1"/> + <source>Copy label</source> + <translation>Скопіювати мітку</translation> + </message> + <message> + <location line="+1"/> + <location line="+26"/> + <source>Copy amount</source> + <translation>Копіювати кількість</translation> + </message> + <message> + <location line="-25"/> + <source>Copy transaction ID</source> + <translation>Копіювати ID транзакції </translation> + </message> + <message> + <location line="+1"/> + <source>Lock unspent</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Unlock unspent</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+22"/> + <source>Copy quantity</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>Copy fee</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy after fee</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy bytes</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy priority</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy low output</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy change</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+323"/> + <source>highest</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>higher</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>high</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>medium-high</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>medium</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+4"/> + <source>low-medium</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>low</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>lower</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>lowest</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+11"/> + <source>(%1 locked)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+171"/> + <source>Dust</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>yes</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>no</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+10"/> + <source>This label turns red, if the transaction size is greater than 1000 bytes.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <location line="+5"/> + <source>This means a fee of at least %1 per kB is required.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-4"/> + <source>Can vary +/- 1 byte per input.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>Transactions with higher priority are more likely to get included into a block.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>This label turns red, if the priority is smaller than "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>(немає назви)</translation> + </message> + <message> + <location line="-9"/> + <source>change from %1 (%2)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>(change)</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>EditAddressDialog</name> <message> <location filename="../forms/editaddressdialog.ui" line="+14"/> @@ -724,7 +1015,7 @@ Address: %4 <translation>&Адреса</translation> </message> <message> - <location filename="../editaddressdialog.cpp" line="+21"/> + <location filename="../editaddressdialog.cpp" line="+25"/> <source>New receiving address</source> <translation>Нова адреса для отримання</translation> </message> @@ -767,14 +1058,14 @@ Address: %4 <context> <name>FreespaceChecker</name> <message> - <location filename="../intro.cpp" line="+61"/> + <location filename="../intro.cpp" line="+65"/> <source>A new data directory will be created.</source> <translation type="unfinished"/> </message> <message> <location line="+22"/> <source>name</source> - <translation type="unfinished"/> + <translation>назва</translation> </message> <message> <location line="+2"/> @@ -795,18 +1086,18 @@ Address: %4 <context> <name>GUIUtil::HelpMessageBox</name> <message> - <location filename="../guiutil.cpp" line="+558"/> - <location line="+13"/> - <source>Bitcoin-Qt</source> - <translation>Bitcoin-Qt</translation> - </message> - <message> - <location line="-13"/> + <location filename="../guiutil.cpp" line="+597"/> <source>version</source> <translation>версія</translation> </message> <message> - <location line="+2"/> + <location line="+0"/> + <location line="+13"/> + <source>Bitcoin Core</source> + <translation>Bitcoin Ядро</translation> + </message> + <message> + <location line="-11"/> <source>Usage:</source> <translation>Використання:</translation> </message> @@ -846,21 +1137,21 @@ 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-Qt.</source> + <source>Welcome to Bitcoin Core.</source> <translation type="unfinished"/> </message> <message> <location line="+26"/> - <source>As this is the first time the program is launched, you can choose where Bitcoin-Qt will store its data.</source> + <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source> <translation type="unfinished"/> </message> <message> <location line="+10"/> - <source>Bitcoin-Qt will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source> + <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source> <translation type="unfinished"/> </message> <message> @@ -874,14 +1165,24 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../intro.cpp" line="+105"/> - <source>Error</source> + <location filename="../intro.cpp" line="+85"/> + <source>Bitcoin</source> + <translation>Bitcoin</translation> + </message> + <message> + <location line="+1"/> + <source>Error: Specified data directory "%1" can not be created.</source> <translation type="unfinished"/> </message> <message> + <location line="+19"/> + <source>Error</source> + <translation>Помилка</translation> + </message> + <message> <location line="+9"/> <source>GB of free space available</source> - <translation type="unfinished"/> + <translation>ГБ вільного простору доступно</translation> </message> <message> <location line="+3"/> @@ -890,6 +1191,34 @@ Address: %4 </message> </context> <context> + <name>OpenURIDialog</name> + <message> + <location filename="../forms/openuridialog.ui" line="+14"/> + <source>Open URI</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Open payment request from URI or file</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+9"/> + <source>URI:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+11"/> + <source>Select payment request file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../openuridialog.cpp" line="+47"/> + <source>Select payment request file to open</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OptionsDialog</name> <message> <location filename="../forms/optionsdialog.ui" line="+14"/> @@ -904,7 +1233,7 @@ Address: %4 <message> <location line="+6"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> - <translation type="unfinished"/> + <translation>Оплата додаткових транзакцій за Кб, що допомагає переконатися, що ваші транзакції обробляються швидко. Велика частина операцій проводиться 1 Кб.</translation> </message> <message> <location line="+15"/> @@ -1039,7 +1368,7 @@ Address: %4 <message> <location line="+9"/> <source>Whether to show Bitcoin addresses in the transaction list or not.</source> - <translation type="unfinished"/> + <translation>Незалежно від того, щоб показати Bitcoin адреси в списку транзакцій чи ні.</translation> </message> <message> <location line="+3"/> @@ -1047,6 +1376,16 @@ Address: %4 <translation>&Відображати адресу в списку транзакцій</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="+71"/> <source>&OK</source> <translation>&Гаразд</translation> @@ -1062,12 +1401,12 @@ Address: %4 <translation>&Застосувати</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+58"/> + <location filename="../optionsdialog.cpp" line="+63"/> <source>default</source> <translation>типово</translation> </message> <message> - <location line="+130"/> + <location line="+131"/> <source>Confirm options reset</source> <translation>Підтвердження скидання параметрів</translation> </message> @@ -1108,62 +1447,62 @@ Address: %4 </message> <message> <location line="+50"/> - <location line="+202"/> + <location line="+214"/> <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source> <translation>Показана інформація вже може бути застарілою. Ваш гаманець буде автоматично синхронізовано з мережею Bitcoin після встановлення підключення, але цей процес ще не завершено.</translation> </message> <message> - <location line="-131"/> + <location line="-140"/> <source>Unconfirmed:</source> <translation>Непідтверджені:</translation> </message> <message> - <location line="-78"/> + <location line="-81"/> <source>Wallet</source> <translation>Гаманець</translation> </message> <message> <location line="+49"/> <source>Confirmed:</source> - <translation type="unfinished"/> + <translation>підтверджено:</translation> </message> <message> <location line="+16"/> <source>Your current spendable balance</source> - <translation type="unfinished"/> + <translation>Ваш поточний баланс расходуемого</translation> </message> <message> - <location line="+29"/> + <location line="+32"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> - <translation type="unfinished"/> + <translation>Всього угод, які ще мають бути підтверджені, і до цих пір не враховуються в расходуемого балансу</translation> </message> <message> - <location line="+13"/> + <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="+13"/> + <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="+53"/> + <location line="+56"/> <source><b>Recent transactions</b></source> <translation><b>Недавні транзакції</b></translation> </message> <message> - <location filename="../overviewpage.cpp" line="+116"/> + <location filename="../overviewpage.cpp" line="+120"/> <location line="+1"/> <source>out of sync</source> <translation>не синхронізовано</translation> @@ -1172,7 +1511,7 @@ Address: %4 <context> <name>PaymentServer</name> <message> - <location filename="../paymentserver.cpp" line="+392"/> + <location filename="../paymentserver.cpp" line="+397"/> <source>URI handling</source> <translation>Обробка URI</translation> </message> @@ -1182,23 +1521,29 @@ Address: %4 <translation>Неможливо обробити URI! Це може бути викликано неправильною Bitcoin-адресою, чи невірними параметрами URI.</translation> </message> <message> - <location line="+69"/> + <location line="+91"/> <source>Requested payment amount of %1 is too small (considered dust).</source> <translation type="unfinished"/> </message> <message> - <location line="+4"/> - <location line="+37"/> + <location line="-204"/> + <location line="+195"/> + <location line="+13"/> <source>Payment request error</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Insecure requests to custom payment scripts unsupported</source> + <location line="-207"/> + <source>Cannot start bitcoin: click-to-pay handler</source> <translation type="unfinished"/> </message> <message> - <location line="+38"/> + <location line="+195"/> + <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> @@ -1208,7 +1553,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>Bad response from server %1</source> <translation type="unfinished"/> </message> @@ -1218,8 +1563,8 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-58"/> - <location line="+30"/> + <location line="-55"/> + <location line="+27"/> <location line="+17"/> <source>Network request error</source> <translation type="unfinished"/> @@ -1228,9 +1573,8 @@ Address: %4 <context> <name>QObject</name> <message> - <location filename="../bitcoin.cpp" line="+114"/> + <location filename="../bitcoin.cpp" line="+119"/> <location line="+5"/> - <location filename="../intro.cpp" line="-32"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> @@ -1244,23 +1588,18 @@ Address: %4 <source>Error: Invalid combination of -regtest and -testnet.</source> <translation type="unfinished"/> </message> - <message> - <location filename="../intro.cpp" line="+1"/> - <source>Error: Specified data directory "%1" can not be created.</source> - <translation type="unfinished"/> - </message> </context> <context> <name>QRImageWidget</name> <message> - <location filename="../receiverequestdialog.cpp" line="+32"/> + <location filename="../receiverequestdialog.cpp" line="+36"/> <source>&Save Image...</source> - <translation type="unfinished"/> + <translation>&Зберегти зображення...</translation> </message> <message> <location line="+3"/> <source>&Copy Image</source> - <translation type="unfinished"/> + <translation>&Копіювати зображення</translation> </message> <message> <location line="+28"/> @@ -1269,8 +1608,8 @@ Address: %4 </message> <message> <location line="+0"/> - <source>PNG Images (*.png)</source> - <translation>PNG-зображення (*.png)</translation> + <source>PNG Image (*.png)</source> + <translation type="unfinished"/> </message> </context> <context> @@ -1290,7 +1629,7 @@ Address: %4 <location line="+53"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+352"/> + <location filename="../rpcconsole.cpp" line="+360"/> <source>N/A</source> <translation>Н/Д</translation> </message> @@ -1305,14 +1644,19 @@ Address: %4 <translation>&Інформація</translation> </message> <message> - <location line="+68"/> + <location line="-10"/> + <source>Debug window</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+78"/> <source>Using OpenSSL version</source> <translation>Використовується OpenSSL версії</translation> </message> <message> <location line="+49"/> <source>Startup time</source> - <translation type="unfinished"/> + <translation>Час запуску</translation> </message> <message> <location line="+29"/> @@ -1332,7 +1676,7 @@ Address: %4 <message> <location line="+23"/> <source>Block chain</source> - <translation type="unfinished"/> + <translation>Ланцюг блоків</translation> </message> <message> <location line="+7"/> @@ -1342,12 +1686,12 @@ Address: %4 <message> <location line="+23"/> <source>Estimated total blocks</source> - <translation type="unfinished"/> + <translation>Розрахункове число блоків</translation> </message> <message> <location line="+23"/> <source>Last block time</source> - <translation type="unfinished"/> + <translation>Час останнього блоку</translation> </message> <message> <location line="+52"/> @@ -1360,12 +1704,7 @@ Address: %4 <translation>Параметри командного рядка</translation> </message> <message> - <location line="+7"/> - <source>Show the Bitcoin-Qt help message to get a list with possible Bitcoin command-line options.</source> - <translation>Показати довідку Bitcoin-Qt для отримання переліку можливих параметрів командного рядка.</translation> - </message> - <message> - <location line="+3"/> + <location line="+10"/> <source>&Show</source> <translation>Показати</translation> </message> @@ -1405,14 +1744,9 @@ Address: %4 <translation>Дата збирання</translation> </message> <message> - <location line="-104"/> - <source>Bitcoin - Debug window</source> - <translation>Bitcoin - Вікно зневадження</translation> - </message> - <message> - <location line="+25"/> + <location line="-79"/> <source>Bitcoin Core</source> - <translation type="unfinished"/> + <translation>Bitcoin Ядро</translation> </message> <message> <location line="+279"/> @@ -1422,10 +1756,15 @@ 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>Відкрийте налагодження файл журналу Bitcoin з поточного каталогу даних. Це може зайняти кілька секунд для великих файлів журналів.</translation> + </message> + <message> + <location line="+26"/> + <source>Show the Bitcoin-Core help message to get a list with possible Bitcoin command-line options.</source> <translation type="unfinished"/> </message> <message> - <location line="+102"/> + <location line="+76"/> <source>Clear console</source> <translation>Очистити консоль</translation> </message> @@ -1483,37 +1822,32 @@ Address: %4 <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+22"/> + <location filename="../forms/receivecoinsdialog.ui" line="+83"/> <source>&Amount:</source> - <translation type="unfinished"/> + <translation>&Кількість:</translation> </message> <message> - <location line="+16"/> + <location line="+19"/> <source>The amount to request</source> - <translation type="unfinished"/> + <translation>Обов’язкова кількість</translation> </message> <message> - <location line="+7"/> + <location line="-32"/> <source>&Label:</source> <translation>&Мітка:</translation> </message> <message> - <location line="+10"/> - <source>The label to associate with the receiving address</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+7"/> + <location line="-34"/> <source>&Message:</source> - <translation type="unfinished"/> + <translation>&Повідомлення:</translation> </message> <message> - <location line="+10"/> + <location line="+20"/> <source>The message to attach to payment request</source> <translation type="unfinished"/> </message> <message> - <location line="+14"/> + <location line="-37"/> <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> @@ -1523,25 +1857,55 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+7"/> - <source>Use this form to request payments. All fields are optional.</source> + <location line="+27"/> + <source>The label to associate with the new receiving address</source> <translation type="unfinished"/> </message> <message> - <location line="+17"/> + <location line="+14"/> + <source>Use this form to request payments. All fields are optional.</source> + <translation>Використовуйте цю форму щоб отримати платежі. Всі поля є обов’язковими</translation> + </message> + <message> + <location line="+56"/> <source>Clear all fields of the form.</source> - <translation type="unfinished"/> + <translation>Очистити всі поля в формі</translation> </message> <message> <location line="+3"/> <source>Clear</source> - <translation type="unfinished"/> + <translation>Очистити</translation> </message> <message> <location line="+36"/> <source>&Request payment</source> <translation type="unfinished"/> </message> + <message> + <location line="+47"/> + <source>Previously requested payments</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> + <source>Show the selected request (does the same as double clicking an entry)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Show</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+11"/> + <source>Remove the selected entries from the list</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Remove</source> + <translation type="unfinished"/> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -1562,16 +1926,11 @@ Address: %4 </message> <message> <location line="+7"/> - <source>&Copy Image</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+7"/> <source>&Save Image...</source> - <translation type="unfinished"/> + <translation>&Зберегти зображення...</translation> </message> <message> - <location filename="../receiverequestdialog.cpp" line="+58"/> + <location filename="../receiverequestdialog.cpp" line="+56"/> <source>Request payment to %1</source> <translation type="unfinished"/> </message> @@ -1617,16 +1976,119 @@ Address: %4 </message> </context> <context> + <name>RecentRequestsTableModel</name> + <message> + <location filename="../recentrequeststablemodel.cpp" line="+14"/> + <source>Date</source> + <translation>Дата</translation> + </message> + <message> + <location line="+0"/> + <source>Label</source> + <translation>Назва</translation> + </message> + <message> + <location line="+0"/> + <source>Message</source> + <translation>Повідомлення</translation> + </message> + <message> + <location line="+0"/> + <source>Amount</source> + <translation>Кількість</translation> + </message> + <message> + <location line="+36"/> + <source>(no label)</source> + <translation>(немає назви)</translation> + </message> + <message> + <location line="+9"/> + <source>(no message)</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="+14"/> - <location filename="../sendcoinsdialog.cpp" line="+140"/> - <location line="+213"/> + <location filename="../sendcoinsdialog.cpp" line="+381"/> + <location line="+81"/> <source>Send Coins</source> <translation>Відправити</translation> </message> <message> - <location line="+50"/> + <location line="+76"/> + <source>Coin Control Features</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+20"/> + <source>Inputs...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> + <source>automatically selected</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+19"/> + <source>Insufficient funds!</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+89"/> + <source>Quantity:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+35"/> + <source>Bytes:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+48"/> + <source>Amount:</source> + <translation>Кількість:</translation> + </message> + <message> + <location line="+32"/> + <source>Priority:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+48"/> + <source>Fee:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+32"/> + <source>Low Output:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+48"/> + <source>After Fee:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+32"/> + <source>Change:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+44"/> + <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Custom change address</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+115"/> <source>Send to multiple recipients at once</source> <translation>Відправити на декілька адрес</translation> </message> @@ -1638,7 +2100,7 @@ Address: %4 <message> <location line="+20"/> <source>Clear all fields of the form.</source> - <translation type="unfinished"/> + <translation>Очистити всі поля в формі</translation> </message> <message> <location line="+3"/> @@ -1651,12 +2113,7 @@ Address: %4 <translation>Баланс:</translation> </message> <message> - <location line="+10"/> - <source>123.456 BTC</source> - <translation>123.456 BTC</translation> - </message> - <message> - <location line="+31"/> + <location line="+41"/> <source>Confirm the send action</source> <translation>Підтвердити відправлення</translation> </message> @@ -1666,69 +2123,135 @@ Address: %4 <translation>&Відправити</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-154"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation>Підтвердіть відправлення</translation> </message> <message> - <location line="-90"/> + <location line="-74"/> <location line="+5"/> <location line="+5"/> + <location line="+4"/> <source>%1 to %2</source> <translation type="unfinished"/> </message> <message> - <location line="+26"/> + <location line="-136"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>Введіть адресу Bitcoin (наприклад 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> + <message> + <location line="+15"/> + <source>Copy quantity</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation>Копіювати кількість</translation> + </message> + <message> + <location line="+1"/> + <source>Copy fee</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy after fee</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy bytes</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy priority</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy low output</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy change</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+170"/> + <source>Total Amount %1 (= %2)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>or</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+202"/> <source>The recipient address is not valid, please recheck.</source> <translation>Адреса отримувача невірна, будь ласка перепровірте.</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>The amount to pay must be larger than 0.</source> <translation>Кількість монет для відправлення повинна бути більшою 0.</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>The amount exceeds your balance.</source> <translation>Кількість монет для відправлення перевищує ваш баланс.</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>The total exceeds your balance when the %1 transaction fee is included.</source> <translation>Сума перевищить ваш баланс, якщо комісія %1 буде додана до вашої транзакції.</translation> </message> <message> - <location line="+5"/> + <location line="+3"/> <source>Duplicate address found, can only send to each address once per send operation.</source> <translation>Знайдено адресу що дублюється. Відправлення на кожну адресу дозволяється лише один раз на кожну операцію переказу.</translation> </message> <message> - <location line="+4"/> - <source>Error: Transaction creation failed!</source> - <translation>Помилка: Не вдалося створити транзакцію!</translation> + <location line="+3"/> + <source>Transaction creation failed!</source> + <translation type="unfinished"/> </message> <message> - <location line="+15"/> - <source>Are you sure you want to send?</source> + <location line="+4"/> + <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation type="unfinished"/> </message> <message> - <location line="+9"/> - <source>added as transaction fee</source> + <location line="+113"/> + <source>Warning: Invalid Bitcoin address</source> <translation type="unfinished"/> </message> <message> - <location line="+6"/> - <source>Total Amount %1</source> + <location line="+13"/> + <source>(no label)</source> + <translation>(немає назви)</translation> + </message> + <message> + <location line="+8"/> + <source>Warning: Unknown change address</source> <translation type="unfinished"/> </message> <message> - <location line="+20"/> - <source>Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> - <translation>Помилка: транзакцію було відхилено. Це може статись, якщо декілька монет з вашого гаманця вже використані, наприклад, якщо ви використовуєте одну копію гаманця (wallet.dat), а монети були використані з іншої копії, але не позначені як використані в цій.</translation> + <location line="-378"/> + <source>Are you sure you want to send?</source> + <translation>Ви впевнені, що хочете відправити?</translation> </message> <message> - <location line="+144"/> + <location line="+9"/> + <source>added as transaction fee</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+170"/> <source>Payment request expired</source> <translation type="unfinished"/> </message> @@ -1741,39 +2264,44 @@ Address: %4 <context> <name>SendCoinsEntry</name> <message> - <location filename="../forms/sendcoinsentry.ui" line="+33"/> - <location line="+585"/> + <location filename="../forms/sendcoinsentry.ui" line="+131"/> + <location line="+501"/> + <location line="+536"/> <source>A&mount:</source> <translation>&Кількість:</translation> </message> <message> - <location line="-572"/> - <location line="+585"/> + <location line="-1132"/> <source>Pay &To:</source> <translation>&Отримувач:</translation> </message> <message> - <location line="-551"/> + <location line="+18"/> <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"/> + <translation>Звернення до відправити платіж на (наприклад 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location filename="../sendcoinsentry.cpp" line="+28"/> + <location filename="../sendcoinsentry.cpp" line="+30"/> <source>Enter a label for this address to add it to your address book</source> <translation>Введіть мітку для цієї адреси для додавання її в адресну книгу</translation> </message> <message> - <location filename="../forms/sendcoinsentry.ui" line="-18"/> + <location filename="../forms/sendcoinsentry.ui" line="+57"/> <source>&Label:</source> <translation>&Мітка:</translation> </message> <message> - <location line="+28"/> + <location line="-50"/> <source>Choose previously used address</source> + <translation>Обрати ранiш використовувану адресу</translation> + </message> + <message> + <location line="-40"/> + <source>This is a normal payment.</source> <translation type="unfinished"/> </message> <message> - <location line="+10"/> + <location line="+50"/> <source>Alt+A</source> <translation>Alt+A</translation> </message> @@ -1789,20 +2317,39 @@ Address: %4 </message> <message> <location line="+7"/> - <source>Remove this recipient</source> - <translation>Видалити цього отримувача</translation> + <location line="+504"/> + <location line="+536"/> + <source>Remove this entry</source> + <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="-40"/> + <source>This is a verified payment request.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-971"/> <source>Enter a label for this address to add it to the list of used addresses</source> <translation type="unfinished"/> </message> <message> - <location line="+465"/> - <source>Memo:</source> + <location line="+439"/> + <source>This is an unverified payment request.</source> <translation type="unfinished"/> </message> <message> + <location line="+18"/> + <location line="+532"/> + <source>Pay To:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-498"/> + <location line="+536"/> + <source>Memo:</source> + <translation>Нотатка:</translation> + </message> + <message> <location filename="../sendcoinsentry.cpp" line="+1"/> <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation>Введіть адресу Bitcoin (наприклад 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> @@ -1823,7 +2370,7 @@ Address: %4 <message> <location line="+6"/> <source>You can sign messages with your addresses to prove you own them. Be careful not to sign anything vague, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source> - <translation type="unfinished"/> + <translation>Ви можете зареєструватися повідомленнями зі своїми адресами, щоб довести, що ви є їх власником. Будьте обережні, щоб не підписувати що-небудь неясне, як фішинг-атак може спробувати обдурити вас в підписанні вашу особистість до них. Тільки підписати повністю докладні свідчення, користувач зобов'язується.</translation> </message> <message> <location line="+18"/> @@ -1834,7 +2381,7 @@ Address: %4 <location line="+10"/> <location line="+213"/> <source>Choose previously used address</source> - <translation type="unfinished"/> + <translation>Обрати ранiш використовувану адресу</translation> </message> <message> <location line="-203"/> @@ -1896,7 +2443,7 @@ Address: %4 <message> <location line="+6"/> <source>Enter the signing address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack.</source> - <translation type="unfinished"/> + <translation>Введіть адресу підписання, повідомлення (забезпечення копіюванні розриви рядків, прогалини, вкладки і т.д. точно) і підпис нижче, щоб перевірити повідомлення. Будьте обережні, щоб не читати далі в підпис, ніж те, що в підписаному самого повідомлення, щоб уникнути обдурять нападу чоловік-в-середній.</translation> </message> <message> <location line="+21"/> @@ -1919,7 +2466,7 @@ Address: %4 <translation>Скинути всі поля перевірки повідомлення</translation> </message> <message> - <location filename="../signverifymessagedialog.cpp" line="+27"/> + <location filename="../signverifymessagedialog.cpp" line="+29"/> <location line="+3"/> <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation>Введіть адресу Bitcoin (наприклад 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> @@ -1935,7 +2482,7 @@ Address: %4 <translation>Введіть сигнатуру Bitcoin</translation> </message> <message> - <location line="+85"/> + <location line="+84"/> <location line="+81"/> <source>The entered address is invalid.</source> <translation>Введена нечинна адреса.</translation> @@ -1952,17 +2499,17 @@ Address: %4 <location line="-81"/> <location line="+81"/> <source>The entered address does not refer to a key.</source> - <translation type="unfinished"/> + <translation>Введений адреса не відноситься до ключа.</translation> </message> <message> <location line="-73"/> <source>Wallet unlock was cancelled.</source> - <translation type="unfinished"/> + <translation>Розблокування Гаманець був скасований.</translation> </message> <message> <location line="+8"/> <source>Private key for the entered address is not available.</source> - <translation type="unfinished"/> + <translation>Приватний ключ для введеної адреси недоступний. </translation> </message> <message> <location line="+12"/> @@ -1988,7 +2535,7 @@ Address: %4 <message> <location line="+0"/> <source>The signature did not match the message digest.</source> - <translation type="unfinished"/> + <translation>Підпис не відповідає дайджест повідомлення.</translation> </message> <message> <location line="+7"/> @@ -2004,8 +2551,13 @@ Address: %4 <context> <name>SplashScreen</name> <message> - <location filename="../splashscreen.cpp" line="+23"/> - <source>The Bitcoin developers</source> + <location filename="../splashscreen.cpp" line="+26"/> + <source>Bitcoin Core</source> + <translation>Bitcoin Ядро</translation> + </message> + <message> + <location line="+2"/> + <source>The Bitcoin Core developers</source> <translation type="unfinished"/> </message> <message> @@ -2017,15 +2569,15 @@ Address: %4 <context> <name>TrafficGraphWidget</name> <message> - <location filename="../trafficgraphwidget.cpp" line="+75"/> + <location filename="../trafficgraphwidget.cpp" line="+79"/> <source>KB/s</source> - <translation type="unfinished"/> + <translation>КБ/с</translation> </message> </context> <context> <name>TransactionDesc</name> <message> - <location filename="../transactiondesc.cpp" line="+22"/> + <location filename="../transactiondesc.cpp" line="+28"/> <source>Open until %1</source> <translation>Відкрити до %1</translation> </message> @@ -2062,7 +2614,7 @@ Address: %4 <message> <location line="+7"/> <source>Source</source> - <translation type="unfinished"/> + <translation>Джерело</translation> </message> <message> <location line="+0"/> @@ -2086,7 +2638,7 @@ Address: %4 <location line="-77"/> <location line="+2"/> <source>own address</source> - <translation type="unfinished"/> + <translation>Власна адреса</translation> </message> <message> <location line="-2"/> @@ -2158,7 +2710,7 @@ Address: %4 <message> <location line="+8"/> <source>Debug information</source> - <translation type="unfinished"/> + <translation>Отладочна інформація</translation> </message> <message> <location line="+8"/> @@ -2168,7 +2720,7 @@ Address: %4 <message> <location line="+3"/> <source>Inputs</source> - <translation type="unfinished"/> + <translation>витрати</translation> </message> <message> <location line="+23"/> @@ -2217,7 +2769,7 @@ Address: %4 <context> <name>TransactionTableModel</name> <message> - <location filename="../transactiontablemodel.cpp" line="+227"/> + <location filename="../transactiontablemodel.cpp" line="+234"/> <source>Date</source> <translation>Дата</translation> </message> @@ -2335,7 +2887,7 @@ Address: %4 <context> <name>TransactionView</name> <message> - <location filename="../transactionview.cpp" line="+52"/> + <location filename="../transactionview.cpp" line="+57"/> <location line="+16"/> <source>All</source> <translation>Всі</translation> @@ -2396,12 +2948,12 @@ Address: %4 <translation>Інше</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>Enter address or label to search</source> <translation>Введіть адресу чи мітку для пошуку</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>Min amount</source> <translation>Мінімальна сума</translation> </message> @@ -2423,7 +2975,7 @@ Address: %4 <message> <location line="+1"/> <source>Copy transaction ID</source> - <translation type="unfinished"/> + <translation>Копіювати ID транзакції </translation> </message> <message> <location line="+1"/> @@ -2436,17 +2988,37 @@ Address: %4 <translation>Показати деталі транзакції</translation> </message> <message> - <location line="+143"/> - <source>Export Transaction Data</source> - <translation>Експортувати дані транзакцій</translation> + <location line="+142"/> + <source>Export Transaction History</source> + <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+19"/> + <source>Exporting Failed</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>There was an error trying to save the transaction history to %1.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+4"/> + <source>Exporting Successful</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>The transaction history was successfully saved to %1.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-22"/> <source>Comma separated file (*.csv)</source> <translation>Файли, розділені комою (*.csv)</translation> </message> <message> - <location line="+8"/> + <location line="+9"/> <source>Confirmed</source> <translation>Підтверджені</translation> </message> @@ -2481,17 +3053,7 @@ Address: %4 <translation>Ідентифікатор</translation> </message> <message> - <location line="+4"/> - <source>Error exporting</source> - <translation>Помилка експорту</translation> - </message> - <message> - <location line="+0"/> - <source>Could not write to file %1.</source> - <translation>Неможливо записати у файл %1.</translation> - </message> - <message> - <location line="+100"/> + <location line="+107"/> <source>Range:</source> <translation>Діапазон від:</translation> </message> @@ -2502,9 +3064,17 @@ Address: %4 </message> </context> <context> + <name>WalletFrame</name> + <message> + <location filename="../walletframe.cpp" line="+26"/> + <source>No wallet has been loaded.</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>WalletModel</name> <message> - <location filename="../walletmodel.cpp" line="+218"/> + <location filename="../walletmodel.cpp" line="+245"/> <source>Send Coins</source> <translation>Відправити</translation> </message> @@ -2512,9 +3082,9 @@ Address: %4 <context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+46"/> + <location filename="../walletview.cpp" line="+43"/> <source>&Export</source> - <translation type="unfinished"/> + <translation>& Експорт</translation> </message> <message> <location line="+1"/> @@ -2522,65 +3092,60 @@ Address: %4 <translation>Експортувати дані з поточної вкладки в файл</translation> </message> <message> - <location line="+183"/> + <location line="+181"/> <source>Backup Wallet</source> - <translation type="unfinished"/> + <translation>Зробити резервне копіювання гаманця</translation> </message> <message> - <location line="+0"/> + <location line="+1"/> <source>Wallet Data (*.dat)</source> - <translation type="unfinished"/> + <translation>Данi гаманця (*.dat)</translation> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Backup Failed</source> - <translation type="unfinished"/> + <translation>Помилка резервного копіювання</translation> </message> <message> <location line="+0"/> - <source>There was an error trying to save the wallet data to the new location.</source> - <translation>Виникла помилка при спробі зберегти гаманець в новому місці.</translation> + <source>There was an error trying to save the wallet data to %1.</source> + <translation type="unfinished"/> </message> <message> <location line="+4"/> - <source>Backup Successful</source> - <translation>Успішне створення резервної копії</translation> + <source>The wallet data was successfully saved to %1.</source> + <translation type="unfinished"/> </message> <message> <location line="+0"/> - <source>The wallet data was successfully saved to the new location.</source> - <translation>Данні гаманця успішно збережено в новому місці призначення.</translation> + <source>Backup Successful</source> + <translation>Успішне створення резервної копії</translation> </message> </context> <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+102"/> - <source>Bitcoin version</source> - <translation>Версія</translation> - </message> - <message> - <location line="+107"/> + <location filename="../bitcoinstrings.cpp" line="+217"/> <source>Usage:</source> <translation>Використання:</translation> </message> <message> - <location line="-55"/> + <location line="-54"/> <source>List commands</source> <translation>Список команд</translation> </message> <message> - <location line="-13"/> + <location line="-14"/> <source>Get help for a command</source> <translation>Отримати довідку по команді</translation> </message> <message> - <location line="+25"/> + <location line="+26"/> <source>Options:</source> <translation>Параметри:</translation> </message> <message> - <location line="+24"/> + <location line="+23"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Вкажіть файл конфігурації (типово: bitcoin.conf)</translation> </message> @@ -2600,7 +3165,7 @@ Address: %4 <translation>Встановити розмір кешу бази даних в мегабайтах (типово: 25)</translation> </message> <message> - <location line="-28"/> + <location line="-27"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>Чекати на з'єднання на <port> (типово: 8333 або тестова мережа: 18333)</translation> </message> @@ -2610,14 +3175,14 @@ Address: %4 <translation>Підтримувати не більше <n> зв'язків з колегами (типово: 125)</translation> </message> <message> - <location line="-49"/> + <location line="-50"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> - <translation type="unfinished"/> + <translation>Підключитись до вузла, щоб отримати список адрес інших учасників та від'єднатись</translation> </message> <message> <location line="+84"/> <source>Specify your own public address</source> - <translation type="unfinished"/> + <translation>Вкажіть вашу власну публічну адресу</translation> </message> <message> <location line="+4"/> @@ -2625,7 +3190,7 @@ Address: %4 <translation>Поріг відключення неправильно під'єднаних пірів (типово: 100)</translation> </message> <message> - <location line="-142"/> + <location line="-147"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>Максимальній розмір вхідного буферу на одне з'єднання (типово: 86400)</translation> </message> @@ -2640,7 +3205,7 @@ Address: %4 <translation>Прослуховувати <port> для JSON-RPC-з'єднань (типово: 8332 або тестова мережа: 18332)</translation> </message> <message> - <location line="+40"/> + <location line="+45"/> <source>Accept command line and JSON-RPC commands</source> <translation>Приймати команди із командного рядка та команди JSON-RPC</translation> </message> @@ -2650,17 +3215,17 @@ Address: %4 <translation>Запустити в фоновому режимі (як демон) та приймати команди</translation> </message> <message> - <location line="+40"/> + <location line="+39"/> <source>Use the test network</source> <translation>Використовувати тестову мережу</translation> </message> <message> - <location line="-118"/> + <location line="-117"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation type="unfinished"/> + <translation>Приймати з'єднання ззовні (за замовчуванням: 1, якщо ні-проксі або-з'єднання)</translation> </message> <message> - <location line="-87"/> + <location line="-92"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2687,17 +3252,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+3"/> <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> - <translation type="unfinished"/> + <translation>Прив'язка до даного адресою і завжди слухати на ньому. Використовуйте [господаря]: позначення порту для IPv6</translation> </message> <message> <location line="+3"/> <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> - <translation type="unfinished"/> + <translation>Не вдалося отримати блокування на каталог даних% с. Bitcoin, ймовірно, вже запущений.</translation> </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"/> + <translation>Введіть тестовий режим регресії, яка використовує спеціальну ланцюг, в якій блоки можуть бути вирішені негайно. Це призначено для регресійного тестування інструментів і розробки додатків.</translation> </message> <message> <location line="+4"/> @@ -2715,17 +3280,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+11"/> - <source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source> - <translation type="unfinished"/> + <location line="+18"/> + <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> + <translation>Це тест збірки попередньою версією - використовуйте на свій страх і ризик - не використовувати для гірничодобувних або торгових додатків</translation> </message> <message> - <location line="+6"/> - <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> + <location line="+5"/> + <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+3"/> <source>Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source> <translation>Увага: встановлено занадто велику комісію (-paytxfee). Комісія зніматиметься кожен раз коли ви проводитимете транзакції.</translation> </message> @@ -2755,19 +3320,29 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Увага: файл wallet.dat пошкоджено, дані врятовано! Оригінальний wallet.dat збережено як wallet.{timestamp}.bak до %s; якщо Ваш баланс чи транзакції неправильні, Ви можете відновити їх з резервної копії. </translation> </message> <message> - <location line="+14"/> + <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>Спроба відновити закриті ключі з пошкодженого wallet.dat</translation> </message> <message> <location line="+1"/> + <source>Bitcoin Core Daemon</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Bitcoin RPC client version</source> <translation type="unfinished"/> </message> <message> - <location line="+2"/> + <location line="+1"/> <source>Block creation options:</source> - <translation type="unfinished"/> + <translation>Опції створення блоку:</translation> </message> <message> <location line="+5"/> @@ -2775,24 +3350,29 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Підключитись лише до вказаного вузла</translation> </message> <message> - <location line="+2"/> + <location line="+1"/> + <source>Connect through SOCKS proxy</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Connect to JSON-RPC on <port> (default: 8332 or testnet: 18332)</source> <translation type="unfinished"/> </message> <message> <location line="+2"/> <source>Corrupted block database detected</source> - <translation type="unfinished"/> + <translation>Виявлено пошкоджений блок бази даних</translation> </message> <message> <location line="+1"/> <source>Discover own IP address (default: 1 when listening and no -externalip)</source> - <translation type="unfinished"/> + <translation>Відкрийте власну IP-адресу (за замовчуванням: 1, коли не чує і-externalip)</translation> </message> <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"/> @@ -2812,7 +3392,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+4"/> <source>Error opening block database</source> - <translation type="unfinished"/> + <translation>Помилка відкриття блоку бази даних </translation> </message> <message> <location line="+2"/> @@ -2832,67 +3412,72 @@ 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"/> <source>Failed to read block info</source> - <translation type="unfinished"/> + <translation>Не вдалося розпізнати блок інформації </translation> </message> <message> <location line="+1"/> <source>Failed to read block</source> - <translation type="unfinished"/> + <translation>Не вдалося розпізнати блок</translation> </message> <message> <location line="+1"/> <source>Failed to sync block index</source> - <translation type="unfinished"/> + <translation>Не вдалося синхронізувати індекс блоку </translation> </message> <message> <location line="+1"/> <source>Failed to write block index</source> - <translation type="unfinished"/> + <translation>Не вдалося записати індекс блоку</translation> </message> <message> <location line="+1"/> <source>Failed to write block info</source> - <translation type="unfinished"/> + <translation>Не вдалося записати інформацію індекса</translation> </message> <message> <location line="+1"/> <source>Failed to write block</source> - <translation type="unfinished"/> + <translation>Не вдалося записати блок</translation> </message> <message> <location line="+1"/> <source>Failed to write file info</source> - <translation type="unfinished"/> + <translation>Не вдалося записати інформацію файла</translation> </message> <message> <location line="+1"/> <source>Failed to write to coin database</source> - <translation type="unfinished"/> + <translation>Не вдалося записати до бази даних монет</translation> </message> <message> <location line="+1"/> <source>Failed to write transaction index</source> - <translation type="unfinished"/> + <translation>Не вдалося записати індекс транзакції</translation> </message> <message> <location line="+1"/> <source>Failed to write undo data</source> - <translation type="unfinished"/> + <translation>Не вдалося записати скасувати дані</translation> </message> <message> - <location line="+2"/> + <location line="+1"/> + <source>Fee per kB to add to transactions you send</source> + <translation>Комісія за Кб</translation> + </message> + <message> + <location line="+1"/> <source>Find peers using DNS lookup (default: 1 unless -connect)</source> - <translation 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"/> @@ -2902,6 +3487,11 @@ for example: 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>Як ретельне блок перевірка (0-4, за замовчуванням: 3)</translation> + </message> + <message> + <location line="+1"/> + <source>If <category> is not supplied, output all debugging information.</source> <translation type="unfinished"/> </message> <message> @@ -2917,22 +3507,42 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+15"/> <source>Not enough file descriptors available.</source> + <translation>Бракує дескрипторів файлів, доступних.</translation> + </message> + <message> + <location line="+5"/> + <source>Prepend debug output with timestamp (default: 1)</source> <translation type="unfinished"/> </message> <message> - <location line="+8"/> + <location line="+1"/> + <source>RPC client options:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+5"/> + <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Send command to Bitcoin server</source> + <translation>Надіслати команду серверу Біткойну</translation> + </message> + <message> + <location line="+8"/> + <source>Set maximum block size in bytes (default: %d)</source> <translation type="unfinished"/> </message> <message> - <location line="+10"/> + <location line="+2"/> <source>Set the number of threads to service RPC calls (default: 4)</source> - <translation type="unfinished"/> + <translation>Встановити число потоків до дзвінків служба RPC (за замовчуванням: 4)</translation> </message> <message> <location line="+7"/> @@ -2942,21 +3552,26 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+2"/> <source>Start Bitcoin server</source> - <translation type="unfinished"/> + <translation>Запустити сервер Біткойну</translation> </message> <message> <location line="+12"/> <source>Usage (deprecated, use bitcoin-cli):</source> - <translation type="unfinished"/> + <translation>Використання (застаріле, використовуйте bitcoin-cli):</translation> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>Verifying blocks...</source> - <translation type="unfinished"/> + <translation>Перевірка блоків...</translation> </message> <message> <location line="+1"/> <source>Verifying wallet...</source> + <translation>Перевірка гаманця... </translation> + </message> + <message> + <location line="+1"/> + <source>Wait for RPC server to start</source> <translation type="unfinished"/> </message> <message> @@ -2965,7 +3580,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+4"/> + <location line="+3"/> + <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> @@ -2975,17 +3595,27 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Імпорт блоків з зовнішнього файлу blk000??.dat</translation> </message> <message> - <location line="-98"/> + <location line="-104"/> <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> <translation type="unfinished"/> </message> <message> - <location line="+17"/> - <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> + <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="+83"/> + <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>Встановіть кількість перевірки скрипт потоків (до 16, 0 = авто, <0 = залишити, що багато сердечники безкоштовно, за замовчуванням: 0)</translation> + </message> + <message> + <location line="+88"/> <source>Information</source> <translation>Інформація</translation> </message> @@ -3002,7 +3632,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"/> @@ -3017,40 +3647,20 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+2"/> <source>Only accept block chain matching built-in checkpoints (default: 1)</source> - <translation type="unfinished"/> + <translation>Тільки приймати блок відповідності ланцюга вбудованих контрольно-пропускних пунктів (за замовчуванням: 1)</translation> </message> <message> <location line="+1"/> <source>Only connect to nodes in network <net> (IPv4, IPv6 or Tor)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> - <source>Output extra debugging information. Implies all other -debug* options</source> - <translation>Виводити більше налагоджувальної інформації. Мається на увазі всі шнші -debug* параметри</translation> + <translation>Підключити тільки до вузлів в мережі <net> (IPv4, IPv6 або Tor)</translation> </message> <message> - <location line="+1"/> - <source>Output extra network debugging information</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> - <source>Prepend debug output with timestamp</source> - <translation>Доповнювати налагоджувальний вивід відміткою часу</translation> - </message> - <message> - <location line="+5"/> + <location line="+9"/> <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation>Параметри SSL: (див. Bitcoin Wiki для налаштування SSL)</translation> </message> <message> - <location line="+1"/> - <source>Select the version of socks proxy to use (4-5, default: 5)</source> - <translation>Вибір версії socks-проксі для використання (4-5, типово: 5)</translation> - </message> - <message> - <location line="+3"/> + <location line="+4"/> <source>Send trace/debug info to console instead of debug.log file</source> <translation>Відсилати налагоджувальну інформацію на консоль, а не у файл debug.log</translation> </message> @@ -3060,12 +3670,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Відсилати налагоджувальну інформацію до налагоджувача</translation> </message> <message> - <location line="+5"/> - <source>Set maximum block size in bytes (default: 250000)</source> - <translation>Встановити максимальний розмір блоку у байтах (типово: 250000)</translation> - </message> - <message> - <location line="+1"/> + <location line="+6"/> <source>Set minimum block size in bytes (default: 0)</source> <translation>Встановити мінімальний розмір блоку у байтах (типово: 0)</translation> </message> @@ -3077,7 +3682,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"/> @@ -3092,17 +3697,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+4"/> <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"/> <source>Transaction too large</source> - <translation type="unfinished"/> + <translation>Угода занадто великий</translation> </message> <message> <location line="+8"/> @@ -3115,37 +3720,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Намагатись використовувати UPnP для відображення порту, що прослуховується на роутері (default: 1 when listening)</translation> </message> <message> - <location line="+1"/> - <source>Use proxy to reach tor hidden services (default: same as -proxy)</source> - <translation type="unfinished"/> - </message> - <message> <location line="+2"/> <source>Username for JSON-RPC connections</source> <translation>Ім'я користувача для JSON-RPC-з'єднань</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Warning</source> <translation>Попередження</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Warning: This version is obsolete, upgrade required!</source> <translation>Увага: Поточна версія застаріла, необхідне оновлення!</translation> </message> <message> <location line="+2"/> + <source>version</source> + <translation>версія</translation> + </message> + <message> + <location line="+1"/> <source>wallet.dat corrupt, salvage failed</source> <translation>wallet.dat пошкоджено, відновлення не вдалося</translation> </message> <message> - <location line="-54"/> + <location line="-57"/> <source>Password for JSON-RPC connections</source> <translation>Пароль для JSON-RPC-з'єднань</translation> </message> <message> - <location line="-70"/> + <location line="-69"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Дозволити JSON-RPC-з'єднання з вказаної IP-адреси</translation> </message> @@ -3155,12 +3760,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Відправляти команди на вузол, запущений на <ip> (типово: 127.0.0.1)</translation> </message> <message> - <location line="-126"/> + <location line="-131"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation type="unfinished"/> + <translation>Виконати команду, коли з'явиться новий блок (%s в команді змінюється на хеш блоку)</translation> </message> <message> - <location line="+155"/> + <location line="+160"/> <source>Upgrade wallet to latest format</source> <translation>Модернізувати гаманець до останнього формату</translation> </message> @@ -3200,22 +3805,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Неможливо прив'язати до порту %s на цьому комп'ютері (bind returned error %d, %s)</translation> </message> <message> - <location line="-95"/> - <source>Connect through socks proxy</source> - <translation>Підключитись через SOCKS-проксі</translation> - </message> - <message> - <location line="-11"/> + <location line="-106"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>Дозволити пошук в DNS для команд -addnode, -seednode та -connect</translation> </message> <message> - <location line="+58"/> + <location line="+59"/> <source>Loading addresses...</source> <translation>Завантаження адрес...</translation> </message> <message> - <location line="-36"/> + <location line="-37"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>Помилка при завантаженні wallet.dat: Гаманець пошкоджено</translation> </message> @@ -3235,19 +3835,19 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Помилка при завантаженні wallet.dat</translation> </message> <message> - <location line="+30"/> + <location line="+31"/> <source>Invalid -proxy address: '%s'</source> <translation>Помилка в адресі проксі-сервера: «%s»</translation> </message> <message> - <location line="+57"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Невідома мережа вказана в -onlynet: «%s»</translation> </message> <message> <location line="-1"/> <source>Unknown -socks proxy version requested: %i</source> - <translation type="unfinished"/> + <translation>В параметрі -socks запитується невідома версія: %i</translation> </message> <message> <location line="-100"/> @@ -3260,7 +3860,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+46"/> + <location line="+47"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>Помилка у величині комісії -paytxfee=<amount>: «%s»</translation> </message> @@ -3280,29 +3880,24 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Завантаження індексу блоків...</translation> </message> <message> - <location line="-60"/> + <location line="-61"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>Додати вузол до підключення і лишити його відкритим</translation> </message> <message> - <location line="-28"/> + <location line="-32"/> <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source> <translation>Неможливо прив'язати до порту %s на цьому комп'ютері. Можливо гаманець вже запущено.</translation> </message> <message> - <location line="+69"/> - <source>Fee per KB to add to transactions you send</source> - <translation>Комісія за КБ</translation> - </message> - <message> - <location line="+20"/> + <location line="+94"/> <source>Loading wallet...</source> <translation>Завантаження гаманця...</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>Cannot downgrade wallet</source> - <translation type="unfinished"/> + <translation>Не вдається понизити версію гаманця</translation> </message> <message> <location line="+3"/> @@ -3322,7 +3917,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+85"/> <source>To use the %s option</source> - <translation type="unfinished"/> + <translation>Щоб використати опцію %s</translation> </message> <message> <location line="-77"/> @@ -3330,7 +3925,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Помилка</translation> </message> <message> - <location line="-33"/> + <location line="-34"/> <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 23cbe42c14..34cdf9f0ad 100644 --- a/src/qt/locale/bitcoin_zh_CN.ts +++ b/src/qt/locale/bitcoin_zh_CN.ts @@ -3,13 +3,13 @@ <name>AboutDialog</name> <message> <location filename="../forms/aboutdialog.ui" line="+14"/> - <source>About Bitcoin</source> - <translation>关于比特币</translation> + <source>About Bitcoin Core</source> + <translation>关于比特币核心</translation> </message> <message> <location line="+39"/> - <source><b>Bitcoin</b> version</source> - <translation><b>比特币</b>版本</translation> + <source><b>Bitcoin Core</b> version</source> + <translation><b>比特币核心</b> 版本</translation> </message> <message> <location line="+57"/> @@ -27,7 +27,7 @@ Distributed under the MIT/X11 software license, see the accompanying file COPYIN This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="+14"/> + <location filename="../aboutdialog.cpp" line="+19"/> <source>Copyright</source> <translation>版权</translation> </message> @@ -70,7 +70,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>关闭(&C)</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="+72"/> + <location filename="../addressbookpage.cpp" line="+74"/> <source>&Copy Address</source> <translation>复制地址(&C)</translation> </message> @@ -140,7 +140,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>编辑(&E)</translation> </message> <message> - <location line="+197"/> + <location line="+194"/> <source>Export Address List</source> <translation>导出地址列表</translation> </message> @@ -163,7 +163,7 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>AddressTableModel</name> <message> - <location filename="../addresstablemodel.cpp" line="+164"/> + <location filename="../addresstablemodel.cpp" line="+168"/> <source>Label</source> <translation>标签</translation> </message> @@ -201,7 +201,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>重复新密码</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="+34"/> + <location filename="../askpassphrasedialog.cpp" line="+40"/> <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>10 or more random characters</b>, or <b>eight or more words</b>.</source> <translation>输入钱包的新密码。<br/>使用的密码请至少包含<b>10个以上随机字符</>,或者是<b>8个以上的单词</b>。</translation> </message> @@ -322,17 +322,17 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+250"/> + <location filename="../bitcoingui.cpp" line="+260"/> <source>Sign &message...</source> <translation>消息签名(&M)...</translation> </message> <message> - <location line="+254"/> + <location line="+290"/> <source>Synchronizing with network...</source> <translation>正在与网络同步...</translation> </message> <message> - <location line="-324"/> + <location line="-360"/> <source>&Overview</source> <translation>概况(&O)</translation> </message> @@ -398,7 +398,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>更改密码(&C)...</translation> </message> <message> - <location line="+259"/> + <location line="+295"/> <source>Importing blocks from disk...</source> <translation>正在从磁盘导入数据块...</translation> </message> @@ -408,7 +408,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>正在为数据块建立索引...</translation> </message> <message> - <location line="-322"/> + <location line="-358"/> <source>Send coins to a Bitcoin address</source> <translation>向一个比特币地址发送比特币</translation> </message> @@ -443,20 +443,18 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>验证消息(&V)...</translation> </message> <message> - <location line="-180"/> - <location line="+6"/> - <location line="+513"/> + <location line="+375"/> <source>Bitcoin</source> <translation>比特币</translation> </message> <message> - <location line="-519"/> - <location line="+6"/> + <location line="-563"/> + <location line="+10"/> <source>Wallet</source> <translation>钱包</translation> </message> <message> - <location line="+109"/> + <location line="+113"/> <source>&Send</source> <translation>发送(&S)</translation> </message> @@ -466,13 +464,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>接收(&R)</translation> </message> <message> - <location line="+28"/> - <location line="+2"/> - <source>&About Bitcoin</source> - <translation>关于比特币(&A)</translation> - </message> - <message> - <location line="+14"/> + <location line="+44"/> <location line="+2"/> <source>&Show / Hide</source> <translation>显示 / 隐藏(&S)</translation> @@ -498,12 +490,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>校验消息,确保该消息是由指定的比特币地址所有者签名的</translation> </message> <message> - <location line="+35"/> + <location line="+39"/> <source>&File</source> <translation>文件(&F)</translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>&Settings</source> <translation>设置(&S)</translation> </message> @@ -518,18 +510,30 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>分页工具栏</translation> </message> <message> - <location line="-235"/> - <location line="+294"/> + <location line="-244"/> + <location line="+321"/> <source>[testnet]</source> <translation>[测试网络]</translation> </message> <message> - <location line="-177"/> + <location line="-331"/> + <location line="+10"/> + <source>Bitcoin Core</source> + <translation>比特币核心</translation> + </message> + <message> + <location line="+121"/> <source>Request payments (generates QR codes and bitcoin: URIs)</source> <translation>请求支付(生成二维码和 bitcoin: URI)</translation> </message> <message> - <location line="+63"/> + <location line="+27"/> + <location line="+2"/> + <source>&About Bitcoin Core</source> + <translation>关于比特币核心(&A)</translation> + </message> + <message> + <location line="+34"/> <source>&Used sending addresses...</source> <translation>用过的发送地址(&U)...</translation> </message> @@ -549,13 +553,23 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>显示用过的接收地址和标签的列表</translation> </message> <message> - <location line="+106"/> + <location line="+2"/> + <source>Open URI...</source> + <translation>打开 URI...</translation> + </message> + <message> + <location line="+1"/> + <source>Open a bitcoin: URI or payment request</source> + <translation>打开一个比特币:URI 或支付请求</translation> + </message> + <message> + <location line="+126"/> <location line="+5"/> <source>Bitcoin client</source> <translation>比特币客户端</translation> </message> <message numerus="yes"> - <location line="+120"/> + <location line="+133"/> <source>%n active connection(s) to Bitcoin network</source> <translation><numerusform>%n条到比特币网络的活动连接</numerusform></translation> </message> @@ -663,17 +677,7 @@ Address: %4 </translation> </message> <message> - <location line="+34"/> - <source>URI handling</source> - <translation>URI 处理</translation> - </message> - <message> - <location line="+0"/> - <source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source> - <translation>URI无法解析!原因可能是比特币地址不正确,或者URI参数错误。</translation> - </message> - <message> - <location line="+45"/> + <location line="+67"/> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>钱包已被<b>加密</b>,当前为<b>解锁</b>状态</translation> </message> @@ -683,7 +687,7 @@ Address: %4 <translation>钱包已被<b>加密</b>,当前为<b>锁定</b>状态</translation> </message> <message> - <location filename="../bitcoin.cpp" line="+110"/> + <location filename="../bitcoin.cpp" line="+116"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>发生严重错误。</translation> </message> @@ -691,12 +695,299 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+115"/> + <location filename="../clientmodel.cpp" line="+119"/> <source>Network Alert</source> <translation>网络警报</translation> </message> </context> <context> + <name>CoinControlDialog</name> + <message> + <location filename="../forms/coincontroldialog.ui" line="+14"/> + <source>Coin Control Address Selection</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+34"/> + <source>Quantity:</source> + <translation>总量:</translation> + </message> + <message> + <location line="+29"/> + <source>Bytes:</source> + <translation>字节:</translation> + </message> + <message> + <location line="+45"/> + <source>Amount:</source> + <translation>金额:</translation> + </message> + <message> + <location line="+29"/> + <source>Priority:</source> + <translation>优先级:</translation> + </message> + <message> + <location line="+45"/> + <source>Fee:</source> + <translation>费用:</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>变更 : </translation> + </message> + <message> + <location line="+63"/> + <source>(un)select all</source> + <translation>(不)全选</translation> + </message> + <message> + <location line="+13"/> + <source>Tree mode</source> + <translation>树状模式</translation> + </message> + <message> + <location line="+16"/> + <source>List mode</source> + <translation>列表模式</translation> + </message> + <message> + <location line="+52"/> + <source>Amount</source> + <translation>金额</translation> + </message> + <message> + <location line="+10"/> + <source>Address</source> + <translation>地址</translation> + </message> + <message> + <location line="+5"/> + <source>Date</source> + <translation>日期</translation> + </message> + <message> + <location line="+5"/> + <source>Confirmations</source> + <translation>确认</translation> + </message> + <message> + <location line="+3"/> + <source>Confirmed</source> + <translation>已确认</translation> + </message> + <message> + <location line="+5"/> + <source>Priority</source> + <translation>优先级</translation> + </message> + <message> + <location filename="../coincontroldialog.cpp" line="+42"/> + <source>Copy address</source> + <translation>复制地址</translation> + </message> + <message> + <location line="+1"/> + <source>Copy label</source> + <translation>复制标签</translation> + </message> + <message> + <location line="+1"/> + <location line="+26"/> + <source>Copy amount</source> + <translation>复制金额</translation> + </message> + <message> + <location line="-25"/> + <source>Copy transaction ID</source> + <translation>复制交易编号</translation> + </message> + <message> + <location line="+1"/> + <source>Lock unspent</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Unlock unspent</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+22"/> + <source>Copy quantity</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>Copy fee</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy after fee</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy bytes</source> + <translation>复制字节</translation> + </message> + <message> + <location line="+1"/> + <source>Copy priority</source> + <translation>复制优先级</translation> + </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>最高</translation> + </message> + <message> + <location line="+1"/> + <source>higher</source> + <translation>更高</translation> + </message> + <message> + <location line="+1"/> + <source>high</source> + <translation>高</translation> + </message> + <message> + <location line="+1"/> + <source>medium-high</source> + <translation>中高</translation> + </message> + <message> + <location line="+1"/> + <source>medium</source> + <translation>中等</translation> + </message> + <message> + <location line="+4"/> + <source>low-medium</source> + <translation>中低</translation> + </message> + <message> + <location line="+1"/> + <source>low</source> + <translation>低</translation> + </message> + <message> + <location line="+1"/> + <source>lower</source> + <translation>更低</translation> + </message> + <message> + <location line="+1"/> + <source>lowest</source> + <translation>最低</translation> + </message> + <message> + <location line="+11"/> + <source>(%1 locked)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+171"/> + <source>Dust</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>yes</source> + <translation>是</translation> + </message> + <message> + <location line="+0"/> + <source>no</source> + <translation>否</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>(没有标签)</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"/> @@ -716,7 +1007,7 @@ Address: %4 <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>该地址已与地址列表中的条目关联,只能被发送地址修改。</translation> </message> <message> <location line="-10"/> @@ -724,7 +1015,7 @@ Address: %4 <translation>地址(&A)</translation> </message> <message> - <location filename="../editaddressdialog.cpp" line="+21"/> + <location filename="../editaddressdialog.cpp" line="+25"/> <source>New receiving address</source> <translation>新建接收地址</translation> </message> @@ -767,7 +1058,7 @@ Address: %4 <context> <name>FreespaceChecker</name> <message> - <location filename="../intro.cpp" line="+61"/> + <location filename="../intro.cpp" line="+65"/> <source>A new data directory will be created.</source> <translation>一个新的数据目录将被创建。</translation> </message> @@ -795,18 +1086,18 @@ Address: %4 <context> <name>GUIUtil::HelpMessageBox</name> <message> - <location filename="../guiutil.cpp" line="+558"/> - <location line="+13"/> - <source>Bitcoin-Qt</source> - <translation>Bitcoin-Qt</translation> - </message> - <message> - <location line="-13"/> + <location filename="../guiutil.cpp" line="+597"/> <source>version</source> <translation>版本</translation> </message> <message> - <location line="+2"/> + <location line="+0"/> + <location line="+13"/> + <source>Bitcoin Core</source> + <translation>比特币核心</translation> + </message> + <message> + <location line="-11"/> <source>Usage:</source> <translation>使用:</translation> </message> @@ -851,18 +1142,18 @@ Address: %4 </message> <message> <location line="+9"/> - <source>Welcome to Bitcoin-Qt.</source> - <translation>欢迎使用 Bitcoin-Qt。</translation> + <source>Welcome to Bitcoin Core.</source> + <translation type="unfinished"/> </message> <message> <location line="+26"/> - <source>As this is the first time the program is launched, you can choose where Bitcoin-Qt will store its data.</source> - <translation>因为这是第一次启动本程序,您可以选择在哪里存储 Bitcoin-Qt 的数据。</translation> + <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source> + <translation type="unfinished"/> </message> <message> <location line="+10"/> - <source>Bitcoin-Qt will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source> - <translation>Bitcoin-Qt 将下载和存储比特币的区块链。至少 %1GB 的数据将被存储在这个目录中,并将时间推移增加。您的钱包也将存储在这个目录中。</translation> + <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source> + <translation type="unfinished"/> </message> <message> <location line="+10"/> @@ -875,7 +1166,17 @@ Address: %4 <translation>使用自定义的数据目录:</translation> </message> <message> - <location filename="../intro.cpp" line="+105"/> + <location filename="../intro.cpp" line="+85"/> + <source>Bitcoin</source> + <translation>比特币</translation> + </message> + <message> + <location line="+1"/> + <source>Error: Specified data directory "%1" can not be created.</source> + <translation>错误:指定的数据目录“%1”无法创建。</translation> + </message> + <message> + <location line="+19"/> <source>Error</source> <translation>错误</translation> </message> @@ -891,6 +1192,34 @@ Address: %4 </message> </context> <context> + <name>OpenURIDialog</name> + <message> + <location filename="../forms/openuridialog.ui" line="+14"/> + <source>Open URI</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Open payment request from URI or file</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+9"/> + <source>URI:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+11"/> + <source>Select payment request file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../openuridialog.cpp" line="+47"/> + <source>Select payment request file to open</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OptionsDialog</name> <message> <location filename="../forms/optionsdialog.ui" line="+14"/> @@ -1048,6 +1377,16 @@ Address: %4 <translation>在交易清单中显示比特币地址(&D)</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="+71"/> <source>&OK</source> <translation>确定(&O)</translation> @@ -1063,12 +1402,12 @@ Address: %4 <translation>应用(&A)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+58"/> + <location filename="../optionsdialog.cpp" line="+63"/> <source>default</source> <translation>默认</translation> </message> <message> - <location line="+130"/> + <location line="+131"/> <source>Confirm options reset</source> <translation>确认恢复缺省设置</translation> </message> @@ -1109,17 +1448,17 @@ Address: %4 </message> <message> <location line="+50"/> - <location line="+202"/> + <location line="+214"/> <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source> <translation>现在显示的消息可能是过期的. 在连接上比特币网络节点后,您的钱包将自动与网络同步,但是这个过程还没有完成。</translation> </message> <message> - <location line="-131"/> + <location line="-140"/> <source>Unconfirmed:</source> <translation>未确认:</translation> </message> <message> - <location line="-78"/> + <location line="-81"/> <source>Wallet</source> <translation>钱包</translation> </message> @@ -1134,12 +1473,12 @@ Address: %4 <translation>您当前可使用的余额</translation> </message> <message> - <location line="+29"/> + <location line="+32"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation>尚未确认的交易总额,未计入当前余额</translation> </message> <message> - <location line="+13"/> + <location line="+16"/> <source>Immature:</source> <translation>未成熟的:</translation> </message> @@ -1149,7 +1488,7 @@ Address: %4 <translation>尚未成熟的挖矿收入余额</translation> </message> <message> - <location line="+13"/> + <location line="+16"/> <source>Total:</source> <translation>总额:</translation> </message> @@ -1159,12 +1498,12 @@ Address: %4 <translation>您当前的总余额</translation> </message> <message> - <location line="+53"/> + <location line="+56"/> <source><b>Recent transactions</b></source> <translation><b>最近交易记录</b></translation> </message> <message> - <location filename="../overviewpage.cpp" line="+116"/> + <location filename="../overviewpage.cpp" line="+120"/> <location line="+1"/> <source>out of sync</source> <translation>数据同步中</translation> @@ -1173,7 +1512,7 @@ Address: %4 <context> <name>PaymentServer</name> <message> - <location filename="../paymentserver.cpp" line="+392"/> + <location filename="../paymentserver.cpp" line="+397"/> <source>URI handling</source> <translation>URI 处理</translation> </message> @@ -1183,23 +1522,29 @@ Address: %4 <translation>URI无法解析!原因可能是比特币地址不正确,或者URI参数错误。</translation> </message> <message> - <location line="+69"/> + <location line="+91"/> <source>Requested payment amount of %1 is too small (considered dust).</source> <translation>请求支付的金额 %1 太小(就像尘埃)。</translation> </message> <message> - <location line="+4"/> - <location line="+37"/> + <location line="-204"/> + <location line="+195"/> + <location line="+13"/> <source>Payment request error</source> <translation>支付请求出错</translation> </message> <message> - <location line="+1"/> - <source>Insecure requests to custom payment scripts unsupported</source> - <translation>不支持用不安全的请求定制支付脚本</translation> + <location line="-207"/> + <source>Cannot start bitcoin: click-to-pay handler</source> + <translation>暂时无法启动比特币:点击支付功能</translation> </message> <message> - <location line="+38"/> + <location line="+195"/> + <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>退款来自 %1</translation> </message> @@ -1209,7 +1554,7 @@ Address: %4 <translation>%1: %2 通讯出错</translation> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>Bad response from server %1</source> <translation>来自 %1 服务器的错误响应</translation> </message> @@ -1219,8 +1564,8 @@ Address: %4 <translation>支付已到账</translation> </message> <message> - <location line="-58"/> - <location line="+30"/> + <location line="-55"/> + <location line="+27"/> <location line="+17"/> <source>Network request error</source> <translation>网络请求出错</translation> @@ -1229,9 +1574,8 @@ Address: %4 <context> <name>QObject</name> <message> - <location filename="../bitcoin.cpp" line="+114"/> + <location filename="../bitcoin.cpp" line="+119"/> <location line="+5"/> - <location filename="../intro.cpp" line="-32"/> <source>Bitcoin</source> <translation>比特币</translation> </message> @@ -1245,16 +1589,11 @@ Address: %4 <source>Error: Invalid combination of -regtest and -testnet.</source> <translation>错误:无效的 -regtest 与 -testnet 结合体。</translation> </message> - <message> - <location filename="../intro.cpp" line="+1"/> - <source>Error: Specified data directory "%1" can not be created.</source> - <translation>错误:指定的数据目录“%1”无法创建。</translation> - </message> </context> <context> <name>QRImageWidget</name> <message> - <location filename="../receiverequestdialog.cpp" line="+32"/> + <location filename="../receiverequestdialog.cpp" line="+36"/> <source>&Save Image...</source> <translation>保存图片(&S)...</translation> </message> @@ -1270,8 +1609,8 @@ Address: %4 </message> <message> <location line="+0"/> - <source>PNG Images (*.png)</source> - <translation>PNG 图像文件 (*.png)</translation> + <source>PNG Image (*.png)</source> + <translation type="unfinished"/> </message> </context> <context> @@ -1291,7 +1630,7 @@ Address: %4 <location line="+53"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+352"/> + <location filename="../rpcconsole.cpp" line="+360"/> <source>N/A</source> <translation>不可用</translation> </message> @@ -1306,7 +1645,12 @@ Address: %4 <translation>信息(&I)</translation> </message> <message> - <location line="+68"/> + <location line="-10"/> + <source>Debug window</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+78"/> <source>Using OpenSSL version</source> <translation>使用 OpenSSL 版本</translation> </message> @@ -1361,12 +1705,7 @@ Address: %4 <translation>命令行选项</translation> </message> <message> - <location line="+7"/> - <source>Show the Bitcoin-Qt help message to get a list with possible Bitcoin command-line options.</source> - <translation>显示 Bitcoin 命令行选项帮助信息</translation> - </message> - <message> - <location line="+3"/> + <location line="+10"/> <source>&Show</source> <translation>显示(&S)</translation> </message> @@ -1393,12 +1732,12 @@ Address: %4 <message> <location line="+64"/> <source>In:</source> - <translation type="unfinished"/> + <translation>输入:</translation> </message> <message> <location line="+80"/> <source>Out:</source> - <translation type="unfinished"/> + <translation>输出:</translation> </message> <message> <location line="-541"/> @@ -1406,12 +1745,7 @@ Address: %4 <translation>创建时间</translation> </message> <message> - <location line="-104"/> - <source>Bitcoin - Debug window</source> - <translation>比特币 - 调试窗口</translation> - </message> - <message> - <location line="+25"/> + <location line="-79"/> <source>Bitcoin Core</source> <translation>比特币核心</translation> </message> @@ -1426,7 +1760,12 @@ Address: %4 <translation>打开当前目录中的调试日志文件。日志文件大的话可能要等上几秒钟。</translation> </message> <message> - <location line="+102"/> + <location line="+26"/> + <source>Show the Bitcoin-Core help message to get a list with possible Bitcoin command-line options.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+76"/> <source>Clear console</source> <translation>清空控制台</translation> </message> @@ -1484,37 +1823,32 @@ Address: %4 <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+22"/> + <location filename="../forms/receivecoinsdialog.ui" line="+83"/> <source>&Amount:</source> <translation>总额(&A):</translation> </message> <message> - <location line="+16"/> + <location line="+19"/> <source>The amount to request</source> <translation>要求金额</translation> </message> <message> - <location line="+7"/> + <location line="-32"/> <source>&Label:</source> <translation>标签(&L):</translation> </message> <message> - <location line="+10"/> - <source>The label to associate with the receiving address</source> - <translation>与此接收地址相关的标签</translation> - </message> - <message> - <location line="+7"/> + <location line="-34"/> <source>&Message:</source> <translation>消息(&M):</translation> </message> <message> - <location line="+10"/> + <location line="+20"/> <source>The message to attach to payment request</source> <translation>此消息将附加到支付请求</translation> </message> <message> - <location line="+14"/> + <location line="-37"/> <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> @@ -1524,12 +1858,17 @@ Address: %4 <translation>重用现有的接收地址(不推荐)</translation> </message> <message> - <location line="+7"/> + <location line="+27"/> + <source>The label to associate with the new receiving address</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+14"/> <source>Use this form to request payments. All fields are optional.</source> <translation>使用此表单要求付款。所有字段都是可选。</translation> </message> <message> - <location line="+17"/> + <location line="+56"/> <source>Clear all fields of the form.</source> <translation>清空此表单的所有字段。</translation> </message> @@ -1543,6 +1882,31 @@ Address: %4 <source>&Request payment</source> <translation>请求付款(&R)</translation> </message> + <message> + <location line="+47"/> + <source>Previously requested payments</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> + <source>Show the selected request (does the same as double clicking an entry)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Show</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+11"/> + <source>Remove the selected entries from the list</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Remove</source> + <translation type="unfinished"/> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -1563,16 +1927,11 @@ Address: %4 </message> <message> <location line="+7"/> - <source>&Copy Image</source> - <translation>复制图片(&C)</translation> - </message> - <message> - <location line="+7"/> <source>&Save Image...</source> <translation>保存图片(&S)...</translation> </message> <message> - <location filename="../receiverequestdialog.cpp" line="+58"/> + <location filename="../receiverequestdialog.cpp" line="+56"/> <source>Request payment to %1</source> <translation>请求付款到 %1</translation> </message> @@ -1618,16 +1977,119 @@ Address: %4 </message> </context> <context> + <name>RecentRequestsTableModel</name> + <message> + <location filename="../recentrequeststablemodel.cpp" line="+14"/> + <source>Date</source> + <translation>日期</translation> + </message> + <message> + <location line="+0"/> + <source>Label</source> + <translation>标签</translation> + </message> + <message> + <location line="+0"/> + <source>Message</source> + <translation>消息</translation> + </message> + <message> + <location line="+0"/> + <source>Amount</source> + <translation>金额</translation> + </message> + <message> + <location line="+36"/> + <source>(no label)</source> + <translation>(没有标签)</translation> + </message> + <message> + <location line="+9"/> + <source>(no message)</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="+14"/> - <location filename="../sendcoinsdialog.cpp" line="+140"/> - <location line="+213"/> + <location filename="../sendcoinsdialog.cpp" line="+381"/> + <location line="+81"/> <source>Send Coins</source> <translation>发送货币</translation> </message> <message> - <location line="+50"/> + <location line="+76"/> + <source>Coin Control Features</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+20"/> + <source>Inputs...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> + <source>automatically selected</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+19"/> + <source>Insufficient funds!</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+89"/> + <source>Quantity:</source> + <translation>总量:</translation> + </message> + <message> + <location line="+35"/> + <source>Bytes:</source> + <translation>字节:</translation> + </message> + <message> + <location line="+48"/> + <source>Amount:</source> + <translation>金额:</translation> + </message> + <message> + <location line="+32"/> + <source>Priority:</source> + <translation>优先级:</translation> + </message> + <message> + <location line="+48"/> + <source>Fee:</source> + <translation>费用:</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>变更 : </translation> + </message> + <message> + <location line="+44"/> + <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Custom change address</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+115"/> <source>Send to multiple recipients at once</source> <translation>一次发送给多个接收者</translation> </message> @@ -1652,12 +2114,7 @@ Address: %4 <translation>余额:</translation> </message> <message> - <location line="+10"/> - <source>123.456 BTC</source> - <translation>123.456 BTC</translation> - </message> - <message> - <location line="+31"/> + <location line="+41"/> <source>Confirm the send action</source> <translation>确认并发送货币</translation> </message> @@ -1667,49 +2124,125 @@ Address: %4 <translation>发送(&E)</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-154"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation>确认发送货币</translation> </message> <message> - <location line="-90"/> + <location line="-74"/> <location line="+5"/> <location line="+5"/> + <location line="+4"/> <source>%1 to %2</source> <translation>%1 到 %2</translation> </message> <message> - <location line="+26"/> + <location line="-136"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>请输入比特币地址(例如: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> + <message> + <location line="+15"/> + <source>Copy quantity</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation>复制金额</translation> + </message> + <message> + <location line="+1"/> + <source>Copy fee</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy after fee</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy bytes</source> + <translation>复制字节</translation> + </message> + <message> + <location line="+1"/> + <source>Copy priority</source> + <translation>复制优先级</translation> + </message> + <message> + <location line="+1"/> + <source>Copy low output</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Copy change</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+170"/> + <source>Total Amount %1 (= %2)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>or</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+202"/> <source>The recipient address is not valid, please recheck.</source> <translation>收款人地址不合法,请检查。</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>The amount to pay must be larger than 0.</source> <translation>支付金额必须大于0。</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>The amount exceeds your balance.</source> <translation>金额超出您的账上余额。</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>The total exceeds your balance when the %1 transaction fee is included.</source> <translation>计入 %1 交易费后的金额超出您的账上余额。</translation> </message> <message> - <location line="+5"/> + <location line="+3"/> <source>Duplicate address found, can only send to each address once per send operation.</source> <translation>发现重复的地址, 每次只能对同一地址发送一次。</translation> </message> <message> + <location line="+3"/> + <source>Transaction creation failed!</source> + <translation type="unfinished"/> + </message> + <message> <location line="+4"/> - <source>Error: Transaction creation failed!</source> - <translation>错误:创建交易失败!</translation> + <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> + <translation type="unfinished"/> </message> <message> - <location line="+15"/> + <location line="+113"/> + <source>Warning: Invalid Bitcoin address</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+13"/> + <source>(no label)</source> + <translation>(没有标签)</translation> + </message> + <message> + <location line="+8"/> + <source>Warning: Unknown change address</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-378"/> <source>Are you sure you want to send?</source> <translation>您确定要发出吗?</translation> </message> @@ -1719,17 +2252,7 @@ Address: %4 <translation>已添加交易费</translation> </message> <message> - <location line="+6"/> - <source>Total Amount %1</source> - <translation>总金额 %1</translation> - </message> - <message> - <location line="+20"/> - <source>Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> - <translation>错误: 交易被拒绝. 如果您使用的是备份钱包,可能存在两个钱包不同步的情况,另一个钱包中的比特币已经被使用,但本地的这个钱包尚没有记录。</translation> - </message> - <message> - <location line="+144"/> + <location line="+170"/> <source>Payment request expired</source> <translation>支付请求已过期</translation> </message> @@ -1742,39 +2265,44 @@ Address: %4 <context> <name>SendCoinsEntry</name> <message> - <location filename="../forms/sendcoinsentry.ui" line="+33"/> - <location line="+585"/> + <location filename="../forms/sendcoinsentry.ui" line="+131"/> + <location line="+501"/> + <location line="+536"/> <source>A&mount:</source> <translation>金额(&M)</translation> </message> <message> - <location line="-572"/> - <location line="+585"/> + <location line="-1132"/> <source>Pay &To:</source> <translation>付给(&T):</translation> </message> <message> - <location line="-551"/> + <location line="+18"/> <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation>付款给这个地址 (例如 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location filename="../sendcoinsentry.cpp" line="+28"/> + <location filename="../sendcoinsentry.cpp" line="+30"/> <source>Enter a label for this address to add it to your address book</source> <translation>为这个地址输入一个标签,以便将它添加到您的地址簿</translation> </message> <message> - <location filename="../forms/sendcoinsentry.ui" line="-18"/> + <location filename="../forms/sendcoinsentry.ui" line="+57"/> <source>&Label:</source> <translation>标签(&L):</translation> </message> <message> - <location line="+28"/> + <location line="-50"/> <source>Choose previously used address</source> <translation>选择以前用过的地址</translation> </message> <message> - <location line="+10"/> + <location line="-40"/> + <source>This is a normal payment.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+50"/> <source>Alt+A</source> <translation>Alt+A</translation> </message> @@ -1790,16 +2318,35 @@ Address: %4 </message> <message> <location line="+7"/> - <source>Remove this recipient</source> - <translation>移除此接收者</translation> + <location line="+504"/> + <location line="+536"/> + <source>Remove this entry</source> + <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="-40"/> + <source>This is a verified payment request.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-971"/> <source>Enter a label for this address to add it to the list of used addresses</source> <translation>请为此地址输入一个标签以将它加入用过的地址列表</translation> </message> <message> - <location line="+465"/> + <location line="+439"/> + <source>This is an unverified payment request.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+18"/> + <location line="+532"/> + <source>Pay To:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-498"/> + <location line="+536"/> <source>Memo:</source> <translation>便条:</translation> </message> @@ -1920,7 +2467,7 @@ Address: %4 <translation>清空所有验证消息栏</translation> </message> <message> - <location filename="../signverifymessagedialog.cpp" line="+27"/> + <location filename="../signverifymessagedialog.cpp" line="+29"/> <location line="+3"/> <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation>请输入比特币地址 (例如: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> @@ -1936,7 +2483,7 @@ Address: %4 <translation>输入比特币签名</translation> </message> <message> - <location line="+85"/> + <location line="+84"/> <location line="+81"/> <source>The entered address is invalid.</source> <translation>输入的地址非法。</translation> @@ -2005,9 +2552,14 @@ Address: %4 <context> <name>SplashScreen</name> <message> - <location filename="../splashscreen.cpp" line="+23"/> - <source>The Bitcoin developers</source> - <translation>Bitcoin-qt 客户端开发团队</translation> + <location filename="../splashscreen.cpp" line="+26"/> + <source>Bitcoin Core</source> + <translation>比特币核心</translation> + </message> + <message> + <location line="+2"/> + <source>The Bitcoin Core developers</source> + <translation type="unfinished"/> </message> <message> <location line="+1"/> @@ -2018,7 +2570,7 @@ Address: %4 <context> <name>TrafficGraphWidget</name> <message> - <location filename="../trafficgraphwidget.cpp" line="+75"/> + <location filename="../trafficgraphwidget.cpp" line="+79"/> <source>KB/s</source> <translation>KB/s</translation> </message> @@ -2026,7 +2578,7 @@ Address: %4 <context> <name>TransactionDesc</name> <message> - <location filename="../transactiondesc.cpp" line="+22"/> + <location filename="../transactiondesc.cpp" line="+28"/> <source>Open until %1</source> <translation>至 %1 个数据块时开启</translation> </message> @@ -2218,7 +2770,7 @@ Address: %4 <context> <name>TransactionTableModel</name> <message> - <location filename="../transactiontablemodel.cpp" line="+227"/> + <location filename="../transactiontablemodel.cpp" line="+234"/> <source>Date</source> <translation>日期</translation> </message> @@ -2336,7 +2888,7 @@ Address: %4 <context> <name>TransactionView</name> <message> - <location filename="../transactionview.cpp" line="+52"/> + <location filename="../transactionview.cpp" line="+57"/> <location line="+16"/> <source>All</source> <translation>全部</translation> @@ -2397,12 +2949,12 @@ Address: %4 <translation>其他</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>Enter address or label to search</source> <translation>输入地址或标签进行搜索</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>Min amount</source> <translation>最小金额</translation> </message> @@ -2437,17 +2989,37 @@ Address: %4 <translation>显示交易详情</translation> </message> <message> - <location line="+143"/> - <source>Export Transaction Data</source> - <translation>导出交易数据</translation> + <location line="+142"/> + <source>Export Transaction History</source> + <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+19"/> + <source>Exporting Failed</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>There was an error trying to save the transaction history to %1.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+4"/> + <source>Exporting Successful</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+0"/> + <source>The transaction history was successfully saved to %1.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-22"/> <source>Comma separated file (*.csv)</source> <translation>逗号分隔文件 (*.csv)</translation> </message> <message> - <location line="+8"/> + <location line="+9"/> <source>Confirmed</source> <translation>已确认</translation> </message> @@ -2482,17 +3054,7 @@ Address: %4 <translation>ID</translation> </message> <message> - <location line="+4"/> - <source>Error exporting</source> - <translation>导出错误</translation> - </message> - <message> - <location line="+0"/> - <source>Could not write to file %1.</source> - <translation>无法写入文件 %1。</translation> - </message> - <message> - <location line="+100"/> + <location line="+107"/> <source>Range:</source> <translation>范围:</translation> </message> @@ -2503,9 +3065,17 @@ Address: %4 </message> </context> <context> + <name>WalletFrame</name> + <message> + <location filename="../walletframe.cpp" line="+26"/> + <source>No wallet has been loaded.</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>WalletModel</name> <message> - <location filename="../walletmodel.cpp" line="+218"/> + <location filename="../walletmodel.cpp" line="+245"/> <source>Send Coins</source> <translation>发送比特币</translation> </message> @@ -2513,7 +3083,7 @@ Address: %4 <context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+46"/> + <location filename="../walletview.cpp" line="+43"/> <source>&Export</source> <translation>导出(&E)</translation> </message> @@ -2523,68 +3093,63 @@ Address: %4 <translation>导出当前数据到文件</translation> </message> <message> - <location line="+183"/> + <location line="+181"/> <source>Backup Wallet</source> <translation>备份钱包</translation> </message> <message> - <location line="+0"/> + <location line="+1"/> <source>Wallet Data (*.dat)</source> <translation>钱包文件(*.dat)</translation> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Backup Failed</source> <translation>备份失败</translation> </message> <message> <location line="+0"/> - <source>There was an error trying to save the wallet data to the new location.</source> - <translation>备份钱包到其它文件夹失败.</translation> + <source>There was an error trying to save the wallet data to %1.</source> + <translation type="unfinished"/> </message> <message> <location line="+4"/> - <source>Backup Successful</source> - <translation>备份成功</translation> + <source>The wallet data was successfully saved to %1.</source> + <translation type="unfinished"/> </message> <message> <location line="+0"/> - <source>The wallet data was successfully saved to the new location.</source> - <translation>钱包数据成功存储到新位置</translation> + <source>Backup Successful</source> + <translation>备份成功</translation> </message> </context> <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+102"/> - <source>Bitcoin version</source> - <translation>比特币版本</translation> - </message> - <message> - <location line="+107"/> + <location filename="../bitcoinstrings.cpp" line="+217"/> <source>Usage:</source> <translation>使用:</translation> </message> <message> - <location line="-55"/> + <location line="-54"/> <source>List commands</source> <translation>列出命令 </translation> </message> <message> - <location line="-13"/> + <location line="-14"/> <source>Get help for a command</source> <translation>获得某条命令的帮助 </translation> </message> <message> - <location line="+25"/> + <location line="+26"/> <source>Options:</source> <translation>选项: </translation> </message> <message> - <location line="+24"/> + <location line="+23"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>指定配置文件 (默认为 bitcoin.conf) </translation> @@ -2607,7 +3172,7 @@ Address: %4 <translation>设置数据库缓冲区大小 (缺省: 25MB)</translation> </message> <message> - <location line="-28"/> + <location line="-27"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>监听端口连接 <port>(缺省: 8333 或测试网络: 18333)</translation> </message> @@ -2617,7 +3182,7 @@ Address: %4 <translation>最大连接数 <n> (缺省: 125)</translation> </message> <message> - <location line="-49"/> + <location line="-50"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation>连接一个节点并获取对端地址,然后断开连接</translation> </message> @@ -2632,7 +3197,7 @@ Address: %4 <translation>断开行为不端对端阀值(缺省: 100)</translation> </message> <message> - <location line="-142"/> + <location line="-147"/> <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> @@ -2647,7 +3212,7 @@ Address: %4 <translation>JSON-RPC连接监听端口<port> (缺省:8332 testnet:18332)</translation> </message> <message> - <location line="+40"/> + <location line="+45"/> <source>Accept command line and JSON-RPC commands</source> <translation>接受命令行和 JSON-RPC 命令 </translation> @@ -2660,18 +3225,18 @@ Address: %4 </translation> </message> <message> - <location line="+40"/> + <location line="+39"/> <source>Use the test network</source> <translation>使用测试网络 </translation> </message> <message> - <location line="-118"/> + <location line="-117"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>接受来自外部的连接 (缺省: 如果不带 -proxy or -connect 参数设置为1)</translation> </message> <message> - <location line="-87"/> + <location line="-92"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2736,17 +3301,17 @@ rpcpassword=%s <translation>当最佳区块变化时执行命令 (命令行中的 %s 会被替换成区块哈希值)</translation> </message> <message> - <location line="+11"/> - <source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source> - <translation>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</translation> - </message> - <message> - <location line="+6"/> + <location line="+18"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation>这是测试用的预发布版本 - 请谨慎使用 - 不要用来挖矿,或者在正式商用环境下使用</translation> </message> <message> <location line="+5"/> + <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> <source>Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source> <translation>警告:-paytxfee 交易费设置得太高了!每笔交易都将支付交易费。</translation> </message> @@ -2776,17 +3341,27 @@ rpcpassword=%s <translation>警告:钱包文件wallet.dat损坏! 原始的钱包文件已经备份到%s目录下并重命名为{timestamp}.bak 。如果您的账户余额或者交易记录不正确,请使用您的钱包备份文件恢复。</translation> </message> <message> - <location line="+14"/> + <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>尝试从损坏的钱包文件wallet.dat中恢复私钥</translation> </message> <message> <location line="+1"/> + <source>Bitcoin Core Daemon</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Bitcoin RPC client version</source> <translation>Bitcoin RPC 客户端版本</translation> </message> <message> - <location line="+2"/> + <location line="+1"/> <source>Block creation options:</source> <translation>数据块创建选项:</translation> </message> @@ -2796,7 +3371,12 @@ rpcpassword=%s <translation>仅连接到指定节点</translation> </message> <message> - <location line="+2"/> + <location line="+1"/> + <source>Connect through SOCKS proxy</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Connect to JSON-RPC on <port> (default: 8332 or testnet: 18332)</source> <translation>连接到 JSON-RPC 于 <port>(默认: 8332,或测试网络: 18332)</translation> </message> @@ -2906,7 +3486,12 @@ rpcpassword=%s <translation>无法写入回滚信息</translation> </message> <message> - <location line="+2"/> + <location line="+1"/> + <source>Fee per kB to add to transactions you send</source> + <translation>为付款交易支付比特币(每kb)</translation> + </message> + <message> + <location line="+1"/> <source>Find peers using DNS lookup (default: 1 unless -connect)</source> <translation>通过DNS查找节点(缺省:1 除非使用 -connect 选项)</translation> </message> @@ -2926,6 +3511,11 @@ rpcpassword=%s <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"/> + </message> + <message> <location line="+2"/> <source>Incorrect or no genesis block found. Wrong datadir for network?</source> <translation>不正确或没有找到起源区块。网络错误?</translation> @@ -2941,17 +3531,37 @@ rpcpassword=%s <translation>没有足够的文件描述符可用。</translation> </message> <message> - <location line="+8"/> + <location line="+5"/> + <source>Prepend debug output with timestamp (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>RPC client options:</source> + <translation>RPC 客户端选项:</translation> + </message> + <message> + <location line="+1"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation>重新为当前的blk000??.dat文件建立索引</translation> </message> <message> - <location line="+6"/> + <location line="+5"/> + <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source> + <translation>用 -proxy 选择 SOCKS 版本(4 或 5,默认为 5)</translation> + </message> + <message> + <location line="+1"/> <source>Send command to Bitcoin server</source> <translation>发送命令到比特币服务器</translation> </message> <message> - <location line="+10"/> + <location line="+8"/> + <source>Set maximum block size in bytes (default: %d)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>Set the number of threads to service RPC calls (default: 4)</source> <translation>设置使用调用服务 RPC 的线程数量(默认:4)</translation> </message> @@ -2971,7 +3581,7 @@ rpcpassword=%s <translation>用法(不推荐,请使用 bitcoin-cli):</translation> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>Verifying blocks...</source> <translation>正在验证数据库的完整性...</translation> </message> @@ -2982,11 +3592,21 @@ rpcpassword=%s </message> <message> <location line="+1"/> + <source>Wait for RPC server to start</source> + <translation>等待 RPC 服务器</translation> + </message> + <message> + <location line="+1"/> <source>Wallet %s resides outside data directory %s</source> <translation>钱包 %s 在外部的数据目录 %s</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> + <source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source> + <translation>警告:已废弃的 -debugnet 参数已忽略,请用 -debug=net</translation> + </message> + <message> + <location line="+2"/> <source>You need to rebuild the database using -reindex to change -txindex</source> <translation>您需要将 -reindex 改为 -txindex 以重建数据库</translation> </message> @@ -2996,17 +3616,27 @@ rpcpassword=%s <translation>从blk000??.dat文件导入数据块</translation> </message> <message> - <location line="-98"/> + <location line="-104"/> <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> <translation>当收到相关提醒或者我们看到一个长分叉时执行命令(%s 将替换为消息)</translation> </message> <message> - <location line="+17"/> + <location line="+14"/> + <source>Output debugging information (default: 0, supplying <category> is optional)</source> + <translation>输出调试信息(默认为0,提供 <category> 是可选的)</translation> + </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>设置脚本验证线程数量(最多16,0 = 自动,<0 = 留下许多空闲核心,默认为 0)</translation> </message> <message> - <location line="+83"/> + <location line="+88"/> <source>Information</source> <translation>信息</translation> </message> @@ -3046,32 +3676,12 @@ rpcpassword=%s <translation>仅连接至指定网络的节点<net>(IPv4, IPv6 或者 Tor)</translation> </message> <message> - <location line="+2"/> - <source>Output extra debugging information. Implies all other -debug* options</source> - <translation>输出额外的调试信息。打开所有 -debug* 开关</translation> - </message> - <message> - <location line="+1"/> - <source>Output extra network debugging information</source> - <translation>输出额外的网络调试信息</translation> - </message> - <message> - <location line="+2"/> - <source>Prepend debug output with timestamp</source> - <translation>为调试输出信息添加时间戳</translation> - </message> - <message> - <location line="+5"/> + <location line="+9"/> <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation>SSL选项:(参见Bitcoin Wiki关于SSL设置栏目)</translation> </message> <message> - <location line="+1"/> - <source>Select the version of socks proxy to use (4-5, default: 5)</source> - <translation>请选择Socks代理服务器版本 (4 或 5, 缺省: 5)</translation> - </message> - <message> - <location line="+3"/> + <location line="+4"/> <source>Send trace/debug info to console instead of debug.log file</source> <translation>跟踪/调试信息输出到控制台,不输出到 debug.log 文件</translation> </message> @@ -3081,12 +3691,7 @@ rpcpassword=%s <translation>跟踪/调试信息输出到调试器</translation> </message> <message> - <location line="+5"/> - <source>Set maximum block size in bytes (default: 250000)</source> - <translation>设置最大数据块大小(缺省:250000)</translation> - </message> - <message> - <location line="+1"/> + <location line="+6"/> <source>Set minimum block size in bytes (default: 0)</source> <translation>设置最小数据块大小(缺省:0)</translation> </message> @@ -3136,38 +3741,38 @@ rpcpassword=%s <translation>使用UPnp映射监听端口(缺省: 监听状态设为1)</translation> </message> <message> - <location line="+1"/> - <source>Use proxy to reach tor hidden services (default: same as -proxy)</source> - <translation>使用代理服务器访问隐藏服务(缺省:同 -proxy)</translation> - </message> - <message> <location line="+2"/> <source>Username for JSON-RPC connections</source> <translation>JSON-RPC 连接用户名</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Warning</source> <translation>警告</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Warning: This version is obsolete, upgrade required!</source> <translation>警告:该软件版本已过时,请升级!</translation> </message> <message> <location line="+2"/> + <source>version</source> + <translation>版本</translation> + </message> + <message> + <location line="+1"/> <source>wallet.dat corrupt, salvage failed</source> <translation>钱包文件wallet.dat损坏,抢救备份失败</translation> </message> <message> - <location line="-54"/> + <location line="-57"/> <source>Password for JSON-RPC connections</source> <translation>JSON-RPC 连接密码 </translation> </message> <message> - <location line="-70"/> + <location line="-69"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>允许从指定IP接受到的 JSON-RPC 连接</translation> </message> @@ -3177,12 +3782,12 @@ rpcpassword=%s <translation>向IP地址为 <ip> 的节点发送指令 (缺省: 127.0.0.1)</translation> </message> <message> - <location line="-126"/> + <location line="-131"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>当最佳数据块变化时执行命令 (命令行中的 %s 会被替换成数据块哈希值)</translation> </message> <message> - <location line="+155"/> + <location line="+160"/> <source>Upgrade wallet to latest format</source> <translation>将钱包升级到最新的格式</translation> </message> @@ -3226,22 +3831,17 @@ rpcpassword=%s <translation>无法绑定本机端口 %s (返回错误消息 %d, %s)</translation> </message> <message> - <location line="-95"/> - <source>Connect through socks proxy</source> - <translation>通过 socks 代理连接</translation> - </message> - <message> - <location line="-11"/> + <location line="-106"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>使用 -addnode, -seednode 和 -connect 选项时允许查询DNS</translation> </message> <message> - <location line="+58"/> + <location line="+59"/> <source>Loading addresses...</source> <translation>正在加载地址簿...</translation> </message> <message> - <location line="-36"/> + <location line="-37"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>wallet.dat 钱包文件加载出错:钱包损坏</translation> </message> @@ -3261,12 +3861,12 @@ rpcpassword=%s <translation>wallet.dat 钱包文件加载出错</translation> </message> <message> - <location line="+30"/> + <location line="+31"/> <source>Invalid -proxy address: '%s'</source> <translation>无效的代理地址:%s</translation> </message> <message> - <location line="+57"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>-onlynet 指定的是未知网络:%s</translation> </message> @@ -3286,7 +3886,7 @@ rpcpassword=%s <translation>无法解析 -externalip 地址: '%s'</translation> </message> <message> - <location line="+46"/> + <location line="+47"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>非法金额 -paytxfee=<amount>: '%s'</translation> </message> @@ -3306,27 +3906,22 @@ rpcpassword=%s <translation>正在加载数据块索引...</translation> </message> <message> - <location line="-60"/> + <location line="-61"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>添加节点并与其保持连接</translation> </message> <message> - <location line="-28"/> + <location line="-32"/> <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source> <translation>无法在本机绑定 %s 端口。比特币客户端软件可能已经在运行。</translation> </message> <message> - <location line="+69"/> - <source>Fee per KB to add to transactions you send</source> - <translation>您对每KB交易愿出的交易费</translation> - </message> - <message> - <location line="+20"/> + <location line="+94"/> <source>Loading wallet...</source> <translation>正在加载钱包...</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>Cannot downgrade wallet</source> <translation>无法降级钱包</translation> </message> @@ -3356,7 +3951,7 @@ rpcpassword=%s <translation>错误</translation> </message> <message> - <location line="-33"/> + <location line="-34"/> <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_TW.ts b/src/qt/locale/bitcoin_zh_TW.ts index 7ca4a498e4..748d30333c 100644 --- a/src/qt/locale/bitcoin_zh_TW.ts +++ b/src/qt/locale/bitcoin_zh_TW.ts @@ -3,13 +3,13 @@ <name>AboutDialog</name> <message> <location filename="../forms/aboutdialog.ui" line="+14"/> - <source>About Bitcoin</source> - <translation>關於 Bitcoin</translation> + <source>About Bitcoin Core</source> + <translation>關於位元幣核心</translation> </message> <message> <location line="+39"/> - <source><b>Bitcoin</b> version</source> - <translation><b>Bitcoin</b> 版本</translation> + <source><b>Bitcoin Core</b> version</source> + <translation><b>位元幣核心</b>版本</translation> </message> <message> <location line="+57"/> @@ -20,21 +20,23 @@ Distributed under the MIT/X11 software license, see the accompanying file COPYIN This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.</source> <translation> -這是一套實驗性的軟體. +位元幣,原名是 Bitcoin, 又叫做比特幣。 -此軟體是依據 MIT/X11 軟體授權條款散布, 詳情請見附帶的 COPYING 檔案, 或是以下網站: http://www.opensource.org/licenses/mit-license.php. +這是一套實驗性的軟體。 -此產品也包含了由 OpenSSL Project 所開發的 OpenSSL Toolkit (http://www.openssl.org/) 軟體, 由 Eric Young (eay@cryptsoft.com) 撰寫的加解密軟體, 以及由 Thomas Bernard 所撰寫的 UPnP 軟體.</translation> +此軟體是依據 MIT/X11 軟體授權條款散布,詳情請見附帶的 COPYING 檔案,或是以下網站: http://www.opensource.org/licenses/mit-license.php. + +此產品也包含了由 OpenSSL Project 所開發的 OpenSSL Toolkit (http://www.openssl.org/) 軟體,和由 Eric Young (eay@cryptsoft.com) 撰寫的加解密軟體,以及由 Thomas Bernard 所撰寫的 UPnP 軟體。</translation> </message> <message> - <location filename="../aboutdialog.cpp" line="+14"/> + <location filename="../aboutdialog.cpp" line="+19"/> <source>Copyright</source> <translation>版權</translation> </message> <message> <location line="+0"/> <source>The Bitcoin developers</source> - <translation>位元幣開發人員</translation> + <translation>位元幣軟體開發人員</translation> </message> </context> <context> @@ -42,35 +44,35 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location filename="../forms/addressbookpage.ui" line="+30"/> <source>Double-click to edit address or label</source> - <translation>點兩下以編輯位置或位址</translation> + <translation>點兩下來編輯位址或標記</translation> </message> <message> <location line="+27"/> <source>Create a new address</source> - <translation>建立新位址</translation> + <translation>產生新位址</translation> </message> <message> <location line="+3"/> <source>&New</source> - <translation>新增(&N)</translation> + <translation>新增</translation> </message> <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>複製(&C)</translation> + <translation>複製</translation> </message> <message> <location line="+52"/> <source>C&lose</source> - <translation>關閉(&L)</translation> + <translation>關閉</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="+72"/> + <location filename="../addressbookpage.cpp" line="+74"/> <source>&Copy Address</source> <translation>複製位址</translation> </message> @@ -92,42 +94,42 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="-27"/> <source>&Delete</source> - <translation>刪除(&D)</translation> + <translation>刪除</translation> </message> <message> <location filename="../addressbookpage.cpp" line="-30"/> <source>Choose the address to send coins to</source> - <translation>選取位址以傳送金錢至</translation> + <translation>選擇要付錢過去的位址</translation> </message> <message> <location line="+1"/> <source>Choose the address to receive coins with</source> - <translation>選取位址以接受金錢自</translation> + <translation>選擇要收錢進來的位址</translation> </message> <message> <location line="+5"/> <source>C&hoose</source> - <translation>選取(&H)</translation> + <translation>選取</translation> </message> <message> <location line="+6"/> <source>Sending addresses</source> - <translation>正在傳送位址</translation> + <translation>付款位址</translation> </message> <message> <location line="+1"/> <source>Receiving addresses</source> - <translation>正在接收位址</translation> + <translation>收款位址</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>這是你用來付款的位元幣位址. 在付錢之前, 務必要檢查金額和收款位址是否正確.</translation> + <translation>這是你用來付款的位元幣位址。在付錢之前,務必要檢查金額和收款位址是否正確。</translation> </message> <message> <location line="+4"/> <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source> - <translation>此處為您用於收款的 Bitcoin 位址。建議於每個新的交易中都使用一個新的收款位址。</translation> + <translation>這些是你用來收款的位元幣位址。建議在每次交易時,都使用一個新的收款位址。</translation> </message> <message> <location line="+7"/> @@ -140,14 +142,14 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>編輯</translation> </message> <message> - <location line="+197"/> + <location line="+194"/> <source>Export Address List</source> <translation>匯出位址清單</translation> </message> <message> <location line="+1"/> <source>Comma separated file (*.csv)</source> - <translation>逗點分隔檔 (*.csv)</translation> + <translation>逗號分隔資料檔 (*.csv)</translation> </message> <message> <location line="+13"/> @@ -163,7 +165,7 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>AddressTableModel</name> <message> - <location filename="../addresstablemodel.cpp" line="+164"/> + <location filename="../addresstablemodel.cpp" line="+168"/> <source>Label</source> <translation>標記</translation> </message> @@ -201,9 +203,9 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>重複新密碼</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="+34"/> + <location filename="../askpassphrasedialog.cpp" line="+40"/> <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>10 or more random characters</b>, or <b>eight or more words</b>.</source> - <translation>請輸入新密碼至錢包。<br/>請使用<b>10 個以上的任意字元</b>或<b>8 個以上單字</b>作為密碼。</translation> + <translation>請輸入錢包的新密碼。<br/>建議用<b>10 個以上的任意字元</b>,或是<b>8 個以上的單字</b>。</translation> </message> <message> <location line="+1"/> @@ -213,7 +215,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+3"/> <source>This operation needs your wallet passphrase to unlock the wallet.</source> - <translation>此動作需要您的錢包密碼以解鎖錢包。</translation> + <translation>此動作需要你的錢包密碼來解鎖錢包。</translation> </message> <message> <location line="+5"/> @@ -223,12 +225,12 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+3"/> <source>This operation needs your wallet passphrase to decrypt the wallet.</source> - <translation>此動作需要您的錢包密碼以解鎖錢包。</translation> + <translation>此動作需要你的錢包密碼來將錢包解密。</translation> </message> <message> <location line="+5"/> <source>Decrypt wallet</source> - <translation>解鎖錢包</translation> + <translation>解密錢包</translation> </message> <message> <location line="+3"/> @@ -238,44 +240,44 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+1"/> <source>Enter the old and new passphrase to the wallet.</source> - <translation>請輸入舊密碼以及新的密碼至錢包。</translation> + <translation>請輸入錢包的舊密碼及新密碼。</translation> </message> <message> <location line="+46"/> <source>Confirm wallet encryption</source> - <translation>確認錢包加密</translation> + <translation>錢包加密確認</translation> </message> <message> <location line="+1"/> <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> - <translation>警告: 如果將錢包加密後忘記密碼, 你會<b>失去其中所有的位元幣</b>!</translation> + <translation>警告: 如果將錢包加密後忘記密碼,你從此就<b>失去其中所有的位元幣了</b>!</translation> </message> <message> <location line="+0"/> <source>Are you sure you wish to encrypt your wallet?</source> - <translation>你確定要將錢包加密嗎?</translation> + <translation>你確定要將錢包加密嗎?</translation> </message> <message> <location line="+15"/> <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> - <translation>重要: 請改用新產生有加密的錢包檔, 來取代之前錢包檔的備份. 為了安全性的理由, 當你開始使用新的有加密的錢包時, 舊錢包的備份就不能再使用了.</translation> + <translation>重要: 請改用新產生有加密的錢包檔,來取代舊錢包檔的備份。為了安全性的理由,當你開始使用新的有加密的錢包後,舊錢包檔的備份就不能再使用了。</translation> </message> <message> <location line="+100"/> <location line="+24"/> <source>Warning: The Caps Lock key is on!</source> - <translation>警告: 大寫字母鎖定作用中!</translation> + <translation>警告: 大寫字母鎖定作用中!</translation> </message> <message> <location line="-130"/> <location line="+58"/> <source>Wallet encrypted</source> - <translation>已加密錢包</translation> + <translation>錢包已加密</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 即將關閉以完成加密程序。請注意,加密您的錢包並無法完整保護您的 Bitcoin 不被您電腦中的惡意程式竊取。</translation> + <translation>位元幣軟體現在要關閉,好完成加密程序。請注意,加密錢包無法完全防止入侵你的電腦的惡意程式偷取你的位元幣。</translation> </message> <message> <location line="+13"/> @@ -288,13 +290,13 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="-54"/> <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> - <translation>因內部錯誤導致錢包加密失敗。您的錢包尚未加密。</translation> + <translation>因內部錯誤導致錢包加密失敗。你的錢包還是沒加密。</translation> </message> <message> <location line="+7"/> <location line="+48"/> <source>The supplied passphrases do not match.</source> - <translation>給定的密碼不相符。</translation> + <translation>提供的密碼不符。</translation> </message> <message> <location line="-37"/> @@ -306,45 +308,45 @@ This product includes software developed by the OpenSSL Project for use in the O <location line="+11"/> <location line="+19"/> <source>The passphrase entered for the wallet decryption was incorrect.</source> - <translation>以輸入之錢包密碼解密失敗。</translation> + <translation>用輸入的密碼解密錢包失敗。</translation> </message> <message> <location line="-20"/> <source>Wallet decryption failed</source> - <translation>解密錢包失敗</translation> + <translation>錢包解密失敗</translation> </message> <message> <location line="+14"/> <source>Wallet passphrase was successfully changed.</source> - <translation>錢包密碼變更成功.</translation> + <translation>錢包密碼更改成功。</translation> </message> </context> <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+250"/> + <location filename="../bitcoingui.cpp" line="+260"/> <source>Sign &message...</source> <translation>訊息簽署...</translation> </message> <message> - <location line="+254"/> + <location line="+290"/> <source>Synchronizing with network...</source> - <translation>正在進行網路同步...</translation> + <translation>正在跟網路進行同步...</translation> </message> <message> - <location line="-324"/> + <location line="-360"/> <source>&Overview</source> - <translation>縱覽(&O)</translation> + <translation>總覽</translation> </message> <message> <location line="+1"/> <source>Show general overview of wallet</source> - <translation>顯示錢包之基本縱覽</translation> + <translation>顯示錢包一般總覽</translation> </message> <message> <location line="+20"/> <source>&Transactions</source> - <translation>交易(&T)</translation> + <translation>交易</translation> </message> <message> <location line="+1"/> @@ -354,7 +356,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+15"/> <source>E&xit</source> - <translation>結束(&E)</translation> + <translation>結束</translation> </message> <message> <location line="+1"/> @@ -364,13 +366,13 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+7"/> <source>Show information about Bitcoin</source> - <translation>顯示 Bitcoin 相關資訊</translation> + <translation>顯示位元幣軟體相關資訊</translation> </message> <message> <location line="+3"/> <location line="+2"/> <source>About &Qt</source> - <translation>關於 Qt(&Q)</translation> + <translation>關於 &Qt</translation> </message> <message> <location line="+2"/> @@ -380,7 +382,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+2"/> <source>&Options...</source> - <translation>選項(&O)...</translation> + <translation>選項...</translation> </message> <message> <location line="+9"/> @@ -395,37 +397,37 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+2"/> <source>&Change Passphrase...</source> - <translation>密碼變更...</translation> + <translation>密碼更改...</translation> </message> <message> - <location line="+259"/> + <location line="+295"/> <source>Importing blocks from disk...</source> - <translation>從磁碟匯入區塊中...</translation> + <translation>正在從磁碟匯入區塊...</translation> </message> <message> <location line="+3"/> <source>Reindexing blocks on disk...</source> - <translation>重建磁碟區塊索引中...</translation> + <translation>正在為磁碟裡的區塊重建索引...</translation> </message> <message> - <location line="-322"/> + <location line="-358"/> <source>Send coins to a Bitcoin address</source> - <translation>付錢到位元幣位址</translation> + <translation>付錢給一個位元幣位址</translation> </message> <message> <location line="+47"/> <source>Modify configuration options for Bitcoin</source> - <translation>修改位元幣的設定選項</translation> + <translation>修改位元幣軟體的設定選項</translation> </message> <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"/> @@ -443,36 +445,28 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>驗證訊息...</translation> </message> <message> - <location line="-180"/> - <location line="+6"/> - <location line="+513"/> + <location line="+375"/> <source>Bitcoin</source> <translation>位元幣</translation> </message> <message> - <location line="-519"/> - <location line="+6"/> + <location line="-563"/> + <location line="+10"/> <source>Wallet</source> <translation>錢包</translation> </message> <message> - <location line="+109"/> + <location line="+113"/> <source>&Send</source> - <translation>付出</translation> + <translation>付款</translation> </message> <message> <location line="+7"/> <source>&Receive</source> - <translation>收受</translation> - </message> - <message> - <location line="+28"/> - <location line="+2"/> - <source>&About Bitcoin</source> - <translation>關於位元幣</translation> + <translation>收款</translation> </message> <message> - <location line="+14"/> + <location line="+44"/> <location line="+2"/> <source>&Show / Hide</source> <translation>顯示或隱藏</translation> @@ -485,7 +479,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+3"/> <source>Encrypt the private keys that belong to your wallet</source> - <translation>將屬於你的錢包的密鑰加密</translation> + <translation>將錢包中的密鑰加密</translation> </message> <message> <location line="+7"/> @@ -498,66 +492,88 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>驗證訊息來確認是用指定的位元幣位址簽署的</translation> </message> <message> - <location line="+35"/> + <location line="+39"/> <source>&File</source> - <translation>檔案(&F)</translation> + <translation>檔案</translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>&Settings</source> - <translation>設定(&S)</translation> + <translation>設定</translation> </message> <message> <location line="+6"/> <source>&Help</source> - <translation>說明(&H)</translation> + <translation>說明</translation> </message> <message> <location line="+9"/> <source>Tabs toolbar</source> - <translation>工具列分頁</translation> + <translation>分頁工具列</translation> </message> <message> - <location line="-235"/> - <location line="+294"/> + <location line="-244"/> + <location line="+321"/> <source>[testnet]</source> <translation>[testnet]</translation> </message> <message> - <location line="-177"/> + <location line="-331"/> + <location line="+10"/> + <source>Bitcoin Core</source> + <translation>位元幣核心</translation> + </message> + <message> + <location line="+121"/> <source>Request payments (generates QR codes and bitcoin: URIs)</source> - <translation>付款請求(產生QR Code 與 Bitcoin:URI)</translation> + <translation>付款請求(產生 QR Code 與 bitcoin: 的 URI)</translation> </message> <message> - <location line="+63"/> + <location line="+27"/> + <location line="+2"/> + <source>&About Bitcoin Core</source> + <translation>關於位元幣核心</translation> + </message> + <message> + <location line="+34"/> <source>&Used sending addresses...</source> - <translation>已使用的付款位址(&U)...</translation> + <translation>使用過的付款位址...</translation> </message> <message> <location line="+1"/> <source>Show the list of used sending addresses and labels</source> - <translation>顯示已使用的付款位址於標記清單</translation> + <translation>顯示已使用過的付款位址與標記的清單</translation> </message> <message> <location line="+1"/> <source>Used &receiving addresses...</source> - <translation>已使用的收款位址(&R)...</translation> + <translation>使用過的收款位址...</translation> </message> <message> <location line="+1"/> <source>Show the list of used receiving addresses and labels</source> - <translation>顯示已使用的收款位址於標記清單</translation> + <translation>顯示已使用過的收款位址與標記的清單</translation> + </message> + <message> + <location line="+2"/> + <source>Open URI...</source> + <translation>開啓 URI...</translation> + </message> + <message> + <location line="+1"/> + <source>Open a bitcoin: URI or payment request</source> + <translation>開啓 bitcoin: URI 或付款請求</translation> </message> <message> - <location line="+106"/> + <location line="+126"/> <location line="+5"/> <source>Bitcoin client</source> - <translation>Bitcoin 用戶端</translation> + <translation>位元幣客戶端軟體</translation> </message> <message numerus="yes"> - <location line="+120"/> + <location line="+133"/> <source>%n active connection(s) to Bitcoin network</source> - <translation><numerusform>%n 個已啟用之 Bitcoin 網路連線</numerusform></translation> + <translation><numerusform>%n 個運作中的位元幣網路連線</numerusform></translation> </message> <message> <location line="+22"/> @@ -567,12 +583,12 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+12"/> <source>Processed %1 of %2 (estimated) blocks of transaction history.</source> - <translation>已處理了估計全部 %2 個中的 %1 個區塊的交易紀錄.</translation> + <translation>已處理了估計全部 %2 個區塊中的 %1 個的交易紀錄.</translation> </message> <message> <location line="+4"/> <source>Processed %1 blocks of transaction history.</source> - <translation>已處理了 %1 個區塊的交易紀錄.</translation> + <translation>已處理了 %1 個區塊的交易紀錄。</translation> </message> <message numerus="yes"> <location line="+20"/> @@ -597,12 +613,12 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+14"/> <source>Last received block was generated %1 ago.</source> - <translation>最近收到的區塊是在 %1 之前生產出來.</translation> + <translation>最近收到的區塊是在 %1 之前生產出來的。</translation> </message> <message> <location line="+2"/> <source>Transactions after this will not yet be visible.</source> - <translation>會看不見在這之後的交易.</translation> + <translation>暫時會看不到在這之後的交易。</translation> </message> <message> <location line="+27"/> @@ -622,7 +638,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+77"/> <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source> - <translation>這筆交易的資料大小超過限制了. 你還是可以付出 %1 的費用來傳送, 這筆費用會付給處理你的交易的節點, 並幫助維持整個網路. 你願意支付這項費用嗎?</translation> + <translation>這筆交易的資料大小超過限制了。你還是可以付出 %1 的費用來傳送,這筆費用會付給處理你的交易的節點,並幫助維持整個網路。你願意支付這項費用嗎?</translation> </message> <message> <location line="-152"/> @@ -632,7 +648,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+31"/> <source>Catching up...</source> - <translation>進度追趕中...</translation> + <translation>正在趕進度...</translation> </message> <message> <location line="+124"/> @@ -642,7 +658,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+8"/> <source>Sent transaction</source> - <translation>已送出交易</translation> + <translation>付款交易</translation> </message> <message> <location line="+0"/> @@ -656,47 +672,324 @@ Amount: %2 Type: %3 Address: %4 </source> - <translation>日期: %1 -金額: %2 -類型: %3 -位址: %4 + <translation>日期: %1 +金額: %2 +種類: %3 +位址: %4 </translation> </message> <message> - <location line="+34"/> - <source>URI handling</source> - <translation>URI 處理</translation> - </message> - <message> - <location line="+0"/> - <source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source> - <translation>無法解析 URI! 也許位元幣位址無效或 URI 參數有誤.</translation> - </message> - <message> - <location line="+45"/> + <location line="+67"/> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> - <translation>現<b>已解鎖</b><b>加密</b>之錢包</translation> + <translation>錢包<b>已加密</b>並且<b>解鎖中</b></translation> </message> <message> <location line="+8"/> <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> - <translation>現已<b>已加密</b>並<b>鎖定</b>錢包</translation> + <translation>錢包<b>已加密</b>並且<b>上鎖中</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+110"/> + <location filename="../bitcoin.cpp" line="+116"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> - <translation>發生了致命的錯誤. 位元幣程式無法再繼續安全執行, 只好結束.</translation> + <translation>發生了致命的錯誤。位元幣軟體無法再繼續安全執行,只好結束。</translation> </message> </context> <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+115"/> + <location filename="../clientmodel.cpp" line="+119"/> <source>Network Alert</source> <translation>網路警報</translation> </message> </context> <context> + <name>CoinControlDialog</name> + <message> + <location filename="../forms/coincontroldialog.ui" line="+14"/> + <source>Coin Control Address Selection</source> + <translation>錢幣控制位址選擇</translation> + </message> + <message> + <location line="+34"/> + <source>Quantity:</source> + <translation>數量:</translation> + </message> + <message> + <location line="+29"/> + <source>Bytes:</source> + <translation>位元組數:</translation> + </message> + <message> + <location line="+45"/> + <source>Amount:</source> + <translation>金額:</translation> + </message> + <message> + <location line="+29"/> + <source>Priority:</source> + <translation>優先度:</translation> + </message> + <message> + <location line="+45"/> + <source>Fee:</source> + <translation>手續費:</translation> + </message> + <message> + <location line="+32"/> + <source>Low Output:</source> + <translation>小金額輸出</translation> + </message> + <message> + <location line="+48"/> + <source>After Fee:</source> + <translation>計費後金額:</translation> + </message> + <message> + <location line="+32"/> + <source>Change:</source> + <translation>找零:</translation> + </message> + <message> + <location line="+63"/> + <source>(un)select all</source> + <translation>全選或全不選</translation> + </message> + <message> + <location line="+13"/> + <source>Tree mode</source> + <translation>樹狀模式</translation> + </message> + <message> + <location line="+16"/> + <source>List mode</source> + <translation>列表模式</translation> + </message> + <message> + <location line="+52"/> + <source>Amount</source> + <translation>金額</translation> + </message> + <message> + <location line="+10"/> + <source>Address</source> + <translation>位址</translation> + </message> + <message> + <location line="+5"/> + <source>Date</source> + <translation>日期</translation> + </message> + <message> + <location line="+5"/> + <source>Confirmations</source> + <translation>確認次數</translation> + </message> + <message> + <location line="+3"/> + <source>Confirmed</source> + <translation>已確認</translation> + </message> + <message> + <location line="+5"/> + <source>Priority</source> + <translation>優先度</translation> + </message> + <message> + <location filename="../coincontroldialog.cpp" line="+42"/> + <source>Copy address</source> + <translation>複製位址</translation> + </message> + <message> + <location line="+1"/> + <source>Copy label</source> + <translation>複製標記</translation> + </message> + <message> + <location line="+1"/> + <location line="+26"/> + <source>Copy amount</source> + <translation>複製金額</translation> + </message> + <message> + <location line="-25"/> + <source>Copy transaction ID</source> + <translation>複製交易識別碼</translation> + </message> + <message> + <location line="+1"/> + <source>Lock unspent</source> + <translation>鎖定不用</translation> + </message> + <message> + <location line="+1"/> + <source>Unlock unspent</source> + <translation>解鎖可用</translation> + </message> + <message> + <location line="+22"/> + <source>Copy quantity</source> + <translation>複製數量</translation> + </message> + <message> + <location line="+2"/> + <source>Copy fee</source> + <translation>複製手續費</translation> + </message> + <message> + <location line="+1"/> + <source>Copy after fee</source> + <translation>複製計費後金額</translation> + </message> + <message> + <location line="+1"/> + <source>Copy bytes</source> + <translation>複製位元組數</translation> + </message> + <message> + <location line="+1"/> + <source>Copy priority</source> + <translation>複製優先度</translation> + </message> + <message> + <location line="+1"/> + <source>Copy low output</source> + <translation>複製小金額輸出</translation> + </message> + <message> + <location line="+1"/> + <source>Copy change</source> + <translation>複製找零</translation> + </message> + <message> + <location line="+323"/> + <source>highest</source> + <translation>最高</translation> + </message> + <message> + <location line="+1"/> + <source>higher</source> + <translation>很高</translation> + </message> + <message> + <location line="+1"/> + <source>high</source> + <translation>高</translation> + </message> + <message> + <location line="+1"/> + <source>medium-high</source> + <translation>中高</translation> + </message> + <message> + <location line="+1"/> + <source>medium</source> + <translation>中等</translation> + </message> + <message> + <location line="+4"/> + <source>low-medium</source> + <translation>中低</translation> + </message> + <message> + <location line="+1"/> + <source>low</source> + <translation>低</translation> + </message> + <message> + <location line="+1"/> + <source>lower</source> + <translation>很低</translation> + </message> + <message> + <location line="+1"/> + <source>lowest</source> + <translation>最低</translation> + </message> + <message> + <location line="+11"/> + <source>(%1 locked)</source> + <translation>(鎖定 %1 枚)</translation> + </message> + <message> + <location line="+171"/> + <source>Dust</source> + <translation>零散錢</translation> + </message> + <message> + <location line="+0"/> + <source>yes</source> + <translation>是</translation> + </message> + <message> + <location line="+0"/> + <source>no</source> + <translation>否</translation> + </message> + <message> + <location line="+10"/> + <source>This label turns red, if the transaction size is greater than 1000 bytes.</source> + <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>表示每一千位元組(kB)需要至少 %1 的手續費。</translation> + </message> + <message> + <location line="-4"/> + <source>Can vary +/- 1 byte per input.</source> + <translation>每組輸入可能會誤差多或少 1 個位元組。</translation> + </message> + <message> + <location line="+2"/> + <source>Transactions with higher priority are more likely to get included into a block.</source> + <translation>有較高優先度的交易比較有可能被接收放進區塊中。</translation> + </message> + <message> + <location line="+1"/> + <source>This label turns red, if the priority is smaller than "medium"</source> + <translation>當優先度低於"中等"時,文字會變紅色。</translation> + </message> + <message> + <location line="+3"/> + <source>This label turns red, if any recipient receives an amount smaller than %1.</source> + <translation>當任何一個收款金額小於 %1 時,文字會變紅色。</translation> + </message> + <message> + <location line="+1"/> + <location line="+4"/> + <source>This means a fee of at least %1 is required.</source> + <translation>表示至少需要 %1 的交易手續費。</translation> + </message> + <message> + <location line="-3"/> + <source>Amounts below 0.546 times the minimum relay fee are shown as dust.</source> + <translation>金額低於最少轉發手續費乘以 0.546 時,會顯示成零散錢。</translation> + </message> + <message> + <location line="+2"/> + <source>This label turns red, if the change is smaller than %1.</source> + <translation>當找零小於 %1 時,文字會變紅色。</translation> + </message> + <message> + <location line="+43"/> + <location line="+66"/> + <source>(no label)</source> + <translation>(無標記)</translation> + </message> + <message> + <location line="-9"/> + <source>change from %1 (%2)</source> + <translation>改變前是 %1 (%2)</translation> + </message> + <message> + <location line="+1"/> + <source>(change)</source> + <translation>(有變)</translation> + </message> +</context> +<context> <name>EditAddressDialog</name> <message> <location filename="../forms/editaddressdialog.ui" line="+14"/> @@ -706,27 +999,27 @@ Address: %4 <message> <location line="+11"/> <source>&Label</source> - <translation>標記(&L)</translation> + <translation>標記</translation> </message> <message> <location line="+10"/> <source>The label associated with this address list entry</source> - <translation>該標記關聯於位址清單條目</translation> + <translation>與這個位址簿項目關聯的標記</translation> </message> <message> <location line="+17"/> <source>The address associated with this address list entry. This can only be modified for sending addresses.</source> - <translation>該位址關聯於位址清單條目。將只能修改傳送位址。</translation> + <translation>與這個位址簿項目關聯的位址。只有付款位址能被修改。</translation> </message> <message> <location line="-10"/> <source>&Address</source> - <translation>位址(&A)</translation> + <translation>位址</translation> </message> <message> - <location filename="../editaddressdialog.cpp" line="+21"/> + <location filename="../editaddressdialog.cpp" line="+25"/> <source>New receiving address</source> - <translation>新收款位址</translation> + <translation>新增收款位址</translation> </message> <message> <location line="+4"/> @@ -751,12 +1044,12 @@ Address: %4 <message> <location line="-5"/> <source>The entered address "%1" is not a valid Bitcoin address.</source> - <translation>輸入的位址 "%1" 並不是有效的位元幣位址.</translation> + <translation>輸入的位址 "%1" 並不是有效的位元幣位址。</translation> </message> <message> <location line="+10"/> <source>Could not unlock wallet.</source> - <translation>無法解鎖錢包。</translation> + <translation>無法將錢包解鎖。</translation> </message> <message> <location line="+5"/> @@ -767,9 +1060,9 @@ Address: %4 <context> <name>FreespaceChecker</name> <message> - <location filename="../intro.cpp" line="+61"/> + <location filename="../intro.cpp" line="+65"/> <source>A new data directory will be created.</source> - <translation>將會建立新的資料目錄.</translation> + <translation>將會建立新的資料目錄。</translation> </message> <message> <location line="+22"/> @@ -779,34 +1072,34 @@ Address: %4 <message> <location line="+2"/> <source>Directory already exists. Add %1 if you intend to create a new directory here.</source> - <translation>目錄已經存在了. 如果你要在裡面建立新目錄的話, 請加上 %1.</translation> + <translation>目錄已經存在了。如果你要在裡面建立新目錄的話,請加上 %1.</translation> </message> <message> <location line="+3"/> <source>Path already exists, and is not a directory.</source> - <translation>已經存在該路徑了, 並且不是一個目錄.</translation> + <translation>已經存在該路徑了,並且不是一個目錄。</translation> </message> <message> <location line="+7"/> <source>Cannot create data directory here.</source> - <translation>無法在這裡新增資料目錄</translation> + <translation>無法在這裡新增資料目錄。</translation> </message> </context> <context> <name>GUIUtil::HelpMessageBox</name> <message> - <location filename="../guiutil.cpp" line="+558"/> - <location line="+13"/> - <source>Bitcoin-Qt</source> - <translation>位元幣-Qt</translation> - </message> - <message> - <location line="-13"/> + <location filename="../guiutil.cpp" line="+597"/> <source>version</source> <translation>版本</translation> </message> <message> - <location line="+2"/> + <location line="+0"/> + <location line="+13"/> + <source>Bitcoin Core</source> + <translation>位元幣核心</translation> + </message> + <message> + <location line="-11"/> <source>Usage:</source> <translation>用法:</translation> </message> @@ -823,18 +1116,17 @@ Address: %4 <message> <location line="+1"/> <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>設定語言, 比如說 "de_DE" (預設: 系統語系)</translation> + <translation>設定語言,比如說 "de_DE" (預設值: 系統語系)</translation> </message> <message> <location line="+1"/> <source>Start minimized</source> - <translation>啓動時最小化 -</translation> + <translation>啓動時縮到最小</translation> </message> <message> <location line="+1"/> <source>Show splash screen on startup (default: 1)</source> - <translation>顯示啓動畫面 (預設: 1)</translation> + <translation>顯示啓動畫面 (預設值: 1)</translation> </message> <message> <location line="+1"/> @@ -851,31 +1143,41 @@ Address: %4 </message> <message> <location line="+9"/> - <source>Welcome to Bitcoin-Qt.</source> - <translation>歡迎使用"位元幣-Qt"</translation> + <source>Welcome to Bitcoin Core.</source> + <translation>歡迎使用位元幣核心</translation> </message> <message> <location line="+26"/> - <source>As this is the first time the program is launched, you can choose where Bitcoin-Qt will store its data.</source> - <translation>由於這是程式第一次啓動, 你可以選擇"位元幣-Qt"儲存資料的地方.</translation> + <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source> + <translation>由於這是程式第一次啓動,你可以選擇位元幣核心儲存資料的地方。</translation> </message> <message> <location line="+10"/> - <source>Bitcoin-Qt will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source> - <translation>位元幣-Qt 會下載並儲存一份位元幣區塊鏈結的拷貝. 至少有 %1GB 的資料會儲存到這個目錄中, 並且還會持續增長. 另外錢包資料也會儲存在這個目錄.</translation> + <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source> + <translation>位元幣核心會下載並儲存一份位元幣區塊鏈結的拷貝。至少有 %1GB 的資料會儲存到這個目錄中,並且還會持續增長。另外錢包資料也會儲存在這個目錄。</translation> </message> <message> <location line="+10"/> <source>Use the default data directory</source> - <translation>用預設的資料目錄</translation> + <translation>使用預設的資料目錄</translation> </message> <message> <location line="+7"/> <source>Use a custom data directory:</source> - <translation>用自定的資料目錄:</translation> + <translation>使用自定的資料目錄:</translation> + </message> + <message> + <location filename="../intro.cpp" line="+85"/> + <source>Bitcoin</source> + <translation>位元幣</translation> </message> <message> - <location filename="../intro.cpp" line="+105"/> + <location line="+1"/> + <source>Error: Specified data directory "%1" can not be created.</source> + <translation>錯誤: 無法新增指定的資料目錄 "%1".</translation> + </message> + <message> + <location line="+19"/> <source>Error</source> <translation>錯誤</translation> </message> @@ -891,6 +1193,34 @@ Address: %4 </message> </context> <context> + <name>OpenURIDialog</name> + <message> + <location filename="../forms/openuridialog.ui" line="+14"/> + <source>Open URI</source> + <translation>開啓 URI</translation> + </message> + <message> + <location line="+6"/> + <source>Open payment request from URI or file</source> + <translation>從 URI 或檔案開啟付款請求</translation> + </message> + <message> + <location line="+9"/> + <source>URI:</source> + <translation>URI:</translation> + </message> + <message> + <location line="+11"/> + <source>Select payment request file</source> + <translation>選擇付款請求資料檔</translation> + </message> + <message> + <location filename="../openuridialog.cpp" line="+47"/> + <source>Select payment request file to open</source> + <translation>選擇要開啟的付款請求資料檔</translation> + </message> +</context> +<context> <name>OptionsDialog</name> <message> <location filename="../forms/optionsdialog.ui" line="+14"/> @@ -905,7 +1235,7 @@ Address: %4 <message> <location line="+6"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> - <translation>非必要的交易手續費, 以 kB 為計費單位, 且有助於縮短你的交易處理時間. 大部份交易資料的大小是 1 kB.</translation> + <translation>非必要的交易手續費,計費單位是每一千位元組(kB),且有助於縮短你的交易處理時間。大部份交易資料的大小是 1 kB.</translation> </message> <message> <location line="+15"/> @@ -915,7 +1245,7 @@ Address: %4 <message> <location line="+31"/> <source>Automatically start Bitcoin after logging in to the system.</source> - <translation>在登入系統後自動啓動位元幣.</translation> + <translation>在登入系統後自動啓動位元幣軟體。</translation> </message> <message> <location line="+3"/> @@ -925,7 +1255,7 @@ Address: %4 <message> <location line="+35"/> <source>Reset all client options to default.</source> - <translation>回復所有客戶端軟體選項成預設值.</translation> + <translation>回復所有客戶端軟體選項成預設值。</translation> </message> <message> <location line="+3"/> @@ -940,7 +1270,7 @@ Address: %4 <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>自動在路由器上開啟 Bitcoin 的客戶端通訊埠. 只有在你的路由器支援 UPnP 且開啟時才有作用.</translation> + <translation>自動在路由器上開放位元幣的客戶端通訊埠。只有在你的路由器支援且開啓 UPnP 時才有作用。</translation> </message> <message> <location line="+3"/> @@ -950,7 +1280,7 @@ Address: %4 <message> <location line="+7"/> <source>Connect to the Bitcoin network through a SOCKS proxy (e.g. when connecting through Tor).</source> - <translation>透過 SOCKS 代理伺服器連線至位元幣網路 (比如說要透過 Tor 連線).</translation> + <translation>透過 SOCKS 代理伺服器連線到位元幣網路 (比如說要透過 Tor 連線)。</translation> </message> <message> <location line="+3"/> @@ -960,12 +1290,12 @@ Address: %4 <message> <location line="+9"/> <source>Proxy &IP:</source> - <translation>代理伺服器位址:</translation> + <translation>代理位址:</translation> </message> <message> <location line="+19"/> <source>IP address of the proxy (e.g. 127.0.0.1)</source> - <translation>代理伺服器的網際網路位址 (比如說 127.0.0.1)</translation> + <translation>代理伺服器的網際網路位址 (像是 127.0.0.1)</translation> </message> <message> <location line="+7"/> @@ -975,7 +1305,7 @@ Address: %4 <message> <location line="+19"/> <source>Port of the proxy (e.g. 9050)</source> - <translation>代理伺服器的通訊埠 (比如說 9050)</translation> + <translation>代理伺服器的通訊埠 (像是 9050)</translation> </message> <message> <location line="+7"/> @@ -985,7 +1315,7 @@ Address: %4 <message> <location line="+13"/> <source>SOCKS version of the proxy (e.g. 5)</source> - <translation>代理伺服器的 SOCKS 協定版本 (比如說 5)</translation> + <translation>代理伺服器的 SOCKS 協定版本 (像是 5)</translation> </message> <message> <location line="+36"/> @@ -995,17 +1325,17 @@ Address: %4 <message> <location line="+6"/> <source>Show only a tray icon after minimizing the window.</source> - <translation>最小化視窗後只在通知區域顯示圖示</translation> + <translation>視窗縮到最小後只在通知區域顯示圖示。</translation> </message> <message> <location line="+3"/> <source>&Minimize to the tray instead of the taskbar</source> - <translation>最小化至通知區域而非工作列</translation> + <translation>縮到最小於通知區域而不是工作列</translation> </message> <message> <location line="+7"/> <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> - <translation>當視窗關閉時將其最小化, 而非結束應用程式. 當勾選這個選項時, 應用程式只能用選單中的結束來停止執行.</translation> + <translation>當視窗關閉時將它縮到最小,而非結束應用程式。當勾選這個選項時,應用程式只能用選單中的結束來停止執行。</translation> </message> <message> <location line="+3"/> @@ -1025,7 +1355,7 @@ Address: %4 <message> <location line="+13"/> <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</source> - <translation>可以在這裡設定使用者介面的語言. 這個設定在位元幣程式重啓後才會生效.</translation> + <translation>可以在這裡設定使用者介面的語言。這個設定在重啓位元幣軟體後才會生效。</translation> </message> <message> <location line="+11"/> @@ -1035,12 +1365,12 @@ Address: %4 <message> <location line="+13"/> <source>Choose the default subdivision unit to show in the interface and when sending coins.</source> - <translation>選擇操作界面與付錢時預設顯示的細分單位.</translation> + <translation>選擇操作界面與付款時預設顯示的細分單位。</translation> </message> <message> <location line="+9"/> <source>Whether to show Bitcoin addresses in the transaction list or not.</source> - <translation>是否要在交易列表中顯示位元幣位址.</translation> + <translation>是否要在交易列表中顯示位元幣位址。</translation> </message> <message> <location line="+3"/> @@ -1048,6 +1378,16 @@ Address: %4 <translation>在交易列表顯示位址</translation> </message> <message> + <location line="+7"/> + <source>Whether to show coin control features or not.</source> + <translation>是否要顯示錢幣控制功能。</translation> + </message> + <message> + <location line="+3"/> + <source>Display coin &control features (experts only)</source> + <translation>顯示錢幣控制功能(專家用)</translation> + </message> + <message> <location line="+71"/> <source>&OK</source> <translation>好</translation> @@ -1063,19 +1403,19 @@ Address: %4 <translation>套用</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+58"/> + <location filename="../optionsdialog.cpp" line="+63"/> <source>default</source> - <translation>預設</translation> + <translation>預設值</translation> </message> <message> - <location line="+130"/> + <location line="+131"/> <source>Confirm options reset</source> <translation>確認回復選項</translation> </message> <message> <location line="+1"/> <source>Some settings may require a client restart to take effect.</source> - <translation>有些設定可能需要重新啓動客戶端軟體才會生效.</translation> + <translation>有些設定可能需要重啓客戶端軟體才會生效。</translation> </message> <message> <location line="+0"/> @@ -1092,12 +1432,12 @@ Address: %4 <location line="-9"/> <location line="+9"/> <source>This setting will take effect after restarting Bitcoin.</source> - <translation>這個設定會在位元幣程式重啓後生效.</translation> + <translation>這個設定在重啓位元幣軟體後才會生效。</translation> </message> <message> <location line="+29"/> <source>The supplied proxy address is invalid.</source> - <translation>提供的代理伺服器位址無效</translation> + <translation>提供的代理伺服器位址無效。</translation> </message> </context> <context> @@ -1109,17 +1449,17 @@ Address: %4 </message> <message> <location line="+50"/> - <location line="+202"/> + <location line="+214"/> <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source> - <translation>顯示的資訊可能是過期的. 與位元幣網路的連線建立後, 你的錢包會自動和網路同步, 但這個步驟還沒完成.</translation> + <translation>顯示的資訊可能是過期的。與位元幣網路的連線建立後,你的錢包會自動和網路同步,但是這個步驟還沒完成。</translation> </message> <message> - <location line="-131"/> + <location line="-140"/> <source>Unconfirmed:</source> - <translation>未確認:</translation> + <translation>未確認金額:</translation> </message> <message> - <location line="-78"/> + <location line="-81"/> <source>Wallet</source> <translation>錢包</translation> </message> @@ -1134,22 +1474,22 @@ Address: %4 <translation>目前可用餘額</translation> </message> <message> - <location line="+29"/> + <location line="+32"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> - <translation>尚未確認的交易的總金額, 可用餘額不包含此金額</translation> + <translation>還沒確認的交易的總金額,可用餘額不包含此金額</translation> </message> <message> - <location line="+13"/> + <location line="+16"/> <source>Immature:</source> - <translation>未熟成</translation> + <translation>未熟成金額:</translation> </message> <message> <location line="+13"/> <source>Mined balance that has not yet matured</source> - <translation>尚未熟成的開採金額</translation> + <translation>還沒熟成的開採金額</translation> </message> <message> - <location line="+13"/> + <location line="+16"/> <source>Total:</source> <translation>總金額:</translation> </message> @@ -1159,12 +1499,12 @@ Address: %4 <translation>目前全部餘額</translation> </message> <message> - <location line="+53"/> + <location line="+56"/> <source><b>Recent transactions</b></source> <translation><b>最近交易</b></translation> </message> <message> - <location filename="../overviewpage.cpp" line="+116"/> + <location filename="../overviewpage.cpp" line="+120"/> <location line="+1"/> <source>out of sync</source> <translation>沒同步</translation> @@ -1173,33 +1513,39 @@ Address: %4 <context> <name>PaymentServer</name> <message> - <location filename="../paymentserver.cpp" line="+392"/> + <location filename="../paymentserver.cpp" line="+397"/> <source>URI handling</source> <translation>URI 處理</translation> </message> <message> <location line="+1"/> <source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source> - <translation>無法解析 URI !這可能代表 Bitcoin 位址無效或 URI 參數異常。</translation> + <translation>無法解析 URI !這可能代表位元幣位址無效或 URI 參數異常。</translation> </message> <message> - <location line="+69"/> + <location line="+91"/> <source>Requested payment amount of %1 is too small (considered dust).</source> - <translation>請求付款的金額 %1 太少(會被網路認為是沒必要的沙子錢)。</translation> + <translation>請求付款的金額 %1 太少 (會被網路認為是沒必要的零散錢)。</translation> </message> <message> - <location line="+4"/> - <location line="+37"/> + <location line="-204"/> + <location line="+195"/> + <location line="+13"/> <source>Payment request error</source> - <translation>發出付款要求時發生錯誤</translation> + <translation>發出付款請求時發生錯誤</translation> </message> <message> - <location line="+1"/> - <source>Insecure requests to custom payment scripts unsupported</source> - <translation>不支援以不安全的方式要求客製的付款指令碼</translation> + <location line="-207"/> + <source>Cannot start bitcoin: click-to-pay handler</source> + <translation>無法啟動 bitcoin 隨按隨付處理器</translation> </message> <message> - <location line="+38"/> + <location line="+195"/> + <source>Unverified payment requests to custom payment scripts are unsupported.</source> + <translation>不支援含有自訂付款指令碼的未驗證付款請求。</translation> + </message> + <message> + <location line="+59"/> <source>Refund from %1</source> <translation>來自 %1 的退款</translation> </message> @@ -1209,7 +1555,7 @@ Address: %4 <translation>與 %1 交談時發生錯誤: %2</translation> </message> <message> - <location line="+31"/> + <location line="+28"/> <source>Bad response from server %1</source> <translation>伺服器 %1 的回應有誤</translation> </message> @@ -1219,19 +1565,18 @@ Address: %4 <translation>已確認付款</translation> </message> <message> - <location line="-58"/> - <location line="+30"/> + <location line="-55"/> + <location line="+27"/> <location line="+17"/> <source>Network request error</source> - <translation>發出要求時發生網路錯誤</translation> + <translation>發出請求時發生網路錯誤</translation> </message> </context> <context> <name>QObject</name> <message> - <location filename="../bitcoin.cpp" line="+114"/> + <location filename="../bitcoin.cpp" line="+119"/> <location line="+5"/> - <location filename="../intro.cpp" line="-32"/> <source>Bitcoin</source> <translation>位元幣</translation> </message> @@ -1243,25 +1588,20 @@ Address: %4 <message> <location line="+4"/> <source>Error: Invalid combination of -regtest and -testnet.</source> - <translation>錯誤:-regtest 和 -testnet 的使用組合無效</translation> - </message> - <message> - <location filename="../intro.cpp" line="+1"/> - <source>Error: Specified data directory "%1" can not be created.</source> - <translation>錯誤: 無法新增指定的資料目錄 "%1".</translation> + <translation>錯誤: -regtest 和 -testnet 的使用組合無效。</translation> </message> </context> <context> <name>QRImageWidget</name> <message> - <location filename="../receiverequestdialog.cpp" line="+32"/> + <location filename="../receiverequestdialog.cpp" line="+36"/> <source>&Save Image...</source> - <translation>保存圖片(&S)</translation> + <translation>儲存圖片...</translation> </message> <message> <location line="+3"/> <source>&Copy Image</source> - <translation>複製圖片(&C)</translation> + <translation>複製圖片</translation> </message> <message> <location line="+28"/> @@ -1270,7 +1610,7 @@ Address: %4 </message> <message> <location line="+0"/> - <source>PNG Images (*.png)</source> + <source>PNG Image (*.png)</source> <translation>PNG 圖檔 (*.png)</translation> </message> </context> @@ -1291,7 +1631,7 @@ Address: %4 <location line="+53"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+352"/> + <location filename="../rpcconsole.cpp" line="+360"/> <source>N/A</source> <translation>無</translation> </message> @@ -1306,9 +1646,14 @@ Address: %4 <translation>資訊</translation> </message> <message> - <location line="+68"/> + <location line="-10"/> + <source>Debug window</source> + <translation>除錯視窗</translation> + </message> + <message> + <location line="+78"/> <source>Using OpenSSL version</source> - <translation>使用 OpenSSL 版本</translation> + <translation>使用的 OpenSSL 版本</translation> </message> <message> <location line="+49"/> @@ -1333,7 +1678,7 @@ Address: %4 <message> <location line="+23"/> <source>Block chain</source> - <translation>區塊鎖鏈</translation> + <translation>區塊鏈</translation> </message> <message> <location line="+7"/> @@ -1343,7 +1688,7 @@ Address: %4 <message> <location line="+23"/> <source>Estimated total blocks</source> - <translation>估算總區塊數</translation> + <translation>估計總區塊數</translation> </message> <message> <location line="+23"/> @@ -1361,12 +1706,7 @@ Address: %4 <translation>命令列選項</translation> </message> <message> - <location line="+7"/> - <source>Show the Bitcoin-Qt help message to get a list with possible Bitcoin command-line options.</source> - <translation>顯示"位元幣-Qt"的求助訊息, 來取得可用的命令列選項列表.</translation> - </message> - <message> - <location line="+3"/> + <location line="+10"/> <source>&Show</source> <translation>顯示</translation> </message> @@ -1378,12 +1718,12 @@ Address: %4 <message> <location line="+72"/> <source>&Network Traffic</source> - <translation>網路流量(&N)</translation> + <translation>網路流量</translation> </message> <message> <location line="+52"/> <source>&Clear</source> - <translation>清除(&C)</translation> + <translation>清除</translation> </message> <message> <location line="+13"/> @@ -1393,12 +1733,12 @@ Address: %4 <message> <location line="+64"/> <source>In:</source> - <translation>輸入:</translation> + <translation>輸入:</translation> </message> <message> <location line="+80"/> <source>Out:</source> - <translation>輸出:</translation> + <translation>輸出:</translation> </message> <message> <location line="-541"/> @@ -1406,12 +1746,7 @@ Address: %4 <translation>建置日期</translation> </message> <message> - <location line="-104"/> - <source>Bitcoin - Debug window</source> - <translation>位元幣 - 除錯視窗</translation> - </message> - <message> - <location line="+25"/> + <location line="-79"/> <source>Bitcoin Core</source> <translation>位元幣核心</translation> </message> @@ -1423,47 +1758,52 @@ 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>從目前的資料目錄下開啓位元幣的除錯紀錄檔. 當紀錄檔很大時可能要花好幾秒的時間.</translation> + <translation>從目前的資料目錄下開啓位元幣軟體的除錯紀錄檔。當紀錄檔很大時可能要花好幾秒的時間。</translation> </message> <message> - <location line="+102"/> + <location line="+26"/> + <source>Show the Bitcoin-Core help message to get a list with possible Bitcoin command-line options.</source> + <translation>顯示位元幣核心的求助訊息,來取得可用的命令列選項列表。</translation> + </message> + <message> + <location line="+76"/> <source>Clear console</source> <translation>清主控台</translation> </message> <message> <location filename="../rpcconsole.cpp" line="-30"/> <source>Welcome to the Bitcoin RPC console.</source> - <translation>歡迎使用位元幣 RPC 主控台.</translation> + <translation>歡迎使用位元幣 RPC 主控台。</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>請用上下游標鍵來瀏覽歷史指令, 且可用 <b>Ctrl-L</b> 來清理畫面.</translation> + <translation>請用上下游標鍵來瀏覽歷史指令,並用 <b>Ctrl-L</b> 來清理畫面。</translation> </message> <message> <location line="+1"/> <source>Type <b>help</b> for an overview of available commands.</source> - <translation>請打 <b>help</b> 來看可用指令的簡介.</translation> + <translation>請打 <b>help</b> 來看可用指令的簡介。</translation> </message> <message> <location line="+128"/> <source>%1 B</source> - <translation>%1 位元組</translation> + <translation>%1 B (位元組)</translation> </message> <message> <location line="+2"/> <source>%1 KB</source> - <translation>%1 千位元組</translation> + <translation>%1 KB (千位元組)</translation> </message> <message> <location line="+2"/> <source>%1 MB</source> - <translation>%1 MB</translation> + <translation>%1 MB (百萬位元組)</translation> </message> <message> <location line="+2"/> <source>%1 GB</source> - <translation>%1 GB</translation> + <translation>%1 GB (十億位元組)</translation> </message> <message> <location line="+7"/> @@ -1473,65 +1813,65 @@ Address: %4 <message> <location line="+5"/> <source>%1 h</source> - <translation>%1 時</translation> + <translation>%1 小時</translation> </message> <message> <location line="+2"/> <source>%1 h %2 m</source> - <translation>%1 時 %2 分</translation> + <translation>%1 小時 %2 分</translation> </message> </context> <context> <name>ReceiveCoinsDialog</name> <message> - <location filename="../forms/receivecoinsdialog.ui" line="+22"/> + <location filename="../forms/receivecoinsdialog.ui" line="+83"/> <source>&Amount:</source> - <translation>金額(&A):</translation> + <translation>金額:</translation> </message> <message> - <location line="+16"/> + <location line="+19"/> <source>The amount to request</source> <translation>請求金額</translation> </message> <message> - <location line="+7"/> + <location line="-32"/> <source>&Label:</source> - <translation>標記(&L):</translation> - </message> - <message> - <location line="+10"/> - <source>The label to associate with the receiving address</source> - <translation>此標記關聯於收款位址</translation> + <translation>標記:</translation> </message> <message> - <location line="+7"/> + <location line="-34"/> <source>&Message:</source> - <translation>訊息(&M):</translation> + <translation>訊息:</translation> </message> <message> - <location line="+10"/> + <location line="+20"/> <source>The message to attach to payment request</source> - <translation>此訊息將附加至付款請求中</translation> + <translation>要附加到付款請求中的訊息</translation> </message> <message> - <location line="+14"/> + <location line="-37"/> <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source> - <translation>重複使用先前使用的收款位址。重複使用位址將會有安全與隱私方面的疑慮。在重新產生付款請求前請勿使用。</translation> + <translation>重複使用先前使用過的收款位址。重複使用位址將會有安全與隱私方面的疑慮。除非是要重新產生先前的付款請求,否則請不要使用。</translation> </message> <message> <location line="+3"/> <source>R&euse an existing receiving address (not recommended)</source> - <translation>重複使用現有的收款位址(不建議使用)(&E)</translation> + <translation>重複使用現有的收款位址(不建議)</translation> </message> <message> - <location line="+7"/> + <location line="+27"/> + <source>The label to associate with the new receiving address</source> + <translation>跟新收款位址關聯的標記</translation> + </message> + <message> + <location line="+14"/> <source>Use this form to request payments. All fields are optional.</source> - <translation>使用該表單進行付款請求。欄位皆可選填。</translation> + <translation>請使用這份表單來發出付款請求。所有的欄位都不是必填。</translation> </message> <message> - <location line="+17"/> + <location line="+56"/> <source>Clear all fields of the form.</source> - <translation>清除表單中的所有欄位</translation> + <translation>清除表單中的所有欄位。</translation> </message> <message> <location line="+3"/> @@ -1541,7 +1881,32 @@ Address: %4 <message> <location line="+36"/> <source>&Request payment</source> - <translation>付款請求(&R)</translation> + <translation>付款請求</translation> + </message> + <message> + <location line="+47"/> + <source>Previously requested payments</source> + <translation>之前已請求過的付款</translation> + </message> + <message> + <location line="+12"/> + <source>Show the selected request (does the same as double clicking an entry)</source> + <translation>顯示選擇的請求內容(效果跟按它兩下一樣)</translation> + </message> + <message> + <location line="+3"/> + <source>Show</source> + <translation>顯示</translation> + </message> + <message> + <location line="+11"/> + <source>Remove the selected entries from the list</source> + <translation>從列表中刪掉所選擇的項目</translation> + </message> + <message> + <location line="+3"/> + <source>Remove</source> + <translation>刪掉</translation> </message> </context> <context> @@ -1554,25 +1919,20 @@ Address: %4 <message> <location line="+46"/> <source>Copy &URI</source> - <translation>複製URI(&U)</translation> + <translation>複製 URI</translation> </message> <message> <location line="+7"/> <source>Copy &Address</source> - <translation>複製位址(&A)</translation> - </message> - <message> - <location line="+7"/> - <source>&Copy Image</source> - <translation>複製圖片(&C)...</translation> + <translation>複製位址</translation> </message> <message> <location line="+7"/> <source>&Save Image...</source> - <translation>保存圖片(&S)...</translation> + <translation>儲存圖片...</translation> </message> <message> - <location filename="../receiverequestdialog.cpp" line="+58"/> + <location filename="../receiverequestdialog.cpp" line="+56"/> <source>Request payment to %1</source> <translation>要 %1 付款的請求</translation> </message> @@ -1609,27 +1969,130 @@ Address: %4 <message> <location line="+10"/> <source>Resulting URI too long, try to reduce the text for label / message.</source> - <translation>產生的 URI 過長,請嘗試將標記/訊息的文字縮短。</translation> + <translation>產生的 URI 過長,請試著縮短標記或訊息的文字內容。</translation> </message> <message> <location line="+5"/> <source>Error encoding URI into QR Code.</source> - <translation>將 URI 編碼為 QR Code 錯誤</translation> + <translation>將 URI 編碼成 QR Code 錯誤。</translation> + </message> +</context> +<context> + <name>RecentRequestsTableModel</name> + <message> + <location filename="../recentrequeststablemodel.cpp" line="+14"/> + <source>Date</source> + <translation>日期</translation> + </message> + <message> + <location line="+0"/> + <source>Label</source> + <translation>標記</translation> + </message> + <message> + <location line="+0"/> + <source>Message</source> + <translation>訊息</translation> + </message> + <message> + <location line="+0"/> + <source>Amount</source> + <translation>金額</translation> + </message> + <message> + <location line="+36"/> + <source>(no label)</source> + <translation>(無標記)</translation> + </message> + <message> + <location line="+9"/> + <source>(no message)</source> + <translation>(無訊息)</translation> </message> </context> <context> <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="+14"/> - <location filename="../sendcoinsdialog.cpp" line="+140"/> - <location line="+213"/> + <location filename="../sendcoinsdialog.cpp" line="+381"/> + <location line="+81"/> <source>Send Coins</source> <translation>付款</translation> </message> <message> - <location line="+50"/> + <location line="+76"/> + <source>Coin Control Features</source> + <translation>錢幣控制功能</translation> + </message> + <message> + <location line="+20"/> + <source>Inputs...</source> + <translation>輸入...</translation> + </message> + <message> + <location line="+7"/> + <source>automatically selected</source> + <translation>自動選擇</translation> + </message> + <message> + <location line="+19"/> + <source>Insufficient funds!</source> + <translation>累計金額不足!</translation> + </message> + <message> + <location line="+89"/> + <source>Quantity:</source> + <translation>數量:</translation> + </message> + <message> + <location line="+35"/> + <source>Bytes:</source> + <translation>位元組數:</translation> + </message> + <message> + <location line="+48"/> + <source>Amount:</source> + <translation>金額:</translation> + </message> + <message> + <location line="+32"/> + <source>Priority:</source> + <translation>優先度:</translation> + </message> + <message> + <location line="+48"/> + <source>Fee:</source> + <translation>手續費:</translation> + </message> + <message> + <location line="+32"/> + <source>Low Output:</source> + <translation>小金額輸出:</translation> + </message> + <message> + <location line="+48"/> + <source>After Fee:</source> + <translation>計費後金額:</translation> + </message> + <message> + <location line="+32"/> + <source>Change:</source> + <translation>找零:</translation> + </message> + <message> + <location line="+44"/> + <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source> + <translation>如果這項有打開,但是找零位址是空的或無效,則找零的錢會送到一個新產生的位址去。</translation> + </message> + <message> + <location line="+3"/> + <source>Custom change address</source> + <translation>自定找零位址</translation> + </message> + <message> + <location line="+115"/> <source>Send to multiple recipients at once</source> - <translation>付款至多個收款人</translation> + <translation>一次付給多個收款人</translation> </message> <message> <location line="+3"/> @@ -1639,7 +2102,7 @@ Address: %4 <message> <location line="+20"/> <source>Clear all fields of the form.</source> - <translation>清除所有表單欄位</translation> + <translation>清除表單中的所有欄位。</translation> </message> <message> <location line="+3"/> @@ -1649,89 +2112,150 @@ Address: %4 <message> <location line="+22"/> <source>Balance:</source> - <translation>餘額:</translation> + <translation>餘額:</translation> </message> <message> - <location line="+10"/> - <source>123.456 BTC</source> - <translation>123.456 BTC</translation> - </message> - <message> - <location line="+31"/> + <location line="+41"/> <source>Confirm the send action</source> <translation>確認付款動作</translation> </message> <message> <location line="+3"/> <source>S&end</source> - <translation>付出</translation> + <translation>付款</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-154"/> + <location filename="../sendcoinsdialog.cpp" line="-229"/> <source>Confirm send coins</source> <translation>確認付款金額</translation> </message> <message> - <location line="-90"/> + <location line="-74"/> <location line="+5"/> <location line="+5"/> + <location line="+4"/> <source>%1 to %2</source> - <translation>%1 至 %2</translation> + <translation>%1 到 %2</translation> </message> <message> - <location line="+26"/> + <location line="-136"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>請輸入位元幣位址 (像是: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> + <message> + <location line="+15"/> + <source>Copy quantity</source> + <translation>複製數量</translation> + </message> + <message> + <location line="+1"/> + <source>Copy amount</source> + <translation>複製金額</translation> + </message> + <message> + <location line="+1"/> + <source>Copy fee</source> + <translation>複製手續費</translation> + </message> + <message> + <location line="+1"/> + <source>Copy after fee</source> + <translation>複製計費後金額</translation> + </message> + <message> + <location line="+1"/> + <source>Copy bytes</source> + <translation>複製位元組數</translation> + </message> + <message> + <location line="+1"/> + <source>Copy priority</source> + <translation>複製優先度</translation> + </message> + <message> + <location line="+1"/> + <source>Copy low output</source> + <translation>複製小金額輸出</translation> + </message> + <message> + <location line="+1"/> + <source>Copy change</source> + <translation>複製找零</translation> + </message> + <message> + <location line="+170"/> + <source>Total Amount %1 (= %2)</source> + <translation>總金額 %1 (= %2)</translation> + </message> + <message> + <location line="+2"/> + <source>or</source> + <translation>或</translation> + </message> + <message> + <location line="+202"/> <source>The recipient address is not valid, please recheck.</source> - <translation>無效的收款位址, 請再檢查看看.</translation> + <translation>收款位址無效,請再檢查看看。</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>The amount to pay must be larger than 0.</source> - <translation>付款金額需大於 0 。</translation> + <translation>付款金額需大於零。</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>The amount exceeds your balance.</source> - <translation>金額超過餘額了.</translation> + <translation>金額超過餘額了。</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>The total exceeds your balance when the %1 transaction fee is included.</source> - <translation>包含 %1 的交易手續費後, 總金額超過你的餘額了.</translation> + <translation>包含 %1 的交易手續費後,總金額超過你的餘額了。</translation> </message> <message> - <location line="+5"/> + <location line="+3"/> <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation>發現有重複的位址. 每個付款動作中, 只能付給個別的位址一次.</translation> + <translation>發現有重複的位址。每個付款動作中,只能付給個別的位址一次。</translation> + </message> + <message> + <location line="+3"/> + <source>Transaction creation failed!</source> + <translation>交易產生失敗!</translation> </message> <message> <location line="+4"/> - <source>Error: Transaction creation failed!</source> - <translation>錯誤: 交易產生失敗!</translation> + <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> + <translation>交易被拒絕了!有時候會發生這種錯誤,是因為你錢包中的一些錢已經被花掉了。比如說你複製了錢包檔 wallet.dat, 然後用複製的錢包花掉了錢,你現在所用的原來的錢包中,卻沒有該筆錢已經沒有了的紀錄。</translation> </message> <message> - <location line="+15"/> - <source>Are you sure you want to send?</source> - <translation>你確定要付款嗎?</translation> + <location line="+113"/> + <source>Warning: Invalid Bitcoin address</source> + <translation>警告: 位元幣位址無效</translation> </message> <message> - <location line="+9"/> - <source>added as transaction fee</source> - <translation>附加為交易手續費</translation> + <location line="+13"/> + <source>(no label)</source> + <translation>(無標記)</translation> </message> <message> - <location line="+6"/> - <source>Total Amount %1</source> - <translation>總價 %1</translation> + <location line="+8"/> + <source>Warning: Unknown change address</source> + <translation>警告: 不明的找零位址</translation> </message> <message> - <location line="+20"/> - <source>Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> - <translation>錯誤: 交易被拒絕. 有時候會發生這種錯誤, 是因為你錢包中的一些錢已經被花掉了. 比如說你複製了錢包檔 wallet.dat, 然後用複製的錢包花掉了錢, 你現在所用的原來的錢包中卻沒有該筆交易紀錄.</translation> + <location line="-378"/> + <source>Are you sure you want to send?</source> + <translation>你確定要付錢出去嗎?</translation> + </message> + <message> + <location line="+9"/> + <source>added as transaction fee</source> + <translation>加做交易手續費</translation> </message> <message> - <location line="+144"/> + <location line="+170"/> <source>Payment request expired</source> - <translation>付款的要求已經過期</translation> + <translation>付款的請求已經過期</translation> </message> <message> <location line="+8"/> @@ -1742,46 +2266,51 @@ Address: %4 <context> <name>SendCoinsEntry</name> <message> - <location filename="../forms/sendcoinsentry.ui" line="+33"/> - <location line="+585"/> + <location filename="../forms/sendcoinsentry.ui" line="+131"/> + <location line="+501"/> + <location line="+536"/> <source>A&mount:</source> - <translation>金額(&M):</translation> + <translation>金額:</translation> </message> <message> - <location line="-572"/> - <location line="+585"/> + <location line="-1132"/> <source>Pay &To:</source> - <translation>付款至(&T):</translation> + <translation>付給:</translation> </message> <message> - <location line="-551"/> + <location line="+18"/> <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>付款的目標位址 (比如說 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + <translation>付款的目標位址 (像是: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location filename="../sendcoinsentry.cpp" line="+28"/> + <location filename="../sendcoinsentry.cpp" line="+30"/> <source>Enter a label for this address to add it to your address book</source> - <translation>請輸入該地址之標記以將其加入位址簿中</translation> + <translation>請輸入該位址的標記來把它加入到位址簿中</translation> </message> <message> - <location filename="../forms/sendcoinsentry.ui" line="-18"/> + <location filename="../forms/sendcoinsentry.ui" line="+57"/> <source>&Label:</source> - <translation>標記(&L):</translation> + <translation>標記:</translation> </message> <message> - <location line="+28"/> + <location line="-50"/> <source>Choose previously used address</source> - <translation>選擇先前使用的位址</translation> + <translation>選擇先前使用過的位址</translation> </message> <message> - <location line="+10"/> + <location line="-40"/> + <source>This is a normal payment.</source> + <translation>這是一筆正常的付款。</translation> + </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>從剪貼簿貼上位址</translation> + <translation>貼上剪貼簿裡的位址</translation> </message> <message> <location line="+10"/> @@ -1790,23 +2319,42 @@ Address: %4 </message> <message> <location line="+7"/> - <source>Remove this recipient</source> - <translation>移除此收款人</translation> + <location line="+504"/> + <location line="+536"/> + <source>Remove this entry</source> + <translation>刪掉這個項目</translation> </message> <message> - <location line="+16"/> + <location line="-40"/> + <source>This is a verified payment request.</source> + <translation>這是已驗證的付款請求</translation> + </message> + <message> + <location line="-971"/> <source>Enter a label for this address to add it to the list of used addresses</source> - <translation>請輸入該位址的標記並將其加入至使用位址清單。</translation> + <translation>請輸入該位址的標記,來把它加進去已使用過位址的清單。</translation> + </message> + <message> + <location line="+439"/> + <source>This is an unverified payment request.</source> + <translation>這是個還沒驗證的付款請求。</translation> + </message> + <message> + <location line="+18"/> + <location line="+532"/> + <source>Pay To:</source> + <translation>付給:</translation> </message> <message> - <location line="+465"/> + <location line="-498"/> + <location line="+536"/> <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> + <translation>請輸入位元幣位址 (像是: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> </context> <context> @@ -1824,18 +2372,18 @@ Address: %4 <message> <location line="+6"/> <source>You can sign messages with your addresses to prove you own them. Be careful not to sign anything vague, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source> - <translation>你可以用自己的位址來簽署訊息, 以證明你對它的所有權. 但是請小心, 不要簽署語意含糊不清的內容, 因為釣魚式詐騙可能會用騙你簽署的手法來冒充是你. 只有在語句中的細節你都同意時才簽署.</translation> + <translation>你可以用自己的位址來對訊息做簽署,以證明你對位址的所有權。但是請小心,不要簽署語意含糊不清的內容,因為釣魚式詐騙可能會用騙你簽署的手法來冒充是你。只有在語句中的細節你都同意時才簽署。</translation> </message> <message> <location line="+18"/> <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>用來簽署訊息的位址 (比如說 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + <translation>用來簽署訊息的位址 (像是: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> <location line="+10"/> <location line="+213"/> <source>Choose previously used address</source> - <translation>選擇先前使用之位址</translation> + <translation>選擇先前使用過的位址</translation> </message> <message> <location line="-203"/> @@ -1846,7 +2394,7 @@ Address: %4 <message> <location line="-203"/> <source>Paste address from clipboard</source> - <translation>從剪貼簿貼上位址</translation> + <translation>貼上剪貼簿裡的位址</translation> </message> <message> <location line="+10"/> @@ -1856,7 +2404,7 @@ Address: %4 <message> <location line="+12"/> <source>Enter the message you want to sign here</source> - <translation>在這裡輸入你想簽署的訊息</translation> + <translation>請在這裡輸入你想簽署的訊息</translation> </message> <message> <location line="+7"/> @@ -1897,12 +2445,12 @@ Address: %4 <message> <location line="+6"/> <source>Enter the signing address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack.</source> - <translation>請在下面輸入簽署的位址, 訊息(請確認完整複製了所包含的換行, 空格, 跳位符號等等), 與簽章, 以驗證該訊息. 請小心, 除了訊息內容外, 不要對簽章本身過度解讀, 以避免被用"中間人攻擊法"詐騙.</translation> + <translation>請在下面輸入簽署的位址,訊息(請確認完整複製了所包含的換行,空格,跳位符號等等),以及簽章,來驗證該訊息。請小心,除了訊息內容外,不要對簽章本身過度解讀,以避免被用"中間人攻擊法"詐騙。</translation> </message> <message> <location line="+21"/> <source>The address the message was signed with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>簽署該訊息的位址 (比如說 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + <translation>簽署該訊息的位址 (像是: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> <location line="+40"/> @@ -1920,26 +2468,26 @@ Address: %4 <translation>重置所有訊息驗證欄位</translation> </message> <message> - <location filename="../signverifymessagedialog.cpp" line="+27"/> + <location filename="../signverifymessagedialog.cpp" line="+29"/> <location line="+3"/> <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>輸入位元幣位址 (比如說 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + <translation>請輸入位元幣位址 (像是: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> <location line="-2"/> <source>Click "Sign Message" to generate signature</source> - <translation>按"訊息簽署"來產生簽章</translation> + <translation>按一下"訊息簽署"來產生簽章</translation> </message> <message> <location line="+3"/> <source>Enter Bitcoin signature</source> - <translation>輸入位元幣簽章</translation> + <translation>請輸入位元幣簽章</translation> </message> <message> - <location line="+85"/> + <location line="+84"/> <location line="+81"/> <source>The entered address is invalid.</source> - <translation>輸入的位址無效.</translation> + <translation>輸入的位址無效。</translation> </message> <message> <location line="-81"/> @@ -1947,67 +2495,72 @@ Address: %4 <location line="+73"/> <location line="+8"/> <source>Please check the address and try again.</source> - <translation>請檢查位址是否正確後再試一次.</translation> + <translation>請檢查位址是否正確後再試一次。</translation> </message> <message> <location line="-81"/> <location line="+81"/> <source>The entered address does not refer to a key.</source> - <translation>輸入的位址沒有指到任何密鑰.</translation> + <translation>輸入的位址沒有對應到你的任何密鑰。</translation> </message> <message> <location line="-73"/> <source>Wallet unlock was cancelled.</source> - <translation>錢包解鎖已取消.</translation> + <translation>錢包解鎖已取消。</translation> </message> <message> <location line="+8"/> <source>Private key for the entered address is not available.</source> - <translation>沒有所輸入位址的密鑰.</translation> + <translation>沒有所輸入位址的密鑰。</translation> </message> <message> <location line="+12"/> <source>Message signing failed.</source> - <translation>訊息簽署失敗.</translation> + <translation>訊息簽署失敗。</translation> </message> <message> <location line="+5"/> <source>Message signed.</source> - <translation>訊息已簽署.</translation> + <translation>訊息已簽署。</translation> </message> <message> <location line="+59"/> <source>The signature could not be decoded.</source> - <translation>無法將這個簽章解碼.</translation> + <translation>無法將這個簽章解碼。</translation> </message> <message> <location line="+0"/> <location line="+13"/> <source>Please check the signature and try again.</source> - <translation>請檢查簽章是否正確後再試一次.</translation> + <translation>請檢查簽章是否正確後再試一次。</translation> </message> <message> <location line="+0"/> <source>The signature did not match the message digest.</source> - <translation>這個簽章與訊息的數位摘要不符.</translation> + <translation>這個簽章與訊息的數位摘要不符。</translation> </message> <message> <location line="+7"/> <source>Message verification failed.</source> - <translation>訊息驗證失敗.</translation> + <translation>訊息驗證失敗。</translation> </message> <message> <location line="+5"/> <source>Message verified.</source> - <translation>訊息已驗證.</translation> + <translation>訊息驗證無誤。</translation> </message> </context> <context> <name>SplashScreen</name> <message> - <location filename="../splashscreen.cpp" line="+23"/> - <source>The Bitcoin developers</source> - <translation>位元幣開發人員</translation> + <location filename="../splashscreen.cpp" line="+26"/> + <source>Bitcoin Core</source> + <translation>位元幣核心</translation> + </message> + <message> + <location line="+2"/> + <source>The Bitcoin Core developers</source> + <translation>位元幣核心開發人員</translation> </message> <message> <location line="+1"/> @@ -2018,7 +2571,7 @@ Address: %4 <context> <name>TrafficGraphWidget</name> <message> - <location filename="../trafficgraphwidget.cpp" line="+75"/> + <location filename="../trafficgraphwidget.cpp" line="+79"/> <source>KB/s</source> <translation>KB/s</translation> </message> @@ -2026,7 +2579,7 @@ Address: %4 <context> <name>TransactionDesc</name> <message> - <location filename="../transactiondesc.cpp" line="+22"/> + <location filename="../transactiondesc.cpp" line="+28"/> <source>Open until %1</source> <translation>在 %1 前未定</translation> </message> @@ -2053,7 +2606,7 @@ Address: %4 <message numerus="yes"> <location line="+7"/> <source>, broadcast through %n node(s)</source> - <translation><numerusform>, 已公告至 %n 個節點</numerusform></translation> + <translation><numerusform>,已公告給 %n 個節點</numerusform></translation> </message> <message> <location line="+4"/> @@ -2074,7 +2627,7 @@ Address: %4 <location line="+5"/> <location line="+17"/> <source>From</source> - <translation>來處</translation> + <translation>來源</translation> </message> <message> <location line="+1"/> @@ -2092,7 +2645,7 @@ Address: %4 <message> <location line="-2"/> <source>label</source> - <translation>標籤</translation> + <translation>標記</translation> </message> <message> <location line="+37"/> @@ -2154,7 +2707,7 @@ Address: %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>生產出來的錢要再等 %1 個區塊熟成之後,才能夠花用。當你產出區塊時,它會被公告到網路上,以被串連至區塊鏈。如果串連失敗了,它的狀態就會變成"不被接受"。且不能夠花用。當你產出區塊的幾秒鐘內,也有其他節點產出區塊的話,有時候就會發生這種情形。</translation> + <translation>生產出來的錢要再等 %1 個區塊產出後才熟成,才可以花用。當你產出區塊時,它會被公告到網路上,以被串連到區塊鏈。如果串連失敗了,它的狀態就會變成"不被接受",且不能夠花用。當你產出區塊的幾秒鐘內,也有其他節點產出區塊的話,有時候就會發生這種情形。</translation> </message> <message> <location line="+8"/> @@ -2189,7 +2742,7 @@ Address: %4 <message> <location line="-227"/> <source>, has not been successfully broadcast yet</source> - <translation>, 尚未成功公告出去</translation> + <translation>,還沒成功公告出去</translation> </message> <message numerus="yes"> <location line="-35"/> @@ -2212,20 +2765,20 @@ Address: %4 <message> <location line="+6"/> <source>This pane shows a detailed description of the transaction</source> - <translation>此版面顯示該交易之明細</translation> + <translation>此版面顯示該次交易的詳細說明</translation> </message> </context> <context> <name>TransactionTableModel</name> <message> - <location filename="../transactiontablemodel.cpp" line="+227"/> + <location filename="../transactiontablemodel.cpp" line="+234"/> <source>Date</source> <translation>日期</translation> </message> <message> <location line="+0"/> <source>Type</source> - <translation>類型</translation> + <translation>種類</translation> </message> <message> <location line="+0"/> @@ -2250,52 +2803,52 @@ Address: %4 <message> <location line="+3"/> <source>Offline (%1 confirmations)</source> - <translation>離線(%1 次確認)</translation> + <translation>離線中 (%1 次確認)</translation> </message> <message> <location line="+3"/> <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation>未確認 (%1 次確認,應 %2 次)</translation> + <translation>未確認 (%1 次確認,應 %2 次)</translation> </message> <message> <location line="+3"/> <source>Confirmed (%1 confirmations)</source> - <translation>已確認(%1 次確認)</translation> + <translation>已確認 (%1 次確認)</translation> </message> <message numerus="yes"> <location line="+8"/> <source>Mined balance will be available when it matures in %n more block(s)</source> - <translation><numerusform>開採金額將可在 %n 個區塊熟成後可用</numerusform></translation> + <translation><numerusform>開採金額將在 %n 個區塊產出後熟成而可使用</numerusform></translation> </message> <message> <location line="+5"/> <source>This block was not received by any other nodes and will probably not be accepted!</source> - <translation>其它節點尚未收到該區塊且可能不允許接收。</translation> + <translation>沒有其他節點收到這個區塊,也許它不會被接受!</translation> </message> <message> <location line="+3"/> <source>Generated but not accepted</source> - <translation>已產生但不允許。</translation> + <translation>已生產出但不被接受</translation> </message> <message> <location line="+43"/> <source>Received with</source> - <translation>收受於</translation> + <translation>收款於</translation> </message> <message> <location line="+2"/> <source>Received from</source> - <translation>收受自</translation> + <translation>收款自</translation> </message> <message> <location line="+3"/> <source>Sent to</source> - <translation>付款至</translation> + <translation>付款給</translation> </message> <message> <location line="+2"/> <source>Payment to yourself</source> - <translation>付款給自己</translation> + <translation>付給自己</translation> </message> <message> <location line="+2"/> @@ -2305,38 +2858,38 @@ Address: %4 <message> <location line="+38"/> <source>(n/a)</source> - <translation>(n/a)</translation> + <translation>(不適用)</translation> </message> <message> <location line="+199"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> - <translation>交易狀態。將滑鼠移至此欄位以顯示確認次數。</translation> + <translation>交易狀態。將游標停在欄位上會顯示確認次數。</translation> </message> <message> <location line="+2"/> <source>Date and time that the transaction was received.</source> - <translation>收到款項的日期與時間。</translation> + <translation>收到交易的日期與時間。</translation> </message> <message> <location line="+2"/> <source>Type of transaction.</source> - <translation>交易類型。</translation> + <translation>交易的種類。</translation> </message> <message> <location line="+2"/> <source>Destination address of transaction.</source> - <translation>交易之目標位址。</translation> + <translation>交易的目標位址.</translation> </message> <message> <location line="+2"/> <source>Amount removed from or added to balance.</source> - <translation>將金額從餘額中移除或加入至餘額。</translation> + <translation>要減掉或加進餘額的金額。</translation> </message> </context> <context> <name>TransactionView</name> <message> - <location filename="../transactionview.cpp" line="+52"/> + <location filename="../transactionview.cpp" line="+57"/> <location line="+16"/> <source>All</source> <translation>全部</translation> @@ -2349,12 +2902,12 @@ Address: %4 <message> <location line="+1"/> <source>This week</source> - <translation>本週</translation> + <translation>這星期</translation> </message> <message> <location line="+1"/> <source>This month</source> - <translation>本月</translation> + <translation>這個月</translation> </message> <message> <location line="+1"/> @@ -2369,17 +2922,17 @@ Address: %4 <message> <location line="+1"/> <source>Range...</source> - <translation>範圍...</translation> + <translation>指定範圍...</translation> </message> <message> <location line="+11"/> <source>Received with</source> - <translation>收受於</translation> + <translation>收款</translation> </message> <message> <location line="+2"/> <source>Sent to</source> - <translation>付款給</translation> + <translation>付款</translation> </message> <message> <location line="+2"/> @@ -2397,12 +2950,12 @@ Address: %4 <translation>其它</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>Enter address or label to search</source> - <translation>請輸入位址或標籤以進行搜尋</translation> + <translation>請輸入要搜尋的位址或標記</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>Min amount</source> <translation>最小金額</translation> </message> @@ -2437,17 +2990,37 @@ Address: %4 <translation>顯示交易明細</translation> </message> <message> - <location line="+143"/> - <source>Export Transaction Data</source> - <translation>匯出交易資料</translation> + <location line="+142"/> + <source>Export Transaction History</source> + <translation>匯出交易記錄</translation> </message> <message> - <location line="+1"/> + <location line="+19"/> + <source>Exporting Failed</source> + <translation>匯出失敗</translation> + </message> + <message> + <location line="+0"/> + <source>There was an error trying to save the transaction history to %1.</source> + <translation>儲存交易記錄到 %1 時發生錯誤。</translation> + </message> + <message> + <location line="+4"/> + <source>Exporting Successful</source> + <translation>匯出成功</translation> + </message> + <message> + <location line="+0"/> + <source>The transaction history was successfully saved to %1.</source> + <translation>交易記錄已經成功儲存到 %1 了。</translation> + </message> + <message> + <location line="-22"/> <source>Comma separated file (*.csv)</source> - <translation>逗點分隔檔 (*.csv)</translation> + <translation>逗點分隔資料檔 (*.csv)</translation> </message> <message> - <location line="+8"/> + <location line="+9"/> <source>Confirmed</source> <translation>已確認</translation> </message> @@ -2459,7 +3032,7 @@ Address: %4 <message> <location line="+1"/> <source>Type</source> - <translation>類型</translation> + <translation>種類</translation> </message> <message> <location line="+1"/> @@ -2482,38 +3055,36 @@ Address: %4 <translation>識別碼</translation> </message> <message> - <location line="+4"/> - <source>Error exporting</source> - <translation>匯出錯誤</translation> - </message> - <message> - <location line="+0"/> - <source>Could not write to file %1.</source> - <translation>無法寫入至檔案 %1 檔案。</translation> - </message> - <message> - <location line="+100"/> + <location line="+107"/> <source>Range:</source> - <translation>範圍:</translation> + <translation>範圍:</translation> </message> <message> <location line="+8"/> <source>to</source> - <translation>至</translation> + <translation>到</translation> + </message> +</context> +<context> + <name>WalletFrame</name> + <message> + <location filename="../walletframe.cpp" line="+26"/> + <source>No wallet has been loaded.</source> + <translation>沒有載入錢包。</translation> </message> </context> <context> <name>WalletModel</name> <message> - <location filename="../walletmodel.cpp" line="+218"/> + <location filename="../walletmodel.cpp" line="+245"/> <source>Send Coins</source> - <translation>付錢</translation> + <translation>付款</translation> </message> </context> <context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+46"/> + <location filename="../walletview.cpp" line="+43"/> <source>&Export</source> <translation>匯出</translation> </message> @@ -2523,72 +3094,67 @@ Address: %4 <translation>將目前分頁的資料匯出存成檔案</translation> </message> <message> - <location line="+183"/> + <location line="+181"/> <source>Backup Wallet</source> <translation>錢包備份</translation> </message> <message> - <location line="+0"/> + <location line="+1"/> <source>Wallet Data (*.dat)</source> <translation>錢包資料檔 (*.dat)</translation> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Backup Failed</source> <translation>備份失敗</translation> </message> <message> <location line="+0"/> - <source>There was an error trying to save the wallet data to the new location.</source> - <translation>儲存錢包資料到新的地方失敗</translation> + <source>There was an error trying to save the wallet data to %1.</source> + <translation>儲存錢包資料到 %1 時發生錯誤。</translation> </message> <message> <location line="+4"/> - <source>Backup Successful</source> - <translation>備份成功</translation> + <source>The wallet data was successfully saved to %1.</source> + <translation>錢包的資料已經成功儲存到 %1 了。</translation> </message> <message> <location line="+0"/> - <source>The wallet data was successfully saved to the new location.</source> - <translation>錢包的資料已經成功儲存到新的地方了.</translation> + <source>Backup Successful</source> + <translation>備份成功</translation> </message> </context> <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+102"/> - <source>Bitcoin version</source> - <translation>Bitcoin 版本</translation> - </message> - <message> - <location line="+107"/> + <location filename="../bitcoinstrings.cpp" line="+217"/> <source>Usage:</source> - <translation>使用:</translation> + <translation>用法:</translation> </message> <message> - <location line="-55"/> + <location line="-54"/> <source>List commands</source> <translation>列出指令</translation> </message> <message> - <location line="-13"/> + <location line="-14"/> <source>Get help for a command</source> <translation>取得指令說明</translation> </message> <message> - <location line="+25"/> + <location line="+26"/> <source>Options:</source> - <translation>選項:</translation> + <translation>選項:</translation> </message> <message> - <location line="+24"/> + <location line="+23"/> <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"/> @@ -2598,50 +3164,50 @@ Address: %4 <message> <location line="-9"/> <source>Set database cache size in megabytes (default: 25)</source> - <translation>設定資料庫快取大小為若干 MB (預設為 25)</translation> + <translation>設定資料庫快取大小成多少百萬位元組 (MB;預設值: 25)</translation> </message> <message> - <location line="-28"/> + <location line="-27"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> - <translation>監聽 <port> 通訊埠上的連線(預設為 8333,測試網路為 18333)</translation> + <translation>在通訊埠 <port> 聽候連線 (預設值: 8333, 或若是測試網路: 18333)</translation> </message> <message> <location line="+5"/> <source>Maintain at most <n> connections to peers (default: 125)</source> - <translation>保持平行連線數的最大上限在 <n> 個(預設為 125)</translation> + <translation>維持連線節點數的上限為 <n> 個 (預設值: 125)</translation> </message> <message> - <location line="-49"/> + <location line="-50"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> - <translation>連線到某個節點以取得其它節點的位址, 然後斷線</translation> + <translation>連線到某個節點以取得其它節點的位址,然後斷線</translation> </message> <message> <location line="+84"/> <source>Specify your own public address</source> - <translation>指定自己公開的位址</translation> + <translation>指定自己的公開位址</translation> </message> <message> <location line="+4"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> - <translation>切斷異常的平行連線之臨界值(預設為 100)</translation> + <translation>將異常節點斷線的臨界值 (預設值: 100)</translation> </message> <message> - <location line="-142"/> + <location line="-147"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> - <translation>保持在指定秒數內重新連線異常之平行連線(預設為 86400)</translation> + <translation>拒絕跟異常節點連線的秒數 (預設值: 86400)</translation> </message> <message> <location line="-33"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> - <translation>在 IPv4 網路上以通訊埠 %u 聽取 RPC 連線時發生錯誤: %s</translation> + <translation>設定在 IPv4 網路上以通訊埠 %u 聽取 RPC 連線時發生錯誤: %s</translation> </message> <message> <location line="+31"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> - <translation>在通訊埠 <port> 聽候 JSON-RPC 連線 (預設: 8332, 或若為測試網路: 18332)</translation> + <translation>在通訊埠 <port> 聽候 JSON-RPC 連線 (預設值: 8332, 或若是測試網路: 18332)</translation> </message> <message> - <location line="+40"/> + <location line="+45"/> <source>Accept command line and JSON-RPC commands</source> <translation>接受指令列與 JSON-RPC 指令 </translation> @@ -2649,20 +3215,20 @@ Address: %4 <message> <location line="+79"/> <source>Run in the background as a daemon and accept commands</source> - <translation>在背景中執行為 Daemon 並接收指令。</translation> + <translation>以護靈模式在背後執行並接受指令</translation> </message> <message> - <location line="+40"/> + <location line="+39"/> <source>Use the test network</source> <translation>使用測試網路</translation> </message> <message> - <location line="-118"/> + <location line="-117"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>是否接受外來連線 (預設: 當沒有 -proxy 或 -connect 時預設為 1)</translation> + <translation>是否接受外來連線 (預設值: 當沒有 -proxy 或 -connect 時為 1)</translation> </message> <message> - <location line="-87"/> + <location line="-92"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2680,117 +3246,131 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. rpcuser=bitcoinrpc rpcpassword=%s (你不用記住這個密碼) -使用者名稱(rpcuser)和密碼(rpcpassword)不可以相同! -如果設定檔還不存在, 請在新增時, 設定檔案權限為"只有主人才能讀取". -也建議你設定警示通知, 發生問題時你才會被通知到; -比如說設定為: -alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com -</translation> +使用者名稱(rpcuser)和密碼(rpcpassword)不可以相同! +如果設定檔還不存在,請在新增時,設定檔案權限成只有主人才能讀取。 +也建議你設定警示通知,發生問題時你才會被通知到; +比如說設定成: +alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</translation> </message> <message> <location line="+12"/> <source>Acceptable ciphers (default: TLSv1.2+HIGH:TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!3DES:@STRENGTH)</source> - <translation>可允許的加密算法(預設為 TLSv1.2+HIGH:TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!3DES:@STRENGTH)</translation> + <translation>可接受的加密演算法 (預設值: TLSv1.2+HIGH:TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!3DES:@STRENGTH)</translation> </message> <message> <location line="+5"/> <source>An error occurred while setting up the RPC port %u for listening on IPv6, falling back to IPv4: %s</source> - <translation>設定在 IPv6 網路的通訊埠 %u 上聽候 RPC 連線失敗, 退而改用 IPv4 網路: %s</translation> + <translation>設定在 IPv6 網路上以通訊埠 %u 聽候 RPC 連線失敗,退而改用 IPv4 網路: %s</translation> </message> <message> <location line="+3"/> <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> - <translation>和指定的位址繫結, 並總是在該位址聽候連線. IPv6 請用 "[主機]:通訊埠" 這種格式</translation> + <translation>和指定的位址繫結,並總是在該位址聽候連線. 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> + <translation>無法鎖定 %s 這個資料目錄。也許位元幣軟體已經在執行了。</translation> </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>進入回歸測試模式, 特別的區塊鎖鏈使用中, 可以立即解出區塊. 目的是用來做回歸測試, 以及配合應用程式的開發.</translation> + <translation>進入回歸測試模式,使用可以立即解出區塊的特殊區塊鏈。目的是用來做回歸測試,以及配合應用程式的開發。</translation> </message> <message> <location line="+4"/> <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> - <translation>錯誤: 交易被拒絕了! 有時候會發生這種錯誤, 是因為你錢包中的一些錢已經被花掉了. 比如說你複製了錢包檔 wallet.dat, 然後用複製的錢包花掉了錢, 你現在所用的原來的錢包中卻沒有該筆交易紀錄.</translation> + <translation>錯誤: 交易被拒絕了!有時候會發生這種錯誤,是因為你錢包中的一些錢已經被花掉了。比如說你複製了錢包檔 wallet.dat, 然後用複製的錢包花掉了錢,你現在所用的原來的錢包中卻沒有該筆交易紀錄。</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>錯誤: 這筆交易需要至少 %s 的手續費! 因為它的金額太大, 或複雜度太高, 或是使用了最近才剛收到的款項.</translation> + <translation>錯誤: 這筆交易需要至少 %s 的手續費!因為它的金額太大,或複雜度太高,或是使用了最近才剛收到的款項。</translation> </message> <message> <location line="+6"/> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> - <translation>當錢包有交易改變時所要執行的指令 (指令中的 %s 會被取代為交易識別碼)</translation> - </message> - <message> - <location line="+11"/> - <source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source> - <translation>設定高優先權或低手續費的交易資料大小上限為多少位元組 (預設: 27000)</translation> + <translation>當錢包有交易改變時要執行的指令 (指令中的 %s 會被取代成交易識別碼)</translation> </message> <message> - <location line="+6"/> + <location line="+18"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> - <translation>這是尚未發表的測試版本 - 使用請自負風險 - 請不要用於開採或商業應用</translation> + <translation>這是個還沒發表的測試版本 - 使用請自負風險 - 請不要用於開採或商業應用</translation> </message> <message> <location line="+5"/> + <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source> + <translation>使用另外的 SOCK5 代理伺服器來透過 Tor 隱藏服務與節點聯繫 (預設: 同 -proxy)</translation> + </message> + <message> + <location line="+3"/> <source>Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source> - <translation>警告: -paytxfee 設定了很高的金額! 這可是你交易付款所要付的手續費.</translation> + <translation>警告: -paytxfee 設定了很高的金額!這可是你交易付款所要付的手續費。</translation> </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>警告: 請檢查電腦時間與日期是否正確! 位元幣無法在時鐘不準的情況下正常運作.</translation> + <translation>警告: 請檢查電腦時間與日期是否正確!位元幣軟體無法在時鐘不準的情況下正常運作。</translation> </message> <message> <location line="+3"/> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> - <translation>警告: 位元幣網路對於區塊鏈結的決定目前有分歧! 看來有些礦工會有問題.</translation> + <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>警告: 我們和某些連線的節點對於區塊鏈結的決定不同! 你可能需要升級, 或是需要等其它的節點升級.</translation> + <translation>警告: 我們和某些連線的節點對於區塊鏈結的決定不同!你可能需要升級,或是需要等其它的節點升級。</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>警告: 讀取錢包檔 wallet.dat 失敗了! 所有的密鑰都正確讀取了, 但是交易資料或位址簿資料可能會缺少或不正確.</translation> + <translation>警告: 讀取錢包檔 wallet.dat 時發生錯誤!所有的密鑰都正確讀取了,但是交易資料或位址簿資料可能會缺少或不正確。</translation> </message> <message> <location line="+3"/> <source>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</source> - <translation>警告: 錢包檔 wallet.dat 壞掉, 但資料被拯救回來了! 原來的 wallet.dat 會改儲存在 %s, 檔名為 wallet.{timestamp}.bak. 如果餘額或交易資料有誤, 你應該要用備份資料復原回來.</translation> + <translation>警告: 錢包檔 wallet.dat 壞掉,但資料被拯救回來了!原來的 wallet.dat 會改儲存在 %s, 檔名是 wallet.{timestamp}.bak. 如果餘額或交易資料有誤,你應該要用備份資料復原回來。</translation> </message> <message> - <location line="+14"/> + <location line="+9"/> + <source><category> can be:</source> + <translation><category> 可以是:</translation> + </message> + <message> + <location line="+6"/> <source>Attempt to recover private keys from a corrupt wallet.dat</source> <translation>嘗試從壞掉的錢包檔 wallet.dat 復原密鑰</translation> </message> <message> <location line="+1"/> + <source>Bitcoin Core Daemon</source> + <translation>位元幣核心護靈</translation> + </message> + <message> + <location line="+1"/> <source>Bitcoin RPC client version</source> - <translation>Bitcoin RPC 用戶端版本</translation> + <translation>位元幣 RPC 客戶端軟體版本</translation> </message> <message> - <location line="+2"/> + <location line="+1"/> <source>Block creation options:</source> <translation>區塊產生選項:</translation> </message> <message> <location line="+5"/> <source>Connect only to the specified node(s)</source> - <translation>只連線至指定節點(可多個)</translation> + <translation>只連線到指定節點(可多個)</translation> </message> <message> - <location line="+2"/> + <location line="+1"/> + <source>Connect through SOCKS proxy</source> + <translation>透過 SOCKS 代理伺服器連線</translation> + </message> + <message> + <location line="+1"/> <source>Connect to JSON-RPC on <port> (default: 8332 or testnet: 18332)</source> - <translation>連線至 <port> 上的 JSON-RPC (預設為 8332 ,測試網路為 18332)</translation> + <translation>連線到埠號 <port> 上的 JSON-RPC 伺服器 (預設值: 8332,或若是測試網路: 18332)</translation> </message> <message> <location line="+2"/> @@ -2800,12 +3380,12 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <message> <location line="+1"/> <source>Discover own IP address (default: 1 when listening and no -externalip)</source> - <translation>找出自己的網際網路位址 (預設: 當有聽候連線且沒有 -externalip 時為 1)</translation> + <translation>找出自己的網際網路位址 (預設值: 當有聽候連線且沒有 -externalip 時為 1)</translation> </message> <message> <location line="+1"/> <source>Do you want to rebuild the block database now?</source> - <translation>你要現在重建區塊資料庫嗎?</translation> + <translation>你想要現在重建區塊資料庫嗎?</translation> </message> <message> <location line="+2"/> @@ -2815,7 +3395,7 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <message> <location line="+1"/> <source>Error initializing wallet database environment %s!</source> - <translation>錢包資料庫環境 %s 初始化錯誤!</translation> + <translation>錢包資料庫環境 %s 初始化錯誤!</translation> </message> <message> <location line="+1"/> @@ -2830,12 +3410,12 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <message> <location line="+2"/> <source>Error: Disk space is low!</source> - <translation>錯誤: 磁碟空間很少!</translation> + <translation>錯誤: 磁碟空間很少!</translation> </message> <message> <location line="+1"/> <source>Error: Wallet locked, unable to create transaction!</source> - <translation>錯誤: 錢包被上鎖了, 無法產生新的交易!</translation> + <translation>錯誤: 錢包被上鎖了,無法產生新的交易!</translation> </message> <message> <location line="+1"/> @@ -2845,7 +3425,7 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <message> <location line="+1"/> <source>Failed to listen on any port. Use -listen=0 if you want this.</source> - <translation>在任意的通訊埠聽候失敗. 如果你想的話可以用 -listen=0.</translation> + <translation>在任意的通訊埠聽候失敗。如果你想的話可以改用 -listen=0.</translation> </message> <message> <location line="+1"/> @@ -2898,9 +3478,14 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>寫入回復資料失敗</translation> </message> <message> - <location line="+2"/> + <location line="+1"/> + <source>Fee per kB to add to transactions you send</source> + <translation>交易時每一千位元組(kB)加付的交易手續費</translation> + </message> + <message> + <location line="+1"/> <source>Find peers using DNS lookup (default: 1 unless -connect)</source> - <translation>是否允許在找節點時使用域名查詢 (預設: 當沒用 -connect 時為 1)</translation> + <translation>是否允許在找節點時使用域名查詢 (預設值: 當沒用 -connect 時為 1)</translation> </message> <message> <location line="+1"/> @@ -2910,42 +3495,67 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <message> <location line="+2"/> <source>How many blocks to check at startup (default: 288, 0 = all)</source> - <translation>啓動時檢查的區塊數 (預設: 288, 指定 0 表示全部)</translation> + <translation>啓動時檢查的區塊數 (預設值: 288, 指定 0 表示全部)</translation> </message> <message> <location line="+1"/> <source>How thorough the block verification is (0-4, default: 3)</source> - <translation>區塊檢查的仔細程度 (0 至 4, 預設: 3)</translation> + <translation>區塊檢查的仔細程度 (0 到 4, 預設值: 3)</translation> + </message> + <message> + <location line="+1"/> + <source>If <category> is not supplied, output all debugging information.</source> + <translation>如果沒有提供 <category> 就輸出所有的除錯資訊。</translation> </message> <message> <location line="+2"/> <source>Incorrect or no genesis block found. Wrong datadir for network?</source> - <translation>創世區塊不正確或找不到. 資料目錄錯了嗎?</translation> + <translation>創世區塊不正確或找不到。資料目錄錯了嗎?</translation> </message> <message> <location line="+3"/> <source>Invalid -onion address: '%s'</source> - <translation>無效的 -onion 位址:「%s」</translation> + <translation>無效的 -onion 位址: '%s'</translation> </message> <message> <location line="+15"/> <source>Not enough file descriptors available.</source> - <translation>檔案描述器不足.</translation> + <translation>檔案描述元不足。</translation> </message> <message> - <location line="+8"/> + <location line="+5"/> + <source>Prepend debug output with timestamp (default: 1)</source> + <translation>在除錯輸出內容前附加時間 (預設值: 1)</translation> + </message> + <message> + <location line="+1"/> + <source>RPC client options:</source> + <translation>RPC 客戶端選項:</translation> + </message> + <message> + <location line="+1"/> <source>Rebuild block chain index from current blk000??.dat files</source> - <translation>從目前的區塊檔 blk000??.dat 重建鎖鏈索引</translation> + <translation>從目前的區塊檔 blk000??.dat 重建區塊鏈的索引</translation> </message> <message> - <location line="+6"/> + <location line="+5"/> + <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source> + <translation>選擇 -proxy 指定代理伺服器的 SOCKS 協定版本 (4 或 5, 預設值: 5)</translation> + </message> + <message> + <location line="+1"/> <source>Send command to Bitcoin server</source> - <translation>傳送指令至 Bitcoin 伺服器</translation> + <translation>傳送指令給位元幣伺服器</translation> </message> <message> - <location line="+10"/> + <location line="+8"/> + <source>Set maximum block size in bytes (default: %d)</source> + <translation>設定區塊大小上限成多少位元組 (預設值: %d)</translation> + </message> + <message> + <location line="+2"/> <source>Set the number of threads to service RPC calls (default: 4)</source> - <translation>設定處理 RPC 服務請求的執行緒數目 (預設為 4)</translation> + <translation>設定處理 RPC 服務請求的執行緒數目 (預設值: 4)</translation> </message> <message> <location line="+7"/> @@ -2955,22 +3565,27 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <message> <location line="+2"/> <source>Start Bitcoin server</source> - <translation>啟動 Bitcoin 伺服器</translation> + <translation>啟動位元幣伺服器</translation> </message> <message> <location line="+12"/> <source>Usage (deprecated, use bitcoin-cli):</source> - <translation>使用(棄用,使用 Bitcoin-cli):</translation> + <translation>用法 (已過時,請改用 bitcoin-cli):</translation> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>Verifying blocks...</source> - <translation>驗證區塊資料中...</translation> + <translation>正在驗證區塊資料...</translation> </message> <message> <location line="+1"/> <source>Verifying wallet...</source> - <translation>驗證錢包資料中...</translation> + <translation>正在驗證錢包資料...</translation> + </message> + <message> + <location line="+1"/> + <source>Wait for RPC server to start</source> + <translation>等待 RPC 伺服器啟動</translation> </message> <message> <location line="+1"/> @@ -2978,9 +3593,14 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>錢包檔 %s 沒有在資料目錄 %s 裡面</translation> </message> <message> - <location line="+4"/> + <location line="+3"/> + <source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source> + <translation>警告: 參數 -debugnet 因為已經棄用了而被忽略,請改用 -debug=net</translation> + </message> + <message> + <location line="+2"/> <source>You need to rebuild the database using -reindex to change -txindex</source> - <translation>改變 -txindex 參數後, 必須要用 -reindex 參數來重建資料庫</translation> + <translation>改變 -txindex 參數後,必須要用 -reindex 參數來重建資料庫</translation> </message> <message> <location line="-78"/> @@ -2988,49 +3608,59 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>從其它來源的 blk000??.dat 檔匯入區塊</translation> </message> <message> - <location line="-98"/> + <location line="-104"/> <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> - <translation>當收到相關警示, 或發現相當長的分支時, 所要執行的指令 (指令中的 %s 會被取代為警示訊息)</translation> + <translation>當收到相關警示,或發現相當長的分支時,所要執行的指令 (指令中的 %s 會被取代成警示訊息)</translation> </message> <message> - <location line="+17"/> + <location line="+14"/> + <source>Output debugging information (default: 0, supplying <category> is optional)</source> + <translation>輸出除錯資訊 (預設值: 0, 不一定要指定 <category>)</translation> + </message> + <message> + <location line="+2"/> + <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source> + <translation>設定高優先度或低手續費的交易資料大小上限成多少位元組 (預設值: %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>設定指令碼驗證的執行緒數目 (最多為 16, 若為 0 表示程式自動決定, 小於 0 表示保留不用的處理器核心數目, 預設為 0)</translation> + <translation>設定指令碼驗證的執行緒數目 (最多為 16, 若為 0 表示程式自動決定,小於 0 表示保留不用的處理器核心數目,預設值: 0)</translation> </message> <message> - <location line="+83"/> + <location line="+88"/> <source>Information</source> <translation>資訊</translation> </message> <message> <location line="+4"/> <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> - <translation>設定 -minrelaytxfee=<金額> 的金額無效: '%s'</translation> + <translation>設定最少轉發金額 -minrelaytxfee=<金額> 的金額無效: '%s'</translation> </message> <message> <location line="+1"/> <source>Invalid amount for -mintxfee=<amount>: '%s'</source> - <translation>設定 -mintxfee=<amount> 的金額無效: '%s'</translation> + <translation>設定 -mintxfee=<金額> 的金額無效: '%s'</translation> </message> <message> <location line="+8"/> <source>Maintain a full transaction index (default: 0)</source> - <translation>維護全部交易的索引 (預設為 0)</translation> + <translation>維護全部交易的索引 (預設值: 0)</translation> </message> <message> <location line="+2"/> <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 5000)</source> - <translation>每個連線的接收緩衝區大小上限為 <n>*1000 個位元組 (預設: 5000)</translation> + <translation>每個連線的接收緩衝區大小上限為 <n>*1000 個位元組 (預設值: 5000)</translation> </message> <message> <location line="+1"/> <source>Maximum per-connection send buffer, <n>*1000 bytes (default: 1000)</source> - <translation>每個連線的傳送緩衝區大小上限為 <n>*1000 位元組 (預設: 1000)</translation> + <translation>每個連線的傳送緩衝區大小上限為 <n>*1000 位元組 (預設值: 1000)</translation> </message> <message> <location line="+2"/> <source>Only accept block chain matching built-in checkpoints (default: 1)</source> - <translation>只接受與內建的檢查段點吻合的區塊鎖鏈 (預設: 1)</translation> + <translation>只接受與內建的檢查段點吻合的區塊鏈 (預設值: 1)</translation> </message> <message> <location line="+1"/> @@ -3038,54 +3668,29 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>只和 <net> 網路上的節點連線 (IPv4, IPv6, 或 Tor)</translation> </message> <message> - <location line="+2"/> - <source>Output extra debugging information. Implies all other -debug* options</source> - <translation>輸出額外的除錯資訊. 包含了其它所有的 -debug* 選項</translation> - </message> - <message> - <location line="+1"/> - <source>Output extra network debugging information</source> - <translation>輸出額外的網路除錯資訊</translation> - </message> - <message> - <location line="+2"/> - <source>Prepend debug output with timestamp</source> - <translation>附加時戳於偵錯輸出</translation> - </message> - <message> - <location line="+5"/> + <location line="+9"/> <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation>SSL 選項: (SSL 設定程序請見 Bitcoin Wiki)</translation> </message> <message> - <location line="+1"/> - <source>Select the version of socks proxy to use (4-5, default: 5)</source> - <translation>選擇 SOCKS 代理伺服器的協定版本(4 或 5, 預設: 5)</translation> - </message> - <message> - <location line="+3"/> + <location line="+4"/> <source>Send trace/debug info to console instead of debug.log file</source> - <translation>不將追蹤/偵錯資訊輸出至 debug.log 檔案中,將其輸出至終端機。</translation> + <translation>在終端機顯示追蹤或除錯資訊,而不是寫到檔案 debug.log 中</translation> </message> <message> <location line="+1"/> <source>Send trace/debug info to debugger</source> - <translation>輸出追蹤/偵錯資訊至偵錯工具</translation> + <translation>輸出追蹤或除錯資訊給除錯器</translation> </message> <message> - <location line="+5"/> - <source>Set maximum block size in bytes (default: 250000)</source> - <translation>設定區塊大小上限為多少位元組 (預設: 250000)</translation> - </message> - <message> - <location line="+1"/> + <location line="+6"/> <source>Set minimum block size in bytes (default: 0)</source> - <translation>設定區塊大小下限為多少位元組 (預設: 0)</translation> + <translation>設定區塊大小下限成多少位元組 (預設值: 0)</translation> </message> <message> <location line="+2"/> <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> - <translation>客戶端軟體啓動時將 debug.log 檔縮小 (預設: 當沒有 -debug 時為 1)</translation> + <translation>客戶端軟體啓動時將 debug.log 檔縮小 (預設值: 當沒有 -debug 時為 1)</translation> </message> <message> <location line="+1"/> @@ -3095,7 +3700,7 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <message> <location line="+2"/> <source>Specify connection timeout in milliseconds (default: 5000)</source> - <translation>指定連線在幾毫秒後逾時 (預設: 5000)</translation> + <translation>指定連線在幾毫秒後逾時 (預設值: 5000)</translation> </message> <message> <location line="+6"/> @@ -3120,17 +3725,12 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <message> <location line="+8"/> <source>Use UPnP to map the listening port (default: 0)</source> - <translation>是否使用通用即插即用(UPnP)協定來設定聽候連線的通訊埠 (預設: 0)</translation> + <translation>是否使用通用即插即用(UPnP)協定來設定聽候連線的通訊埠的對應 (預設值: 0)</translation> </message> <message> <location line="+1"/> <source>Use UPnP to map the listening port (default: 1 when listening)</source> - <translation>是否使用通用即插即用(UPnP)協定來設定聽候連線的通訊埠 (預設: 當有聽候連線為 1)</translation> - </message> - <message> - <location line="+1"/> - <source>Use proxy to reach tor hidden services (default: same as -proxy)</source> - <translation>透過代理伺服器來使用 Tor 隱藏服務 (預設: 同 -proxy)</translation> + <translation>是否使用通用即插即用(UPnP)協定來設定聽候連線的通訊埠的對應 (預設值: 當有聽候連線時為 1)</translation> </message> <message> <location line="+2"/> @@ -3138,70 +3738,74 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>JSON-RPC 連線使用者名稱</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Warning</source> <translation>警告</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Warning: This version is obsolete, upgrade required!</source> - <translation>警告: 這個版本已經被淘汰掉了, 必須要升級!</translation> + <translation>警告: 這個版本已經被淘汰了,必須要升級!</translation> </message> <message> <location line="+2"/> + <source>version</source> + <translation>版本</translation> + </message> + <message> + <location line="+1"/> <source>wallet.dat corrupt, salvage failed</source> - <translation>錢包檔 weallet.dat 壞掉了, 拯救失敗</translation> + <translation>錢包檔 weallet.dat 壞掉了,拯救失敗</translation> </message> <message> - <location line="-54"/> + <location line="-57"/> <source>Password for JSON-RPC connections</source> <translation>JSON-RPC 連線密碼</translation> </message> <message> - <location line="-70"/> + <location line="-69"/> <source>Allow JSON-RPC connections from specified IP address</source> - <translation>允許自指定的 IP 位址進行 JSON-RPC 連線</translation> + <translation>允許指定的來源 IP 位址進行 JSON-RPC 連線</translation> </message> <message> <location line="+79"/> <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="-126"/> + <location line="-131"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation>當最新區塊改變時執行指令(指令中的 %s 會被取代為區塊雜湊值)</translation> + <translation>當最新區塊改變時要執行的指令 (指令中的 %s 會被取代成區塊雜湊值)</translation> </message> <message> - <location line="+155"/> + <location line="+160"/> <source>Upgrade wallet to latest format</source> - <translation>將錢包升級成最新格式</translation> + <translation>將錢包檔案升級成最新格式</translation> </message> <message> <location line="-23"/> <source>Set key pool size to <n> (default: 100)</source> - <translation>設定密鑰池大小至 <n> (預設為 100)</translation> + <translation>設定密鑰池大小成 <n> (預設值: 100)</translation> </message> <message> <location line="-12"/> <source>Rescan the block chain for missing wallet transactions</source> - <translation>為錢包遺失的交易重新掃描區塊鏈</translation> + <translation>重新掃描區塊鏈,來尋找錢包可能遺漏的交易。</translation> </message> <message> <location line="+38"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> - <translation>使用 OpenSSL (https) 於 JSON-RPC 連線</translation> + <translation>在 JSON-RPC 連線使用 OpenSSL (https)</translation> </message> <message> <location line="-29"/> <source>Server certificate file (default: server.cert)</source> - <translation>伺服器憑證檔(預設為 server.cert) -</translation> + <translation>伺服器憑證檔 (預設值: server.cert)</translation> </message> <message> <location line="+1"/> <source>Server private key (default: server.pem)</source> - <translation>伺服器私鑰(預設: server.pem)</translation> + <translation>伺服器私鑰檔 (預設值: server.pem)</translation> </message> <message> <location line="+16"/> @@ -3214,47 +3818,42 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>無法和這台電腦上的 %s 繫結 (繫結回傳錯誤 %d, %s)</translation> </message> <message> - <location line="-95"/> - <source>Connect through socks proxy</source> - <translation>透過 SOCKS 代理伺服器連線</translation> - </message> - <message> - <location line="-11"/> + <location line="-106"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>允許對 -addnode, -seednode, -connect 的參數使用域名查詢 </translation> </message> <message> - <location line="+58"/> + <location line="+59"/> <source>Loading addresses...</source> - <translation>正在加載位址...</translation> + <translation>正在載入位址資料...</translation> </message> <message> - <location line="-36"/> + <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 檔案錯誤:錢包要求新版的 Bitcoin</translation> + <translation>載入 wallet.dat 檔案錯誤: 這個錢包需要新版的位元幣軟體</translation> </message> <message> <location line="+98"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> - <translation>錢包需要複寫:請重新啟動 Bitcoin 以完成</translation> + <translation>錢包需要重寫: 請重新啓動位元幣軟體來完成</translation> </message> <message> <location line="-100"/> <source>Error loading wallet.dat</source> - <translation>加載 wallet.dat 檔案錯誤</translation> + <translation>載入錢包檔 wallet.dat 錯誤</translation> </message> <message> - <location line="+30"/> + <location line="+31"/> <source>Invalid -proxy address: '%s'</source> <translation>無效的 -proxy 位址: '%s'</translation> </message> <message> - <location line="+57"/> + <location line="+56"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>在 -onlynet 指定了不明的網路別: '%s'</translation> </message> @@ -3274,7 +3873,7 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>無法解析 -externalip 位址: '%s'</translation> </message> <message> - <location line="+46"/> + <location line="+47"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>設定 -paytxfee=<金額> 的金額無效: '%s'</translation> </message> @@ -3291,30 +3890,25 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <message> <location line="+10"/> <source>Loading block index...</source> - <translation>正在加載區塊索引...</translation> + <translation>正在載入區塊索引...</translation> </message> <message> - <location line="-60"/> + <location line="-61"/> <source>Add a node to connect to and attempt to keep the connection open</source> - <translation>加入一個要連線的節線, 並試著保持對它的連線暢通</translation> + <translation>加入一個要連線的節線,並試著保持對它的連線暢通</translation> </message> <message> - <location line="-28"/> + <location line="-32"/> <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source> - <translation>無法和這台電腦上的 %s 繫結. 也許位元幣已經在執行了.</translation> + <translation>無法和這台電腦上的 %s 繫結。也許位元幣軟體已經在執行了。</translation> </message> <message> - <location line="+69"/> - <source>Fee per KB to add to transactions you send</source> - <translation>交易付款時每 KB 的交易手續費</translation> - </message> - <message> - <location line="+20"/> + <location line="+94"/> <source>Loading wallet...</source> - <translation>正在加載錢包...</translation> + <translation>正在載入錢包資料...</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>Cannot downgrade wallet</source> <translation>無法將錢包格式降級</translation> </message> @@ -3331,7 +3925,7 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <message> <location line="-58"/> <source>Done loading</source> - <translation>加載完成</translation> + <translation>載入完成</translation> </message> <message> <location line="+85"/> @@ -3344,13 +3938,13 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>錯誤</translation> </message> <message> - <location line="-33"/> + <location line="-34"/> <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>你必須在下列設定檔中設定 RPC 密碼(rpcpassword=<password>): + <translation>你必須在下列設定檔中設定 RPC 密碼 (rpcpassword=<password>): %s -如果這個檔案還不存在, 請在新增時, 設定檔案權限為"只有主人才能讀取".</translation> +如果這個檔案還不存在,請在新增時,設定檔案權限成只有主人才能讀取。</translation> </message> </context> </TS>
\ No newline at end of file diff --git a/src/qt/macdockiconhandler.mm b/src/qt/macdockiconhandler.mm index 86b8c834d4..64291c9188 100644 --- a/src/qt/macdockiconhandler.mm +++ b/src/qt/macdockiconhandler.mm @@ -1,9 +1,13 @@ +// 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 "macdockiconhandler.h" +#include <QImageWriter> #include <QMenu> -#include <QWidget> #include <QTemporaryFile> -#include <QImageWriter> +#include <QWidget> #undef slots #include <Cocoa/Cocoa.h> diff --git a/src/qt/macnotificationhandler.mm b/src/qt/macnotificationhandler.mm index 8bb9b887a1..8a4c94cc5c 100644 --- a/src/qt/macnotificationhandler.mm +++ b/src/qt/macnotificationhandler.mm @@ -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 "macnotificationhandler.h" #undef slots diff --git a/src/qt/notificator.cpp b/src/qt/notificator.cpp index 1cef397d12..38a029dbe5 100644 --- a/src/qt/notificator.cpp +++ b/src/qt/notificator.cpp @@ -14,18 +14,18 @@ #include <QSystemTrayIcon> #include <QTemporaryFile> #include <QVariant> - -#ifdef Q_OS_MAC -#include "macnotificationhandler.h" - -#include <ApplicationServices/ApplicationServices.h> -#endif - #ifdef USE_DBUS #include <stdint.h> - #include <QtDBus> #endif +// Include ApplicationServices.h after QtDbus to avoid redefinition of check(). +// This affects at least OSX 10.6. See /usr/include/AssertMacros.h for details. +// Note: This could also be worked around using: +// #define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0 +#ifdef Q_OS_MAC +#include <ApplicationServices/ApplicationServices.h> +#include "macnotificationhandler.h" +#endif // https://wiki.ubuntu.com/NotificationDevelopmentGuidelines recommends at least 128 diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp index 0a569d16f4..d024e3b7aa 100644 --- a/src/qt/optionsdialog.cpp +++ b/src/qt/optionsdialog.cpp @@ -10,6 +10,7 @@ #include "ui_optionsdialog.h" #include "bitcoinunits.h" +#include "guiutil.h" #include "monitoreddatamapper.h" #include "optionsmodel.h" @@ -19,17 +20,20 @@ #include <QIntValidator> #include <QLocale> #include <QMessageBox> +#include <QTimer> OptionsDialog::OptionsDialog(QWidget *parent) : QDialog(parent), ui(new Ui::OptionsDialog), model(0), mapper(0), - fRestartWarningDisplayed_Proxy(false), - fRestartWarningDisplayed_Lang(false), fProxyIpValid(true) { ui->setupUi(this); + GUIUtil::restoreWindowGeometry("nOptionsDialogWindow", this->size(), this); + + /* Main elements init */ + ui->databaseCache->setMaximum(sizeof(void*) > 4 ? 4096 : 1024); /* Network elements init */ #ifndef USE_UPNP @@ -40,6 +44,7 @@ OptionsDialog::OptionsDialog(QWidget *parent) : ui->proxyPort->setEnabled(false); ui->proxyPort->setValidator(new QIntValidator(1, 65535, this)); + /** SOCKS version is only selectable for default proxy and is always 5 for IPv6 and Tor */ ui->socksVersion->setEnabled(false); ui->socksVersion->addItem("5", 5); ui->socksVersion->addItem("4", 4); @@ -95,16 +100,13 @@ OptionsDialog::OptionsDialog(QWidget *parent) : mapper->setSubmitPolicy(QDataWidgetMapper::ManualSubmit); mapper->setOrientation(Qt::Vertical); - /* enable apply button when data modified */ - connect(mapper, SIGNAL(viewModified()), this, SLOT(enableApplyButton())); - /* disable apply button when new data loaded */ - connect(mapper, SIGNAL(currentIndexChanged(int)), this, SLOT(disableApplyButton())); /* setup/change UI elements when proxy IP is invalid/valid */ - connect(this, SIGNAL(proxyIpValid(QValidatedLineEdit *, bool)), this, SLOT(handleProxyIpValid(QValidatedLineEdit *, bool))); + connect(this, SIGNAL(proxyIpChecks(QValidatedLineEdit *, int)), this, SLOT(doProxyIpChecks(QValidatedLineEdit *, int))); } OptionsDialog::~OptionsDialog() { + GUIUtil::saveWindowGeometry("nOptionsDialogWindow", this); delete ui; } @@ -114,6 +116,15 @@ void OptionsDialog::setModel(OptionsModel *model) if(model) { + /* check if client restart is needed and show persistent message */ + if (model->isRestartRequired()) + showRestartWarning(true); + + QString strLabel = model->getOverriddenByCommandLine(); + if (strLabel.isEmpty()) + strLabel = tr("none"); + ui->overriddenByCommandLineLabel->setText(strLabel); + connect(model, SIGNAL(displayUnitChanged(int)), this, SLOT(updateDisplayUnit())); mapper->setModel(model); @@ -124,11 +135,15 @@ void OptionsDialog::setModel(OptionsModel *model) /* update the display unit, to not use the default ("BTC") */ updateDisplayUnit(); - /* warn only when language selection changes by user action (placed here so init via mapper doesn't trigger this) */ - connect(ui->lang, SIGNAL(valueChanged()), this, SLOT(showRestartWarning_Lang())); + /* warn when one of the following settings changes by user action (placed here so init via mapper doesn't trigger them) */ - /* disable apply button after settings are loaded as there is nothing to save */ - disableApplyButton(); + /* Main */ + connect(ui->databaseCache, SIGNAL(valueChanged(int)), this, SLOT(showRestartWarning())); + connect(ui->threadsScriptVerif, SIGNAL(valueChanged(int)), this, SLOT(showRestartWarning())); + /* Network */ + connect(ui->connectSocks, SIGNAL(clicked(bool)), this, SLOT(showRestartWarning())); + /* Display */ + connect(ui->lang, SIGNAL(valueChanged()), this, SLOT(showRestartWarning())); } void OptionsDialog::setMapper() @@ -136,6 +151,8 @@ void OptionsDialog::setMapper() /* Main */ mapper->addMapping(ui->transactionFee, OptionsModel::Fee); mapper->addMapping(ui->bitcoinAtStartup, OptionsModel::StartAtStartup); + mapper->addMapping(ui->threadsScriptVerif, OptionsModel::ThreadsScriptVerif); + mapper->addMapping(ui->databaseCache, OptionsModel::DatabaseCache); /* Network */ mapper->addMapping(ui->mapPortUpnp, OptionsModel::MapPortUPnP); @@ -158,31 +175,20 @@ void OptionsDialog::setMapper() mapper->addMapping(ui->coinControlFeatures, OptionsModel::CoinControlFeatures); } -void OptionsDialog::enableApplyButton() -{ - ui->applyButton->setEnabled(true); -} - -void OptionsDialog::disableApplyButton() -{ - ui->applyButton->setEnabled(false); -} - -void OptionsDialog::enableSaveButtons() +void OptionsDialog::enableOkButton() { - /* prevent enabling of the save buttons when data modified, if there is an invalid proxy address present */ + /* prevent enabling of the OK button when data modified, if there is an invalid proxy address present */ if(fProxyIpValid) - setSaveButtonState(true); + setOkButtonState(true); } -void OptionsDialog::disableSaveButtons() +void OptionsDialog::disableOkButton() { - setSaveButtonState(false); + setOkButtonState(false); } -void OptionsDialog::setSaveButtonState(bool fState) +void OptionsDialog::setOkButtonState(bool fState) { - ui->applyButton->setEnabled(fState); ui->okButton->setEnabled(fState); } @@ -192,24 +198,15 @@ void OptionsDialog::on_resetButton_clicked() { // confirmation dialog QMessageBox::StandardButton btnRetVal = QMessageBox::question(this, tr("Confirm options reset"), - tr("Some settings may require a client restart to take effect.") + "<br><br>" + tr("Do you want to proceed?"), + tr("Client restart required to activate changes.") + "<br><br>" + tr("Client will be shutdown, do you want to proceed?"), QMessageBox::Yes | QMessageBox::Cancel, QMessageBox::Cancel); if(btnRetVal == QMessageBox::Cancel) return; - disableApplyButton(); - - /* disable restart warning messages display */ - fRestartWarningDisplayed_Lang = fRestartWarningDisplayed_Proxy = true; - - /* reset all options and save the default values (QSettings) */ + /* reset all options and close Bitcoin-Qt */ model->Reset(); - mapper->toFirst(); - mapper->submit(); - - /* re-enable restart warning messages display */ - fRestartWarningDisplayed_Lang = fRestartWarningDisplayed_Proxy = false; + QApplication::quit(); } } @@ -224,28 +221,26 @@ void OptionsDialog::on_cancelButton_clicked() reject(); } -void OptionsDialog::on_applyButton_clicked() +void OptionsDialog::showRestartWarning(bool fPersistent) { - mapper->submit(); - disableApplyButton(); -} + ui->statusLabel->setStyleSheet("QLabel { color: red; }"); -void OptionsDialog::showRestartWarning_Proxy() -{ - if(!fRestartWarningDisplayed_Proxy) + if(fPersistent) + { + ui->statusLabel->setText(tr("Client restart required to activate changes.")); + } + else { - QMessageBox::warning(this, tr("Warning"), tr("This setting will take effect after restarting Bitcoin."), QMessageBox::Ok); - fRestartWarningDisplayed_Proxy = true; + ui->statusLabel->setText(tr("This change would require a client restart.")); + // clear non-persistent status label after 10 seconds + // Todo: should perhaps be a class attribute, if we extend the use of statusLabel + QTimer::singleShot(10000, this, SLOT(clearStatusLabel())); } } -void OptionsDialog::showRestartWarning_Lang() +void OptionsDialog::clearStatusLabel() { - if(!fRestartWarningDisplayed_Lang) - { - QMessageBox::warning(this, tr("Warning"), tr("This setting will take effect after restarting Bitcoin."), QMessageBox::Ok); - fRestartWarningDisplayed_Lang = true; - } + ui->statusLabel->clear(); } void OptionsDialog::updateDisplayUnit() @@ -257,22 +252,25 @@ void OptionsDialog::updateDisplayUnit() } } -void OptionsDialog::handleProxyIpValid(QValidatedLineEdit *object, bool fState) +void OptionsDialog::doProxyIpChecks(QValidatedLineEdit *pUiProxyIp, int nProxyPort) { - // this is used in a check before re-enabling the save buttons - fProxyIpValid = fState; + Q_UNUSED(nProxyPort); - if(fProxyIpValid) + const std::string strAddrProxy = pUiProxyIp->text().toStdString(); + CService addrProxy; + + /* Check for a valid IPv4 / IPv6 address */ + if (!(fProxyIpValid = LookupNumeric(strAddrProxy.c_str(), addrProxy))) { - enableSaveButtons(); - ui->statusLabel->clear(); + disableOkButton(); + pUiProxyIp->setValid(false); + ui->statusLabel->setStyleSheet("QLabel { color: red; }"); + ui->statusLabel->setText(tr("The supplied proxy address is invalid.")); } else { - disableSaveButtons(); - object->setValid(fProxyIpValid); - ui->statusLabel->setStyleSheet("QLabel { color: red; }"); - ui->statusLabel->setText(tr("The supplied proxy address is invalid.")); + enableOkButton(); + ui->statusLabel->clear(); } } @@ -282,9 +280,7 @@ bool OptionsDialog::eventFilter(QObject *object, QEvent *event) { if(object == ui->proxyIp) { - CService addr; - /* Check proxyIp for a valid IPv4/IPv6 address and emit the proxyIpValid signal */ - emit proxyIpValid(ui->proxyIp, LookupNumeric(ui->proxyIp->text().toStdString().c_str(), addr)); + emit proxyIpChecks(ui->proxyIp, ui->proxyPort->text().toInt()); } } return QDialog::eventFilter(object, event); diff --git a/src/qt/optionsdialog.h b/src/qt/optionsdialog.h index 0181905a8c..6b62069660 100644 --- a/src/qt/optionsdialog.h +++ b/src/qt/optionsdialog.h @@ -31,35 +31,28 @@ protected: bool eventFilter(QObject *object, QEvent *event); private slots: - /* enable only apply button */ - void enableApplyButton(); - /* disable only apply button */ - void disableApplyButton(); - /* enable apply button and OK button */ - void enableSaveButtons(); - /* disable apply button and OK button */ - void disableSaveButtons(); - /* set apply button and OK button state (enabled / disabled) */ - void setSaveButtonState(bool fState); + /* enable OK button */ + void enableOkButton(); + /* disable OK button */ + void disableOkButton(); + /* set OK button state (enabled / disabled) */ + void setOkButtonState(bool fState); void on_resetButton_clicked(); void on_okButton_clicked(); void on_cancelButton_clicked(); - void on_applyButton_clicked(); - void showRestartWarning_Proxy(); - void showRestartWarning_Lang(); + void showRestartWarning(bool fPersistent = false); + void clearStatusLabel(); void updateDisplayUnit(); - void handleProxyIpValid(QValidatedLineEdit *object, bool fState); + void doProxyIpChecks(QValidatedLineEdit *pUiProxyIp, int nProxyPort); signals: - void proxyIpValid(QValidatedLineEdit *object, bool fValid); + void proxyIpChecks(QValidatedLineEdit *pUiProxyIp, int nProxyPort); private: Ui::OptionsDialog *ui; OptionsModel *model; MonitoredDataMapper *mapper; - bool fRestartWarningDisplayed_Proxy; - bool fRestartWarningDisplayed_Lang; bool fProxyIpValid; }; diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp index 15a873d2bd..1133c457b3 100644 --- a/src/qt/optionsmodel.cpp +++ b/src/qt/optionsmodel.cpp @@ -14,9 +14,13 @@ #include "init.h" #include "main.h" #include "net.h" +#ifdef ENABLE_WALLET +#include "wallet.h" #include "walletdb.h" +#endif #include <QSettings> +#include <QStringList> OptionsModel::OptionsModel(QObject *parent) : QAbstractListModel(parent) @@ -24,82 +28,120 @@ OptionsModel::OptionsModel(QObject *parent) : Init(); } -bool static ApplyProxySettings() -{ - QSettings settings; - CService addrProxy(settings.value("addrProxy", "127.0.0.1:9050").toString().toStdString()); - int nSocksVersion(settings.value("nSocksVersion", 5).toInt()); - if (!settings.value("fUseProxy", false).toBool()) { - addrProxy = CService(); - nSocksVersion = 0; - return false; - } - if (nSocksVersion && !addrProxy.IsValid()) - return false; - if (!IsLimited(NET_IPV4)) - SetProxy(NET_IPV4, addrProxy, nSocksVersion); - if (nSocksVersion > 4) { -#ifdef USE_IPV6 - if (!IsLimited(NET_IPV6)) - SetProxy(NET_IPV6, addrProxy, nSocksVersion); -#endif - SetNameProxy(addrProxy, nSocksVersion); - } - return true; -} - +// Writes all missing QSettings with their default values void OptionsModel::Init() { QSettings settings; + // Ensure restart flag is unset on client startup + setRestartRequired(false); + // These are Qt-only settings: - nDisplayUnit = settings.value("nDisplayUnit", BitcoinUnits::BTC).toInt(); + + // Window + if (!settings.contains("fMinimizeToTray")) + settings.setValue("fMinimizeToTray", false); + fMinimizeToTray = settings.value("fMinimizeToTray").toBool(); + + if (!settings.contains("fMinimizeOnClose")) + settings.setValue("fMinimizeOnClose", false); + fMinimizeOnClose = settings.value("fMinimizeOnClose").toBool(); + + // Display + if (!settings.contains("nDisplayUnit")) + settings.setValue("nDisplayUnit", BitcoinUnits::BTC); + nDisplayUnit = settings.value("nDisplayUnit").toInt(); + + if (!settings.contains("bDisplayAddresses")) + settings.setValue("bDisplayAddresses", false); bDisplayAddresses = settings.value("bDisplayAddresses", false).toBool(); - fMinimizeToTray = settings.value("fMinimizeToTray", false).toBool(); - fMinimizeOnClose = settings.value("fMinimizeOnClose", false).toBool(); - nTransactionFee = settings.value("nTransactionFee").toLongLong(); - language = settings.value("language", "").toString(); + + if (!settings.contains("fCoinControlFeatures")) + settings.setValue("fCoinControlFeatures", false); fCoinControlFeatures = settings.value("fCoinControlFeatures", false).toBool(); - // These are shared with core Bitcoin; we want - // command-line options to override the GUI settings: - if (settings.contains("fUseUPnP")) - SoftSetBoolArg("-upnp", settings.value("fUseUPnP").toBool()); - if (settings.contains("addrProxy") && settings.value("fUseProxy").toBool()) - SoftSetArg("-proxy", settings.value("addrProxy").toString().toStdString()); - if (settings.contains("nSocksVersion") && settings.value("fUseProxy").toBool()) - SoftSetArg("-socks", settings.value("nSocksVersion").toString().toStdString()); - if (!language.isEmpty()) - SoftSetArg("-lang", language.toStdString()); + // These are shared with the core or have a command-line parameter + // and we want command-line parameters to overwrite the GUI settings. + // + // If setting doesn't exist create it with defaults. + // + // If SoftSetArg() or SoftSetBoolArg() return false we were overridden + // by command-line and show this in the UI. + + // Main +#ifdef ENABLE_WALLET + if (!settings.contains("nTransactionFee")) + settings.setValue("nTransactionFee", 0); +#endif + + if (!settings.contains("nDatabaseCache")) + settings.setValue("nDatabaseCache", 25); + 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 + if (!SoftSetBoolArg("-upnp", settings.value("fUseUPnP").toBool())) + strOverriddenByCommandLine += "-upnp "; + + if (!settings.contains("fUseProxy")) + settings.setValue("fUseProxy", false); + if (!settings.contains("addrProxy")) + 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 "; + 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 "; + + // Display + if (!settings.contains("language")) + settings.setValue("language", ""); + if (!SoftSetArg("-lang", settings.value("language").toString().toStdString())) + strOverriddenByCommandLine += "-lang"; + + language = settings.value("language").toString(); } void OptionsModel::Reset() { QSettings settings; - // Remove all entries in this QSettings object + // Remove all entries from our QSettings object settings.clear(); // default setting for OptionsModel::StartAtStartup - disabled if (GUIUtil::GetStartOnSystemStartup()) GUIUtil::SetStartOnSystemStartup(false); - // Re-Init to get default values - Init(); - // Ensure Upgrade() is not running again by setting the bImportFinished flag settings.setValue("bImportFinished", true); } -bool OptionsModel::Upgrade() +void OptionsModel::Upgrade() { QSettings settings; + // Already upgraded if (settings.contains("bImportFinished")) - return false; // Already upgraded + return; settings.setValue("bImportFinished", true); +#ifdef ENABLE_WALLET // Move settings from old wallet.dat (if any): CWalletDB walletdb(strWalletFile); @@ -144,18 +186,17 @@ bool OptionsModel::Upgrade() walletdb.EraseSetting("addrProxy"); } } - ApplyProxySettings(); - Init(); +#endif - return true; + Init(); } - int OptionsModel::rowCount(const QModelIndex & parent) const { return OptionIDRowCount; } +// read QSettings values and return them QVariant OptionsModel::data(const QModelIndex & index, int role) const { if(role == Qt::EditRole) @@ -164,52 +205,57 @@ QVariant OptionsModel::data(const QModelIndex & index, int role) const switch(index.row()) { case StartAtStartup: - return QVariant(GUIUtil::GetStartOnSystemStartup()); + return GUIUtil::GetStartOnSystemStartup(); case MinimizeToTray: - return QVariant(fMinimizeToTray); + return fMinimizeToTray; case MapPortUPnP: #ifdef USE_UPNP - return settings.value("fUseUPnP", GetBoolArg("-upnp", true)); + return settings.value("fUseUPnP"); #else - return QVariant(false); + return false; #endif case MinimizeOnClose: - return QVariant(fMinimizeOnClose); - case ProxyUse: { - proxyType proxy; - return QVariant(GetProxy(NET_IPV4, proxy)); - } + return fMinimizeOnClose; + + // default proxy + case ProxyUse: + return settings.value("fUseProxy", false); case ProxyIP: { - proxyType proxy; - if (GetProxy(NET_IPV4, proxy)) - return QVariant(QString::fromStdString(proxy.first.ToStringIP())); - else - return QVariant(QString::fromStdString("127.0.0.1")); + // contains IP at index 0 and port at index 1 + QStringList strlIpPort = settings.value("addrProxy").toString().split(":", QString::SkipEmptyParts); + return strlIpPort.at(0); } case ProxyPort: { - proxyType proxy; - if (GetProxy(NET_IPV4, proxy)) - return QVariant(proxy.first.GetPort()); - else - return QVariant(9050); - } - case ProxySocksVersion: { - proxyType proxy; - if (GetProxy(NET_IPV4, proxy)) - return QVariant(proxy.second); - else - return QVariant(5); + // contains IP at index 0 and port at index 1 + QStringList strlIpPort = settings.value("addrProxy").toString().split(":", QString::SkipEmptyParts); + return strlIpPort.at(1); } + case ProxySocksVersion: + return settings.value("nSocksVersion", 5); + +#ifdef ENABLE_WALLET case Fee: - return QVariant((qint64) nTransactionFee); + // Attention: Init() is called before nTransactionFee is set in AppInit2()! + // To ensure we can change the fee on-the-fly update our QSetting when + // opening OptionsDialog, which queries Fee via the mapper. + if (nTransactionFee != settings.value("nTransactionFee").toLongLong()) + settings.setValue("nTransactionFee", (qint64)nTransactionFee); + // Todo: Consider to revert back to use just nTransactionFee here, if we don't want + // -paytxfee to update our QSettings! + return settings.value("nTransactionFee"); +#endif case DisplayUnit: - return QVariant(nDisplayUnit); + return nDisplayUnit; case DisplayAddresses: - return QVariant(bDisplayAddresses); + return bDisplayAddresses; case Language: - return settings.value("language", ""); + return settings.value("language"); case CoinControlFeatures: - return QVariant(fCoinControlFeatures); + return fCoinControlFeatures; + case DatabaseCache: + return settings.value("nDatabaseCache"); + case ThreadsScriptVerif: + return settings.value("nThreadsScriptVerif"); default: return QVariant(); } @@ -217,6 +263,7 @@ QVariant OptionsModel::data(const QModelIndex & index, int role) const return QVariant(); } +// write QSettings values bool OptionsModel::setData(const QModelIndex & index, const QVariant & value, int role) { bool successful = true; /* set to false on parse error */ @@ -232,7 +279,7 @@ bool OptionsModel::setData(const QModelIndex & index, const QVariant & value, in fMinimizeToTray = value.toBool(); settings.setValue("fMinimizeToTray", fMinimizeToTray); break; - case MapPortUPnP: + case MapPortUPnP: // core option - can be changed on-the-fly settings.setValue("fUseUPnP", value.toBool()); MapPort(value.toBool()); break; @@ -240,46 +287,53 @@ bool OptionsModel::setData(const QModelIndex & index, const QVariant & value, in fMinimizeOnClose = value.toBool(); settings.setValue("fMinimizeOnClose", fMinimizeOnClose); break; + + // default proxy case ProxyUse: - settings.setValue("fUseProxy", value.toBool()); - successful = ApplyProxySettings(); + if (settings.value("fUseProxy") != value) { + settings.setValue("fUseProxy", value.toBool()); + setRestartRequired(true); + } break; case ProxyIP: { - proxyType proxy; - proxy.first = CService("127.0.0.1", 9050); - GetProxy(NET_IPV4, proxy); - - CNetAddr addr(value.toString().toStdString()); - proxy.first.SetIP(addr); - settings.setValue("addrProxy", proxy.first.ToStringIPPort().c_str()); - successful = ApplyProxySettings(); + // contains current IP at index 0 and current port at index 1 + QStringList strlIpPort = settings.value("addrProxy").toString().split(":", QString::SkipEmptyParts); + // if that key doesn't exist or has a changed IP + if (!settings.contains("addrProxy") || strlIpPort.at(0) != value.toString()) { + // construct new value from new IP and current port + QString strNewValue = value.toString() + ":" + strlIpPort.at(1); + settings.setValue("addrProxy", strNewValue); + setRestartRequired(true); + } } break; case ProxyPort: { - proxyType proxy; - proxy.first = CService("127.0.0.1", 9050); - GetProxy(NET_IPV4, proxy); - - proxy.first.SetPort(value.toInt()); - settings.setValue("addrProxy", proxy.first.ToStringIPPort().c_str()); - successful = ApplyProxySettings(); + // contains current IP at index 0 and current port at index 1 + QStringList strlIpPort = settings.value("addrProxy").toString().split(":", QString::SkipEmptyParts); + // if that key doesn't exist or has a changed port + if (!settings.contains("addrProxy") || strlIpPort.at(1) != value.toString()) { + // construct new value from current IP and new port + QString strNewValue = strlIpPort.at(0) + ":" + value.toString(); + settings.setValue("addrProxy", strNewValue); + setRestartRequired(true); + } } break; case ProxySocksVersion: { - proxyType proxy; - proxy.second = 5; - GetProxy(NET_IPV4, proxy); - - proxy.second = value.toInt(); - settings.setValue("nSocksVersion", proxy.second); - successful = ApplyProxySettings(); + if (settings.value("nSocksVersion") != value) { + settings.setValue("nSocksVersion", value.toInt()); + setRestartRequired(true); + } } break; - case Fee: +#ifdef ENABLE_WALLET + case Fee: // core option - can be changed on-the-fly + // Todo: Add is valid check and warn via message, if not nTransactionFee = value.toLongLong(); - settings.setValue("nTransactionFee", (qint64) nTransactionFee); + settings.setValue("nTransactionFee", (qint64)nTransactionFee); emit transactionFeeChanged(nTransactionFee); break; +#endif case DisplayUnit: nDisplayUnit = value.toInt(); settings.setValue("nDisplayUnit", nDisplayUnit); @@ -290,13 +344,28 @@ bool OptionsModel::setData(const QModelIndex & index, const QVariant & value, in settings.setValue("bDisplayAddresses", bDisplayAddresses); break; case Language: - settings.setValue("language", value); + if (settings.value("language") != value) { + settings.setValue("language", value); + setRestartRequired(true); + } break; case CoinControlFeatures: fCoinControlFeatures = value.toBool(); settings.setValue("fCoinControlFeatures", fCoinControlFeatures); emit coinControlFeaturesChanged(fCoinControlFeatures); break; + case DatabaseCache: + if (settings.value("nDatabaseCache") != value) { + settings.setValue("nDatabaseCache", value); + setRestartRequired(true); + } + break; + case ThreadsScriptVerif: + if (settings.value("nThreadsScriptVerif") != value) { + settings.setValue("nThreadsScriptVerif", value); + setRestartRequired(true); + } + break; default: break; } @@ -306,11 +375,6 @@ bool OptionsModel::setData(const QModelIndex & index, const QVariant & value, in return successful; } -qint64 OptionsModel::getTransactionFee() -{ - return (qint64) nTransactionFee; -} - bool OptionsModel::getProxySettings(QString& proxyIP, quint16 &proxyPort) const { std::string proxy = GetArg("-proxy", ""); @@ -321,3 +385,15 @@ bool OptionsModel::getProxySettings(QString& proxyIP, quint16 &proxyPort) const proxyPort = addrProxy.GetPort(); return true; } + +void OptionsModel::setRestartRequired(bool fRequired) +{ + QSettings settings; + return settings.setValue("fRestartRequired", fRequired); +} + +bool OptionsModel::isRestartRequired() +{ + QSettings settings; + return settings.value("fRestartRequired", false).toBool(); +} diff --git a/src/qt/optionsmodel.h b/src/qt/optionsmodel.h index 5bb563cc36..d05cb46746 100644 --- a/src/qt/optionsmodel.h +++ b/src/qt/optionsmodel.h @@ -34,6 +34,8 @@ public: DisplayAddresses, // bool Language, // QString CoinControlFeatures, // bool + ThreadsScriptVerif, // int + DatabaseCache, // int OptionIDRowCount, }; @@ -41,29 +43,35 @@ public: void Reset(); /* Migrate settings from wallet.dat after app initialization */ - bool Upgrade(); /* returns true if settings upgraded */ + void Upgrade(); int rowCount(const QModelIndex & parent = QModelIndex()) const; QVariant data(const QModelIndex & index, int role = Qt::DisplayRole) const; bool setData(const QModelIndex & index, const QVariant & value, int role = Qt::EditRole); /* Explicit getters */ - qint64 getTransactionFee(); bool getMinimizeToTray() { return fMinimizeToTray; } bool getMinimizeOnClose() { return fMinimizeOnClose; } int getDisplayUnit() { return nDisplayUnit; } bool getDisplayAddresses() { return bDisplayAddresses; } - QString getLanguage() { return language; } bool getProxySettings(QString& proxyIP, quint16 &proxyPort) const; bool getCoinControlFeatures() { return fCoinControlFeatures; } + const QString& getOverriddenByCommandLine() { return strOverriddenByCommandLine; } + + /* Restart flag helper */ + void setRestartRequired(bool fRequired); + bool isRestartRequired(); private: - int nDisplayUnit; - bool bDisplayAddresses; + /* Qt-only settings */ bool fMinimizeToTray; bool fMinimizeOnClose; QString language; + int nDisplayUnit; + bool bDisplayAddresses; bool fCoinControlFeatures; + /* settings that were overriden by command-line */ + QString strOverriddenByCommandLine; signals: void displayUnitChanged(int unit); diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp index 120831fc90..e22ac43fb2 100644 --- a/src/qt/paymentserver.cpp +++ b/src/qt/paymentserver.cpp @@ -180,10 +180,8 @@ void PaymentServer::LoadRootCAs(X509_STORE* _store) // and the items in savedPaymentRequest will be handled // when uiReady() is called. // -bool PaymentServer::ipcSendCommandLine(int argc, char* argv[]) +bool PaymentServer::ipcParseCommandLine(int argc, char* argv[]) { - bool fResult = false; - for (int i = 1; i < argc; i++) { QString arg(argv[i]); @@ -226,7 +224,18 @@ bool PaymentServer::ipcSendCommandLine(int argc, char* argv[]) qDebug() << "PaymentServer::ipcSendCommandLine : Payment request file does not exist: " << arg; } } + return true; +} +// +// Sending to the server is done synchronously, at startup. +// If the server isn't already running, startup continues, +// and the items in savedPaymentRequest will be handled +// when uiReady() is called. +// +bool PaymentServer::ipcSendCommandLine() +{ + bool fResult = false; foreach (const QString& r, savedPaymentRequests) { QLocalSocket* socket = new QLocalSocket(); @@ -560,6 +569,7 @@ void PaymentServer::fetchPaymentACK(CWallet* wallet, SendCoinsRecipient recipien else { CPubKey newKey; if (wallet->GetKeyFromPool(newKey)) { + LOCK(wallet->cs_wallet); // SetAddressBook CKeyID keyID = newKey.GetID(); wallet->SetAddressBook(keyID, strAccount, "refund"); diff --git a/src/qt/paymentserver.h b/src/qt/paymentserver.h index da9923f9f1..af19661bdd 100644 --- a/src/qt/paymentserver.h +++ b/src/qt/paymentserver.h @@ -56,12 +56,16 @@ class PaymentServer : public QObject Q_OBJECT public: + // Parse URIs on command line + // Returns false on error + static bool ipcParseCommandLine(int argc, char *argv[]); + // Returns true if there were URIs on the command line // which were successfully sent to an already-running // process. // Note: if a payment request is given, SelectParams(MAIN/TESTNET) // will be called so we startup in the right mode. - static bool ipcSendCommandLine(int argc, char *argv[]); + static bool ipcSendCommandLine(); // parent should be QApplication object PaymentServer(QObject* parent, bool startLocalServer = true); diff --git a/src/qt/receivecoinsdialog.h b/src/qt/receivecoinsdialog.h index 4435bf6694..ed4b04d361 100644 --- a/src/qt/receivecoinsdialog.h +++ b/src/qt/receivecoinsdialog.h @@ -13,6 +13,7 @@ namespace Ui { } class WalletModel; class OptionsModel; + QT_BEGIN_NAMESPACE class QModelIndex; QT_END_NAMESPACE diff --git a/src/qt/recentrequeststablemodel.cpp b/src/qt/recentrequeststablemodel.cpp index 06f64af146..86c29dd02b 100644 --- a/src/qt/recentrequeststablemodel.cpp +++ b/src/qt/recentrequeststablemodel.cpp @@ -3,13 +3,16 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include "recentrequeststablemodel.h" -#include "guiutil.h" + #include "bitcoinunits.h" +#include "guiutil.h" #include "optionsmodel.h" -RecentRequestsTableModel::RecentRequestsTableModel(CWallet *wallet, WalletModel *parent): +RecentRequestsTableModel::RecentRequestsTableModel(CWallet *wallet, WalletModel *parent) : walletModel(parent) { + Q_UNUSED(wallet); + /* These columns must match the indices in the ColumnIndex enumeration */ columns << tr("Date") << tr("Label") << tr("Message") << tr("Amount"); } @@ -22,12 +25,14 @@ RecentRequestsTableModel::~RecentRequestsTableModel() int RecentRequestsTableModel::rowCount(const QModelIndex &parent) const { Q_UNUSED(parent); + return list.length(); } int RecentRequestsTableModel::columnCount(const QModelIndex &parent) const { Q_UNUSED(parent); + return columns.length(); } @@ -88,12 +93,15 @@ QVariant RecentRequestsTableModel::headerData(int section, Qt::Orientation orien QModelIndex RecentRequestsTableModel::index(int row, int column, const QModelIndex &parent) const { - return createIndex(row, column, 0); + Q_UNUSED(parent); + + return createIndex(row, column); } bool RecentRequestsTableModel::removeRows(int row, int count, const QModelIndex &parent) { Q_UNUSED(parent); + if(count > 0 && row >= 0 && (row+count) <= list.size()) { beginRemoveRows(parent, row, row + count - 1); diff --git a/src/qt/recentrequeststablemodel.h b/src/qt/recentrequeststablemodel.h index d00a2a9055..3aab7b0a48 100644 --- a/src/qt/recentrequeststablemodel.h +++ b/src/qt/recentrequeststablemodel.h @@ -5,12 +5,12 @@ #ifndef RECENTREQUESTSTABLEMODEL_H #define RECENTREQUESTSTABLEMODEL_H +#include "walletmodel.h" + #include <QAbstractTableModel> #include <QStringList> #include <QDateTime> -#include "walletmodel.h" - class CWallet; struct RecentRequestEntry @@ -27,7 +27,7 @@ class RecentRequestsTableModel: public QAbstractTableModel Q_OBJECT public: - explicit RecentRequestsTableModel(CWallet *wallet, WalletModel *parent = 0); + explicit RecentRequestsTableModel(CWallet *wallet, WalletModel *parent); ~RecentRequestsTableModel(); enum ColumnIndex { diff --git a/src/qt/res/bitcoin-qt-res.rc b/src/qt/res/bitcoin-qt-res.rc index 3e3672a835..ee23ae9b78 100644 --- a/src/qt/res/bitcoin-qt-res.rc +++ b/src/qt/res/bitcoin-qt-res.rc @@ -21,13 +21,13 @@ BEGIN BLOCK "040904E4" // U.S. English - multilingual (hex) BEGIN VALUE "CompanyName", "Bitcoin" - VALUE "FileDescription", "Bitcoin-Qt (OSS GUI client for Bitcoin)" + VALUE "FileDescription", "Bitcoin Core (OSS GUI client for Bitcoin)" VALUE "FileVersion", VER_FILEVERSION_STR VALUE "InternalName", "bitcoin-qt" VALUE "LegalCopyright", COPYRIGHT_STR VALUE "LegalTrademarks1", "Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php." VALUE "OriginalFilename", "bitcoin-qt.exe" - VALUE "ProductName", "Bitcoin-Qt" + VALUE "ProductName", "Bitcoin Core" VALUE "ProductVersion", VER_PRODUCTVERSION_STR END END diff --git a/src/qt/res/icons/notsynced.png b/src/qt/res/icons/notsynced.png Binary files differdeleted file mode 100644 index 87b1c3290b..0000000000 --- a/src/qt/res/icons/notsynced.png +++ /dev/null diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp index d43cdc7e5f..a8470572dd 100644 --- a/src/qt/rpcconsole.cpp +++ b/src/qt/rpcconsole.cpp @@ -284,7 +284,7 @@ void RPCConsole::setClientModel(ClientModel *model) ui->buildDate->setText(model->formatBuildDate()); ui->startupTime->setText(model->formatClientStartupTime()); - ui->isTestNet->setChecked(model->isTestNet()); + ui->networkName->setText(model->getNetworkName()); } } diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp index 0a4e80811f..92be835c56 100644 --- a/src/qt/sendcoinsdialog.cpp +++ b/src/qt/sendcoinsdialog.cpp @@ -306,12 +306,14 @@ void SendCoinsDialog::updateTabsAndLabels() void SendCoinsDialog::removeEntry(SendCoinsEntry* entry) { - entry->deleteLater(); + entry->hide(); - // If the last entry was removed add an empty one - if (!ui->entries->count()) + // If the last entry is about to be removed add an empty one + if (ui->entries->count() == 1) addEntry(); + entry->deleteLater(); + updateTabsAndLabels(); } @@ -450,9 +452,8 @@ void SendCoinsDialog::processSendCoinsReturn(const WalletModel::SendCoinsReturn msgParams.first = tr("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."); msgParams.second = CClientUIInterface::MSG_ERROR; break; - // OK and Aborted are included to prevent a compiler warning. + // included to prevent a compiler warning. case WalletModel::OK: - case WalletModel::Aborted: default: return; } @@ -543,46 +544,47 @@ void SendCoinsDialog::coinControlChangeChecked(int state) } // Coin Control: custom change address changed -void SendCoinsDialog::coinControlChangeEdited(const QString & text) +void SendCoinsDialog::coinControlChangeEdited(const QString& text) { - if (model) + if (model && model->getAddressTableModel()) { - CoinControlDialog::coinControl->destChange = CBitcoinAddress(text.toStdString()).Get(); + // Default to no change address until verified + CoinControlDialog::coinControl->destChange = CNoDestination(); + ui->labelCoinControlChangeLabel->setStyleSheet("QLabel{color:red;}"); - // label for the change address - ui->labelCoinControlChangeLabel->setStyleSheet("QLabel{color:black;}"); - if (text.isEmpty()) + CBitcoinAddress addr = CBitcoinAddress(text.toStdString()); + + if (text.isEmpty()) // Nothing entered + { ui->labelCoinControlChangeLabel->setText(""); - else if (!CBitcoinAddress(text.toStdString()).IsValid()) + } + else if (!addr.IsValid()) // Invalid address { - // invalid change address - CoinControlDialog::coinControl->destChange = CNoDestination(); - ui->lineEditCoinControlChange->setValid(false); - ui->labelCoinControlChangeLabel->setStyleSheet("QLabel{color:red;}"); ui->labelCoinControlChangeLabel->setText(tr("Warning: Invalid Bitcoin address")); } - else + else // Valid address { - QString associatedLabel = model->getAddressTableModel()->labelForAddress(text); - if (!associatedLabel.isEmpty()) - ui->labelCoinControlChangeLabel->setText(associatedLabel); - else + CPubKey pubkey; + CKeyID keyid; + addr.GetKeyID(keyid); + if (!model->getPubKey(keyid, pubkey)) // Unknown change address { - CPubKey pubkey; - CKeyID keyid; - CBitcoinAddress(text.toStdString()).GetKeyID(keyid); - if (model->getPubKey(keyid, pubkey)) - ui->labelCoinControlChangeLabel->setText(tr("(no label)")); + ui->lineEditCoinControlChange->setValid(false); + ui->labelCoinControlChangeLabel->setText(tr("Warning: Unknown change address")); + } + else // Known change address + { + ui->labelCoinControlChangeLabel->setStyleSheet("QLabel{color:black;}"); + + // Query label + QString associatedLabel = model->getAddressTableModel()->labelForAddress(text); + if (!associatedLabel.isEmpty()) + ui->labelCoinControlChangeLabel->setText(associatedLabel); else - { - // unknown change address - CoinControlDialog::coinControl->destChange = CNoDestination(); - - ui->lineEditCoinControlChange->setValid(false); - ui->labelCoinControlChangeLabel->setStyleSheet("QLabel{color:red;}"); - ui->labelCoinControlChangeLabel->setText(tr("Warning: Unknown change address")); - } + ui->labelCoinControlChangeLabel->setText(tr("(no label)")); + + CoinControlDialog::coinControl->destChange = addr.Get(); } } } diff --git a/src/qt/sendcoinsentry.cpp b/src/qt/sendcoinsentry.cpp index 4d28f68861..3f5d0cda3a 100644 --- a/src/qt/sendcoinsentry.cpp +++ b/src/qt/sendcoinsentry.cpp @@ -155,11 +155,12 @@ SendCoinsRecipient SendCoinsEntry::getValue() QWidget *SendCoinsEntry::setupTabChain(QWidget *prev) { QWidget::setTabOrder(prev, ui->payTo); - QWidget::setTabOrder(ui->payTo, ui->addressBookButton); + QWidget::setTabOrder(ui->payTo, ui->addAsLabel); + QWidget *w = ui->payAmount->setupTabChain(ui->addAsLabel); + QWidget::setTabOrder(w, ui->addressBookButton); QWidget::setTabOrder(ui->addressBookButton, ui->pasteButton); QWidget::setTabOrder(ui->pasteButton, ui->deleteButton); - QWidget::setTabOrder(ui->deleteButton, ui->addAsLabel); - return ui->payAmount->setupTabChain(ui->addAsLabel); + return ui->deleteButton; } void SendCoinsEntry::setValue(const SendCoinsRecipient &value) diff --git a/src/qt/splashscreen.cpp b/src/qt/splashscreen.cpp index 12280bb702..8b16496c18 100644 --- a/src/qt/splashscreen.cpp +++ b/src/qt/splashscreen.cpp @@ -4,16 +4,18 @@ #include "splashscreen.h" -#include "chainparams.h" #include "clientversion.h" #include "util.h" +#include "ui_interface.h" #include <QApplication> #include <QPainter> -SplashScreen::SplashScreen(const QPixmap &pixmap, Qt::WindowFlags f) : +SplashScreen::SplashScreen(const QPixmap &pixmap, Qt::WindowFlags f, bool isTestNet) : QSplashScreen(pixmap, f) { + setAutoFillBackground(true); + // set reference point, paddings int paddingRight = 50; int paddingTop = 50; @@ -23,16 +25,16 @@ SplashScreen::SplashScreen(const QPixmap &pixmap, Qt::WindowFlags f) : float fontFactor = 1.0; // define text to place - QString titleText = QString(QApplication::applicationName()).replace(QString("-testnet"), QString(""), Qt::CaseSensitive); // cut of testnet, place it as single object further down + QString titleText = tr("Bitcoin Core"); QString versionText = QString("Version %1").arg(QString::fromStdString(FormatFullVersion())); - QString copyrightText = QChar(0xA9)+QString(" 2009-%1 ").arg(COPYRIGHT_YEAR) + QString(tr("The Bitcoin developers")); + QString copyrightText = QChar(0xA9)+QString(" 2009-%1 ").arg(COPYRIGHT_YEAR) + QString(tr("The Bitcoin Core developers")); QString testnetAddText = QString(tr("[testnet]")); // define text to place as single text object QString font = "Arial"; // load the bitmap for writing some text over it QPixmap newPixmap; - if(TestNet()) { + if(isTestNet) { newPixmap = QPixmap(":/images/splash_testnet"); } else { @@ -72,7 +74,7 @@ SplashScreen::SplashScreen(const QPixmap &pixmap, Qt::WindowFlags f) : pixPaint.drawText(newPixmap.width()-titleTextWidth-paddingRight,paddingTop+titleCopyrightVSpace,copyrightText); // draw testnet string if testnet is on - if(TestNet()) { + if(isTestNet) { QFont boldFont = QFont(font, 10*fontFactor); boldFont.setWeight(QFont::Bold); pixPaint.setFont(boldFont); @@ -84,4 +86,37 @@ SplashScreen::SplashScreen(const QPixmap &pixmap, Qt::WindowFlags f) : pixPaint.end(); this->setPixmap(newPixmap); + + subscribeToCoreSignals(); +} + +SplashScreen::~SplashScreen() +{ + unsubscribeFromCoreSignals(); +} + +void SplashScreen::slotFinish(QWidget *mainWin) +{ + finish(mainWin); +} + +static void InitMessage(SplashScreen *splash, const std::string &message) +{ + QMetaObject::invokeMethod(splash, "showMessage", + Qt::QueuedConnection, + Q_ARG(QString, QString::fromStdString(message)), + Q_ARG(int, Qt::AlignBottom|Qt::AlignHCenter), + Q_ARG(QColor, QColor(55,55,55))); +} + +void SplashScreen::subscribeToCoreSignals() +{ + // Connect signals to client + uiInterface.InitMessage.connect(boost::bind(InitMessage, this, _1)); +} + +void SplashScreen::unsubscribeFromCoreSignals() +{ + // Disconnect signals from client + uiInterface.InitMessage.disconnect(boost::bind(InitMessage, this, _1)); } diff --git a/src/qt/splashscreen.h b/src/qt/splashscreen.h index ddf040593d..6bc10e60ab 100644 --- a/src/qt/splashscreen.h +++ b/src/qt/splashscreen.h @@ -14,7 +14,18 @@ class SplashScreen : public QSplashScreen Q_OBJECT public: - explicit SplashScreen(const QPixmap &pixmap = QPixmap(), Qt::WindowFlags f = 0); + explicit SplashScreen(const QPixmap &pixmap, Qt::WindowFlags f, bool isTestNet); + ~SplashScreen(); + +public slots: + /** Slot to call finish() method as it's not defined as slot */ + void slotFinish(QWidget *mainWin); + +private: + /** Connect core signals to splash screen */ + void subscribeToCoreSignals(); + /** Disconnect core signals to splash screen */ + void unsubscribeFromCoreSignals(); }; #endif // SPLASHSCREEN_H diff --git a/src/qt/test/Makefile.am b/src/qt/test/Makefile.am index cb6874700e..00ccfadf3f 100644 --- a/src/qt/test/Makefile.am +++ b/src/qt/test/Makefile.am @@ -8,18 +8,38 @@ AM_CPPFLAGS += -I$(top_srcdir)/src \ bin_PROGRAMS = test_bitcoin-qt TESTS = test_bitcoin-qt -TEST_QT_MOC_CPP = moc_uritests.cpp moc_paymentservertests.cpp +TEST_QT_MOC_CPP = moc_uritests.cpp -TEST_QT_H = uritests.h paymentservertests.h paymentrequestdata.h +if ENABLE_WALLET +TEST_QT_MOC_CPP += moc_paymentservertests.cpp +endif + +TEST_QT_H = \ + uritests.h \ + paymentrequestdata.h \ + paymentservertests.h BUILT_SOURCES = $(TEST_QT_MOC_CPP) test_bitcoin_qt_CPPFLAGS = $(AM_CPPFLAGS) $(QT_INCLUDES) $(QT_TEST_INCLUDES) -test_bitcoin_qt_SOURCES = test_main.cpp uritests.cpp paymentservertests.cpp $(TEST_QT_H) + +test_bitcoin_qt_SOURCES = \ + test_main.cpp \ + uritests.cpp \ + $(TEST_QT_H) +if ENABLE_WALLET +test_bitcoin_qt_SOURCES += \ + paymentservertests.cpp +endif + nodist_test_bitcoin_qt_SOURCES = $(TEST_QT_MOC_CPP) -test_bitcoin_qt_LDADD = $(LIBBITCOINQT) $(LIBBITCOIN_SERVER) $(LIBBITCOIN_WALLET) $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBLEVELDB) \ - $(LIBMEMENV) $(BOOST_LIBS) $(QT_LIBS) $(QT_DBUS_LIBS) $(QT_TEST_LIBS) \ + +test_bitcoin_qt_LDADD = $(LIBBITCOINQT) $(LIBBITCOIN_SERVER) +if ENABLE_WALLET +test_bitcoin_qt_LDADD += $(LIBBITCOIN_WALLET) +endif +test_bitcoin_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBLEVELDB) \ + $(LIBMEMENV) $(BOOST_LIBS) $(QT_DBUS_LIBS) $(QT_TEST_LIBS) $(QT_LIBS) \ $(QR_LIBS) $(PROTOBUF_LIBS) $(BDB_LIBS) CLEANFILES = $(BUILT_SOURCES) *.gcda *.gcno - diff --git a/src/qt/test/test_main.cpp b/src/qt/test/test_main.cpp index ae584706f1..a2adb00327 100644 --- a/src/qt/test/test_main.cpp +++ b/src/qt/test/test_main.cpp @@ -1,10 +1,25 @@ +#include "bitcoin-config.h" +#if defined(HAVE_CONFIG_H) +#include "bitcoin-config.h" +#endif + +#ifdef ENABLE_WALLET #include "paymentservertests.h" +#endif #include "uritests.h" #include <QCoreApplication> #include <QObject> #include <QTest> +#if defined(QT_STATICPLUGIN) && QT_VERSION < 0x050000 +#include <QtPlugin> +Q_IMPORT_PLUGIN(qcncodecs) +Q_IMPORT_PLUGIN(qjpcodecs) +Q_IMPORT_PLUGIN(qtwcodecs) +Q_IMPORT_PLUGIN(qkrcodecs) +#endif + // This is all you need to run all the tests int main(int argc, char *argv[]) { @@ -18,10 +33,11 @@ int main(int argc, char *argv[]) URITests test1; if (QTest::qExec(&test1) != 0) fInvalid = true; - +#ifdef ENABLE_WALLET PaymentServerTests test2; if (QTest::qExec(&test2) != 0) fInvalid = true; +#endif return fInvalid; } diff --git a/src/qt/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp index 3777e82f31..b29be7e0cb 100644 --- a/src/qt/transactiontablemodel.cpp +++ b/src/qt/transactiontablemodel.cpp @@ -285,38 +285,40 @@ QString TransactionTableModel::formatTxStatus(const TransactionRecord *wtx) cons { QString status; - switch(wtx->status.status) - { - case TransactionStatus::OpenUntilBlock: - status = tr("Open for %n more block(s)","",wtx->status.open_for); - break; - case TransactionStatus::OpenUntilDate: - status = tr("Open until %1").arg(GUIUtil::dateTimeStr(wtx->status.open_for)); - break; - case TransactionStatus::Offline: - status = tr("Offline (%1 confirmations)").arg(wtx->status.depth); - break; - case TransactionStatus::Unconfirmed: - status = tr("Unconfirmed (%1 of %2 confirmations)").arg(wtx->status.depth).arg(TransactionRecord::NumConfirmations); - break; - case TransactionStatus::HaveConfirmations: - status = tr("Confirmed (%1 confirmations)").arg(wtx->status.depth); - break; - } if(wtx->type == TransactionRecord::Generated) { switch(wtx->status.maturity) { case TransactionStatus::Immature: - status += "\n" + tr("Mined balance will be available when it matures in %n more block(s)", "", wtx->status.matures_in); + status = tr("Immature (%1 confirmations, will be available after %2)").arg(wtx->status.depth).arg(wtx->status.depth + wtx->status.matures_in); break; case TransactionStatus::Mature: + status = tr("Confirmed (%1 confirmations)").arg(wtx->status.depth); break; case TransactionStatus::MaturesWarning: - status += "\n" + tr("This block was not received by any other nodes and will probably not be accepted!"); + status = tr("This block was not received by any other nodes and will probably not be accepted!"); break; case TransactionStatus::NotAccepted: - status += "\n" + tr("Generated but not accepted"); + status = tr("Generated but not accepted"); + break; + } + } else { + switch(wtx->status.status) + { + case TransactionStatus::OpenUntilBlock: + status = tr("Open for %n more block(s)","",wtx->status.open_for); + break; + case TransactionStatus::OpenUntilDate: + status = tr("Open until %1").arg(GUIUtil::dateTimeStr(wtx->status.open_for)); + break; + case TransactionStatus::Offline: + status = tr("Offline (%1 confirmations)").arg(wtx->status.depth); + break; + case TransactionStatus::Unconfirmed: + status = tr("Unconfirmed (%1 of %2 confirmations)").arg(wtx->status.depth).arg(TransactionRecord::NumConfirmations); + break; + case TransactionStatus::HaveConfirmations: + status = tr("Confirmed (%1 confirmations)").arg(wtx->status.depth); break; } } diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp index 984a5a2e71..6f3e3b0aaf 100644 --- a/src/qt/walletmodel.cpp +++ b/src/qt/walletmodel.cpp @@ -6,8 +6,8 @@ #include "addresstablemodel.h" #include "guiconstants.h" -#include "transactiontablemodel.h" #include "recentrequeststablemodel.h" +#include "transactiontablemodel.h" #include "base58.h" #include "db.h" @@ -502,6 +502,7 @@ void WalletModel::listCoins(std::map<QString, std::vector<COutput> >& mapCoins) std::vector<COutput> vCoins; wallet->AvailableCoins(vCoins); + LOCK(wallet->cs_wallet); // ListLockedCoins, mapWallet std::vector<COutPoint> vLockedCoins; wallet->ListLockedCoins(vLockedCoins); @@ -531,20 +532,24 @@ void WalletModel::listCoins(std::map<QString, std::vector<COutput> >& mapCoins) bool WalletModel::isLockedCoin(uint256 hash, unsigned int n) const { + LOCK(wallet->cs_wallet); return wallet->IsLockedCoin(hash, n); } void WalletModel::lockCoin(COutPoint& output) { + LOCK(wallet->cs_wallet); wallet->LockCoin(output); } void WalletModel::unlockCoin(COutPoint& output) { + LOCK(wallet->cs_wallet); wallet->UnlockCoin(output); } void WalletModel::listLockedCoins(std::vector<COutPoint>& vOutpts) { + LOCK(wallet->cs_wallet); wallet->ListLockedCoins(vOutpts); } diff --git a/src/qt/walletmodel.h b/src/qt/walletmodel.h index 44a1912ecc..1a4d25615a 100644 --- a/src/qt/walletmodel.h +++ b/src/qt/walletmodel.h @@ -17,8 +17,8 @@ class AddressTableModel; class OptionsModel; -class TransactionTableModel; class RecentRequestsTableModel; +class TransactionTableModel; class WalletModelTransaction; class CCoinControl; @@ -75,8 +75,7 @@ public: AmountWithFeeExceedsBalance, DuplicateAddress, TransactionCreationFailed, // Error returned when wallet is still locked - TransactionCommitFailed, - Aborted + TransactionCommitFailed }; enum EncryptionStatus @@ -103,7 +102,7 @@ public: // Return status record for SendCoins, contains error id + information struct SendCoinsReturn { - SendCoinsReturn(StatusCode status = Aborted): + SendCoinsReturn(StatusCode status = OK): status(status) {} StatusCode status; }; diff --git a/src/qt/walletmodeltransaction.h b/src/qt/walletmodeltransaction.h index a948808a75..b7e85bcd11 100644 --- a/src/qt/walletmodeltransaction.h +++ b/src/qt/walletmodeltransaction.h @@ -39,9 +39,6 @@ private: CWalletTx *walletTransaction; CReserveKey *keyChange; qint64 fee; - -public slots: - }; #endif // WALLETMODELTRANSACTION_H diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp index 34ae6e0543..661deffb19 100644 --- a/src/rpcblockchain.cpp +++ b/src/rpcblockchain.cpp @@ -127,30 +127,6 @@ Value getdifficulty(const Array& params, bool fHelp) } -Value settxfee(const Array& params, bool fHelp) -{ - if (fHelp || params.size() < 1 || params.size() > 1) - throw runtime_error( - "settxfee amount\n" - "\nSet the transaction fee. 'amount' is a real and is rounded to the nearest 0.00000001\n" - "\nArguments:\n" - "1. amount (numeric, required) The transaction fee in btc rounded to the nearest 0.00000001\n" - "\nResult\n" - "true|false (boolean) Returns true if successful\n" - "\nExamples:\n" - + HelpExampleCli("settxfee", "0.00001") - + HelpExampleRpc("settxfee", "0.00001") - ); - - // Amount - int64_t nAmount = 0; - if (params[0].get_real() != 0.0) - nAmount = AmountFromValue(params[0]); // rejects 0.0 amounts - - nTransactionFee = nAmount; - return true; -} - Value getrawmempool(const Array& params, bool fHelp) { if (fHelp || params.size() > 1) diff --git a/src/rpcclient.cpp b/src/rpcclient.cpp index a3168917fc..c404ac274b 100644 --- a/src/rpcclient.cpp +++ b/src/rpcclient.cpp @@ -257,7 +257,7 @@ std::string HelpMessageCli(bool mainProgram) strUsage += " -datadir=<dir> " + _("Specify data directory") + "\n"; strUsage += " -testnet " + _("Use the test network") + "\n"; strUsage += " -regtest " + _("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.") + "\n"; + "solved instantly. This is intended for regression testing tools and app development.") + "\n"; } else { strUsage += _("RPC client options:") + "\n"; } diff --git a/src/rpcdump.cpp b/src/rpcdump.cpp index 92f4c2c6dd..c801b284cb 100644 --- a/src/rpcdump.cpp +++ b/src/rpcdump.cpp @@ -86,6 +86,8 @@ Value importprivkey(const Array& params, bool fHelp) + HelpExampleRpc("importprivkey", "\"mykey\", \"testing\", false") ); + EnsureWalletIsUnlocked(); + string strSecret = params[0].get_str(); string strLabel = ""; if (params.size() > 1) diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp index b81433120e..564f0401f1 100644 --- a/src/rpcmining.cpp +++ b/src/rpcmining.cpp @@ -5,13 +5,14 @@ #include "rpcserver.h" #include "chainparams.h" -#include "db.h" #include "init.h" #include "net.h" #include "main.h" #include "miner.h" +#ifdef ENABLE_WALLET +#include "db.h" #include "wallet.h" - +#endif #include <stdint.h> #include "json/json_spirit_utils.h" @@ -54,7 +55,10 @@ void ShutdownRPCMining() // or from the last difficulty change if 'lookup' is nonpositive. // If 'height' is nonnegative, compute the estimate at the time when a given block was found. Value GetNetworkHashPS(int lookup, int height) { - CBlockIndex *pb = chainActive[height]; + CBlockIndex *pb = chainActive.Tip(); + + if (height >= 0 && height < chainActive.Height()) + pb = chainActive[height]; if (pb == NULL || !pb->nHeight) return 0; diff --git a/src/rpcmisc.cpp b/src/rpcmisc.cpp new file mode 100644 index 0000000000..f8a7d07fc3 --- /dev/null +++ b/src/rpcmisc.cpp @@ -0,0 +1,325 @@ +// Copyright (c) 2010 Satoshi Nakamoto +// Copyright (c) 2009-2013 The Bitcoin developers +// Distributed under the MIT/X11 software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + +#include "base58.h" +#include "init.h" +#include "main.h" +#include "net.h" +#include "netbase.h" +#include "rpcserver.h" +#include "util.h" +#ifdef ENABLE_WALLET +#include "wallet.h" +#include "walletdb.h" +#endif + +#include <stdint.h> + +#include <boost/assign/list_of.hpp> +#include "json/json_spirit_utils.h" +#include "json/json_spirit_value.h" + +using namespace std; +using namespace boost; +using namespace boost::assign; +using namespace json_spirit; + +Value getinfo(const Array& params, bool fHelp) +{ + if (fHelp || params.size() != 0) + throw runtime_error( + "getinfo\n" + "Returns an object containing various state info.\n" + "\nResult:\n" + "{\n" + " \"version\": xxxxx, (numeric) the server version\n" + " \"protocolversion\": xxxxx, (numeric) the protocol version\n" + " \"walletversion\": xxxxx, (numeric) the wallet version\n" + " \"balance\": xxxxxxx, (numeric) the total bitcoin balance of the wallet\n" + " \"blocks\": xxxxxx, (numeric) the current number of blocks processed in the server\n" + " \"timeoffset\": xxxxx, (numeric) the time offset\n" + " \"connections\": xxxxx, (numeric) the number of connections\n" + " \"proxy\": \"host:port\", (string, optional) the proxy used by the server\n" + " \"difficulty\": xxxxxx, (numeric) the current difficulty\n" + " \"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" + " \"errors\": \"...\" (string) any error messages\n" + "}\n" + "\nExamples:\n" + + HelpExampleCli("getinfo", "") + + HelpExampleRpc("getinfo", "") + ); + + proxyType proxy; + GetProxy(NET_IPV4, proxy); + + Object obj; + obj.push_back(Pair("version", (int)CLIENT_VERSION)); + obj.push_back(Pair("protocolversion",(int)PROTOCOL_VERSION)); +#ifdef ENABLE_WALLET + if (pwalletMain) { + obj.push_back(Pair("walletversion", pwalletMain->GetVersion())); + obj.push_back(Pair("balance", ValueFromAmount(pwalletMain->GetBalance()))); + } +#endif + obj.push_back(Pair("blocks", (int)chainActive.Height())); + obj.push_back(Pair("timeoffset", (boost::int64_t)GetTimeOffset())); + obj.push_back(Pair("connections", (int)vNodes.size())); + obj.push_back(Pair("proxy", (proxy.first.IsValid() ? proxy.first.ToStringIPPort() : string()))); + obj.push_back(Pair("difficulty", (double)GetDifficulty())); + obj.push_back(Pair("testnet", TestNet())); +#ifdef ENABLE_WALLET + if (pwalletMain) { + 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)); +#endif + obj.push_back(Pair("errors", GetWarnings("statusbar"))); + return obj; +} + +#ifdef ENABLE_WALLET +class DescribeAddressVisitor : public boost::static_visitor<Object> +{ +public: + Object operator()(const CNoDestination &dest) const { return Object(); } + + Object operator()(const CKeyID &keyID) const { + Object obj; + CPubKey vchPubKey; + pwalletMain->GetPubKey(keyID, vchPubKey); + obj.push_back(Pair("isscript", false)); + obj.push_back(Pair("pubkey", HexStr(vchPubKey))); + obj.push_back(Pair("iscompressed", vchPubKey.IsCompressed())); + return obj; + } + + Object operator()(const CScriptID &scriptID) const { + Object obj; + obj.push_back(Pair("isscript", true)); + CScript subscript; + pwalletMain->GetCScript(scriptID, subscript); + std::vector<CTxDestination> addresses; + txnouttype whichType; + int nRequired; + ExtractDestinations(subscript, whichType, addresses, nRequired); + obj.push_back(Pair("script", GetTxnOutputType(whichType))); + obj.push_back(Pair("hex", HexStr(subscript.begin(), subscript.end()))); + Array a; + BOOST_FOREACH(const CTxDestination& addr, addresses) + a.push_back(CBitcoinAddress(addr).ToString()); + obj.push_back(Pair("addresses", a)); + if (whichType == TX_MULTISIG) + obj.push_back(Pair("sigsrequired", nRequired)); + return obj; + } +}; +#endif + +Value validateaddress(const Array& params, bool fHelp) +{ + if (fHelp || params.size() != 1) + throw runtime_error( + "validateaddress \"bitcoinaddress\"\n" + "\nReturn information about the given bitcoin address.\n" + "\nArguments:\n" + "1. \"bitcoinaddress\" (string, required) The bitcoin address to validate\n" + "\nResult:\n" + "{\n" + " \"isvalid\" : true|false, (boolean) If the address is valid or not. If not, this is the only property returned.\n" + " \"address\" : \"bitcoinaddress\", (string) The bitcoin address validated\n" + " \"ismine\" : true|false, (boolean) If the address is yours or not\n" + " \"isscript\" : true|false, (boolean) If the key is a script\n" + " \"pubkey\" : \"publickeyhex\", (string) The hex value of the raw public key\n" + " \"iscompressed\" : true|false, (boolean) If the address is compressed\n" + " \"account\" : \"account\" (string) The account associated with the address, \"\" is the default account\n" + "}\n" + "\nExamples:\n" + + HelpExampleCli("validateaddress", "\"1PSSGeFHDnKNxiEyFrD1wcEaHr9hrQDDWc\"") + + HelpExampleRpc("validateaddress", "\"1PSSGeFHDnKNxiEyFrD1wcEaHr9hrQDDWc\"") + ); + + CBitcoinAddress address(params[0].get_str()); + bool isValid = address.IsValid(); + + Object ret; + ret.push_back(Pair("isvalid", isValid)); + if (isValid) + { + CTxDestination dest = address.Get(); + string currentAddress = address.ToString(); + ret.push_back(Pair("address", currentAddress)); +#ifdef ENABLE_WALLET + bool fMine = pwalletMain ? IsMine(*pwalletMain, dest) : false; + ret.push_back(Pair("ismine", fMine)); + if (fMine) { + Object detail = boost::apply_visitor(DescribeAddressVisitor(), dest); + ret.insert(ret.end(), detail.begin(), detail.end()); + } + if (pwalletMain && pwalletMain->mapAddressBook.count(dest)) + ret.push_back(Pair("account", pwalletMain->mapAddressBook[dest].name)); +#endif + } + return ret; +} + +// +// Used by addmultisigaddress / createmultisig: +// +CScript _createmultisig(const Array& params) +{ + int nRequired = params[0].get_int(); + const Array& keys = params[1].get_array(); + + // Gather public keys + if (nRequired < 1) + throw runtime_error("a multisignature address must require at least one key to redeem"); + if ((int)keys.size() < nRequired) + throw runtime_error( + strprintf("not enough keys supplied " + "(got %"PRIszu" keys, but need at least %d to redeem)", keys.size(), nRequired)); + std::vector<CPubKey> pubkeys; + pubkeys.resize(keys.size()); + for (unsigned int i = 0; i < keys.size(); i++) + { + const std::string& ks = keys[i].get_str(); +#ifdef ENABLE_WALLET + // Case 1: Bitcoin address and we have full public key: + CBitcoinAddress address(ks); + if (pwalletMain && address.IsValid()) + { + CKeyID keyID; + if (!address.GetKeyID(keyID)) + throw runtime_error( + strprintf("%s does not refer to a key",ks.c_str())); + CPubKey vchPubKey; + if (!pwalletMain->GetPubKey(keyID, vchPubKey)) + throw runtime_error( + strprintf("no full public key for address %s",ks.c_str())); + if (!vchPubKey.IsFullyValid()) + throw runtime_error(" Invalid public key: "+ks); + pubkeys[i] = vchPubKey; + } + + // Case 2: hex public key + else +#endif + if (IsHex(ks)) + { + CPubKey vchPubKey(ParseHex(ks)); + if (!vchPubKey.IsFullyValid()) + throw runtime_error(" Invalid public key: "+ks); + pubkeys[i] = vchPubKey; + } + else + { + throw runtime_error(" Invalid public key: "+ks); + } + } + CScript result; + result.SetMultisig(nRequired, pubkeys); + return result; +} + +Value createmultisig(const Array& params, bool fHelp) +{ + if (fHelp || params.size() < 2 || params.size() > 2) + { + string msg = "createmultisig nrequired [\"key\",...]\n" + "\nCreates a multi-signature address with n signature of m keys required.\n" + "It returns a json object with the address and redeemScript.\n" + + "\nArguments:\n" + "1. nrequired (numeric, required) The number of required signatures out of the n keys or addresses.\n" + "2. \"keys\" (string, required) A json array of keys which are bitcoin addresses or hex-encoded public keys\n" + " [\n" + " \"key\" (string) bitcoin address or hex-encoded public key\n" + " ,...\n" + " ]\n" + + "\nResult:\n" + "{\n" + " \"address\":\"multisigaddress\", (string) The value of the new multisig address.\n" + " \"redeemScript\":\"script\" (string) The string value of the hex-encoded redemption script.\n" + "}\n" + + "\nExamples:\n" + "\nCreate a multisig address from 2 addresses\n" + + HelpExampleCli("createmultisig", "2 \"[\\\"16sSauSf5pF2UkUwvKGq4qjNRzBZYqgEL5\\\",\\\"171sgjn4YtPu27adkKGrdDwzRTxnRkBfKV\\\"]\"") + + "\nAs a json rpc call\n" + + HelpExampleRpc("icreatemultisig", "2, \"[\\\"16sSauSf5pF2UkUwvKGq4qjNRzBZYqgEL5\\\",\\\"171sgjn4YtPu27adkKGrdDwzRTxnRkBfKV\\\"]\"") + ; + throw runtime_error(msg); + } + + // Construct using pay-to-script-hash: + CScript inner = _createmultisig(params); + CScriptID innerID = inner.GetID(); + CBitcoinAddress address(innerID); + + Object result; + result.push_back(Pair("address", address.ToString())); + result.push_back(Pair("redeemScript", HexStr(inner.begin(), inner.end()))); + + return result; +} + +Value verifymessage(const Array& params, bool fHelp) +{ + if (fHelp || params.size() != 3) + throw runtime_error( + "verifymessage \"bitcoinaddress\" \"signature\" \"message\"\n" + "\nVerify a signed message\n" + "\nArguments:\n" + "1. \"bitcoinaddress\" (string, required) The bitcoin address to use for the signature.\n" + "2. \"signature\" (string, required) The signature provided by the signer in base 64 encoding (see signmessage).\n" + "3. \"message\" (string, required) The message that was signed.\n" + "\nResult:\n" + "true|false (boolean) If the signature is verified or not.\n" + "\nExamples:\n" + "\nUnlock the wallet for 30 seconds\n" + + HelpExampleCli("walletpassphrase", "\"mypassphrase\" 30") + + "\nCreate the signature\n" + + HelpExampleCli("signmessage", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XZ\" \"my message\"") + + "\nVerify the signature\n" + + HelpExampleCli("verifymessage", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XZ\" \"signature\" \"my message\"") + + "\nAs json rpc\n" + + HelpExampleRpc("verifymessage", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XZ\", \"signature\", \"my message\"") + ); + + string strAddress = params[0].get_str(); + string strSign = params[1].get_str(); + string strMessage = params[2].get_str(); + + CBitcoinAddress addr(strAddress); + if (!addr.IsValid()) + throw JSONRPCError(RPC_TYPE_ERROR, "Invalid address"); + + CKeyID keyID; + if (!addr.GetKeyID(keyID)) + throw JSONRPCError(RPC_TYPE_ERROR, "Address does not refer to key"); + + bool fInvalid = false; + vector<unsigned char> vchSig = DecodeBase64(strSign.c_str(), &fInvalid); + + if (fInvalid) + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Malformed base64 encoding"); + + CHashWriter ss(SER_GETHASH, 0); + ss << strMessageMagic; + ss << strMessage; + + CPubKey pubkey; + if (!pubkey.RecoverCompact(ss.GetHash(), vchSig)) + return false; + + return (pubkey.GetID() == keyID); +} diff --git a/src/rpcnet.cpp b/src/rpcnet.cpp index 93811e80ed..06ae7070c3 100644 --- a/src/rpcnet.cpp +++ b/src/rpcnet.cpp @@ -1,8 +1,8 @@ // Copyright (c) 2009-2013 The Bitcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "rpcserver.h" +#include "rpcserver.h" #include "main.h" #include "net.h" @@ -11,10 +11,9 @@ #include "sync.h" #include "util.h" #ifdef ENABLE_WALLET -#include "wallet.h" // for getinfo #include "init.h" // for getinfo +#include "wallet.h" // for getinfo #endif -#include "main.h" // for getinfo #include <inttypes.h> @@ -339,65 +338,3 @@ Value getnettotals(const Array& params, bool fHelp) obj.push_back(Pair("timemillis", static_cast<boost::int64_t>(GetTimeMillis()))); return obj; } - -Value getinfo(const Array& params, bool fHelp) -{ - if (fHelp || params.size() != 0) - throw runtime_error( - "getinfo\n" - "Returns an object containing various state info.\n" - "\nResult:\n" - "{\n" - " \"version\": xxxxx, (numeric) the server version\n" - " \"protocolversion\": xxxxx, (numeric) the protocol version\n" - " \"walletversion\": xxxxx, (numeric) the wallet version\n" - " \"balance\": xxxxxxx, (numeric) the total bitcoin balance of the wallet\n" - " \"blocks\": xxxxxx, (numeric) the current number of blocks processed in the server\n" - " \"timeoffset\": xxxxx, (numeric) the time offset\n" - " \"connections\": xxxxx, (numeric) the number of connections\n" - " \"proxy\": \"host:port\", (string, optional) the proxy used by the server\n" - " \"difficulty\": xxxxxx, (numeric) the current difficulty\n" - " \"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" - " \"errors\": \"...\" (string) any error messages\n" - "}\n" - "\nExamples:\n" - + HelpExampleCli("getinfo", "") - + HelpExampleRpc("getinfo", "") - ); - - proxyType proxy; - GetProxy(NET_IPV4, proxy); - - Object obj; - obj.push_back(Pair("version", (int)CLIENT_VERSION)); - obj.push_back(Pair("protocolversion",(int)PROTOCOL_VERSION)); -#ifdef ENABLE_WALLET - if (pwalletMain) { - obj.push_back(Pair("walletversion", pwalletMain->GetVersion())); - obj.push_back(Pair("balance", ValueFromAmount(pwalletMain->GetBalance()))); - } -#endif - obj.push_back(Pair("blocks", (int)chainActive.Height())); - obj.push_back(Pair("timeoffset", (boost::int64_t)GetTimeOffset())); - obj.push_back(Pair("connections", (int)vNodes.size())); - obj.push_back(Pair("proxy", (proxy.first.IsValid() ? proxy.first.ToStringIPPort() : string()))); - obj.push_back(Pair("difficulty", (double)GetDifficulty())); - obj.push_back(Pair("testnet", TestNet())); -#ifdef ENABLE_WALLET - if (pwalletMain) { - obj.push_back(Pair("keypoololdest", (boost::int64_t)pwalletMain->GetOldestKeyPoolTime())); - obj.push_back(Pair("keypoolsize", (int)pwalletMain->GetKeyPoolSize())); - } -#endif - obj.push_back(Pair("paytxfee", ValueFromAmount(nTransactionFee))); -#ifdef ENABLE_WALLET - if (pwalletMain && pwalletMain->IsCrypted()) - obj.push_back(Pair("unlocked_until", (boost::int64_t)nWalletUnlockTime)); -#endif - obj.push_back(Pair("errors", GetWarnings("statusbar"))); - return obj; -} diff --git a/src/rpcrawtransaction.cpp b/src/rpcrawtransaction.cpp index 86025918ef..ff652ca34d 100644 --- a/src/rpcrawtransaction.cpp +++ b/src/rpcrawtransaction.cpp @@ -4,13 +4,13 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include "base58.h" -#include "rpcserver.h" +#include "core.h" #include "init.h" +#include "keystore.h" +#include "main.h" #include "net.h" +#include "rpcserver.h" #include "uint256.h" -#include "core.h" -#include "main.h" -#include "keystore.h" #ifdef ENABLE_WALLET #include "wallet.h" #endif diff --git a/src/rpcserver.cpp b/src/rpcserver.cpp index c95f450c82..9d34a900ff 100644 --- a/src/rpcserver.cpp +++ b/src/rpcserver.cpp @@ -8,8 +8,8 @@ #include "base58.h" #include "init.h" #include "main.h" -#include "util.h" #include "ui_interface.h" +#include "util.h" #ifdef ENABLE_WALLET #include "wallet.h" #endif @@ -237,7 +237,6 @@ static const CRPCCommand vRPCCommands[] = { "getrawmempool", &getrawmempool, true, false, false }, { "getblock", &getblock, false, false, false }, { "getblockhash", &getblockhash, false, false, false }, - { "settxfee", &settxfee, false, false, true }, { "getrawtransaction", &getrawtransaction, false, false, false }, { "createrawtransaction", &createrawtransaction, false, false, false }, { "decoderawtransaction", &decoderawtransaction, false, false, false }, @@ -253,6 +252,9 @@ static const CRPCCommand vRPCCommands[] = { "getmininginfo", &getmininginfo, true, false, false }, { "getblocktemplate", &getblocktemplate, true, false, false }, { "submitblock", &submitblock, false, false, false }, + { "validateaddress", &validateaddress, true, false, false }, + { "createmultisig", &createmultisig, true, true , false }, + { "verifymessage", &verifymessage, false, false, false }, #ifdef ENABLE_WALLET /* Wallet */ @@ -273,18 +275,16 @@ static const CRPCCommand vRPCCommands[] = { "walletpassphrasechange", &walletpassphrasechange, false, false, true }, { "walletlock", &walletlock, true, false, true }, { "encryptwallet", &encryptwallet, false, false, true }, - { "validateaddress", &validateaddress, true, false, false }, { "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 }, - { "createmultisig", &createmultisig, true, true , false }, { "gettransaction", &gettransaction, false, false, true }, { "listtransactions", &listtransactions, false, false, true }, { "listaddressgroupings", &listaddressgroupings, false, false, true }, { "signmessage", &signmessage, false, false, true }, - { "verifymessage", &verifymessage, false, false, false }, { "listaccounts", &listaccounts, false, false, true }, { "listsinceblock", &listsinceblock, false, false, true }, { "dumpprivkey", &dumpprivkey, true, false, true }, @@ -294,6 +294,7 @@ static const CRPCCommand vRPCCommands[] = { "listunspent", &listunspent, false, false, true }, { "lockunspent", &lockunspent, false, false, true }, { "listlockunspent", &listlockunspent, false, false, true }, + { "settxfee", &settxfee, false, false, true }, /* Wallet-enabled mining */ { "getgenerate", &getgenerate, true, false, false }, diff --git a/src/rpcserver.h b/src/rpcserver.h index 4d29e90c09..9087be9e88 100644 --- a/src/rpcserver.h +++ b/src/rpcserver.h @@ -135,6 +135,7 @@ extern json_spirit::Value verifymessage(const json_spirit::Array& params, bool f extern json_spirit::Value getreceivedbyaddress(const json_spirit::Array& params, bool fHelp); extern json_spirit::Value getreceivedbyaccount(const json_spirit::Array& params, bool fHelp); extern json_spirit::Value getbalance(const json_spirit::Array& params, bool fHelp); +extern json_spirit::Value getunconfirmedbalance(const json_spirit::Array& params, bool fHelp); extern json_spirit::Value movecmd(const json_spirit::Array& params, bool fHelp); extern json_spirit::Value sendfrom(const json_spirit::Array& params, bool fHelp); extern json_spirit::Value sendmany(const json_spirit::Array& params, bool fHelp); diff --git a/src/rpcwallet.cpp b/src/rpcwallet.cpp index 82fa9d88c5..8ad5c9c51d 100644 --- a/src/rpcwallet.cpp +++ b/src/rpcwallet.cpp @@ -441,59 +441,6 @@ Value signmessage(const Array& params, bool fHelp) return EncodeBase64(&vchSig[0], vchSig.size()); } -Value verifymessage(const Array& params, bool fHelp) -{ - if (fHelp || params.size() != 3) - throw runtime_error( - "verifymessage \"bitcoinaddress\" \"signature\" \"message\"\n" - "\nVerify a signed message\n" - "\nArguments:\n" - "1. \"bitcoinaddress\" (string, required) The bitcoin address to use for the signature.\n" - "2. \"signature\" (string, required) The signature provided by the signer in base 64 encoding (see signmessage).\n" - "3. \"message\" (string, required) The message that was signed.\n" - "\nResult:\n" - "true|false (boolean) If the signature is verified or not.\n" - "\nExamples:\n" - "\nUnlock the wallet for 30 seconds\n" - + HelpExampleCli("walletpassphrase", "\"mypassphrase\" 30") + - "\nCreate the signature\n" - + HelpExampleCli("signmessage", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XZ\" \"my message\"") + - "\nVerify the signature\n" - + HelpExampleCli("verifymessage", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XZ\" \"signature\" \"my message\"") + - "\nAs json rpc\n" - + HelpExampleRpc("verifymessage", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XZ\", \"signature\", \"my message\"") - ); - - string strAddress = params[0].get_str(); - string strSign = params[1].get_str(); - string strMessage = params[2].get_str(); - - CBitcoinAddress addr(strAddress); - if (!addr.IsValid()) - throw JSONRPCError(RPC_TYPE_ERROR, "Invalid address"); - - CKeyID keyID; - if (!addr.GetKeyID(keyID)) - throw JSONRPCError(RPC_TYPE_ERROR, "Address does not refer to key"); - - bool fInvalid = false; - vector<unsigned char> vchSig = DecodeBase64(strSign.c_str(), &fInvalid); - - if (fInvalid) - throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Malformed base64 encoding"); - - CHashWriter ss(SER_GETHASH, 0); - ss << strMessageMagic; - ss << strMessage; - - CPubKey pubkey; - if (!pubkey.RecoverCompact(ss.GetHash(), vchSig)) - return false; - - return (pubkey.GetID() == keyID); -} - - Value getreceivedbyaddress(const Array& params, bool fHelp) { if (fHelp || params.size() < 1 || params.size() > 2) @@ -699,6 +646,15 @@ Value getbalance(const Array& params, bool fHelp) return ValueFromAmount(nBalance); } +Value getunconfirmedbalance(const Array ¶ms, bool fHelp) +{ + if (fHelp || params.size() > 0) + throw runtime_error( + "getunconfirmedbalance\n" + "Returns the server's total unconfirmed balance\n"); + return ValueFromAmount(pwalletMain->GetUnconfirmedBalance()); +} + Value movecmd(const Array& params, bool fHelp) { @@ -907,61 +863,8 @@ Value sendmany(const Array& params, bool fHelp) return wtx.GetHash().GetHex(); } -// -// Used by addmultisigaddress / createmultisig: -// -static CScript _createmultisig(const Array& params) -{ - int nRequired = params[0].get_int(); - const Array& keys = params[1].get_array(); - - // Gather public keys - if (nRequired < 1) - throw runtime_error("a multisignature address must require at least one key to redeem"); - if ((int)keys.size() < nRequired) - throw runtime_error( - strprintf("not enough keys supplied " - "(got %"PRIszu" keys, but need at least %d to redeem)", keys.size(), nRequired)); - std::vector<CPubKey> pubkeys; - pubkeys.resize(keys.size()); - for (unsigned int i = 0; i < keys.size(); i++) - { - const std::string& ks = keys[i].get_str(); - - // Case 1: Bitcoin address and we have full public key: - CBitcoinAddress address(ks); - if (pwalletMain && address.IsValid()) - { - CKeyID keyID; - if (!address.GetKeyID(keyID)) - throw runtime_error( - strprintf("%s does not refer to a key",ks.c_str())); - CPubKey vchPubKey; - if (!pwalletMain->GetPubKey(keyID, vchPubKey)) - throw runtime_error( - strprintf("no full public key for address %s",ks.c_str())); - if (!vchPubKey.IsFullyValid()) - throw runtime_error(" Invalid public key: "+ks); - pubkeys[i] = vchPubKey; - } - - // Case 2: hex public key - else if (IsHex(ks)) - { - CPubKey vchPubKey(ParseHex(ks)); - if (!vchPubKey.IsFullyValid()) - throw runtime_error(" Invalid public key: "+ks); - pubkeys[i] = vchPubKey; - } - else - { - throw runtime_error(" Invalid public key: "+ks); - } - } - CScript result; - result.SetMultisig(nRequired, pubkeys); - return result; -} +// Defined in rpcmisc.cpp +extern CScript _createmultisig(const Array& params); Value addmultisigaddress(const Array& params, bool fHelp) { @@ -1006,49 +909,6 @@ Value addmultisigaddress(const Array& params, bool fHelp) return CBitcoinAddress(innerID).ToString(); } -Value createmultisig(const Array& params, bool fHelp) -{ - if (fHelp || params.size() < 2 || params.size() > 2) - { - string msg = "createmultisig nrequired [\"key\",...]\n" - "\nCreates a multi-signature address with n signature of m keys required.\n" - "It returns a json object with the address and redeemScript.\n" - - "\nArguments:\n" - "1. nrequired (numeric, required) The number of required signatures out of the n keys or addresses.\n" - "2. \"keys\" (string, required) A json array of keys which are bitcoin addresses or hex-encoded public keys\n" - " [\n" - " \"key\" (string) bitcoin address or hex-encoded public key\n" - " ,...\n" - " ]\n" - - "\nResult:\n" - "{\n" - " \"address\":\"multisigaddress\", (string) The value of the new multisig address.\n" - " \"redeemScript\":\"script\" (string) The string value of the hex-encoded redemption script.\n" - "}\n" - - "\nExamples:\n" - "\nCreate a multisig address from 2 addresses\n" - + HelpExampleCli("createmultisig", "2 \"[\\\"16sSauSf5pF2UkUwvKGq4qjNRzBZYqgEL5\\\",\\\"171sgjn4YtPu27adkKGrdDwzRTxnRkBfKV\\\"]\"") + - "\nAs a json rpc call\n" - + HelpExampleRpc("icreatemultisig", "2, \"[\\\"16sSauSf5pF2UkUwvKGq4qjNRzBZYqgEL5\\\",\\\"171sgjn4YtPu27adkKGrdDwzRTxnRkBfKV\\\"]\"") - ; - throw runtime_error(msg); - } - - // Construct using pay-to-script-hash: - CScript inner = _createmultisig(params); - CScriptID innerID = inner.GetID(); - CBitcoinAddress address(innerID); - - Object result; - result.push_back(Pair("address", address.ToString())); - result.push_back(Pair("redeemScript", HexStr(inner.begin(), inner.end()))); - - return result; -} - struct tallyitem { @@ -1862,87 +1722,6 @@ Value encryptwallet(const Array& params, bool fHelp) return "wallet encrypted; Bitcoin server stopping, restart to run with encrypted wallet. The keypool has been flushed, you need to make a new backup."; } -class DescribeAddressVisitor : public boost::static_visitor<Object> -{ -public: - Object operator()(const CNoDestination &dest) const { return Object(); } - - Object operator()(const CKeyID &keyID) const { - Object obj; - CPubKey vchPubKey; - pwalletMain->GetPubKey(keyID, vchPubKey); - obj.push_back(Pair("isscript", false)); - obj.push_back(Pair("pubkey", HexStr(vchPubKey))); - obj.push_back(Pair("iscompressed", vchPubKey.IsCompressed())); - return obj; - } - - Object operator()(const CScriptID &scriptID) const { - Object obj; - obj.push_back(Pair("isscript", true)); - CScript subscript; - pwalletMain->GetCScript(scriptID, subscript); - std::vector<CTxDestination> addresses; - txnouttype whichType; - int nRequired; - ExtractDestinations(subscript, whichType, addresses, nRequired); - obj.push_back(Pair("script", GetTxnOutputType(whichType))); - obj.push_back(Pair("hex", HexStr(subscript.begin(), subscript.end()))); - Array a; - BOOST_FOREACH(const CTxDestination& addr, addresses) - a.push_back(CBitcoinAddress(addr).ToString()); - obj.push_back(Pair("addresses", a)); - if (whichType == TX_MULTISIG) - obj.push_back(Pair("sigsrequired", nRequired)); - return obj; - } -}; - -Value validateaddress(const Array& params, bool fHelp) -{ - if (fHelp || params.size() != 1) - throw runtime_error( - "validateaddress \"bitcoinaddress\"\n" - "\nReturn information about the given bitcoin address.\n" - "\nArguments:\n" - "1. \"bitcoinaddress\" (string, required) The bitcoin address to validate\n" - "\nResult:\n" - "{\n" - " \"isvalid\" : true|false, (boolean) If the address is valid or not. If not, this is the only property returned.\n" - " \"address\" : \"bitcoinaddress\", (string) The bitcoin address validated\n" - " \"ismine\" : true|false, (boolean) If the address is yours or not\n" - " \"isscript\" : true|false, (boolean) If the key is a script\n" - " \"pubkey\" : \"publickeyhex\", (string) The hex value of the raw public key\n" - " \"iscompressed\" : true|false, (boolean) If the address is compressed\n" - " \"account\" : \"account\" (string) The account associated with the address, \"\" is the default account\n" - "}\n" - "\nExamples:\n" - + HelpExampleCli("validateaddress", "\"1PSSGeFHDnKNxiEyFrD1wcEaHr9hrQDDWc\"") - + HelpExampleRpc("validateaddress", "\"1PSSGeFHDnKNxiEyFrD1wcEaHr9hrQDDWc\"") - ); - - CBitcoinAddress address(params[0].get_str()); - bool isValid = address.IsValid(); - - Object ret; - ret.push_back(Pair("isvalid", isValid)); - if (isValid) - { - CTxDestination dest = address.Get(); - string currentAddress = address.ToString(); - ret.push_back(Pair("address", currentAddress)); - bool fMine = pwalletMain ? IsMine(*pwalletMain, dest) : false; - ret.push_back(Pair("ismine", fMine)); - if (fMine) { - Object detail = boost::apply_visitor(DescribeAddressVisitor(), dest); - ret.insert(ret.end(), detail.begin(), detail.end()); - } - if (pwalletMain && pwalletMain->mapAddressBook.count(dest)) - ret.push_back(Pair("account", pwalletMain->mapAddressBook[dest].name)); - } - return ret; -} - Value lockunspent(const Array& params, bool fHelp) { if (fHelp || params.size() < 1 || params.size() > 2) @@ -2066,3 +1845,28 @@ Value listlockunspent(const Array& params, bool fHelp) return ret; } +Value settxfee(const Array& params, bool fHelp) +{ + if (fHelp || params.size() < 1 || params.size() > 1) + throw runtime_error( + "settxfee amount\n" + "\nSet the transaction fee. 'amount' is a real and is rounded to the nearest 0.00000001\n" + "\nArguments:\n" + "1. amount (numeric, required) The transaction fee in btc rounded to the nearest 0.00000001\n" + "\nResult\n" + "true|false (boolean) Returns true if successful\n" + "\nExamples:\n" + + HelpExampleCli("settxfee", "0.00001") + + HelpExampleRpc("settxfee", "0.00001") + ); + + // Amount + int64_t nAmount = 0; + if (params[0].get_real() != 0.0) + nAmount = AmountFromValue(params[0]); // rejects 0.0 amounts + + nTransactionFee = nAmount; + return true; +} + + diff --git a/src/sync.cpp b/src/sync.cpp index 9a20c87f88..b57d8c3c00 100644 --- a/src/sync.cpp +++ b/src/sync.cpp @@ -136,11 +136,11 @@ std::string LocksHeld() return result; } -void AssertLockHeld(std::string strName) +void AssertLockHeldInternal(const char *pszName, const char* pszFile, int nLine, void *cs) { BOOST_FOREACH(const PAIRTYPE(void*, CLockLocation)&i, *lockstack) - if (i.second.MutexName() == strName) return; - LogPrintf("Lock %s not held; locks held:\n%s", strName.c_str(), LocksHeld().c_str()); + if (i.first == cs) return; + LogPrintf("Lock %s not held in %s:%i; locks held:\n%s", pszName, pszFile, nLine, LocksHeld().c_str()); assert(0); } diff --git a/src/sync.h b/src/sync.h index c50abf81b6..077ed59b89 100644 --- a/src/sync.h +++ b/src/sync.h @@ -88,12 +88,13 @@ typedef AnnotatedMixin<boost::mutex> CWaitableCriticalSection; void EnterCritical(const char* pszName, const char* pszFile, int nLine, void* cs, bool fTry = false); void LeaveCritical(); std::string LocksHeld(); -void AssertLockHeld(std::string strName); +void AssertLockHeldInternal(const char* pszName, const char* pszFile, int nLine, void *cs); #else void static inline EnterCritical(const char* pszName, const char* pszFile, int nLine, void* cs, bool fTry = false) {} void static inline LeaveCritical() {} -void static inline AssertLockHeld(std::string) {} +void static inline AssertLockHeldInternal(const char* pszName, const char* pszFile, int nLine, void *cs) {} #endif +#define AssertLockHeld(cs) AssertLockHeldInternal(#cs, __FILE__, __LINE__, &cs) #ifdef DEBUG_LOCKCONTENTION void PrintLockContention(const char* pszName, const char* pszFile, int nLine); diff --git a/src/test/Makefile.am b/src/test/Makefile.am index ccc8da1690..667e53c6b4 100644 --- a/src/test/Makefile.am +++ b/src/test/Makefile.am @@ -6,12 +6,15 @@ bin_PROGRAMS = test_bitcoin TESTS = test_bitcoin -JSON_TEST_FILES= data/script_valid.json \ - data/base58_keys_valid.json data/sig_canonical.json \ +JSON_TEST_FILES = \ + data/script_valid.json \ + data/base58_keys_valid.json \ + data/sig_canonical.json \ data/sig_noncanonical.json \ data/base58_encode_decode.json \ data/base58_keys_invalid.json \ - data/script_invalid.json data/tx_invalid.json \ + data/script_invalid.json \ + data/tx_invalid.json \ data/tx_valid.json RAW_TEST_FILES = data/alertTests.raw @@ -27,18 +30,43 @@ test_bitcoin_LDADD += $(LIBBITCOIN_WALLET) endif test_bitcoin_LDADD += $(BDB_LIBS) -test_bitcoin_SOURCES = alert_tests.cpp \ - allocator_tests.cpp base32_tests.cpp base58_tests.cpp base64_tests.cpp \ - bignum_tests.cpp bloom_tests.cpp canonical_tests.cpp checkblock_tests.cpp \ - Checkpoints_tests.cpp compress_tests.cpp DoS_tests.cpp getarg_tests.cpp \ - key_tests.cpp miner_tests.cpp mruset_tests.cpp multisig_tests.cpp \ - netbase_tests.cpp pmt_tests.cpp rpc_tests.cpp script_P2SH_tests.cpp \ - script_tests.cpp serialize_tests.cpp sigopcount_tests.cpp test_bitcoin.cpp \ - transaction_tests.cpp uint160_tests.cpp uint256_tests.cpp util_tests.cpp \ - sighash_tests.cpp $(JSON_TEST_FILES) $(RAW_TEST_FILES) +test_bitcoin_SOURCES = \ + alert_tests.cpp \ + allocator_tests.cpp \ + base32_tests.cpp \ + base58_tests.cpp \ + base64_tests.cpp \ + bignum_tests.cpp \ + bloom_tests.cpp \ + canonical_tests.cpp \ + checkblock_tests.cpp \ + Checkpoints_tests.cpp \ + compress_tests.cpp \ + DoS_tests.cpp \ + getarg_tests.cpp \ + key_tests.cpp \ + miner_tests.cpp \ + mruset_tests.cpp \ + multisig_tests.cpp \ + netbase_tests.cpp \ + pmt_tests.cpp \ + rpc_tests.cpp \ + script_P2SH_tests.cpp \ + script_tests.cpp \ + serialize_tests.cpp \ + sigopcount_tests.cpp \ + test_bitcoin.cpp \ + transaction_tests.cpp \ + uint256_tests.cpp \ + util_tests.cpp \ + sighash_tests.cpp \ + $(JSON_TEST_FILES) $(RAW_TEST_FILES) if ENABLE_WALLET -test_bitcoin_SOURCES += accounting_tests.cpp wallet_tests.cpp rpc_wallet_tests.cpp +test_bitcoin_SOURCES += \ + accounting_tests.cpp \ + wallet_tests.cpp \ + rpc_wallet_tests.cpp endif nodist_test_bitcoin_SOURCES = $(BUILT_SOURCES) diff --git a/src/test/data/tx_invalid.json b/src/test/data/tx_invalid.json index a26f4a87db..e386f81fe6 100644 --- a/src/test/data/tx_invalid.json +++ b/src/test/data/tx_invalid.json @@ -65,5 +65,10 @@ ["Same as the transactions in valid with one input SIGHASH_ALL and one SIGHASH_ANYONECANPAY, but we set the _ANYONECANPAY sequence number, invalidating the SIGHASH_ALL signature"], [[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0x21 0x035e7f0d4d0841bcd56c39337ed086b1a633ee770c1ffdd94ac552a95ac2ce0efc CHECKSIG"], ["0000000000000000000000000000000000000000000000000000000000000200", 0, "0x21 0x035e7f0d4d0841bcd56c39337ed086b1a633ee770c1ffdd94ac552a95ac2ce0efc CHECKSIG"]], - "01000000020001000000000000000000000000000000000000000000000000000000000000000000004948304502203a0f5f0e1f2bdbcd04db3061d18f3af70e07f4f467cbc1b8116f267025f5360b022100c792b6e215afc5afc721a351ec413e714305cb749aae3d7fee76621313418df10101000000000200000000000000000000000000000000000000000000000000000000000000000000484730440220201dc2d030e380e8f9cfb41b442d930fa5a685bb2c8db5906671f865507d0670022018d9e7a8d4c8d86a73c2a724ee38ef983ec249827e0e464841735955c707ece98101000000010100000000000000015100000000", true] + "01000000020001000000000000000000000000000000000000000000000000000000000000000000004948304502203a0f5f0e1f2bdbcd04db3061d18f3af70e07f4f467cbc1b8116f267025f5360b022100c792b6e215afc5afc721a351ec413e714305cb749aae3d7fee76621313418df10101000000000200000000000000000000000000000000000000000000000000000000000000000000484730440220201dc2d030e380e8f9cfb41b442d930fa5a685bb2c8db5906671f865507d0670022018d9e7a8d4c8d86a73c2a724ee38ef983ec249827e0e464841735955c707ece98101000000010100000000000000015100000000", true], + +["Incorrect signature order"], +["Note the input is just required to make the tester happy"], +[[["b3da01dd4aae683c7aee4d5d8b52a540a508e1115f77cd7fa9a291243f501223", 0, "HASH160 0x14 0xb1ce99298d5f07364b57b1e5c9cc00be0b04a954 EQUAL"]], +"01000000012312503f2491a2a97fcd775f11e108a540a5528b5d4dee7a3c68ae4add01dab300000000fdfe000048304502207aacee820e08b0b174e248abd8d7a34ed63b5da3abedb99934df9fddd65c05c4022100dfe87896ab5ee3df476c2655f9fbe5bd089dccbef3e4ea05b5d121169fe7f5f401483045022100f6649b0eddfdfd4ad55426663385090d51ee86c3481bdc6b0c18ea6c0ece2c0b0220561c315b07cffa6f7dd9df96dbae9200c2dee09bf93cc35ca05e6cdf613340aa014c695221031d11db38972b712a9fe1fc023577c7ae3ddb4a3004187d41c45121eecfdbb5b7210207ec36911b6ad2382860d32989c7b8728e9489d7bbc94a6b5509ef0029be128821024ea9fac06f666a4adc3fc1357b7bec1fd0bdece2b9d08579226a8ebde53058e453aeffffffff0180380100000000001976a914c9b99cddf847d10685a4fabaa0baf505f7c3dfab88ac00000000", true] ] diff --git a/src/test/data/tx_valid.json b/src/test/data/tx_valid.json index 63e7074a32..c33a7a035a 100644 --- a/src/test/data/tx_valid.json +++ b/src/test/data/tx_valid.json @@ -87,5 +87,10 @@ ["ddc454a1c0c35c188c98976b17670f69e586d9c0f3593ea879928332f0a069e7, which spends an input that pushes using a PUSHDATA1 that is negative when read as signed"], [[["c5510a5dd97a25f43175af1fe649b707b1df8e1a41489bac33a23087027a2f48", 0, "0x4c 0xae 0x606563686f2022553246736447566b58312b5a536e587574356542793066794778625456415675534a6c376a6a334878416945325364667657734f53474f36633338584d7439435c6e543249584967306a486956304f376e775236644546673d3d22203e20743b206f70656e73736c20656e63202d7061737320706173733a5b314a564d7751432d707269766b65792d6865785d202d64202d6165732d3235362d636263202d61202d696e207460 DROP DUP HASH160 0x14 0xbfd7436b6265aa9de506f8a994f881ff08cc2872 EQUALVERIFY CHECKSIG"]], - "0100000001482f7a028730a233ac9b48411a8edfb107b749e61faf7531f4257ad95d0a51c5000000008b483045022100bf0bbae9bde51ad2b222e87fbf67530fbafc25c903519a1e5dcc52a32ff5844e022028c4d9ad49b006dd59974372a54291d5764be541574bb0c4dc208ec51f80b7190141049dd4aad62741dc27d5f267f7b70682eee22e7e9c1923b9c0957bdae0b96374569b460eb8d5b40d972e8c7c0ad441de3d94c4a29864b212d56050acb980b72b2bffffffff0180969800000000001976a914e336d0017a9d28de99d16472f6ca6d5a3a8ebc9988ac00000000", true] + "0100000001482f7a028730a233ac9b48411a8edfb107b749e61faf7531f4257ad95d0a51c5000000008b483045022100bf0bbae9bde51ad2b222e87fbf67530fbafc25c903519a1e5dcc52a32ff5844e022028c4d9ad49b006dd59974372a54291d5764be541574bb0c4dc208ec51f80b7190141049dd4aad62741dc27d5f267f7b70682eee22e7e9c1923b9c0957bdae0b96374569b460eb8d5b40d972e8c7c0ad441de3d94c4a29864b212d56050acb980b72b2bffffffff0180969800000000001976a914e336d0017a9d28de99d16472f6ca6d5a3a8ebc9988ac00000000", true], + +["Correct signature order"], +["Note the input is just required to make the tester happy"], +[[["b3da01dd4aae683c7aee4d5d8b52a540a508e1115f77cd7fa9a291243f501223", 0, "HASH160 0x14 0xb1ce99298d5f07364b57b1e5c9cc00be0b04a954 EQUAL"]], +"01000000012312503f2491a2a97fcd775f11e108a540a5528b5d4dee7a3c68ae4add01dab300000000fdfe0000483045022100f6649b0eddfdfd4ad55426663385090d51ee86c3481bdc6b0c18ea6c0ece2c0b0220561c315b07cffa6f7dd9df96dbae9200c2dee09bf93cc35ca05e6cdf613340aa0148304502207aacee820e08b0b174e248abd8d7a34ed63b5da3abedb99934df9fddd65c05c4022100dfe87896ab5ee3df476c2655f9fbe5bd089dccbef3e4ea05b5d121169fe7f5f4014c695221031d11db38972b712a9fe1fc023577c7ae3ddb4a3004187d41c45121eecfdbb5b7210207ec36911b6ad2382860d32989c7b8728e9489d7bbc94a6b5509ef0029be128821024ea9fac06f666a4adc3fc1357b7bec1fd0bdece2b9d08579226a8ebde53058e453aeffffffff0180380100000000001976a914c9b99cddf847d10685a4fabaa0baf505f7c3dfab88ac00000000", true] ] diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp index ea6abb7e9a..8e3091d555 100644 --- a/src/test/miner_tests.cpp +++ b/src/test/miner_tests.cpp @@ -4,7 +4,6 @@ #include "miner.h" #include "uint256.h" #include "util.h" -#include "wallet.h" #include <boost/test/unit_test.hpp> diff --git a/src/test/serialize_tests.cpp b/src/test/serialize_tests.cpp index afcdd118bc..415f957811 100644 --- a/src/test/serialize_tests.cpp +++ b/src/test/serialize_tests.cpp @@ -61,9 +61,16 @@ BOOST_AUTO_TEST_CASE(compactsize) static bool isCanonicalException(const std::ios_base::failure& ex) { - return std::string("non-canonical ReadCompactSize()") == ex.what(); + std::ios_base::failure expectedException("non-canonical ReadCompactSize()"); + + // The string returned by what() can be different for different platforms. + // Instead of directly comparing the ex.what() with an expected string, + // create an instance of exception to see if ex.what() matches + // the expected explanatory string returned by the exception instance. + return strcmp(expectedException.what(), ex.what()) == 0; } + BOOST_AUTO_TEST_CASE(noncanonical) { // Write some non-canonical CompactSize encodings, and diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp index a4592fe803..96d0712403 100644 --- a/src/test/test_bitcoin.cpp +++ b/src/test/test_bitcoin.cpp @@ -2,12 +2,12 @@ -#include "db.h" #include "main.h" #include "txdb.h" #include "ui_interface.h" #include "util.h" #ifdef ENABLE_WALLET +#include "db.h" #include "wallet.h" #endif @@ -26,7 +26,7 @@ struct TestingSetup { boost::thread_group threadGroup; TestingSetup() { - fPrintToDebugger = true; // don't want to write to debug.log file + fPrintToDebugLog = false; // don't want to write to debug.log file noui_connect(); #ifdef ENABLE_WALLET bitdb.MakeMock(); diff --git a/src/test/uint160_tests.cpp b/src/test/uint160_tests.cpp deleted file mode 100644 index 87418fabec..0000000000 --- a/src/test/uint160_tests.cpp +++ /dev/null @@ -1,20 +0,0 @@ -#include "uint256.h" - -#include <stdint.h> - -#include <boost/test/unit_test.hpp> - -BOOST_AUTO_TEST_SUITE(uint160_tests) - -BOOST_AUTO_TEST_CASE(uint160_equality) -{ - uint160 num1 = 10; - uint160 num2 = 11; - BOOST_CHECK(num1+1 == num2); - - uint64_t num3 = 10; - BOOST_CHECK(num1 == num3); - BOOST_CHECK(num1+num2 == num3+num2); -} - -BOOST_AUTO_TEST_SUITE_END() diff --git a/src/test/uint256_tests.cpp b/src/test/uint256_tests.cpp index 188635dcbd..368484fdff 100644 --- a/src/test/uint256_tests.cpp +++ b/src/test/uint256_tests.cpp @@ -1,29 +1,633 @@ +#include <boost/test/unit_test.hpp> +#include <stdint.h> +#include <sstream> +#include <iomanip> +#include <limits> +#include <cmath> #include "uint256.h" #include <string> +#include "version.h" -#include <stdint.h> +BOOST_AUTO_TEST_SUITE(uint256_tests) + +const unsigned char R1Array[] = + "\x9c\x52\x4a\xdb\xcf\x56\x11\x12\x2b\x29\x12\x5e\x5d\x35\xd2\xd2" + "\x22\x81\xaa\xb5\x33\xf0\x08\x32\xd5\x56\xb1\xf9\xea\xe5\x1d\x7d"; +const char R1ArrayHex[] = "7D1DE5EAF9B156D53208F033B5AA8122D2d2355d5e12292b121156cfdb4a529c"; +const double R1Ldouble = 0.4887374590559308955; // R1L equals roughly R1Ldouble * 2^256 +const double R1Sdouble = 0.7096329412477836074; +const uint256 R1L = uint256(std::vector<unsigned char>(R1Array,R1Array+32)); +const uint160 R1S = uint160(std::vector<unsigned char>(R1Array,R1Array+20)); +const uint64_t R1LLow64 = 0x121156cfdb4a529cULL; -#include <boost/test/unit_test.hpp> +const unsigned char R2Array[] = + "\x70\x32\x1d\x7c\x47\xa5\x6b\x40\x26\x7e\x0a\xc3\xa6\x9c\xb6\xbf" + "\x13\x30\x47\xa3\x19\x2d\xda\x71\x49\x13\x72\xf0\xb4\xca\x81\xd7"; +const uint256 R2L = uint256(std::vector<unsigned char>(R2Array,R2Array+32)); +const uint160 R2S = uint160(std::vector<unsigned char>(R2Array,R2Array+20)); -BOOST_AUTO_TEST_SUITE(uint256_tests) +const char R1LplusR2L[] = "549FB09FEA236A1EA3E31D4D58F1B1369288D204211CA751527CFC175767850C"; + +const unsigned char ZeroArray[] = + "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" + "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"; +const uint256 ZeroL = uint256(std::vector<unsigned char>(ZeroArray,ZeroArray+32)); +const uint160 ZeroS = uint160(std::vector<unsigned char>(ZeroArray,ZeroArray+20)); + +const unsigned char OneArray[] = + "\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" + "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"; +const uint256 OneL = uint256(std::vector<unsigned char>(OneArray,OneArray+32)); +const uint160 OneS = uint160(std::vector<unsigned char>(OneArray,OneArray+20)); + +const unsigned char MaxArray[] = + "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff" + "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff"; +const uint256 MaxL = uint256(std::vector<unsigned char>(MaxArray,MaxArray+32)); +const uint160 MaxS = uint160(std::vector<unsigned char>(MaxArray,MaxArray+20)); + +const uint256 HalfL = (OneL << 255); +const uint160 HalfS = (OneS << 159); +std::string ArrayToString(const unsigned char A[], unsigned int width) +{ + std::stringstream Stream; + Stream << std::hex; + for (unsigned int i = 0; i < width; ++i) + { + Stream<<std::setw(2)<<std::setfill('0')<<(unsigned int)A[width-i-1]; + } + return Stream.str(); +} -BOOST_AUTO_TEST_CASE(uint256_equality) +BOOST_AUTO_TEST_CASE( basics ) // constructors, equality, inequality { - uint256 num1 = 10; - uint256 num2 = 11; - BOOST_CHECK(num1+1 == num2); + BOOST_CHECK(1 == 0+1); + // constructor uint256(vector<char>): + BOOST_CHECK(R1L.ToString() == ArrayToString(R1Array,32)); + BOOST_CHECK(R1S.ToString() == ArrayToString(R1Array,20)); + BOOST_CHECK(R2L.ToString() == ArrayToString(R2Array,32)); + BOOST_CHECK(R2S.ToString() == ArrayToString(R2Array,20)); + BOOST_CHECK(ZeroL.ToString() == ArrayToString(ZeroArray,32)); + BOOST_CHECK(ZeroS.ToString() == ArrayToString(ZeroArray,20)); + BOOST_CHECK(OneL.ToString() == ArrayToString(OneArray,32)); + BOOST_CHECK(OneS.ToString() == ArrayToString(OneArray,20)); + BOOST_CHECK(MaxL.ToString() == ArrayToString(MaxArray,32)); + BOOST_CHECK(MaxS.ToString() == ArrayToString(MaxArray,20)); + BOOST_CHECK(OneL.ToString() != ArrayToString(ZeroArray,32)); + BOOST_CHECK(OneS.ToString() != ArrayToString(ZeroArray,20)); + + // == and != + BOOST_CHECK(R1L != R2L && R1S != R2S); + BOOST_CHECK(ZeroL != OneL && ZeroS != OneS); + BOOST_CHECK(OneL != ZeroL && OneS != ZeroS); + BOOST_CHECK(MaxL != ZeroL && MaxS != ZeroS); + BOOST_CHECK(~MaxL == ZeroL && ~MaxS == ZeroS); + BOOST_CHECK( ((R1L ^ R2L) ^ R1L) == R2L); + BOOST_CHECK( ((R1S ^ R2S) ^ R1S) == R2S); + + uint64_t Tmp64 = 0xc4dab720d9c7acaaULL; + for (unsigned int i = 0; i < 256; ++i) + { + BOOST_CHECK(ZeroL != (OneL << i)); + BOOST_CHECK((OneL << i) != ZeroL); + BOOST_CHECK(R1L != (R1L ^ (OneL << i))); + BOOST_CHECK(((uint256(Tmp64) ^ (OneL << i) ) != Tmp64 )); + } + BOOST_CHECK(ZeroL == (OneL << 256)); + + for (unsigned int i = 0; i < 160; ++i) + { + BOOST_CHECK(ZeroS != (OneS << i)); + BOOST_CHECK((OneS << i) != ZeroS); + BOOST_CHECK(R1S != (R1S ^ (OneS << i))); + BOOST_CHECK(((uint160(Tmp64) ^ (OneS << i) ) != Tmp64 )); + } + BOOST_CHECK(ZeroS == (OneS << 256)); + + // String Constructor and Copy Constructor + BOOST_CHECK(uint256("0x"+R1L.ToString()) == R1L); + BOOST_CHECK(uint256("0x"+R2L.ToString()) == R2L); + BOOST_CHECK(uint256("0x"+ZeroL.ToString()) == ZeroL); + BOOST_CHECK(uint256("0x"+OneL.ToString()) == OneL); + BOOST_CHECK(uint256("0x"+MaxL.ToString()) == MaxL); + BOOST_CHECK(uint256(R1L.ToString()) == R1L); + BOOST_CHECK(uint256(" 0x"+R1L.ToString()+" ") == R1L); + BOOST_CHECK(uint256("") == ZeroL); + BOOST_CHECK(R1L == uint256(R1ArrayHex)); + BOOST_CHECK(uint256(R1L) == R1L); + BOOST_CHECK((uint256(R1L^R2L)^R2L) == R1L); + BOOST_CHECK(uint256(ZeroL) == ZeroL); + BOOST_CHECK(uint256(OneL) == OneL); + + BOOST_CHECK(uint160("0x"+R1S.ToString()) == R1S); + BOOST_CHECK(uint160("0x"+R2S.ToString()) == R2S); + BOOST_CHECK(uint160("0x"+ZeroS.ToString()) == ZeroS); + BOOST_CHECK(uint160("0x"+OneS.ToString()) == OneS); + BOOST_CHECK(uint160("0x"+MaxS.ToString()) == MaxS); + BOOST_CHECK(uint160(R1S.ToString()) == R1S); + BOOST_CHECK(uint160(" 0x"+R1S.ToString()+" ") == R1S); + BOOST_CHECK(uint160("") == ZeroS); + BOOST_CHECK(R1S == uint160(R1ArrayHex)); + + BOOST_CHECK(uint160(R1S) == R1S); + BOOST_CHECK((uint160(R1S^R2S)^R2S) == R1S); + BOOST_CHECK(uint160(ZeroS) == ZeroS); + BOOST_CHECK(uint160(OneS) == OneS); + + // uint64_t constructor + BOOST_CHECK( (R1L & uint256("0xffffffffffffffff")) == uint256(R1LLow64)); + BOOST_CHECK(ZeroL == uint256(0)); + BOOST_CHECK(OneL == uint256(1)); + BOOST_CHECK(uint256("0xffffffffffffffff") = uint256(0xffffffffffffffffULL)); + BOOST_CHECK( (R1S & uint160("0xffffffffffffffff")) == uint160(R1LLow64)); + BOOST_CHECK(ZeroS == uint160(0)); + BOOST_CHECK(OneS == uint160(1)); + BOOST_CHECK(uint160("0xffffffffffffffff") = uint160(0xffffffffffffffffULL)); + + // Assignment (from base_uint) + uint256 tmpL = ~ZeroL; BOOST_CHECK(tmpL == ~ZeroL); + tmpL = ~OneL; BOOST_CHECK(tmpL == ~OneL); + tmpL = ~R1L; BOOST_CHECK(tmpL == ~R1L); + tmpL = ~R2L; BOOST_CHECK(tmpL == ~R2L); + tmpL = ~MaxL; BOOST_CHECK(tmpL == ~MaxL); + uint160 tmpS = ~ZeroS; BOOST_CHECK(tmpS == ~ZeroS); + tmpS = ~OneS; BOOST_CHECK(tmpS == ~OneS); + tmpS = ~R1S; BOOST_CHECK(tmpS == ~R1S); + tmpS = ~R2S; BOOST_CHECK(tmpS == ~R2S); + tmpS = ~MaxS; BOOST_CHECK(tmpS == ~MaxS); - uint64_t num3 = 10; - BOOST_CHECK(num1 == num3); - BOOST_CHECK(num1+num2 == num3+num2); + // Wrong length must give 0 + BOOST_CHECK(uint256(std::vector<unsigned char>(OneArray,OneArray+31)) == 0); + BOOST_CHECK(uint256(std::vector<unsigned char>(OneArray,OneArray+20)) == 0); + BOOST_CHECK(uint160(std::vector<unsigned char>(OneArray,OneArray+32)) == 0); + BOOST_CHECK(uint160(std::vector<unsigned char>(OneArray,OneArray+19)) == 0); } -BOOST_AUTO_TEST_CASE(uint256_hex) +void shiftArrayRight(unsigned char* to, const unsigned char* from, unsigned int arrayLength, unsigned int bitsToShift) { - std::string hexStr = "d35583ed493a5eee756931353144f558e6a9ab3ad6024a63ced7f10daf7faad9"; - uint256 num1; - num1.SetHex(hexStr); - BOOST_CHECK(num1.GetHex() == hexStr); + for (unsigned int T=0; T < arrayLength; ++T) + { + unsigned int F = (T+bitsToShift/8); + if (F < arrayLength) + to[T] = from[F] >> (bitsToShift%8); + else + to[T] = 0; + if (F + 1 < arrayLength) + to[T] |= from[(F+1)] << (8-bitsToShift%8); + } +} + +void shiftArrayLeft(unsigned char* to, const unsigned char* from, unsigned int arrayLength, unsigned int bitsToShift) +{ + for (unsigned int T=0; T < arrayLength; ++T) + { + if (T >= bitsToShift/8) + { + unsigned int F = T-bitsToShift/8; + to[T] = from[F] << (bitsToShift%8); + if (T >= bitsToShift/8+1) + to[T] |= from[F-1] >> (8-bitsToShift%8); + } + else { + to[T] = 0; + } + } +} + +BOOST_AUTO_TEST_CASE( shifts ) { // "<<" ">>" "<<=" ">>=" + unsigned char TmpArray[32]; + uint256 TmpL; + for (unsigned int i = 0; i < 256; ++i) + { + shiftArrayLeft(TmpArray, OneArray, 32, i); + BOOST_CHECK(uint256(std::vector<unsigned char>(TmpArray,TmpArray+32)) == (OneL << i)); + TmpL = OneL; TmpL <<= i; + BOOST_CHECK(TmpL == (OneL << i)); + BOOST_CHECK((HalfL >> (255-i)) == (OneL << i)); + TmpL = HalfL; TmpL >>= (255-i); + BOOST_CHECK(TmpL == (OneL << i)); + + shiftArrayLeft(TmpArray, R1Array, 32, i); + BOOST_CHECK(uint256(std::vector<unsigned char>(TmpArray,TmpArray+32)) == (R1L << i)); + TmpL = R1L; TmpL <<= i; + BOOST_CHECK(TmpL == (R1L << i)); + + shiftArrayRight(TmpArray, R1Array, 32, i); + BOOST_CHECK(uint256(std::vector<unsigned char>(TmpArray,TmpArray+32)) == (R1L >> i)); + TmpL = R1L; TmpL >>= i; + BOOST_CHECK(TmpL == (R1L >> i)); + + shiftArrayLeft(TmpArray, MaxArray, 32, i); + BOOST_CHECK(uint256(std::vector<unsigned char>(TmpArray,TmpArray+32)) == (MaxL << i)); + TmpL = MaxL; TmpL <<= i; + BOOST_CHECK(TmpL == (MaxL << i)); + + shiftArrayRight(TmpArray, MaxArray, 32, i); + BOOST_CHECK(uint256(std::vector<unsigned char>(TmpArray,TmpArray+32)) == (MaxL >> i)); + TmpL = MaxL; TmpL >>= i; + BOOST_CHECK(TmpL == (MaxL >> i)); + } + uint256 c1L = uint256(0x0123456789abcdefULL); + uint256 c2L = c1L << 128; + for (unsigned int i = 0; i < 128; ++i) { + BOOST_CHECK((c1L << i) == (c2L >> (128-i))); + } + for (unsigned int i = 128; i < 256; ++i) { + BOOST_CHECK((c1L << i) == (c2L << (i-128))); + } + + uint160 TmpS; + for (unsigned int i = 0; i < 160; ++i) + { + shiftArrayLeft(TmpArray, OneArray, 20, i); + BOOST_CHECK(uint160(std::vector<unsigned char>(TmpArray,TmpArray+20)) == (OneS << i)); + TmpS = OneS; TmpS <<= i; + BOOST_CHECK(TmpS == (OneS << i)); + BOOST_CHECK((HalfS >> (159-i)) == (OneS << i)); + TmpS = HalfS; TmpS >>= (159-i); + BOOST_CHECK(TmpS == (OneS << i)); + + shiftArrayLeft(TmpArray, R1Array, 20, i); + BOOST_CHECK(uint160(std::vector<unsigned char>(TmpArray,TmpArray+20)) == (R1S << i)); + TmpS = R1S; TmpS <<= i; + BOOST_CHECK(TmpS == (R1S << i)); + + shiftArrayRight(TmpArray, R1Array, 20, i); + BOOST_CHECK(uint160(std::vector<unsigned char>(TmpArray,TmpArray+20)) == (R1S >> i)); + TmpS = R1S; TmpS >>= i; + BOOST_CHECK(TmpS == (R1S >> i)); + + shiftArrayLeft(TmpArray, MaxArray, 20, i); + BOOST_CHECK(uint160(std::vector<unsigned char>(TmpArray,TmpArray+20)) == (MaxS << i)); + TmpS = MaxS; TmpS <<= i; + BOOST_CHECK(TmpS == (MaxS << i)); + + shiftArrayRight(TmpArray, MaxArray, 20, i); + BOOST_CHECK(uint160(std::vector<unsigned char>(TmpArray,TmpArray+20)) == (MaxS >> i)); + TmpS = MaxS; TmpS >>= i; + BOOST_CHECK(TmpS == (MaxS >> i)); + } + uint160 c1S = uint160(0x0123456789abcdefULL); + uint160 c2S = c1S << 80; + for (unsigned int i = 0; i < 80; ++i) { + BOOST_CHECK((c1S << i) == (c2S >> (80-i))); + } + for (unsigned int i = 80; i < 160; ++i) { + BOOST_CHECK((c1S << i) == (c2S << (i-80))); + } +} + +BOOST_AUTO_TEST_CASE( unaryOperators ) // ! ~ - +{ + BOOST_CHECK(!ZeroL); BOOST_CHECK(!ZeroS); + BOOST_CHECK(!(!OneL));BOOST_CHECK(!(!OneS)); + for (unsigned int i = 0; i < 256; ++i) + BOOST_CHECK(!(!(OneL<<i))); + for (unsigned int i = 0; i < 160; ++i) + BOOST_CHECK(!(!(OneS<<i))); + BOOST_CHECK(!(!R1L));BOOST_CHECK(!(!R1S)); + BOOST_CHECK(!(!R2S));BOOST_CHECK(!(!R2S)); + BOOST_CHECK(!(!MaxL));BOOST_CHECK(!(!MaxS)); + + BOOST_CHECK(~ZeroL == MaxL); BOOST_CHECK(~ZeroS == MaxS); + + unsigned char TmpArray[32]; + for (unsigned int i = 0; i < 32; ++i) { TmpArray[i] = ~R1Array[i]; } + BOOST_CHECK(uint256(std::vector<unsigned char>(TmpArray,TmpArray+32)) == (~R1L)); + BOOST_CHECK(uint160(std::vector<unsigned char>(TmpArray,TmpArray+20)) == (~R1S)); + + BOOST_CHECK(-ZeroL == ZeroL); BOOST_CHECK(-ZeroS == ZeroS); + BOOST_CHECK(-R1L == (~R1L)+1); + BOOST_CHECK(-R1S == (~R1S)+1); + for (unsigned int i = 0; i < 256; ++i) + BOOST_CHECK(-(OneL<<i) == (MaxL << i)); + for (unsigned int i = 0; i < 160; ++i) + BOOST_CHECK(-(OneS<<i) == (MaxS << i)); +} + + +// Check if doing _A_ _OP_ _B_ results in the same as applying _OP_ onto each +// element of Aarray and Barray, and then converting the result into a uint256. +#define CHECKBITWISEOPERATOR(_A_,_B_,_OP_) \ + for (unsigned int i = 0; i < 32; ++i) { TmpArray[i] = _A_##Array[i] _OP_ _B_##Array[i]; } \ + BOOST_CHECK(uint256(std::vector<unsigned char>(TmpArray,TmpArray+32)) == (_A_##L _OP_ _B_##L)); \ + for (unsigned int i = 0; i < 20; ++i) { TmpArray[i] = _A_##Array[i] _OP_ _B_##Array[i]; } \ + BOOST_CHECK(uint160(std::vector<unsigned char>(TmpArray,TmpArray+20)) == (_A_##S _OP_ _B_##S)); + +#define CHECKASSIGNMENTOPERATOR(_A_,_B_,_OP_) \ + TmpL = _A_##L; TmpL _OP_##= _B_##L; BOOST_CHECK(TmpL == (_A_##L _OP_ _B_##L)); \ + TmpS = _A_##S; TmpS _OP_##= _B_##S; BOOST_CHECK(TmpS == (_A_##S _OP_ _B_##S)); + +BOOST_AUTO_TEST_CASE( bitwiseOperators ) +{ + unsigned char TmpArray[32]; + + CHECKBITWISEOPERATOR(R1,R2,|) + CHECKBITWISEOPERATOR(R1,R2,^) + CHECKBITWISEOPERATOR(R1,R2,&) + CHECKBITWISEOPERATOR(R1,Zero,|) + CHECKBITWISEOPERATOR(R1,Zero,^) + CHECKBITWISEOPERATOR(R1,Zero,&) + CHECKBITWISEOPERATOR(R1,Max,|) + CHECKBITWISEOPERATOR(R1,Max,^) + CHECKBITWISEOPERATOR(R1,Max,&) + CHECKBITWISEOPERATOR(Zero,R1,|) + CHECKBITWISEOPERATOR(Zero,R1,^) + CHECKBITWISEOPERATOR(Zero,R1,&) + CHECKBITWISEOPERATOR(Max,R1,|) + CHECKBITWISEOPERATOR(Max,R1,^) + CHECKBITWISEOPERATOR(Max,R1,&) + + uint256 TmpL; + uint160 TmpS; + CHECKASSIGNMENTOPERATOR(R1,R2,|) + CHECKASSIGNMENTOPERATOR(R1,R2,^) + CHECKASSIGNMENTOPERATOR(R1,R2,&) + CHECKASSIGNMENTOPERATOR(R1,Zero,|) + CHECKASSIGNMENTOPERATOR(R1,Zero,^) + CHECKASSIGNMENTOPERATOR(R1,Zero,&) + CHECKASSIGNMENTOPERATOR(R1,Max,|) + CHECKASSIGNMENTOPERATOR(R1,Max,^) + CHECKASSIGNMENTOPERATOR(R1,Max,&) + CHECKASSIGNMENTOPERATOR(Zero,R1,|) + CHECKASSIGNMENTOPERATOR(Zero,R1,^) + CHECKASSIGNMENTOPERATOR(Zero,R1,&) + CHECKASSIGNMENTOPERATOR(Max,R1,|) + CHECKASSIGNMENTOPERATOR(Max,R1,^) + CHECKASSIGNMENTOPERATOR(Max,R1,&) + + uint64_t Tmp64 = 0xe1db685c9a0b47a2ULL; + TmpL = R1L; TmpL |= Tmp64; BOOST_CHECK(TmpL == (R1L | uint256(Tmp64))); + TmpS = R1S; TmpS |= Tmp64; BOOST_CHECK(TmpS == (R1S | uint160(Tmp64))); + TmpL = R1L; TmpL |= 0; BOOST_CHECK(TmpL == R1L); + TmpS = R1S; TmpS |= 0; BOOST_CHECK(TmpS == R1S); + TmpL ^= 0; BOOST_CHECK(TmpL == R1L); + TmpS ^= 0; BOOST_CHECK(TmpS == R1S); + TmpL ^= Tmp64; BOOST_CHECK(TmpL == (R1L ^ uint256(Tmp64))); + TmpS ^= Tmp64; BOOST_CHECK(TmpS == (R1S ^ uint160(Tmp64))); +} + +BOOST_AUTO_TEST_CASE( comparison ) // <= >= < > +{ + uint256 TmpL; + for (unsigned int i = 0; i < 256; ++i) { + TmpL= OneL<< i; + BOOST_CHECK( TmpL >= ZeroL && TmpL > ZeroL && ZeroL < TmpL && ZeroL <= TmpL); + BOOST_CHECK( TmpL >= 0 && TmpL > 0 && 0 < TmpL && 0 <= TmpL); + TmpL |= R1L; + BOOST_CHECK( TmpL >= R1L ); BOOST_CHECK( (TmpL == R1L) != (TmpL > R1L)); BOOST_CHECK( (TmpL == R1L) || !( TmpL <= R1L)); + BOOST_CHECK( R1L <= TmpL ); BOOST_CHECK( (R1L == TmpL) != (R1L < TmpL)); BOOST_CHECK( (TmpL == R1L) || !( R1L >= TmpL)); + BOOST_CHECK(! (TmpL < R1L)); BOOST_CHECK(! (R1L > TmpL)); + } + uint160 TmpS; + for (unsigned int i = 0; i < 160; ++i) { + TmpS= OneS<< i; + BOOST_CHECK( TmpS >= ZeroS && TmpS > ZeroS && ZeroS < TmpS && ZeroS <= TmpS); + BOOST_CHECK( TmpS >= 0 && TmpS > 0 && 0 < TmpS && 0 <= TmpS); + TmpS |= R1S; + BOOST_CHECK( TmpS >= R1S ); BOOST_CHECK( (TmpS == R1S) != (TmpS > R1S)); BOOST_CHECK( (TmpS == R1S) || !( TmpS <= R1S)); + BOOST_CHECK( R1S <= TmpS ); BOOST_CHECK( (R1S == TmpS) != (R1S < TmpS)); BOOST_CHECK( (TmpS == R1S) || !( R1S >= TmpS)); + BOOST_CHECK(! (TmpS < R1S)); BOOST_CHECK(! (R1S > TmpS)); + } +} + +BOOST_AUTO_TEST_CASE( plusMinus ) +{ + uint256 TmpL = 0; + BOOST_CHECK(R1L+R2L == uint256(R1LplusR2L)); + TmpL += R1L; + BOOST_CHECK(TmpL == R1L); + TmpL += R2L; + BOOST_CHECK(TmpL == R1L + R2L); + BOOST_CHECK(OneL+MaxL == ZeroL); + BOOST_CHECK(MaxL+OneL == ZeroL); + for (unsigned int i = 1; i < 256; ++i) { + BOOST_CHECK( (MaxL >> i) + OneL == (HalfL >> (i-1)) ); + BOOST_CHECK( OneL + (MaxL >> i) == (HalfL >> (i-1)) ); + TmpL = (MaxL>>i); TmpL += OneL; + BOOST_CHECK( TmpL == (HalfL >> (i-1)) ); + TmpL = (MaxL>>i); TmpL += 1; + BOOST_CHECK( TmpL == (HalfL >> (i-1)) ); + TmpL = (MaxL>>i); + BOOST_CHECK( TmpL++ == (MaxL>>i) ); + BOOST_CHECK( TmpL == (HalfL >> (i-1))); + } + BOOST_CHECK(uint256(0xbedc77e27940a7ULL) + 0xee8d836fce66fbULL == uint256(0xbedc77e27940a7ULL + 0xee8d836fce66fbULL)); + TmpL = uint256(0xbedc77e27940a7ULL); TmpL += 0xee8d836fce66fbULL; + BOOST_CHECK(TmpL == uint256(0xbedc77e27940a7ULL+0xee8d836fce66fbULL)); + TmpL -= 0xee8d836fce66fbULL; BOOST_CHECK(TmpL == 0xbedc77e27940a7ULL); + TmpL = R1L; + BOOST_CHECK(++TmpL == R1L+1); + + BOOST_CHECK(R1L -(-R2L) == R1L+R2L); + BOOST_CHECK(R1L -(-OneL) == R1L+OneL); + BOOST_CHECK(R1L - OneL == R1L+(-OneL)); + for (unsigned int i = 1; i < 256; ++i) { + BOOST_CHECK((MaxL>>i) - (-OneL) == (HalfL >> (i-1))); + BOOST_CHECK((HalfL >> (i-1)) - OneL == (MaxL>>i)); + TmpL = (HalfL >> (i-1)); + BOOST_CHECK(TmpL-- == (HalfL >> (i-1))); + BOOST_CHECK(TmpL == (MaxL >> i)); + TmpL = (HalfL >> (i-1)); + BOOST_CHECK(--TmpL == (MaxL >> i)); + } + TmpL = R1L; + BOOST_CHECK(--TmpL == R1L-1); + + // 160-bit; copy-pasted + uint160 TmpS = 0; + BOOST_CHECK(R1S+R2S == uint160(R1LplusR2L)); + TmpS += R1S; + BOOST_CHECK(TmpS == R1S); + TmpS += R2S; + BOOST_CHECK(TmpS == R1S + R2S); + BOOST_CHECK(OneS+MaxS == ZeroS); + BOOST_CHECK(MaxS+OneS == ZeroS); + for (unsigned int i = 1; i < 160; ++i) { + BOOST_CHECK( (MaxS >> i) + OneS == (HalfS >> (i-1)) ); + BOOST_CHECK( OneS + (MaxS >> i) == (HalfS >> (i-1)) ); + TmpS = (MaxS>>i); TmpS += OneS; + BOOST_CHECK( TmpS == (HalfS >> (i-1)) ); + TmpS = (MaxS>>i); TmpS += 1; + BOOST_CHECK( TmpS == (HalfS >> (i-1)) ); + TmpS = (MaxS>>i); + BOOST_CHECK( TmpS++ == (MaxS>>i) ); + BOOST_CHECK( TmpS == (HalfS >> (i-1))); + } + BOOST_CHECK(uint160(0xbedc77e27940a7ULL) + 0xee8d836fce66fbULL == uint160(0xbedc77e27940a7ULL + 0xee8d836fce66fbULL)); + TmpS = uint160(0xbedc77e27940a7ULL); TmpS += 0xee8d836fce66fbULL; + BOOST_CHECK(TmpS == uint160(0xbedc77e27940a7ULL+0xee8d836fce66fbULL)); + TmpS -= 0xee8d836fce66fbULL; BOOST_CHECK(TmpS == 0xbedc77e27940a7ULL); + TmpS = R1S; + BOOST_CHECK(++TmpS == R1S+1); + + BOOST_CHECK(R1S -(-R2S) == R1S+R2S); + BOOST_CHECK(R1S -(-OneS) == R1S+OneS); + BOOST_CHECK(R1S - OneS == R1S+(-OneS)); + for (unsigned int i = 1; i < 160; ++i) { + BOOST_CHECK((MaxS>>i) - (-OneS) == (HalfS >> (i-1))); + BOOST_CHECK((HalfS >> (i-1)) - OneS == (MaxS>>i)); + TmpS = (HalfS >> (i-1)); + BOOST_CHECK(TmpS-- == (HalfS >> (i-1))); + BOOST_CHECK(TmpS == (MaxS >> i)); + TmpS = (HalfS >> (i-1)); + BOOST_CHECK(--TmpS == (MaxS >> i)); + } + TmpS = R1S; + BOOST_CHECK(--TmpS == R1S-1); + +} + +bool almostEqual(double d1, double d2) +{ + return fabs(d1-d2) <= 4*fabs(d1)*std::numeric_limits<double>::epsilon(); +} + +BOOST_AUTO_TEST_CASE( methods ) // GetHex SetHex begin() end() size() GetLow64 GetSerializeSize, Serialize, Unserialize +{ + BOOST_CHECK(R1L.GetHex() == R1L.ToString()); + BOOST_CHECK(R2L.GetHex() == R2L.ToString()); + BOOST_CHECK(OneL.GetHex() == OneL.ToString()); + BOOST_CHECK(MaxL.GetHex() == MaxL.ToString()); + uint256 TmpL(R1L); + BOOST_CHECK(TmpL == R1L); + TmpL.SetHex(R2L.ToString()); BOOST_CHECK(TmpL == R2L); + TmpL.SetHex(ZeroL.ToString()); BOOST_CHECK(TmpL == 0); + TmpL.SetHex(HalfL.ToString()); BOOST_CHECK(TmpL == HalfL); + + TmpL.SetHex(R1L.ToString()); + BOOST_CHECK(memcmp(R1L.begin(), R1Array, 32)==0); + BOOST_CHECK(memcmp(TmpL.begin(), R1Array, 32)==0); + BOOST_CHECK(memcmp(R2L.begin(), R2Array, 32)==0); + BOOST_CHECK(memcmp(ZeroL.begin(), ZeroArray, 32)==0); + BOOST_CHECK(memcmp(OneL.begin(), OneArray, 32)==0); + BOOST_CHECK(R1L.size() == 32); + BOOST_CHECK(R2L.size() == 32); + BOOST_CHECK(ZeroL.size() == 32); + BOOST_CHECK(MaxL.size() == 32); + BOOST_CHECK(R1L.begin() + 32 == R1L.end()); + BOOST_CHECK(R2L.begin() + 32 == R2L.end()); + BOOST_CHECK(OneL.begin() + 32 == OneL.end()); + BOOST_CHECK(MaxL.begin() + 32 == MaxL.end()); + BOOST_CHECK(TmpL.begin() + 32 == TmpL.end()); + BOOST_CHECK(R1L.GetLow64() == R1LLow64); + BOOST_CHECK(HalfL.GetLow64() ==0x0000000000000000ULL); + BOOST_CHECK(OneL.GetLow64() ==0x0000000000000001ULL); + BOOST_CHECK(R1L.GetSerializeSize(0,PROTOCOL_VERSION) == 32); + BOOST_CHECK(ZeroL.GetSerializeSize(0,PROTOCOL_VERSION) == 32); + + std::stringstream ss; + R1L.Serialize(ss,0,PROTOCOL_VERSION); + BOOST_CHECK(ss.str() == std::string(R1Array,R1Array+32)); + TmpL.Unserialize(ss,0,PROTOCOL_VERSION); + BOOST_CHECK(R1L == TmpL); + ss.str(""); + ZeroL.Serialize(ss,0,PROTOCOL_VERSION); + BOOST_CHECK(ss.str() == std::string(ZeroArray,ZeroArray+32)); + TmpL.Unserialize(ss,0,PROTOCOL_VERSION); + BOOST_CHECK(ZeroL == TmpL); + ss.str(""); + MaxL.Serialize(ss,0,PROTOCOL_VERSION); + BOOST_CHECK(ss.str() == std::string(MaxArray,MaxArray+32)); + TmpL.Unserialize(ss,0,PROTOCOL_VERSION); + BOOST_CHECK(MaxL == TmpL); + ss.str(""); + + BOOST_CHECK(R1S.GetHex() == R1S.ToString()); + BOOST_CHECK(R2S.GetHex() == R2S.ToString()); + BOOST_CHECK(OneS.GetHex() == OneS.ToString()); + BOOST_CHECK(MaxS.GetHex() == MaxS.ToString()); + uint160 TmpS(R1S); + BOOST_CHECK(TmpS == R1S); + TmpS.SetHex(R2S.ToString()); BOOST_CHECK(TmpS == R2S); + TmpS.SetHex(ZeroS.ToString()); BOOST_CHECK(TmpS == 0); + TmpS.SetHex(HalfS.ToString()); BOOST_CHECK(TmpS == HalfS); + + TmpS.SetHex(R1S.ToString()); + BOOST_CHECK(memcmp(R1S.begin(), R1Array, 20)==0); + BOOST_CHECK(memcmp(TmpS.begin(), R1Array, 20)==0); + BOOST_CHECK(memcmp(R2S.begin(), R2Array, 20)==0); + BOOST_CHECK(memcmp(ZeroS.begin(), ZeroArray, 20)==0); + BOOST_CHECK(memcmp(OneS.begin(), OneArray, 20)==0); + BOOST_CHECK(R1S.size() == 20); + BOOST_CHECK(R2S.size() == 20); + BOOST_CHECK(ZeroS.size() == 20); + BOOST_CHECK(MaxS.size() == 20); + BOOST_CHECK(R1S.begin() + 20 == R1S.end()); + BOOST_CHECK(R2S.begin() + 20 == R2S.end()); + BOOST_CHECK(OneS.begin() + 20 == OneS.end()); + BOOST_CHECK(MaxS.begin() + 20 == MaxS.end()); + BOOST_CHECK(TmpS.begin() + 20 == TmpS.end()); + BOOST_CHECK(R1S.GetLow64() == R1LLow64); + BOOST_CHECK(HalfS.GetLow64() ==0x0000000000000000ULL); + BOOST_CHECK(OneS.GetLow64() ==0x0000000000000001ULL); + BOOST_CHECK(R1S.GetSerializeSize(0,PROTOCOL_VERSION) == 20); + BOOST_CHECK(ZeroS.GetSerializeSize(0,PROTOCOL_VERSION) == 20); + + R1S.Serialize(ss,0,PROTOCOL_VERSION); + BOOST_CHECK(ss.str() == std::string(R1Array,R1Array+20)); + TmpS.Unserialize(ss,0,PROTOCOL_VERSION); + BOOST_CHECK(R1S == TmpS); + ss.str(""); + ZeroS.Serialize(ss,0,PROTOCOL_VERSION); + BOOST_CHECK(ss.str() == std::string(ZeroArray,ZeroArray+20)); + TmpS.Unserialize(ss,0,PROTOCOL_VERSION); + BOOST_CHECK(ZeroS == TmpS); + ss.str(""); + MaxS.Serialize(ss,0,PROTOCOL_VERSION); + BOOST_CHECK(ss.str() == std::string(MaxArray,MaxArray+20)); + TmpS.Unserialize(ss,0,PROTOCOL_VERSION); + BOOST_CHECK(MaxS == TmpS); + ss.str(""); + + for (unsigned int i = 0; i < 255; ++i) + { + BOOST_CHECK((OneL << i).getdouble() == ldexp(1.0,i)); + if (i < 160) BOOST_CHECK((OneS << i).getdouble() == ldexp(1.0,i)); + } + BOOST_CHECK(ZeroL.getdouble() == 0.0); + BOOST_CHECK(ZeroS.getdouble() == 0.0); + for (int i = 256; i > 53; --i) + BOOST_CHECK(almostEqual((R1L>>(256-i)).getdouble(), ldexp(R1Ldouble,i))); + for (int i = 160; i > 53; --i) + BOOST_CHECK(almostEqual((R1S>>(160-i)).getdouble(), ldexp(R1Sdouble,i))); + uint64_t R1L64part = (R1L>>192).GetLow64(); + uint64_t R1S64part = (R1S>>96).GetLow64(); + for (int i = 53; i > 0; --i) // doubles can store all integers in {0,...,2^54-1} exactly + { + BOOST_CHECK((R1L>>(256-i)).getdouble() == (double)(R1L64part >> (64-i))); + BOOST_CHECK((R1S>>(160-i)).getdouble() == (double)(R1S64part >> (64-i))); + } +} + +BOOST_AUTO_TEST_CASE( getmaxcoverage ) // some more tests just to get 100% coverage +{ + // ~R1L give a base_uint<256> + BOOST_CHECK((~~R1L >> 10) == (R1L >> 10)); BOOST_CHECK((~~R1S >> 10) == (R1S >> 10)); + BOOST_CHECK((~~R1L << 10) == (R1L << 10)); BOOST_CHECK((~~R1S << 10) == (R1S << 10)); + BOOST_CHECK(!(~~R1L < R1L)); BOOST_CHECK(!(~~R1S < R1S)); + BOOST_CHECK(~~R1L <= R1L); BOOST_CHECK(~~R1S <= R1S); + BOOST_CHECK(!(~~R1L > R1L)); BOOST_CHECK(!(~~R1S > R1S)); + BOOST_CHECK(~~R1L >= R1L); BOOST_CHECK(~~R1S >= R1S); + BOOST_CHECK(!(R1L < ~~R1L)); BOOST_CHECK(!(R1S < ~~R1S)); + BOOST_CHECK(R1L <= ~~R1L); BOOST_CHECK(R1S <= ~~R1S); + BOOST_CHECK(!(R1L > ~~R1L)); BOOST_CHECK(!(R1S > ~~R1S)); + BOOST_CHECK(R1L >= ~~R1L); BOOST_CHECK(R1S >= ~~R1S); + + BOOST_CHECK(~~R1L + R2L == R1L + ~~R2L); + BOOST_CHECK(~~R1S + R2S == R1S + ~~R2S); + BOOST_CHECK(~~R1L - R2L == R1L - ~~R2L); + BOOST_CHECK(~~R1S - R2S == R1S - ~~R2S); + BOOST_CHECK(~R1L != R1L); BOOST_CHECK(R1L != ~R1L); + BOOST_CHECK(~R1S != R1S); BOOST_CHECK(R1S != ~R1S); + unsigned char TmpArray[32]; + CHECKBITWISEOPERATOR(~R1,R2,|) + CHECKBITWISEOPERATOR(~R1,R2,^) + CHECKBITWISEOPERATOR(~R1,R2,&) + CHECKBITWISEOPERATOR(R1,~R2,|) + CHECKBITWISEOPERATOR(R1,~R2,^) + CHECKBITWISEOPERATOR(R1,~R2,&) } BOOST_AUTO_TEST_SUITE_END() + diff --git a/src/test/util_tests.cpp b/src/test/util_tests.cpp index b57945d061..691f02a9d7 100644 --- a/src/test/util_tests.cpp +++ b/src/test/util_tests.cpp @@ -330,4 +330,12 @@ BOOST_AUTO_TEST_CASE(strprintf_numbers) #undef B #undef E +/* Check for mingw/wine issue #3494 + * Remove this test before time.ctime(0xffffffff) == 'Sun Feb 7 07:28:15 2106' + */ +BOOST_AUTO_TEST_CASE(gettime) +{ + BOOST_CHECK((GetTime() & ~0xFFFFFFFFLL) == 0); +} + BOOST_AUTO_TEST_SUITE_END() diff --git a/src/txdb.cpp b/src/txdb.cpp index 99deb31404..6ed0d18785 100644 --- a/src/txdb.cpp +++ b/src/txdb.cpp @@ -26,8 +26,8 @@ void static BatchWriteHashBestChain(CLevelDBBatch &batch, const uint256 &hash) { CCoinsViewDB::CCoinsViewDB(size_t nCacheSize, bool fMemory, bool fWipe) : db(GetDataDir() / "chainstate", nCacheSize, fMemory, fWipe) { } -bool CCoinsViewDB::GetCoins(const uint256 &txid, CCoins &coins) { - return db.Read(make_pair('c', txid), coins); +bool CCoinsViewDB::GetCoins(const uint256 &txid, CCoins &coins) { + return db.Read(make_pair('c', txid), coins); } bool CCoinsViewDB::SetCoins(const uint256 &txid, const CCoins &coins) { @@ -37,7 +37,7 @@ bool CCoinsViewDB::SetCoins(const uint256 &txid, const CCoins &coins) { } bool CCoinsViewDB::HaveCoins(const uint256 &txid) { - return db.Exists(make_pair('c', txid)); + return db.Exists(make_pair('c', txid)); } uint256 CCoinsViewDB::GetBestBlock() { @@ -131,7 +131,7 @@ bool CCoinsViewDB::GetStats(CCoinsStats &stats) { ssKey >> txhash; ss << txhash; ss << VARINT(coins.nVersion); - ss << (coins.fCoinBase ? 'c' : 'n'); + ss << (coins.fCoinBase ? 'c' : 'n'); ss << VARINT(coins.nHeight); stats.nTransactions++; for (unsigned int i=0; i<coins.vout.size(); i++) { @@ -148,7 +148,7 @@ bool CCoinsViewDB::GetStats(CCoinsStats &stats) { } pcursor->Next(); } catch (std::exception &e) { - return error("%s() : deserialize error", __PRETTY_FUNCTION__); + return error("%s : Deserialize or I/O error - %s", __PRETTY_FUNCTION__, e.what()); } } delete pcursor; @@ -226,7 +226,7 @@ bool CBlockTreeDB::LoadBlockIndexGuts() break; // if shutdown requested or finished loading block index } } catch (std::exception &e) { - return error("%s() : deserialize error", __PRETTY_FUNCTION__); + return error("%s : Deserialize or I/O error - %s", __PRETTY_FUNCTION__, e.what()); } } delete pcursor; diff --git a/src/ui_interface.h b/src/ui_interface.h index 2378d5dfbb..677d097fa4 100644 --- a/src/ui_interface.h +++ b/src/ui_interface.h @@ -62,6 +62,8 @@ public: /** Force blocking, modal message box dialog (not just OS notification) */ MODAL = 0x10000000U, + /** Don't bring GUI to foreground. Use for messages during initialization */ + NOSHOWGUI = 0x20000000U, /** Predefined combinations for certain default usage cases */ MSG_INFORMATION = ICON_INFORMATION, @@ -72,12 +74,6 @@ public: /** Show message box. */ boost::signals2::signal<bool (const std::string& message, const std::string& caption, unsigned int style), boost::signals2::last_value<bool> > ThreadSafeMessageBox; - /** Ask the user whether they want to pay a fee or not. */ - boost::signals2::signal<bool (int64_t nFeeRequired), boost::signals2::last_value<bool> > ThreadSafeAskFee; - - /** Handle a URL passed at the command line. */ - boost::signals2::signal<void (const std::string& strURI)> ThreadSafeHandleURI; - /** Progress message during initialization. */ boost::signals2::signal<void (const std::string &message)> InitMessage; diff --git a/src/uint256.h b/src/uint256.h index 7dbb3f83bb..ba903bc8fc 100644 --- a/src/uint256.h +++ b/src/uint256.h @@ -19,9 +19,6 @@ inline signed char HexDigit(char c) return p_util_hexdigit[(unsigned char)c]; } -inline int Testuint256AdHoc(std::vector<std::string> vArg); - - /** Base class without constructors for uint256 and uint160. * This makes the compiler let you use it in a union. */ @@ -203,7 +200,7 @@ public: { // prefix operator int i = 0; - while (--pn[i] == -1 && i < WIDTH-1) + while (--pn[i] == (uint32_t)-1 && i < WIDTH-1) i++; return *this; } @@ -370,9 +367,10 @@ public: return sizeof(pn); } - uint64_t Get64(int n=0) const + uint64_t GetLow64() const { - return pn[2*n] | (uint64_t)pn[2*n+1] << 32; + assert(WIDTH >= 2); + return pn[0] | (uint64_t)pn[1] << 32; } // unsigned int GetSerializeSize(int nType=0, int nVersion=PROTOCOL_VERSION) const @@ -398,7 +396,6 @@ public: friend class uint160; friend class uint256; - friend inline int Testuint256AdHoc(std::vector<std::string> vArg); }; typedef base_uint<160> base_uint160; @@ -525,9 +522,6 @@ inline const uint160 operator-(const uint160& a, const uint160& b) { r - - - ////////////////////////////////////////////////////////////////////////////// // // uint256 @@ -638,147 +632,4 @@ inline const uint256 operator|(const uint256& a, const uint256& b) { return inline const uint256 operator+(const uint256& a, const uint256& b) { return (base_uint256)a + (base_uint256)b; } inline const uint256 operator-(const uint256& a, const uint256& b) { return (base_uint256)a - (base_uint256)b; } - - - - - - - - - -#ifdef TEST_UINT256 - -inline int Testuint256AdHoc(std::vector<std::string> vArg) -{ - uint256 g(0); - - - LogPrintf("%s\n", g.ToString().c_str()); - g--; LogPrintf("g--\n"); - LogPrintf("%s\n", g.ToString().c_str()); - g--; LogPrintf("g--\n"); - LogPrintf("%s\n", g.ToString().c_str()); - g++; LogPrintf("g++\n"); - LogPrintf("%s\n", g.ToString().c_str()); - g++; LogPrintf("g++\n"); - LogPrintf("%s\n", g.ToString().c_str()); - g++; LogPrintf("g++\n"); - LogPrintf("%s\n", g.ToString().c_str()); - g++; LogPrintf("g++\n"); - LogPrintf("%s\n", g.ToString().c_str()); - - - - uint256 a(7); - LogPrintf("a=7\n"); - LogPrintf("%s\n", a.ToString().c_str()); - - uint256 b; - LogPrintf("b undefined\n"); - LogPrintf("%s\n", b.ToString().c_str()); - int c = 3; - - a = c; - a.pn[3] = 15; - LogPrintf("%s\n", a.ToString().c_str()); - uint256 k(c); - - a = 5; - a.pn[3] = 15; - LogPrintf("%s\n", a.ToString().c_str()); - b = 1; - b <<= 52; - - a |= b; - - a ^= 0x500; - - LogPrintf("a %s\n", a.ToString().c_str()); - - a = a | b | (uint256)0x1000; - - - LogPrintf("a %s\n", a.ToString().c_str()); - LogPrintf("b %s\n", b.ToString().c_str()); - - a = 0xfffffffe; - a.pn[4] = 9; - - LogPrintf("%s\n", a.ToString().c_str()); - a++; - LogPrintf("%s\n", a.ToString().c_str()); - a++; - LogPrintf("%s\n", a.ToString().c_str()); - a++; - LogPrintf("%s\n", a.ToString().c_str()); - a++; - LogPrintf("%s\n", a.ToString().c_str()); - - a--; - LogPrintf("%s\n", a.ToString().c_str()); - a--; - LogPrintf("%s\n", a.ToString().c_str()); - a--; - LogPrintf("%s\n", a.ToString().c_str()); - uint256 d = a--; - LogPrintf("%s\n", d.ToString().c_str()); - LogPrintf("%s\n", a.ToString().c_str()); - a--; - LogPrintf("%s\n", a.ToString().c_str()); - a--; - LogPrintf("%s\n", a.ToString().c_str()); - - d = a; - - LogPrintf("%s\n", d.ToString().c_str()); - for (int i = uint256::WIDTH-1; i >= 0; i--) LogPrintf("%08x", d.pn[i]); LogPrintf("\n"); - - uint256 neg = d; - neg = ~neg; - LogPrintf("%s\n", neg.ToString().c_str()); - - - uint256 e = uint256("0xABCDEF123abcdef12345678909832180000011111111"); - LogPrintf("\n"); - LogPrintf("%s\n", e.ToString().c_str()); - - - LogPrintf("\n"); - uint256 x1 = uint256("0xABCDEF123abcdef12345678909832180000011111111"); - uint256 x2; - LogPrintf("%s\n", x1.ToString().c_str()); - for (int i = 0; i < 270; i += 4) - { - x2 = x1 << i; - LogPrintf("%s\n", x2.ToString().c_str()); - } - - LogPrintf("\n"); - LogPrintf("%s\n", x1.ToString().c_str()); - for (int i = 0; i < 270; i += 4) - { - x2 = x1; - x2 >>= i; - LogPrintf("%s\n", x2.ToString().c_str()); - } - - - for (int i = 0; i < 100; i++) - { - uint256 k = (~uint256(0) >> i); - LogPrintf("%s\n", k.ToString().c_str()); - } - - for (int i = 0; i < 100; i++) - { - uint256 k = (~uint256(0) << i); - LogPrintf("%s\n", k.ToString().c_str()); - } - - return (0); -} - -#endif - #endif diff --git a/src/util.cpp b/src/util.cpp index a8c591cc7a..280798f2fb 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -88,7 +88,7 @@ map<string, string> mapArgs; map<string, vector<string> > mapMultiArgs; bool fDebug = false; bool fPrintToConsole = false; -bool fPrintToDebugger = false; +bool fPrintToDebugLog = true; bool fDaemon = false; bool fServer = false; string strMiscWarning; @@ -242,17 +242,23 @@ int LogPrint(const char* category, const char* pszFormat, ...) if (!fDebug) return 0; - const vector<string>& categories = mapMultiArgs["-debug"]; - bool allCategories = count(categories.begin(), categories.end(), string("")); - - // Only look for categories, if not -debug/-debug=1 was passed, - // as that implies every category should be logged. - if (!allCategories) + // Give each thread quick access to -debug settings. + // This helps prevent issues debugging global destructors, + // where mapMultiArgs might be deleted before another + // global destructor calls LogPrint() + static boost::thread_specific_ptr<set<string> > ptrCategory; + if (ptrCategory.get() == NULL) { - // Category was not found (not supplied via -debug=<category>) - if (find(categories.begin(), categories.end(), string(category)) == categories.end()) - return 0; + const vector<string>& categories = mapMultiArgs["-debug"]; + ptrCategory.reset(new set<string>(categories.begin(), categories.end())); + // thread_specific_ptr automatically deletes the set when the thread ends. } + const set<string>& setCategories = *ptrCategory.get(); + + // if not debugging everything and not debugging specific category, LogPrint does nothing. + if (setCategories.count(string("")) == 0 && + setCategories.count(string(category)) == 0) + return 0; } int ret = 0; // Returns total number of characters written @@ -264,7 +270,7 @@ int LogPrint(const char* category, const char* pszFormat, ...) ret += vprintf(pszFormat, arg_ptr); va_end(arg_ptr); } - else if (!fPrintToDebugger) + else if (fPrintToDebugLog) { static bool fStartedNewLine = true; boost::call_once(&DebugPrintInit, debugPrintInitFlag); @@ -296,32 +302,6 @@ int LogPrint(const char* category, const char* pszFormat, ...) va_end(arg_ptr); } -#ifdef WIN32 - if (fPrintToDebugger) - { - static CCriticalSection cs_OutputDebugStringF; - - // accumulate and output a line at a time - { - LOCK(cs_OutputDebugStringF); - static std::string buffer; - - va_list arg_ptr; - va_start(arg_ptr, pszFormat); - buffer += vstrprintf(pszFormat, arg_ptr); - va_end(arg_ptr); - - int line_start = 0, line_end; - while((line_end = buffer.find('\n', line_start)) != -1) - { - OutputDebugStringA(buffer.substr(line_start, line_end - line_start).c_str()); - line_start = line_end + 1; - ret += line_end-line_start; - } - buffer.erase(0, line_start); - } - } -#endif return ret; } diff --git a/src/util.h b/src/util.h index 9c7f185f13..c6a1318fd7 100644 --- a/src/util.h +++ b/src/util.h @@ -120,8 +120,7 @@ extern std::map<std::string, std::string> mapArgs; extern std::map<std::string, std::vector<std::string> > mapMultiArgs; extern bool fDebug; extern bool fPrintToConsole; -extern bool fPrintToDebugger; -extern bool fDaemon; +extern bool fPrintToDebugLog; extern bool fServer; extern std::string strMiscWarning; extern bool fNoListen; diff --git a/src/wallet.cpp b/src/wallet.cpp index 241e937b1b..9065ba8483 100644 --- a/src/wallet.cpp +++ b/src/wallet.cpp @@ -16,6 +16,8 @@ using namespace std; +// Settings +int64_t nTransactionFee = 0; ////////////////////////////////////////////////////////////////////////////// // @@ -33,6 +35,7 @@ struct CompareValueOnly CPubKey CWallet::GenerateNewKey() { + AssertLockHeld(cs_wallet); // mapKeyMetadata bool fCompressed = CanSupportFeature(FEATURE_COMPRPUBKEY); // default to compressed public keys if we want 0.6.0 wallets RandAddSeedPerfmon(); @@ -58,6 +61,7 @@ CPubKey CWallet::GenerateNewKey() bool CWallet::AddKeyPubKey(const CKey& secret, const CPubKey &pubkey) { + AssertLockHeld(cs_wallet); // mapKeyMetadata if (!CCryptoKeyStore::AddKeyPubKey(secret, pubkey)) return false; if (!fFileBacked) @@ -93,6 +97,7 @@ bool CWallet::AddCryptedKey(const CPubKey &vchPubKey, bool CWallet::LoadKeyMetadata(const CPubKey &pubkey, const CKeyMetadata &meta) { + AssertLockHeld(cs_wallet); // mapKeyMetadata if (meta.nCreateTime && (!nTimeFirstKey || meta.nCreateTime < nTimeFirstKey)) nTimeFirstKey = meta.nCreateTime; @@ -200,6 +205,7 @@ public: bool CWallet::SetMinVersion(enum WalletFeature nVersion, CWalletDB* pwalletdbIn, bool fExplicit) { + AssertLockHeld(cs_wallet); // nWalletVersion if (nWalletVersion >= nVersion) return true; @@ -233,6 +239,7 @@ bool CWallet::SetMinVersion(enum WalletFeature nVersion, CWalletDB* pwalletdbIn, bool CWallet::SetMaxVersion(int nVersion) { + AssertLockHeld(cs_wallet); // nWalletVersion, nWalletMaxVersion // cannot downgrade below current version if (nWalletVersion > nVersion) return false; @@ -325,6 +332,7 @@ bool CWallet::EncryptWallet(const SecureString& strWalletPassphrase) int64_t CWallet::IncOrderPosNext(CWalletDB *pwalletdb) { + AssertLockHeld(cs_wallet); // nOrderPosNext int64_t nRet = nOrderPosNext++; if (pwalletdb) { pwalletdb->WriteOrderPosNext(nOrderPosNext); @@ -336,6 +344,7 @@ int64_t CWallet::IncOrderPosNext(CWalletDB *pwalletdb) CWallet::TxItems CWallet::OrderedTxItems(std::list<CAccountingEntry>& acentries, std::string strAccount) { + AssertLockHeld(cs_wallet); // mapWallet CWalletDB walletdb(strWalletFile); // First: get all CWalletTx and CAccountingEntry into a sorted-by-order multimap. @@ -1434,7 +1443,7 @@ bool CWallet::CommitTransaction(CWalletTx& wtxNew, CReserveKey& reservekey) -string CWallet::SendMoney(CScript scriptPubKey, int64_t nValue, CWalletTx& wtxNew, bool fAskFee) +string CWallet::SendMoney(CScript scriptPubKey, int64_t nValue, CWalletTx& wtxNew) { CReserveKey reservekey(this); int64_t nFeeRequired; @@ -1454,9 +1463,6 @@ string CWallet::SendMoney(CScript scriptPubKey, int64_t nValue, CWalletTx& wtxNe return strError; } - if (fAskFee && !uiInterface.ThreadSafeAskFee(nFeeRequired)) - return "ABORTED"; - if (!CommitTransaction(wtxNew, reservekey)) return _("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."); @@ -1465,7 +1471,7 @@ string CWallet::SendMoney(CScript scriptPubKey, int64_t nValue, CWalletTx& wtxNe -string CWallet::SendMoneyToDestination(const CTxDestination& address, int64_t nValue, CWalletTx& wtxNew, bool fAskFee) +string CWallet::SendMoneyToDestination(const CTxDestination& address, int64_t nValue, CWalletTx& wtxNew) { // Check amount if (nValue <= 0) @@ -1477,7 +1483,7 @@ string CWallet::SendMoneyToDestination(const CTxDestination& address, int64_t nV CScript scriptPubKey; scriptPubKey.SetDestination(address); - return SendMoney(scriptPubKey, nValue, wtxNew, fAskFee); + return SendMoney(scriptPubKey, nValue, wtxNew); } @@ -1493,6 +1499,7 @@ DBErrors CWallet::LoadWallet(bool& fFirstRunRet) { if (CDB::Rewrite(strWalletFile, "\x04pool")) { + LOCK(cs_wallet); setKeyPool.clear(); // Note: can't top-up keypool here, because wallet is locked. // User will be prompted to unlock wallet the next operation @@ -1510,6 +1517,7 @@ DBErrors CWallet::LoadWallet(bool& fFirstRunRet) bool CWallet::SetAddressBook(const CTxDestination& address, const string& strName, const string& strPurpose) { + AssertLockHeld(cs_wallet); // mapAddressBook std::map<CTxDestination, CAddressBookData>::iterator mi = mapAddressBook.find(address); mapAddressBook[address].name = strName; if (!strPurpose.empty()) /* update purpose only if requested */ @@ -1526,6 +1534,7 @@ bool CWallet::SetAddressBook(const CTxDestination& address, const string& strNam bool CWallet::DelAddressBook(const CTxDestination& address) { + AssertLockHeld(cs_wallet); // mapAddressBook mapAddressBook.erase(address); NotifyAddressBookChanged(this, address, "", ::IsMine(*this, address), "", CT_DELETED); if (!fFileBacked) @@ -1739,6 +1748,7 @@ std::map<CTxDestination, int64_t> CWallet::GetAddressBalances() set< set<CTxDestination> > CWallet::GetAddressGroupings() { + AssertLockHeld(cs_wallet); // mapWallet set< set<CTxDestination> > groupings; set<CTxDestination> grouping; @@ -1831,6 +1841,7 @@ set< set<CTxDestination> > CWallet::GetAddressGroupings() set<CTxDestination> CWallet::GetAccountAddresses(string strAccount) const { + AssertLockHeld(cs_wallet); // mapWallet set<CTxDestination> result; BOOST_FOREACH(const PAIRTYPE(CTxDestination, CAddressBookData)& item, mapAddressBook) { @@ -1912,21 +1923,25 @@ void CWallet::UpdatedTransaction(const uint256 &hashTx) void CWallet::LockCoin(COutPoint& output) { + AssertLockHeld(cs_wallet); // setLockedCoins setLockedCoins.insert(output); } void CWallet::UnlockCoin(COutPoint& output) { + AssertLockHeld(cs_wallet); // setLockedCoins setLockedCoins.erase(output); } void CWallet::UnlockAllCoins() { + AssertLockHeld(cs_wallet); // setLockedCoins setLockedCoins.clear(); } bool CWallet::IsLockedCoin(uint256 hash, unsigned int n) const { + AssertLockHeld(cs_wallet); // setLockedCoins COutPoint outpt(hash, n); return (setLockedCoins.count(outpt) > 0); @@ -1934,6 +1949,7 @@ bool CWallet::IsLockedCoin(uint256 hash, unsigned int n) const void CWallet::ListLockedCoins(std::vector<COutPoint>& vOutpts) { + AssertLockHeld(cs_wallet); // setLockedCoins for (std::set<COutPoint>::iterator it = setLockedCoins.begin(); it != setLockedCoins.end(); it++) { COutPoint outpt = (*it); @@ -1942,6 +1958,7 @@ void CWallet::ListLockedCoins(std::vector<COutPoint>& vOutpts) } void CWallet::GetKeyBirthTimes(std::map<CKeyID, int64_t> &mapKeyBirth) const { + AssertLockHeld(cs_wallet); // mapKeyMetadata mapKeyBirth.clear(); // get birth times for keys with metadata diff --git a/src/wallet.h b/src/wallet.h index 90209122fd..e4452a3093 100644 --- a/src/wallet.h +++ b/src/wallet.h @@ -23,6 +23,9 @@ #include <utility> #include <vector> +// Settings +extern int64_t nTransactionFee; + class CAccountingEntry; class CCoinControl; class COutput; @@ -102,6 +105,11 @@ private: int64_t nLastResend; public: + /// Main wallet lock. + /// This lock protects all the fields added by CWallet + /// except for: + /// fFileBacked (immutable after instantiation) + /// strWalletFile (immutable after instantiation) mutable CCriticalSection cs_wallet; bool fFileBacked; @@ -151,10 +159,11 @@ public: int64_t nTimeFirstKey; // check whether we are allowed to upgrade (or already support) to the named feature - bool CanSupportFeature(enum WalletFeature wf) { return nWalletMaxVersion >= wf; } + bool CanSupportFeature(enum WalletFeature wf) { AssertLockHeld(cs_wallet); return nWalletMaxVersion >= wf; } void AvailableCoins(std::vector<COutput>& vCoins, bool fOnlyConfirmed=true, const CCoinControl *coinControl = NULL) const; bool SelectCoinsMinConf(int64_t nTargetValue, int nConfMine, int nConfTheirs, std::vector<COutput> vCoins, std::set<std::pair<const CWalletTx*,unsigned int> >& setCoinsRet, int64_t& nValueRet) const; + bool IsLockedCoin(uint256 hash, unsigned int n) const; void LockCoin(COutPoint& output); void UnlockCoin(COutPoint& output); @@ -171,7 +180,7 @@ public: // Load metadata (used by LoadWallet) bool LoadKeyMetadata(const CPubKey &pubkey, const CKeyMetadata &metadata); - bool LoadMinVersion(int nVersion) { nWalletVersion = nVersion; nWalletMaxVersion = std::max(nWalletMaxVersion, nVersion); return true; } + bool LoadMinVersion(int nVersion) { AssertLockHeld(cs_wallet); nWalletVersion = nVersion; nWalletMaxVersion = std::max(nWalletMaxVersion, nVersion); return true; } // Adds an encrypted key to the store, and saves it to disk. bool AddCryptedKey(const CPubKey &vchPubKey, const std::vector<unsigned char> &vchCryptedSecret); @@ -217,8 +226,8 @@ public: bool CreateTransaction(CScript scriptPubKey, int64_t nValue, CWalletTx& wtxNew, CReserveKey& reservekey, int64_t& nFeeRet, std::string& strFailReason, const CCoinControl *coinControl = NULL); bool CommitTransaction(CWalletTx& wtxNew, CReserveKey& reservekey); - std::string SendMoney(CScript scriptPubKey, int64_t nValue, CWalletTx& wtxNew, bool fAskFee=false); - std::string SendMoneyToDestination(const CTxDestination &address, int64_t nValue, CWalletTx& wtxNew, bool fAskFee=false); + std::string SendMoney(CScript scriptPubKey, int64_t nValue, CWalletTx& wtxNew); + std::string SendMoneyToDestination(const CTxDestination &address, int64_t nValue, CWalletTx& wtxNew); bool NewKeyPool(); bool TopUpKeyPool(unsigned int kpSize = 0); @@ -320,6 +329,7 @@ public: unsigned int GetKeyPoolSize() { + AssertLockHeld(cs_wallet); // setKeyPool return setKeyPool.size(); } @@ -332,7 +342,7 @@ public: bool SetMaxVersion(int nVersion); // get the current wallet format (the oldest client version guaranteed to understand this wallet) - int GetVersion() { return nWalletVersion; } + int GetVersion() { AssertLockHeld(cs_wallet); return nWalletVersion; } /** Address book entry changed. * @note called with lock cs_wallet held. |