diff options
Diffstat (limited to 'src')
48 files changed, 5951 insertions, 1465 deletions
diff --git a/src/base58.h b/src/base58.h index cace423d6e..113fa14a5e 100644 --- a/src/base58.h +++ b/src/base58.h @@ -18,6 +18,7 @@ #include <string> #include <vector> #include "bignum.h" +#include "key.h" static const char* pszBase58 = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz"; @@ -257,15 +258,14 @@ public: class CBitcoinAddress : public CBase58Data { public: - bool SetHash160(const uint160& hash160) + void SetHash160(const uint160& hash160) { SetData(fTestNet ? 111 : 0, &hash160, 20); - return true; } - bool SetPubKey(const std::vector<unsigned char>& vchPubKey) + void SetPubKey(const std::vector<unsigned char>& vchPubKey) { - return SetHash160(Hash160(vchPubKey)); + SetHash160(Hash160(vchPubKey)); } bool IsValid() const @@ -320,4 +320,49 @@ public: } }; +class CBitcoinSecret : public CBase58Data +{ +public: + void SetSecret(const CSecret& vchSecret) + { + SetData(fTestNet ? 239 : 128, &vchSecret[0], vchSecret.size()); + } + + CSecret GetSecret() + { + CSecret vchSecret; + vchSecret.resize(vchData.size()); + memcpy(&vchSecret[0], &vchData[0], vchData.size()); + return vchSecret; + } + + bool IsValid() const + { + int nExpectedSize = 32; + bool fExpectTestNet = false; + switch(nVersion) + { + case 128: + break; + + case 239: + fExpectTestNet = true; + break; + + default: + return false; + } + return fExpectTestNet == fTestNet && vchData.size() == nExpectedSize; + } + + CBitcoinSecret(const CSecret& vchSecret) + { + SetSecret(vchSecret); + } + + CBitcoinSecret() + { + } +}; + #endif diff --git a/src/bignum.h b/src/bignum.h index 1a2406b935..f5d545f07e 100644 --- a/src/bignum.h +++ b/src/bignum.h @@ -338,19 +338,19 @@ public: return ToString(16); } - unsigned int GetSerializeSize(int nType=0, int nVersion=VERSION) const + unsigned int GetSerializeSize(int nType=0, int nVersion=PROTOCOL_VERSION) const { return ::GetSerializeSize(getvch(), nType, nVersion); } template<typename Stream> - void Serialize(Stream& s, int nType=0, int nVersion=VERSION) const + void Serialize(Stream& s, int nType=0, int nVersion=PROTOCOL_VERSION) const { ::Serialize(s, getvch(), nType, nVersion); } template<typename Stream> - void Unserialize(Stream& s, int nType=0, int nVersion=VERSION) + void Unserialize(Stream& s, int nType=0, int nVersion=PROTOCOL_VERSION) { std::vector<unsigned char> vch; ::Unserialize(s, vch, nType, nVersion); diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp index bb8d8e2d77..cd08d95d29 100644 --- a/src/bitcoinrpc.cpp +++ b/src/bitcoinrpc.cpp @@ -9,9 +9,11 @@ #include "init.h" #undef printf #include <boost/asio.hpp> +#include <boost/filesystem.hpp> #include <boost/iostreams/concepts.hpp> #include <boost/iostreams/stream.hpp> #include <boost/algorithm/string.hpp> +#include <boost/lexical_cast.hpp> #ifdef USE_SSL #include <boost/asio/ssl.hpp> #include <boost/filesystem.hpp> @@ -41,6 +43,8 @@ static std::string strRPCUserColonPass; static int64 nWalletUnlockTime; static CCriticalSection cs_nWalletUnlockTime; +extern Value dumpprivkey(const Array& params, bool fHelp); +extern Value importprivkey(const Array& params, bool fHelp); Object JSONRPCError(int code, const string& message) { @@ -87,7 +91,13 @@ Value ValueFromAmount(int64 amount) void WalletTxToJSON(const CWalletTx& wtx, Object& entry) { - entry.push_back(Pair("confirmations", wtx.GetDepthInMainChain())); + int confirms = wtx.GetDepthInMainChain(); + entry.push_back(Pair("confirmations", confirms)); + if (confirms) + { + entry.push_back(Pair("blockhash", wtx.hashBlock.GetHex())); + entry.push_back(Pair("blockindex", wtx.nIndex)); + } entry.push_back(Pair("txid", wtx.GetHash().GetHex())); entry.push_back(Pair("time", (boost::int64_t)wtx.GetTxTime())); BOOST_FOREACH(const PAIRTYPE(string,string)& item, wtx.mapValue) @@ -304,7 +314,8 @@ Value getinfo(const Array& params, bool fHelp) "Returns an object containing various state info."); Object obj; - obj.push_back(Pair("version", (int)VERSION)); + obj.push_back(Pair("version", (int)CLIENT_VERSION)); + obj.push_back(Pair("protocolversion",(int)PROTOCOL_VERSION)); obj.push_back(Pair("balance", ValueFromAmount(pwalletMain->GetBalance()))); obj.push_back(Pair("blocks", (int)nBestHeight)); obj.push_back(Pair("connections", (int)vNodes.size())); @@ -595,7 +606,7 @@ Value verifymessage(const Array& params, bool fHelp) if (!key.SetCompactSignature(Hash(ss.begin(), ss.end()), vchSig)) return false; - return (key.GetAddress() == addr); + return (CBitcoinAddress(key.GetPubKey()) == addr); } @@ -1598,7 +1609,6 @@ Value validateaddress(const Array& params, bool fHelp) return ret; } - Value getwork(const Array& params, bool fHelp) { if (fHelp || params.size() > 1) @@ -1839,13 +1849,15 @@ pair<string, rpcfn_type> pCallTable[] = make_pair("sendmany", &sendmany), make_pair("gettransaction", &gettransaction), make_pair("listtransactions", &listtransactions), - make_pair("signmessage", &signmessage), - make_pair("verifymessage", &verifymessage), + make_pair("signmessage", &signmessage), + make_pair("verifymessage", &verifymessage), make_pair("getwork", &getwork), make_pair("listaccounts", &listaccounts), make_pair("settxfee", &settxfee), make_pair("getmemorypool", &getmemorypool), - make_pair("listsinceblock", &listsinceblock), + make_pair("listsinceblock", &listsinceblock), + make_pair("dumpprivkey", &dumpprivkey), + make_pair("importprivkey", &importprivkey) }; map<string, rpcfn_type> mapCallTable(pCallTable, pCallTable + sizeof(pCallTable)/sizeof(pCallTable[0])); diff --git a/src/db.cpp b/src/db.cpp index 9ac93b3506..7195e065ea 100644 --- a/src/db.cpp +++ b/src/db.cpp @@ -131,7 +131,7 @@ CDB::CDB(const char* pszFile, const char* pszMode) : pdb(NULL) { bool fTmp = fReadOnly; fReadOnly = false; - WriteVersion(VERSION); + WriteVersion(CLIENT_VERSION); fReadOnly = fTmp; } @@ -236,7 +236,7 @@ bool CDB::Rewrite(const string& strFile, const char* pszSkip) { // Update version: ssValue.clear(); - ssValue << VERSION; + ssValue << CLIENT_VERSION; } Dbt datKey(&ssKey[0], ssKey.size()); Dbt datValue(&ssValue[0], ssValue.size()); @@ -810,7 +810,7 @@ int CWalletDB::LoadWallet(CWallet* pwallet) ssKey >> hash; CWalletTx& wtx = pwallet->mapWallet[hash]; ssValue >> wtx; - wtx.pwallet = pwallet; + wtx.BindWallet(pwallet); if (wtx.GetHash() != hash) printf("Error in wallet.dat, hash mismatch\n"); @@ -931,7 +931,7 @@ int CWalletDB::LoadWallet(CWallet* pwallet) { int nMinVersion = 0; ssValue >> nMinVersion; - if (nMinVersion > VERSION) + if (nMinVersion > CLIENT_VERSION) return DB_TOO_NEW; } } @@ -956,13 +956,13 @@ int CWalletDB::LoadWallet(CWallet* pwallet) if (fIsEncrypted && (nFileVersion == 40000 || nFileVersion == 50000)) return DB_NEED_REWRITE; - if (nFileVersion < VERSION) // Update + if (nFileVersion < CLIENT_VERSION) // Update { // Get rid of old debug.log file in current directory if (nFileVersion <= 105 && !pszSetDataDir[0]) unlink("debug.log"); - WriteVersion(VERSION); + WriteVersion(CLIENT_VERSION); } return DB_LOAD_OK; diff --git a/src/init.cpp b/src/init.cpp index 291510fc21..b9e35aeac1 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -176,69 +176,69 @@ bool AppInit2(int argc, char* argv[]) _("Bitcoin version") + " " + FormatFullVersion() + "\n\n" + _("Usage:") + "\t\t\t\t\t\t\t\t\t\t\n" + " bitcoind [options] \t " + "\n" + - " bitcoind [options] <command> [params]\t " + _("Send command to -server or bitcoind\n") + - " bitcoind [options] help \t\t " + _("List commands\n") + - " bitcoind [options] help <command> \t\t " + _("Get help for a command\n") + - _("Options:\n") + - " -conf=<file> \t\t " + _("Specify configuration file (default: bitcoin.conf)\n") + - " -pid=<file> \t\t " + _("Specify pid file (default: bitcoind.pid)\n") + - " -gen \t\t " + _("Generate coins\n") + - " -gen=0 \t\t " + _("Don't generate coins\n") + - " -min \t\t " + _("Start minimized\n") + - " -datadir=<dir> \t\t " + _("Specify data directory\n") + - " -timeout=<n> \t " + _("Specify connection timeout (in milliseconds)\n") + - " -proxy=<ip:port> \t " + _("Connect through socks4 proxy\n") + - " -dns \t " + _("Allow DNS lookups for addnode and connect\n") + - " -port=<port> \t\t " + _("Listen for connections on <port> (default: 8333 or testnet: 18333)\n") + - " -maxconnections=<n>\t " + _("Maintain at most <n> connections to peers (default: 125)\n") + - " -addnode=<ip> \t " + _("Add a node to connect to\n") + - " -connect=<ip> \t\t " + _("Connect only to the specified node\n") + - " -nolisten \t " + _("Don't accept connections from outside\n") + - " -nodnsseed \t " + _("Don't bootstrap list of peers using DNS\n") + - " -banscore=<n> \t " + _("Threshold for disconnecting misbehaving peers (default: 100)\n") + - " -bantime=<n> \t " + _("Number of seconds to keep misbehaving peers from reconnecting (default: 86400)\n") + - " -maxreceivebuffer=<n>\t " + _("Maximum per-connection receive buffer, <n>*1000 bytes (default: 10000)\n") + - " -maxsendbuffer=<n>\t " + _("Maximum per-connection send buffer, <n>*1000 bytes (default: 10000)\n") + + " bitcoind [options] <command> [params]\t " + _("Send command to -server or bitcoind") + "\n" + + " bitcoind [options] help \t\t " + _("List commands") + "\n" + + " bitcoind [options] help <command> \t\t " + _("Get help for a command") + "\n" + + _("Options:") + "\n" + + " -conf=<file> \t\t " + _("Specify configuration file (default: bitcoin.conf)") + "\n" + + " -pid=<file> \t\t " + _("Specify pid file (default: bitcoind.pid)") + "\n" + + " -gen \t\t " + _("Generate coins") + "\n" + + " -gen=0 \t\t " + _("Don't generate coins") + "\n" + + " -min \t\t " + _("Start minimized") + "\n" + + " -datadir=<dir> \t\t " + _("Specify data directory") + "\n" + + " -timeout=<n> \t " + _("Specify connection timeout (in milliseconds)") + "\n" + + " -proxy=<ip:port> \t " + _("Connect through socks4 proxy") + "\n" + + " -dns \t " + _("Allow DNS lookups for addnode and connect") + "\n" + + " -port=<port> \t\t " + _("Listen for connections on <port> (default: 8333 or testnet: 18333)") + "\n" + + " -maxconnections=<n>\t " + _("Maintain at most <n> connections to peers (default: 125)") + "\n" + + " -addnode=<ip> \t " + _("Add a node to connect to") + "\n" + + " -connect=<ip> \t\t " + _("Connect only to the specified node") + "\n" + + " -nolisten \t " + _("Don't accept connections from outside") + "\n" + + " -nodnsseed \t " + _("Don't bootstrap list of peers using DNS") + "\n" + + " -banscore=<n> \t " + _("Threshold for disconnecting misbehaving peers (default: 100)") + "\n" + + " -bantime=<n> \t " + _("Number of seconds to keep misbehaving peers from reconnecting (default: 86400)") + "\n" + + " -maxreceivebuffer=<n>\t " + _("Maximum per-connection receive buffer, <n>*1000 bytes (default: 10000)") + "\n" + + " -maxsendbuffer=<n>\t " + _("Maximum per-connection send buffer, <n>*1000 bytes (default: 10000)") + "\n" + #ifdef USE_UPNP #if USE_UPNP - " -noupnp \t " + _("Don't attempt to use UPnP to map the listening port\n") + + " -noupnp \t " + _("Don't attempt to use UPnP to map the listening port") + "\n" + #else - " -upnp \t " + _("Attempt to use UPnP to map the listening port\n") + + " -upnp \t " + _("Attempt to use UPnP to map the listening port") + "\n" + #endif #endif - " -paytxfee=<amt> \t " + _("Fee per KB to add to transactions you send\n") + + " -paytxfee=<amt> \t " + _("Fee per KB to add to transactions you send") + "\n" + #ifdef GUI - " -server \t\t " + _("Accept command line and JSON-RPC commands\n") + + " -server \t\t " + _("Accept command line and JSON-RPC commands") + "\n" + #endif #ifndef WIN32 - " -daemon \t\t " + _("Run in the background as a daemon and accept commands\n") + + " -daemon \t\t " + _("Run in the background as a daemon and accept commands") + "\n" + #endif - " -testnet \t\t " + _("Use the test network\n") + - " -debug \t\t " + _("Output extra debugging information\n") + - " -logtimestamps \t " + _("Prepend debug output with timestamp\n") + - " -printtoconsole \t " + _("Send trace/debug info to console instead of debug.log file\n") + + " -testnet \t\t " + _("Use the test network") + "\n" + + " -debug \t\t " + _("Output extra debugging information") + "\n" + + " -logtimestamps \t " + _("Prepend debug output with timestamp") + "\n" + + " -printtoconsole \t " + _("Send trace/debug info to console instead of debug.log file") + "\n" + #ifdef WIN32 - " -printtodebugger \t " + _("Send trace/debug info to debugger\n") + + " -printtodebugger \t " + _("Send trace/debug info to debugger") + "\n" + #endif - " -rpcuser=<user> \t " + _("Username for JSON-RPC connections\n") + - " -rpcpassword=<pw>\t " + _("Password for JSON-RPC connections\n") + - " -rpcport=<port> \t\t " + _("Listen for JSON-RPC connections on <port> (default: 8332)\n") + - " -rpcallowip=<ip> \t\t " + _("Allow JSON-RPC connections from specified IP address\n") + - " -rpcconnect=<ip> \t " + _("Send commands to node running on <ip> (default: 127.0.0.1)\n") + - " -keypool=<n> \t " + _("Set key pool size to <n> (default: 100)\n") + - " -rescan \t " + _("Rescan the block chain for missing wallet transactions\n"); + " -rpcuser=<user> \t " + _("Username for JSON-RPC connections") + "\n" + + " -rpcpassword=<pw>\t " + _("Password for JSON-RPC connections") + "\n" + + " -rpcport=<port> \t\t " + _("Listen for JSON-RPC connections on <port> (default: 8332)") + "\n" + + " -rpcallowip=<ip> \t\t " + _("Allow JSON-RPC connections from specified IP address") + "\n" + + " -rpcconnect=<ip> \t " + _("Send commands to node running on <ip> (default: 127.0.0.1)") + "\n" + + " -keypool=<n> \t " + _("Set key pool size to <n> (default: 100)") + "\n" + + " -rescan \t " + _("Rescan the block chain for missing wallet transactions") + "\n"; #ifdef USE_SSL strUsage += string() + - _("\nSSL options: (see the Bitcoin Wiki for SSL setup instructions)\n") + - " -rpcssl \t " + _("Use OpenSSL (https) for JSON-RPC connections\n") + - " -rpcsslcertificatechainfile=<file.cert>\t " + _("Server certificate file (default: server.cert)\n") + - " -rpcsslprivatekeyfile=<file.pem> \t " + _("Server private key (default: server.pem)\n") + - " -rpcsslciphers=<ciphers> \t " + _("Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)\n"); + _("\nSSL options: (see the Bitcoin Wiki for SSL setup instructions)") + "\n" + + " -rpcssl \t " + _("Use OpenSSL (https) for JSON-RPC connections") + "\n" + + " -rpcsslcertificatechainfile=<file.cert>\t " + _("Server certificate file (default: server.cert)") + "\n" + + " -rpcsslprivatekeyfile=<file.pem> \t " + _("Server private key (default: server.pem)") + "\n" + + " -rpcsslciphers=<ciphers> \t " + _("Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)") + "\n"; #endif strUsage += string() + - " -? \t\t " + _("This help message\n"); + " -? \t\t " + _("This help message") + "\n"; // Remove tabs strUsage.erase(std::remove(strUsage.begin(), strUsage.end(), '\t'), strUsage.end()); @@ -332,36 +332,36 @@ bool AppInit2(int argc, char* argv[]) } // Bind to the port early so we can tell if another instance is already running. - string strErrors; if (!fNoListen) { - if (!BindListenPort(strErrors)) + std::string strError; + if (!BindListenPort(strError)) { - wxMessageBox(strErrors, "Bitcoin"); + wxMessageBox(strError, "Bitcoin"); return false; } } + std::ostringstream strErrors; // // Load data files // if (fDaemon) fprintf(stdout, "bitcoin server starting\n"); - strErrors = ""; int64 nStart; InitMessage(_("Loading addresses...")); printf("Loading addresses...\n"); nStart = GetTimeMillis(); if (!LoadAddresses()) - strErrors += _("Error loading addr.dat \n"); + strErrors << _("Error loading addr.dat") << "\n"; printf(" addresses %15"PRI64d"ms\n", GetTimeMillis() - nStart); InitMessage(_("Loading block index...")); printf("Loading block index...\n"); nStart = GetTimeMillis(); if (!LoadBlockIndex()) - strErrors += _("Error loading blkindex.dat \n"); + strErrors << _("Error loading blkindex.dat") << "\n"; printf(" block index %15"PRI64d"ms\n", GetTimeMillis() - nStart); InitMessage(_("Loading wallet...")); @@ -373,17 +373,17 @@ bool AppInit2(int argc, char* argv[]) if (nLoadWalletRet != DB_LOAD_OK) { if (nLoadWalletRet == DB_CORRUPT) - strErrors += _("Error loading wallet.dat: Wallet corrupted \n"); + strErrors << _("Error loading wallet.dat: Wallet corrupted") << "\n"; else if (nLoadWalletRet == DB_TOO_NEW) - strErrors += _("Error loading wallet.dat: Wallet requires newer version of Bitcoin \n"); + strErrors << _("Error loading wallet.dat: Wallet requires newer version of Bitcoin") << "\n"; else if (nLoadWalletRet == DB_NEED_REWRITE) { - strErrors += _("Wallet needed to be rewritten: restart Bitcoin to complete \n"); - wxMessageBox(strErrors, "Bitcoin", wxOK | wxICON_ERROR); + strErrors << _("Wallet needed to be rewritten: restart Bitcoin to complete") << "\n"; + wxMessageBox(strErrors.str(), "Bitcoin", wxOK | wxICON_ERROR); return false; } else - strErrors += _("Error loading wallet.dat \n"); + strErrors << _("Error loading wallet.dat") << "\n"; } printf(" wallet %15"PRI64d"ms\n", GetTimeMillis() - nStart); @@ -411,16 +411,16 @@ bool AppInit2(int argc, char* argv[]) InitMessage(_("Done loading")); printf("Done loading\n"); - //// debug print - printf("mapBlockIndex.size() = %d\n", mapBlockIndex.size()); - printf("nBestHeight = %d\n", nBestHeight); - printf("setKeyPool.size() = %d\n", pwalletMain->setKeyPool.size()); - printf("mapWallet.size() = %d\n", pwalletMain->mapWallet.size()); - printf("mapAddressBook.size() = %d\n", pwalletMain->mapAddressBook.size()); + //// debug print + printf("mapBlockIndex.size() = %d\n", mapBlockIndex.size()); + printf("nBestHeight = %d\n", nBestHeight); + printf("setKeyPool.size() = %d\n", pwalletMain->setKeyPool.size()); + printf("mapWallet.size() = %d\n", pwalletMain->mapWallet.size()); + printf("mapAddressBook.size() = %d\n", pwalletMain->mapAddressBook.size()); - if (!strErrors.empty()) + if (!strErrors.str().empty()) { - wxMessageBox(strErrors, "Bitcoin", wxOK | wxICON_ERROR); + wxMessageBox(strErrors.str(), "Bitcoin", wxOK | wxICON_ERROR); return false; } diff --git a/src/key.cpp b/src/key.cpp new file mode 100644 index 0000000000..400b1887c5 --- /dev/null +++ b/src/key.cpp @@ -0,0 +1,117 @@ +// Copyright (c) 2011 The Bitcoin developers +// Distributed under the MIT/X11 software license, see the accompanying +// file license.txt or http://www.opensource.org/licenses/mit-license.php. + +#include <openssl/ec.h> +#include <openssl/ecdsa.h> + +// Generate a private key from just the secret parameter +int EC_KEY_regenerate_key(EC_KEY *eckey, BIGNUM *priv_key) +{ + int ok = 0; + BN_CTX *ctx = NULL; + EC_POINT *pub_key = NULL; + + if (!eckey) return 0; + + const EC_GROUP *group = EC_KEY_get0_group(eckey); + + if ((ctx = BN_CTX_new()) == NULL) + goto err; + + pub_key = EC_POINT_new(group); + + if (pub_key == NULL) + goto err; + + if (!EC_POINT_mul(group, pub_key, priv_key, NULL, NULL, ctx)) + goto err; + + EC_KEY_set_private_key(eckey,priv_key); + EC_KEY_set_public_key(eckey,pub_key); + + ok = 1; + +err: + + if (pub_key) + EC_POINT_free(pub_key); + if (ctx != NULL) + BN_CTX_free(ctx); + + return(ok); +} + +// Perform ECDSA key recovery (see SEC1 4.1.6) for curves over (mod p)-fields +// recid selects which key is recovered +// if check is nonzero, additional checks are performed +int ECDSA_SIG_recover_key_GFp(EC_KEY *eckey, ECDSA_SIG *ecsig, const unsigned char *msg, int msglen, int recid, int check) +{ + if (!eckey) return 0; + + int ret = 0; + BN_CTX *ctx = NULL; + + BIGNUM *x = NULL; + BIGNUM *e = NULL; + BIGNUM *order = NULL; + BIGNUM *sor = NULL; + BIGNUM *eor = NULL; + BIGNUM *field = NULL; + EC_POINT *R = NULL; + EC_POINT *O = NULL; + EC_POINT *Q = NULL; + BIGNUM *rr = NULL; + BIGNUM *zero = NULL; + int n = 0; + int i = recid / 2; + + const EC_GROUP *group = EC_KEY_get0_group(eckey); + if ((ctx = BN_CTX_new()) == NULL) { ret = -1; goto err; } + BN_CTX_start(ctx); + order = BN_CTX_get(ctx); + if (!EC_GROUP_get_order(group, order, ctx)) { ret = -2; goto err; } + x = BN_CTX_get(ctx); + if (!BN_copy(x, order)) { ret=-1; goto err; } + if (!BN_mul_word(x, i)) { ret=-1; goto err; } + if (!BN_add(x, x, ecsig->r)) { ret=-1; goto err; } + field = BN_CTX_get(ctx); + if (!EC_GROUP_get_curve_GFp(group, field, NULL, NULL, ctx)) { ret=-2; goto err; } + if (BN_cmp(x, field) >= 0) { ret=0; goto err; } + if ((R = EC_POINT_new(group)) == NULL) { ret = -2; goto err; } + if (!EC_POINT_set_compressed_coordinates_GFp(group, R, x, recid % 2, ctx)) { ret=0; goto err; } + if (check) + { + if ((O = EC_POINT_new(group)) == NULL) { ret = -2; goto err; } + if (!EC_POINT_mul(group, O, NULL, R, order, ctx)) { ret=-2; goto err; } + if (!EC_POINT_is_at_infinity(group, O)) { ret = 0; goto err; } + } + if ((Q = EC_POINT_new(group)) == NULL) { ret = -2; goto err; } + n = EC_GROUP_get_degree(group); + e = BN_CTX_get(ctx); + if (!BN_bin2bn(msg, msglen, e)) { ret=-1; goto err; } + if (8*msglen > n) BN_rshift(e, e, 8-(n & 7)); + zero = BN_CTX_get(ctx); + if (!BN_zero(zero)) { ret=-1; goto err; } + if (!BN_mod_sub(e, zero, e, order, ctx)) { ret=-1; goto err; } + rr = BN_CTX_get(ctx); + if (!BN_mod_inverse(rr, ecsig->r, order, ctx)) { ret=-1; goto err; } + sor = BN_CTX_get(ctx); + if (!BN_mod_mul(sor, ecsig->s, rr, order, ctx)) { ret=-1; goto err; } + eor = BN_CTX_get(ctx); + if (!BN_mod_mul(eor, e, rr, order, ctx)) { ret=-1; goto err; } + if (!EC_POINT_mul(group, Q, eor, R, sor, ctx)) { ret=-2; goto err; } + if (!EC_KEY_set_public_key(eckey, Q)) { ret=-2; goto err; } + + ret = 1; + +err: + if (ctx) { + BN_CTX_end(ctx); + BN_CTX_free(ctx); + } + if (R != NULL) EC_POINT_free(R); + if (O != NULL) EC_POINT_free(O); + if (Q != NULL) EC_POINT_free(Q); + return ret; +} @@ -14,7 +14,6 @@ #include "serialize.h" #include "uint256.h" -#include "base58.h" // secp160k1 // const unsigned int PRIVATE_KEY_SIZE = 192; @@ -39,116 +38,8 @@ // see www.keylength.com // script supports up to 75 for single byte push -// Generate a private key from just the secret parameter -int static inline EC_KEY_regenerate_key(EC_KEY *eckey, BIGNUM *priv_key) -{ - int ok = 0; - BN_CTX *ctx = NULL; - EC_POINT *pub_key = NULL; - - if (!eckey) return 0; - - const EC_GROUP *group = EC_KEY_get0_group(eckey); - - if ((ctx = BN_CTX_new()) == NULL) - goto err; - - pub_key = EC_POINT_new(group); - - if (pub_key == NULL) - goto err; - - if (!EC_POINT_mul(group, pub_key, priv_key, NULL, NULL, ctx)) - goto err; - - EC_KEY_set_private_key(eckey,priv_key); - EC_KEY_set_public_key(eckey,pub_key); - - ok = 1; - -err: - - if (pub_key) - EC_POINT_free(pub_key); - if (ctx != NULL) - BN_CTX_free(ctx); - - return(ok); -} - -// Perform ECDSA key recovery (see SEC1 4.1.6) for curves over (mod p)-fields -// recid selects which key is recovered -// if check is nonzero, additional checks are performed -int static inline ECDSA_SIG_recover_key_GFp(EC_KEY *eckey, ECDSA_SIG *ecsig, const unsigned char *msg, int msglen, int recid, int check) -{ - if (!eckey) return 0; - - int ret = 0; - BN_CTX *ctx = NULL; - - BIGNUM *x = NULL; - BIGNUM *e = NULL; - BIGNUM *order = NULL; - BIGNUM *sor = NULL; - BIGNUM *eor = NULL; - BIGNUM *field = NULL; - EC_POINT *R = NULL; - EC_POINT *O = NULL; - EC_POINT *Q = NULL; - BIGNUM *rr = NULL; - BIGNUM *zero = NULL; - int n = 0; - int i = recid / 2; - - const EC_GROUP *group = EC_KEY_get0_group(eckey); - if ((ctx = BN_CTX_new()) == NULL) { ret = -1; goto err; } - BN_CTX_start(ctx); - order = BN_CTX_get(ctx); - if (!EC_GROUP_get_order(group, order, ctx)) { ret = -2; goto err; } - x = BN_CTX_get(ctx); - if (!BN_copy(x, order)) { ret=-1; goto err; } - if (!BN_mul_word(x, i)) { ret=-1; goto err; } - if (!BN_add(x, x, ecsig->r)) { ret=-1; goto err; } - field = BN_CTX_get(ctx); - if (!EC_GROUP_get_curve_GFp(group, field, NULL, NULL, ctx)) { ret=-2; goto err; } - if (BN_cmp(x, field) >= 0) { ret=0; goto err; } - if ((R = EC_POINT_new(group)) == NULL) { ret = -2; goto err; } - if (!EC_POINT_set_compressed_coordinates_GFp(group, R, x, recid % 2, ctx)) { ret=0; goto err; } - if (check) - { - if ((O = EC_POINT_new(group)) == NULL) { ret = -2; goto err; } - if (!EC_POINT_mul(group, O, NULL, R, order, ctx)) { ret=-2; goto err; } - if (!EC_POINT_is_at_infinity(group, O)) { ret = 0; goto err; } - } - if ((Q = EC_POINT_new(group)) == NULL) { ret = -2; goto err; } - n = EC_GROUP_get_degree(group); - e = BN_CTX_get(ctx); - if (!BN_bin2bn(msg, msglen, e)) { ret=-1; goto err; } - if (8*msglen > n) BN_rshift(e, e, 8-(n & 7)); - zero = BN_CTX_get(ctx); - if (!BN_zero(zero)) { ret=-1; goto err; } - if (!BN_mod_sub(e, zero, e, order, ctx)) { ret=-1; goto err; } - rr = BN_CTX_get(ctx); - if (!BN_mod_inverse(rr, ecsig->r, order, ctx)) { ret=-1; goto err; } - sor = BN_CTX_get(ctx); - if (!BN_mod_mul(sor, ecsig->s, rr, order, ctx)) { ret=-1; goto err; } - eor = BN_CTX_get(ctx); - if (!BN_mod_mul(eor, e, rr, order, ctx)) { ret=-1; goto err; } - if (!EC_POINT_mul(group, Q, eor, R, sor, ctx)) { ret=-2; goto err; } - if (!EC_KEY_set_public_key(eckey, Q)) { ret=-2; goto err; } - - ret = 1; - -err: - if (ctx) { - BN_CTX_end(ctx); - BN_CTX_free(ctx); - } - if (R != NULL) EC_POINT_free(R); - if (O != NULL) EC_POINT_free(O); - if (Q != NULL) EC_POINT_free(Q); - return ret; -} +int extern EC_KEY_regenerate_key(EC_KEY *eckey, BIGNUM *priv_key); +int extern ECDSA_SIG_recover_key_GFp(EC_KEY *eckey, ECDSA_SIG *ecsig, const unsigned char *msg, int msglen, int recid, int check); class key_error : public std::runtime_error { @@ -381,12 +272,6 @@ public: return false; return true; } - - // Get the address corresponding to this key - CBitcoinAddress GetAddress() const - { - return CBitcoinAddress(GetPubKey()); - } }; #endif diff --git a/src/keystore.cpp b/src/keystore.cpp index 68f57e7e0e..6cf557fafe 100644 --- a/src/keystore.cpp +++ b/src/keystore.cpp @@ -29,7 +29,7 @@ bool CKeyStore::GetPubKey(const CBitcoinAddress &address, std::vector<unsigned c bool CBasicKeyStore::AddKey(const CKey& key) { CRITICAL_BLOCK(cs_KeyStore) - mapKeys[key.GetAddress()] = key.GetSecret(); + mapKeys[CBitcoinAddress(key.GetPubKey())] = key.GetSecret(); return true; } @@ -116,23 +116,19 @@ bool CCryptoKeyStore::AddCryptedKey(const std::vector<unsigned char> &vchPubKey, return true; } -bool CCryptoKeyStore::GetKey(const CBitcoinAddress &address, CKey& keyOut) const +bool CCryptoKeyStore::GetSecret(const CBitcoinAddress &address, CSecret& vchSecretOut) const { CRITICAL_BLOCK(cs_KeyStore) { if (!IsCrypted()) - return CBasicKeyStore::GetKey(address, keyOut); + return CBasicKeyStore::GetSecret(address, vchSecretOut); CryptedKeyMap::const_iterator mi = mapCryptedKeys.find(address); if (mi != mapCryptedKeys.end()) { const std::vector<unsigned char> &vchPubKey = (*mi).second.first; const std::vector<unsigned char> &vchCryptedSecret = (*mi).second.second; - CSecret vchSecret; - if (!DecryptSecret(vMasterKey, vchCryptedSecret, Hash(vchPubKey.begin(), vchPubKey.end()), vchSecret)) - return false; - keyOut.SetSecret(vchSecret); - return true; + return DecryptSecret(vMasterKey, vchCryptedSecret, Hash(vchPubKey.begin(), vchPubKey.end()), vchSecretOut); } } return false; diff --git a/src/keystore.h b/src/keystore.h index 4d889146fc..3b91de6fb4 100644 --- a/src/keystore.h +++ b/src/keystore.h @@ -19,17 +19,28 @@ public: // Check whether a key corresponding to a given address is present in the store. virtual bool HaveKey(const CBitcoinAddress &address) const =0; - - // Retrieve a key corresponding to a given address from the store. - // Return true if succesful. - virtual bool GetKey(const CBitcoinAddress &address, CKey& keyOut) const =0; - - // Retrieve only the public key corresponding to a given address. - // This may succeed even if GetKey fails (e.g., encrypted wallets) + virtual bool GetKey(const CBitcoinAddress &address, CKey& keyOut) const + { + CSecret vchSecret; + if (!GetSecret(address, vchSecret)) + return false; + if (!keyOut.SetSecret(vchSecret)) + return false; + return true; + } + virtual void GetKeys(std::set<CBitcoinAddress> &setAddress) const =0; virtual bool GetPubKey(const CBitcoinAddress &address, std::vector<unsigned char>& vchPubKeyOut) const; // Generate a new key, and add it to the store virtual std::vector<unsigned char> GenerateNewKey(); + virtual bool GetSecret(const CBitcoinAddress &address, CSecret& vchSecret) const + { + CKey key; + if (!GetKey(address, key)) + return false; + vchSecret = key.GetSecret(); + return true; + } }; typedef std::map<CBitcoinAddress, CSecret> KeyMap; @@ -49,14 +60,27 @@ public: result = (mapKeys.count(address) > 0); return result; } - bool GetKey(const CBitcoinAddress &address, CKey& keyOut) const + void GetKeys(std::set<CBitcoinAddress> &setAddress) const + { + setAddress.clear(); + CRITICAL_BLOCK(cs_KeyStore) + { + KeyMap::const_iterator mi = mapKeys.begin(); + while (mi != mapKeys.end()) + { + setAddress.insert((*mi).first); + mi++; + } + } + } + bool GetSecret(const CBitcoinAddress &address, CSecret &vchSecret) const { CRITICAL_BLOCK(cs_KeyStore) { KeyMap::const_iterator mi = mapKeys.find(address); if (mi != mapKeys.end()) { - keyOut.SetSecret((*mi).second); + vchSecret = (*mi).second; return true; } } @@ -131,8 +155,23 @@ public: } return false; } - bool GetKey(const CBitcoinAddress &address, CKey& keyOut) const; + bool GetSecret(const CBitcoinAddress &address, CSecret& vchSecret) const; bool GetPubKey(const CBitcoinAddress &address, std::vector<unsigned char>& vchPubKeyOut) const; + void GetKeys(std::set<CBitcoinAddress> &setAddress) const + { + if (!IsCrypted()) + { + CBasicKeyStore::GetKeys(setAddress); + return; + } + setAddress.clear(); + CryptedKeyMap::const_iterator mi = mapCryptedKeys.begin(); + while (mi != mapCryptedKeys.end()) + { + setAddress.insert((*mi).first); + mi++; + } + } }; #endif diff --git a/src/main.cpp b/src/main.cpp index a7871fcc16..052701e5fc 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -17,6 +17,11 @@ using namespace boost; // Global state // +// Name of client reported in the 'version' message. Report the same name +// for both bitcoind and bitcoin-qt, to make it harder for attackers to +// target servers or GUI users specifically. +const std::string CLIENT_NAME("bitcoin-qt"); + CCriticalSection cs_setpwalletRegistered; set<CWallet*> setpwalletRegistered; @@ -516,7 +521,7 @@ bool CTransaction::RemoveFromMemoryPool() -int CMerkleTx::GetDepthInMainChain(int& nHeightRet) const +int CMerkleTx::GetDepthInMainChain(CBlockIndex* &pindexRet) const { if (hashBlock == 0 || nIndex == -1) return 0; @@ -537,7 +542,7 @@ int CMerkleTx::GetDepthInMainChain(int& nHeightRet) const fMerkleVerified = true; } - nHeightRet = pindex->nHeight; + pindexRet = pindex; return pindexBest->nHeight - pindex->nHeight + 1; } @@ -1847,9 +1852,9 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) // Change version if (pfrom->nVersion >= 209) pfrom->PushMessage("verack"); - pfrom->vSend.SetVersion(min(pfrom->nVersion, VERSION)); + pfrom->vSend.SetVersion(min(pfrom->nVersion, PROTOCOL_VERSION)); if (pfrom->nVersion < 209) - pfrom->vRecv.SetVersion(min(pfrom->nVersion, VERSION)); + pfrom->vRecv.SetVersion(min(pfrom->nVersion, PROTOCOL_VERSION)); if (!pfrom->fInbound) { @@ -1902,7 +1907,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) else if (strCommand == "verack") { - pfrom->vRecv.SetVersion(min(pfrom->nVersion, VERSION)); + pfrom->vRecv.SetVersion(min(pfrom->nVersion, PROTOCOL_VERSION)); } diff --git a/src/main.h b/src/main.h index 3870cee864..7f8da4e898 100644 --- a/src/main.h +++ b/src/main.h @@ -27,6 +27,10 @@ class CRequestTracker; class CNode; class CBlockIndex; +static const int CLIENT_VERSION = 59900; +static const bool VERSION_IS_BETA = true; +extern const std::string CLIENT_NAME; + static const unsigned int MAX_BLOCK_SIZE = 1000000; static const unsigned int MAX_BLOCK_SIZE_GEN = MAX_BLOCK_SIZE/2; static const int MAX_BLOCK_SIGOPS = MAX_BLOCK_SIZE/50; @@ -695,8 +699,8 @@ public: int SetMerkleBranch(const CBlock* pblock=NULL); - int GetDepthInMainChain(int& nHeightRet) const; - int GetDepthInMainChain() const { int nHeight; return GetDepthInMainChain(nHeight); } + int GetDepthInMainChain(CBlockIndex* &pindexRet) const; + int GetDepthInMainChain() const { CBlockIndex *pindexRet; return GetDepthInMainChain(pindexRet); } bool IsInMainChain() const { return GetDepthInMainChain() > 0; } int GetBlocksToMaturity() const; bool AcceptToMemoryPool(CTxDB& txdb, bool fCheckInputs=true); @@ -758,6 +762,7 @@ public: return !(a == b); } int GetDepthInMainChain() const; + }; @@ -1263,6 +1268,11 @@ public: Set((*mi).second); } + CBlockLocator(const std::vector<uint256>& vHaveIn) + { + vHave = vHaveIn; + } + IMPLEMENT_SERIALIZE ( if (!(nType & SER_GETHASH)) @@ -1521,6 +1531,7 @@ public: bool AppliesTo(int nVersion, std::string strSubVerIn) const { + // TODO: rework for client-version-embedded-in-strSubVer ? return (IsInEffect() && nMinVer <= nVersion && nVersion <= nMaxVer && (setSubVer.empty() || setSubVer.count(strSubVerIn))); @@ -1528,7 +1539,7 @@ public: bool AppliesToMe() const { - return AppliesTo(VERSION, ::pszSubVer); + return AppliesTo(PROTOCOL_VERSION, FormatSubVersion(CLIENT_NAME, CLIENT_VERSION, std::vector<std::string>())); } bool RelayTo(CNode* pnode) const diff --git a/src/makefile.linux-mingw b/src/makefile.linux-mingw index 61f8d4881f..c96a12182d 100644 --- a/src/makefile.linux-mingw +++ b/src/makefile.linux-mingw @@ -64,6 +64,7 @@ LIBS += -l mingwthrd -l kernel32 -l user32 -l gdi32 -l comdlg32 -l winspool -l w OBJS= \ obj/checkpoints.o \ obj/crypter.o \ + obj/key.o \ obj/db.o \ obj/init.o \ obj/irc.o \ @@ -72,6 +73,7 @@ OBJS= \ obj/net.o \ obj/protocol.o \ obj/bitcoinrpc.o \ + obj/rpcdump.o \ obj/script.o \ obj/util.o \ obj/wallet.o diff --git a/src/makefile.mingw b/src/makefile.mingw index 2cb78d97e6..ed718b89ea 100644 --- a/src/makefile.mingw +++ b/src/makefile.mingw @@ -61,6 +61,7 @@ LIBS += -l kernel32 -l user32 -l gdi32 -l comdlg32 -l winspool -l winmm -l shell OBJS= \ obj/checkpoints.o \ obj/crypter.o \ + obj/key.o \ obj/db.o \ obj/init.o \ obj/irc.o \ @@ -69,6 +70,7 @@ OBJS= \ obj/net.o \ obj/protocol.o \ obj/bitcoinrpc.o \ + obj/rpcdump.o \ obj/script.o \ obj/util.o \ obj/wallet.o diff --git a/src/makefile.osx b/src/makefile.osx index de71887935..4b0b521a33 100644 --- a/src/makefile.osx +++ b/src/makefile.osx @@ -72,6 +72,7 @@ HEADERS = \ OBJS= \ obj/checkpoints.o \ obj/crypter.o \ + obj/key.o \ obj/db.o \ obj/init.o \ obj/irc.o \ @@ -80,6 +81,7 @@ OBJS= \ obj/net.o \ obj/protocol.o \ obj/bitcoinrpc.o \ + obj/rpcdump.o \ obj/script.o \ obj/util.o \ obj/wallet.o diff --git a/src/makefile.unix b/src/makefile.unix index 6c48199546..a436f968bc 100644 --- a/src/makefile.unix +++ b/src/makefile.unix @@ -110,6 +110,7 @@ HEADERS = \ OBJS= \ obj/checkpoints.o \ obj/crypter.o \ + obj/key.o \ obj/db.o \ obj/init.o \ obj/irc.o \ @@ -118,6 +119,7 @@ OBJS= \ obj/net.o \ obj/protocol.o \ obj/bitcoinrpc.o \ + obj/rpcdump.o \ obj/script.o \ obj/util.o \ obj/wallet.o diff --git a/src/net.cpp b/src/net.cpp index 199fb407f2..7d2f18b2d0 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -727,6 +727,21 @@ void CNode::Cleanup() } +void CNode::PushVersion() +{ + /// when NTP implemented, change to just nTime = GetAdjustedTime() + int64 nTime = (fInbound ? GetAdjustedTime() : GetTime()); + CAddress addrYou = (fUseProxy ? CAddress("0.0.0.0") : addr); + CAddress addrMe = (fUseProxy ? CAddress("0.0.0.0") : addrLocalHost); + RAND_bytes((unsigned char*)&nLocalHostNonce, sizeof(nLocalHostNonce)); + PushMessage("version", PROTOCOL_VERSION, nLocalServices, nTime, addrYou, addrMe, + nLocalHostNonce, FormatSubVersion(CLIENT_NAME, CLIENT_VERSION, std::vector<string>()), nBestHeight); +} + + + + + std::map<unsigned int, int64> CNode::setBanned; CCriticalSection CNode::cs_setBanned; @@ -1132,11 +1147,17 @@ void ThreadMapPort2(void* parg) const char * rootdescurl = 0; const char * multicastif = 0; const char * minissdpdpath = 0; - int error = 0; struct UPNPDev * devlist = 0; char lanaddr[64]; +#ifndef UPNPDISCOVER_SUCCESS + /* miniupnpc 1.5 */ + devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0); +#else + /* miniupnpc 1.6 */ + int error = 0; devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0, 0, &error); +#endif struct UPNPUrls urls; struct IGDdatas data; @@ -1148,8 +1169,15 @@ void ThreadMapPort2(void* parg) char intClient[16]; char intPort[6]; string strDesc = "Bitcoin " + FormatFullVersion(); +#ifndef UPNPDISCOVER_SUCCESS + /* miniupnpc 1.5 */ + r = UPNP_AddPortMapping(urls.controlURL, data.first.servicetype, + port, port, lanaddr, strDesc.c_str(), "TCP", 0); +#else + /* miniupnpc 1.6 */ r = UPNP_AddPortMapping(urls.controlURL, data.first.servicetype, port, port, lanaddr, strDesc.c_str(), "TCP", 0, "0"); +#endif if(r!=UPNPCOMMAND_SUCCESS) printf("AddPortMapping(%s, %s, %s) failed with code %d (%s)\n", @@ -1212,6 +1240,8 @@ void MapPort(bool /* unused fMapPort */) static const char *strDNSSeed[] = { "bitseed.xf2.org", "dnsseed.bluematt.me", + "seed.bitcoin.sipa.be", + "dnsseed.bitcoin.dashjr.org", }; void ThreadDNSAddressSeed(void* parg) @@ -355,18 +355,8 @@ public: - void PushVersion() - { - /// when NTP implemented, change to just nTime = GetAdjustedTime() - int64 nTime = (fInbound ? GetAdjustedTime() : GetTime()); - CAddress addrYou = (fUseProxy ? CAddress("0.0.0.0") : addr); - CAddress addrMe = (fUseProxy ? CAddress("0.0.0.0") : addrLocalHost); - RAND_bytes((unsigned char*)&nLocalHostNonce, sizeof(nLocalHostNonce)); - PushMessage("version", VERSION, nLocalServices, nTime, addrYou, addrMe, - nLocalHostNonce, std::string(pszSubVer), nBestHeight); - } - + void PushVersion(); void PushMessage(const char* pszCommand) diff --git a/src/qt/askpassphrasedialog.cpp b/src/qt/askpassphrasedialog.cpp index 24f622d637..31e4040d1d 100644 --- a/src/qt/askpassphrasedialog.cpp +++ b/src/qt/askpassphrasedialog.cpp @@ -6,17 +6,25 @@ #include <QMessageBox> #include <QPushButton> +#include <QKeyEvent> AskPassphraseDialog::AskPassphraseDialog(Mode mode, QWidget *parent) : QDialog(parent), ui(new Ui::AskPassphraseDialog), mode(mode), - model(0) + model(0), + fCapsLock(false) { ui->setupUi(this); ui->passEdit1->setMaxLength(MAX_PASSPHRASE_SIZE); ui->passEdit2->setMaxLength(MAX_PASSPHRASE_SIZE); ui->passEdit3->setMaxLength(MAX_PASSPHRASE_SIZE); + + // Setup Caps Lock detection. + ui->passEdit1->installEventFilter(this); + ui->passEdit2->installEventFilter(this); + ui->passEdit3->installEventFilter(this); + ui->capsLabel->clear(); switch(mode) { @@ -47,7 +55,6 @@ AskPassphraseDialog::AskPassphraseDialog(Mode mode, QWidget *parent) : ui->warningLabel->setText(tr("Enter the old and new passphrase to the wallet.")); break; } - resize(minimumSize()); // Get rid of extra space in dialog textChanged(); connect(ui->passEdit1, SIGNAL(textChanged(QString)), this, SLOT(textChanged())); @@ -188,3 +195,46 @@ void AskPassphraseDialog::textChanged() } ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(acceptable); } + +bool AskPassphraseDialog::event(QEvent *event) +{ + // Detect Caps Lock key press. + if (event->type() == QEvent::KeyPress) { + QKeyEvent *ke = static_cast<QKeyEvent *>(event); + if (ke->key() == Qt::Key_CapsLock) { + fCapsLock = !fCapsLock; + } + if (fCapsLock) { + ui->capsLabel->setText(tr("Warning: The Caps Lock key is on.")); + } else { + ui->capsLabel->clear(); + } + } + return QWidget::event(event); +} + +bool AskPassphraseDialog::eventFilter(QObject *, QEvent *event) +{ + /* Detect Caps Lock. + * There is no good OS-independent way to check a key state in Qt, but we + * can detect Caps Lock by checking for the following condition: + * Shift key is down and the result is a lower case character, or + * Shift key is not down and the result is an upper case character. + */ + if (event->type() == QEvent::KeyPress) { + QKeyEvent *ke = static_cast<QKeyEvent *>(event); + QString str = ke->text(); + if (str.length() != 0) { + const QChar *psz = str.unicode(); + bool fShift = (ke->modifiers() & Qt::ShiftModifier) != 0; + if ((fShift && psz->isLower()) || (!fShift && psz->isUpper())) { + fCapsLock = true; + ui->capsLabel->setText(tr("Warning: The Caps Lock key is on.")); + } else if (psz->isLetter()) { + fCapsLock = false; + ui->capsLabel->clear(); + } + } + } + return false; +} diff --git a/src/qt/askpassphrasedialog.h b/src/qt/askpassphrasedialog.h index 32a3f6a5f3..b500ff49bf 100644 --- a/src/qt/askpassphrasedialog.h +++ b/src/qt/askpassphrasedialog.h @@ -34,9 +34,12 @@ private: Ui::AskPassphraseDialog *ui; Mode mode; WalletModel *model; + bool fCapsLock; private slots: void textChanged(); + bool event(QEvent *event); + bool eventFilter(QObject *, QEvent *event); }; #endif // ASKPASSPHRASEDIALOG_H diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index 808a9f46be..cba4e851b4 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -91,6 +91,8 @@ void UIThreadCall(boost::function0<void> fn) void MainFrameRepaint() { + if(guiref) + QMetaObject::invokeMethod(guiref, "refreshStatusBar", Qt::QueuedConnection); } void InitMessage(const std::string &message) diff --git a/src/qt/bitcoin.qrc b/src/qt/bitcoin.qrc index bfd630e572..aea61d6982 100644 --- a/src/qt/bitcoin.qrc +++ b/src/qt/bitcoin.qrc @@ -55,8 +55,10 @@ <file alias="it">locale/bitcoin_it.qm</file> <file alias="nb">locale/bitcoin_nb.qm</file> <file alias="nl">locale/bitcoin_nl.qm</file> + <file alias="pt_BR">locale/bitcoin_pt_BR.qm</file> <file alias="ru">locale/bitcoin_ru.qm</file> <file alias="uk">locale/bitcoin_uk.qm</file> + <file alias="zh_CN">locale/bitcoin_zh_CN.qm</file> <file alias="zh_TW">locale/bitcoin_zh_TW.qm</file> </qresource> </RCC> diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 8641c723b0..1c49683364 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -2,6 +2,7 @@ * Qt4 bitcoin GUI. * * W.J. van der Laan 2011 + * The Bitcoin Developers 2011 */ #include "bitcoingui.h" #include "transactiontablemodel.h" @@ -56,6 +57,7 @@ BitcoinGUI::BitcoinGUI(QWidget *parent): walletModel(0), encryptWalletAction(0), changePassphraseAction(0), + aboutQtAction(0), trayIcon(0), notificator(0) { @@ -191,10 +193,15 @@ void BitcoinGUI::createActions() sendCoinsAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_2)); tabGroup->addAction(sendCoinsAction); + connect(overviewAction, SIGNAL(triggered()), this, SLOT(show())); connect(overviewAction, SIGNAL(triggered()), this, SLOT(gotoOverviewPage())); + connect(historyAction, SIGNAL(triggered()), this, SLOT(show())); connect(historyAction, SIGNAL(triggered()), this, SLOT(gotoHistoryPage())); + connect(addressBookAction, SIGNAL(triggered()), this, SLOT(show())); connect(addressBookAction, SIGNAL(triggered()), this, SLOT(gotoAddressBookPage())); + connect(receiveCoinsAction, SIGNAL(triggered()), this, SLOT(show())); connect(receiveCoinsAction, SIGNAL(triggered()), this, SLOT(gotoReceiveCoinsPage())); + connect(sendCoinsAction, SIGNAL(triggered()), this, SLOT(show())); connect(sendCoinsAction, SIGNAL(triggered()), this, SLOT(gotoSendCoinsPage())); quitAction = new QAction(QIcon(":/icons/quit"), tr("E&xit"), this); @@ -203,7 +210,10 @@ void BitcoinGUI::createActions() quitAction->setMenuRole(QAction::QuitRole); aboutAction = new QAction(QIcon(":/icons/bitcoin"), tr("&About %1").arg(qApp->applicationName()), this); aboutAction->setToolTip(tr("Show information about Bitcoin")); - aboutAction->setMenuRole(QAction::AboutQtRole); + aboutAction->setMenuRole(QAction::AboutRole); + aboutQtAction = new QAction(tr("About &Qt"), this); + aboutQtAction->setToolTip(tr("Show information about Qt")); + aboutQtAction->setMenuRole(QAction::AboutQtRole); optionsAction = new QAction(QIcon(":/icons/options"), tr("&Options..."), this); optionsAction->setToolTip(tr("Modify configuration options for bitcoin")); optionsAction->setMenuRole(QAction::PreferencesRole); @@ -220,6 +230,7 @@ void BitcoinGUI::createActions() connect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit())); connect(optionsAction, SIGNAL(triggered()), this, SLOT(optionsClicked())); connect(aboutAction, SIGNAL(triggered()), this, SLOT(aboutClicked())); + connect(aboutQtAction, SIGNAL(triggered()), qApp, SLOT(aboutQt())); connect(openBitcoinAction, SIGNAL(triggered()), this, SLOT(showNormal())); connect(encryptWalletAction, SIGNAL(triggered(bool)), this, SLOT(encryptWallet(bool))); connect(changePassphraseAction, SIGNAL(triggered()), this, SLOT(changePassphrase())); @@ -247,6 +258,7 @@ void BitcoinGUI::createMenuBar() QMenu *help = appMenuBar->addMenu(tr("&Help")); help->addAction(aboutAction); + help->addAction(aboutQtAction); } void BitcoinGUI::createToolBars() @@ -412,15 +424,31 @@ void BitcoinGUI::setNumBlocks(int count) if(count < total) { - progressBarLabel->setVisible(true); - progressBar->setVisible(true); - progressBar->setMaximum(total - initTotal); - progressBar->setValue(count - initTotal); + if (clientModel->getStatusBarWarnings() == "") + { + progressBarLabel->setVisible(true); + progressBarLabel->setText(tr("Synchronizing with network...")); + progressBar->setVisible(true); + progressBar->setMaximum(total - initTotal); + progressBar->setValue(count - initTotal); + } + else + { + progressBarLabel->setText(clientModel->getStatusBarWarnings()); + progressBarLabel->setVisible(true); + progressBar->setVisible(false); + } tooltip = tr("Downloaded %1 of %2 blocks of transaction history.").arg(count).arg(total); } else { - progressBarLabel->setVisible(false); + if (clientModel->getStatusBarWarnings() == "") + progressBarLabel->setVisible(false); + else + { + progressBarLabel->setText(clientModel->getStatusBarWarnings()); + progressBarLabel->setVisible(true); + } progressBar->setVisible(false); tooltip = tr("Downloaded %1 blocks of transaction history.").arg(count); } @@ -469,6 +497,19 @@ void BitcoinGUI::setNumBlocks(int count) progressBar->setToolTip(tooltip); } +void BitcoinGUI::refreshStatusBar() +{ + /* Might display multiple times in the case of multiple alerts + static QString prevStatusBar; + QString newStatusBar = clientModel->getStatusBarWarnings(); + if (prevStatusBar != newStatusBar) + { + prevStatusBar = newStatusBar; + error(tr("Network Alert"), newStatusBar); + }*/ + setNumBlocks(clientModel->getNumBlocks()); +} + void BitcoinGUI::error(const QString &title, const QString &message) { // Report errors from network/worker thread @@ -563,7 +604,6 @@ void BitcoinGUI::incomingTransaction(const QModelIndex & parent, int start, int void BitcoinGUI::gotoOverviewPage() { - show(); overviewAction->setChecked(true); centralWidget->setCurrentWidget(overviewPage); @@ -573,7 +613,6 @@ void BitcoinGUI::gotoOverviewPage() void BitcoinGUI::gotoHistoryPage() { - show(); historyAction->setChecked(true); centralWidget->setCurrentWidget(transactionsPage); @@ -584,7 +623,6 @@ void BitcoinGUI::gotoHistoryPage() void BitcoinGUI::gotoAddressBookPage() { - show(); addressBookAction->setChecked(true); centralWidget->setCurrentWidget(addressBookPage); @@ -595,7 +633,6 @@ void BitcoinGUI::gotoAddressBookPage() void BitcoinGUI::gotoReceiveCoinsPage() { - show(); receiveCoinsAction->setChecked(true); centralWidget->setCurrentWidget(receiveCoinsPage); @@ -606,7 +643,6 @@ void BitcoinGUI::gotoReceiveCoinsPage() void BitcoinGUI::gotoSendCoinsPage() { - show(); sendCoinsAction->setChecked(true); centralWidget->setCurrentWidget(sendCoinsPage); diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h index d01ab59ae6..a0905e44ad 100644 --- a/src/qt/bitcoingui.h +++ b/src/qt/bitcoingui.h @@ -82,6 +82,7 @@ private: QAction *exportAction; QAction *encryptWalletAction; QAction *changePassphraseAction; + QAction *aboutQtAction; QSystemTrayIcon *trayIcon; Notificator *notificator; @@ -108,6 +109,8 @@ public slots: @see WalletModel::EncryptionStatus */ void setEncryptionStatus(int status); + /** Set the status bar text if there are any warnings (removes sync progress bar if applicable) */ + void refreshStatusBar(); /** Notify the user of an error in the network or transaction handling code. */ void error(const QString &title, const QString &message); diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp index 647adb9c53..624ff58ce5 100644 --- a/src/qt/bitcoinstrings.cpp +++ b/src/qt/bitcoinstrings.cpp @@ -2,61 +2,70 @@ // Automatically generated by extract_strings.py static const char *bitcoin_strings[] = {QT_TRANSLATE_NOOP("bitcoin-core", "Bitcoin version"), QT_TRANSLATE_NOOP("bitcoin-core", "Usage:"), -QT_TRANSLATE_NOOP("bitcoin-core", "Send command to -server or bitcoind\n"), -QT_TRANSLATE_NOOP("bitcoin-core", "List commands\n"), -QT_TRANSLATE_NOOP("bitcoin-core", "Get help for a command\n"), -QT_TRANSLATE_NOOP("bitcoin-core", "Options:\n"), -QT_TRANSLATE_NOOP("bitcoin-core", "Specify configuration file (default: bitcoin.conf)\n"), -QT_TRANSLATE_NOOP("bitcoin-core", "Specify pid file (default: bitcoind.pid)\n"), -QT_TRANSLATE_NOOP("bitcoin-core", "Generate coins\n"), -QT_TRANSLATE_NOOP("bitcoin-core", "Don't generate coins\n"), -QT_TRANSLATE_NOOP("bitcoin-core", "Start minimized\n"), -QT_TRANSLATE_NOOP("bitcoin-core", "Specify data directory\n"), -QT_TRANSLATE_NOOP("bitcoin-core", "Specify connection timeout (in milliseconds)\n"), -QT_TRANSLATE_NOOP("bitcoin-core", "Connect through socks4 proxy\n"), -QT_TRANSLATE_NOOP("bitcoin-core", "Allow DNS lookups for addnode and connect\n"), -QT_TRANSLATE_NOOP("bitcoin-core", "Add a node to connect to\n"), -QT_TRANSLATE_NOOP("bitcoin-core", "Connect only to the specified node\n"), -QT_TRANSLATE_NOOP("bitcoin-core", "Don't accept connections from outside\n"), -QT_TRANSLATE_NOOP("bitcoin-core", "Threshold for disconnecting misbehaving peers (default: 100)\n"), +QT_TRANSLATE_NOOP("bitcoin-core", "Send command to -server or bitcoind"), +QT_TRANSLATE_NOOP("bitcoin-core", "List commands"), +QT_TRANSLATE_NOOP("bitcoin-core", "Get help for a command"), +QT_TRANSLATE_NOOP("bitcoin-core", "Options:"), +QT_TRANSLATE_NOOP("bitcoin-core", "Specify configuration file (default: bitcoin.conf)"), +QT_TRANSLATE_NOOP("bitcoin-core", "Specify pid file (default: bitcoind.pid)"), +QT_TRANSLATE_NOOP("bitcoin-core", "Generate coins"), +QT_TRANSLATE_NOOP("bitcoin-core", "Don't generate coins"), +QT_TRANSLATE_NOOP("bitcoin-core", "Start minimized"), +QT_TRANSLATE_NOOP("bitcoin-core", "Specify data directory"), +QT_TRANSLATE_NOOP("bitcoin-core", "Specify connection timeout (in milliseconds)"), +QT_TRANSLATE_NOOP("bitcoin-core", "Connect through socks4 proxy"), +QT_TRANSLATE_NOOP("bitcoin-core", "Allow DNS lookups for addnode and connect"), +QT_TRANSLATE_NOOP("bitcoin-core", "Listen for connections on <port> (default: 8333 or testnet: 18333)"), +QT_TRANSLATE_NOOP("bitcoin-core", "Maintain at most <n> connections to peers (default: 125)"), +QT_TRANSLATE_NOOP("bitcoin-core", "Add a node to connect to"), +QT_TRANSLATE_NOOP("bitcoin-core", "Connect only to the specified node"), +QT_TRANSLATE_NOOP("bitcoin-core", "Don't accept connections from outside"), +QT_TRANSLATE_NOOP("bitcoin-core", "Don't bootstrap list of peers using DNS"), +QT_TRANSLATE_NOOP("bitcoin-core", "Threshold for disconnecting misbehaving peers (default: 100)"), QT_TRANSLATE_NOOP("bitcoin-core", "" "Number of seconds to keep misbehaving peers from reconnecting (default: " -"86400)\n"), -QT_TRANSLATE_NOOP("bitcoin-core", "Don't attempt to use UPnP to map the listening port\n"), -QT_TRANSLATE_NOOP("bitcoin-core", "Attempt to use UPnP to map the listening port\n"), -QT_TRANSLATE_NOOP("bitcoin-core", "Fee per KB to add to transactions you send\n"), -QT_TRANSLATE_NOOP("bitcoin-core", "Accept command line and JSON-RPC commands\n"), -QT_TRANSLATE_NOOP("bitcoin-core", "Run in the background as a daemon and accept commands\n"), -QT_TRANSLATE_NOOP("bitcoin-core", "Use the test network\n"), -QT_TRANSLATE_NOOP("bitcoin-core", "Username for JSON-RPC connections\n"), -QT_TRANSLATE_NOOP("bitcoin-core", "Password for JSON-RPC connections\n"), -QT_TRANSLATE_NOOP("bitcoin-core", "Listen for JSON-RPC connections on <port> (default: 8332)\n"), -QT_TRANSLATE_NOOP("bitcoin-core", "Allow JSON-RPC connections from specified IP address\n"), -QT_TRANSLATE_NOOP("bitcoin-core", "Send commands to node running on <ip> (default: 127.0.0.1)\n"), -QT_TRANSLATE_NOOP("bitcoin-core", "Set key pool size to <n> (default: 100)\n"), -QT_TRANSLATE_NOOP("bitcoin-core", "Rescan the block chain for missing wallet transactions\n"), +"86400)"), +QT_TRANSLATE_NOOP("bitcoin-core", "Maximum per-connection receive buffer, <n>*1000 bytes (default: 10000)"), +QT_TRANSLATE_NOOP("bitcoin-core", "Maximum per-connection send buffer, <n>*1000 bytes (default: 10000)"), +QT_TRANSLATE_NOOP("bitcoin-core", "Don't attempt to use UPnP to map the listening port"), +QT_TRANSLATE_NOOP("bitcoin-core", "Attempt to use UPnP to map the listening port"), +QT_TRANSLATE_NOOP("bitcoin-core", "Fee per KB to add to transactions you send"), +QT_TRANSLATE_NOOP("bitcoin-core", "Accept command line and JSON-RPC commands"), +QT_TRANSLATE_NOOP("bitcoin-core", "Run in the background as a daemon and accept commands"), +QT_TRANSLATE_NOOP("bitcoin-core", "Use the test network"), +QT_TRANSLATE_NOOP("bitcoin-core", "Output extra debugging information"), +QT_TRANSLATE_NOOP("bitcoin-core", "Prepend debug output with timestamp"), +QT_TRANSLATE_NOOP("bitcoin-core", "Send trace/debug info to console instead of debug.log file"), +QT_TRANSLATE_NOOP("bitcoin-core", "Send trace/debug info to debugger"), +QT_TRANSLATE_NOOP("bitcoin-core", "Username for JSON-RPC connections"), +QT_TRANSLATE_NOOP("bitcoin-core", "Password for JSON-RPC connections"), +QT_TRANSLATE_NOOP("bitcoin-core", "Listen for JSON-RPC connections on <port> (default: 8332)"), +QT_TRANSLATE_NOOP("bitcoin-core", "Allow JSON-RPC connections from specified IP address"), +QT_TRANSLATE_NOOP("bitcoin-core", "Send commands to node running on <ip> (default: 127.0.0.1)"), +QT_TRANSLATE_NOOP("bitcoin-core", "Set key pool size to <n> (default: 100)"), +QT_TRANSLATE_NOOP("bitcoin-core", "Rescan the block chain for missing wallet transactions"), QT_TRANSLATE_NOOP("bitcoin-core", "" "\n" -"SSL options: (see the Bitcoin Wiki for SSL setup instructions)\n"), -QT_TRANSLATE_NOOP("bitcoin-core", "Use OpenSSL (https) for JSON-RPC connections\n"), -QT_TRANSLATE_NOOP("bitcoin-core", "Server certificate file (default: server.cert)\n"), -QT_TRANSLATE_NOOP("bitcoin-core", "Server private key (default: server.pem)\n"), +"SSL options: (see the Bitcoin Wiki for SSL setup instructions)"), +QT_TRANSLATE_NOOP("bitcoin-core", "Use OpenSSL (https) for JSON-RPC connections"), +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", "" "Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:" -"@STRENGTH)\n"), -QT_TRANSLATE_NOOP("bitcoin-core", "This help message\n"), +"@STRENGTH)"), +QT_TRANSLATE_NOOP("bitcoin-core", "This help message"), QT_TRANSLATE_NOOP("bitcoin-core", "" "Cannot obtain a lock on data directory %s. Bitcoin is probably already " "running."), QT_TRANSLATE_NOOP("bitcoin-core", "Loading addresses..."), -QT_TRANSLATE_NOOP("bitcoin-core", "Error loading addr.dat \n"), +QT_TRANSLATE_NOOP("bitcoin-core", "Error loading addr.dat"), QT_TRANSLATE_NOOP("bitcoin-core", "Loading block index..."), -QT_TRANSLATE_NOOP("bitcoin-core", "Error loading blkindex.dat \n"), +QT_TRANSLATE_NOOP("bitcoin-core", "Error loading blkindex.dat"), QT_TRANSLATE_NOOP("bitcoin-core", "Loading wallet..."), -QT_TRANSLATE_NOOP("bitcoin-core", "Error loading wallet.dat: Wallet corrupted \n"), -QT_TRANSLATE_NOOP("bitcoin-core", "" -"Error loading wallet.dat: Wallet requires newer version of Bitcoin \n"), -QT_TRANSLATE_NOOP("bitcoin-core", "Error loading wallet.dat \n"), +QT_TRANSLATE_NOOP("bitcoin-core", "Error loading wallet.dat: Wallet corrupted"), +QT_TRANSLATE_NOOP("bitcoin-core", "Error loading wallet.dat: Wallet requires newer version of Bitcoin"), +QT_TRANSLATE_NOOP("bitcoin-core", "Wallet needed to be rewritten: restart Bitcoin to complete"), +QT_TRANSLATE_NOOP("bitcoin-core", "Error loading wallet.dat"), QT_TRANSLATE_NOOP("bitcoin-core", "Rescanning..."), QT_TRANSLATE_NOOP("bitcoin-core", "Done loading"), QT_TRANSLATE_NOOP("bitcoin-core", "Invalid -proxy address"), diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp index 2ed3ce51df..5a0b4aa83c 100644 --- a/src/qt/clientmodel.cpp +++ b/src/qt/clientmodel.cpp @@ -72,6 +72,11 @@ int ClientModel::getNumBlocksOfPeers() const return GetNumBlocksOfPeers(); } +QString ClientModel::getStatusBarWarnings() const +{ + return QString::fromStdString(GetWarnings("statusbar")); +} + OptionsModel *ClientModel::getOptionsModel() { return optionsModel; diff --git a/src/qt/clientmodel.h b/src/qt/clientmodel.h index b4054b5d87..5a12c4fcd8 100644 --- a/src/qt/clientmodel.h +++ b/src/qt/clientmodel.h @@ -33,6 +33,8 @@ public: bool inInitialBlockDownload() const; //! Return conservative estimate of total number of blocks, or 0 if unknown int getNumBlocksOfPeers() const; + //! Return warnings to be displayed in status bar + QString getStatusBarWarnings() const; QString formatFullVersion() const; diff --git a/src/qt/forms/askpassphrasedialog.ui b/src/qt/forms/askpassphrasedialog.ui index 70d9180e75..3f6b668e06 100644 --- a/src/qt/forms/askpassphrasedialog.ui +++ b/src/qt/forms/askpassphrasedialog.ui @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>589</width> - <height>228</height> + <width>598</width> + <height>198</height> </rect> </property> <property name="sizePolicy"> @@ -34,6 +34,9 @@ <property name="textFormat"> <enum>Qt::RichText</enum> </property> + <property name="wordWrap"> + <bool>true</bool> + </property> </widget> </item> <item> @@ -83,22 +86,24 @@ </property> </widget> </item> + <item row="4" column="1"> + <widget class="QLabel" name="capsLabel"> + <property name="styleSheet"> + <string notr="true">#capsLabel { + font: bold; +}</string> + </property> + <property name="text"> + <string>TextLabel</string> + </property> + <property name="alignment"> + <set>Qt::AlignCenter</set> + </property> + </widget> + </item> </layout> </item> <item> - <spacer name="verticalSpacer"> - <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> <widget class="QDialogButtonBox" name="buttonBox"> <property name="orientation"> <enum>Qt::Horizontal</enum> diff --git a/src/qt/locale/bitcoin_da.ts b/src/qt/locale/bitcoin_da.ts index 19dde6a5d7..c6ef676ffc 100644 --- a/src/qt/locale/bitcoin_da.ts +++ b/src/qt/locale/bitcoin_da.ts @@ -495,8 +495,7 @@ Er du sikker på at du ønsker at kryptere din tegnebog?</translation> <source>Date: %1 Amount: %2 Type: %3 -Address: %4 -</source> +Address: %4</source> <translation>Dato: %1 Beløb: %2 Type: %3 @@ -1399,245 +1398,210 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../bitcoinstrings.cpp" line="5"/> - <source>Send command to -server or bitcoind -</source> + <source>Send command to -server or bitcoind</source> <translation>Send kommando til -server eller bitcoind </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="6"/> - <source>List commands -</source> + <source>List commands</source> <translation>Liste over kommandoer </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="7"/> - <source>Get help for a command -</source> + <source>Get help for a command</source> <translation>Få hjælp til en kommando </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="8"/> - <source>Options: -</source> + <source>Options:</source> <translation>Indstillinger: </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="9"/> - <source>Specify configuration file (default: bitcoin.conf) -</source> + <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Angiv konfigurationsfil (standard: bitcoin.conf) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="10"/> - <source>Specify pid file (default: bitcoind.pid) -</source> + <source>Specify pid file (default: bitcoind.pid)</source> <translation>Angiv pid-fil (default: bitcoind.pid) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="11"/> - <source>Generate coins -</source> + <source>Generate coins</source> <translation>Generér coins </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="12"/> - <source>Don't generate coins -</source> + <source>Don't generate coins</source> <translation>Generér ikke coins </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="13"/> - <source>Start minimized -</source> + <source>Start minimized</source> <translation>Start minimeret </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="14"/> - <source>Specify data directory -</source> + <source>Specify data directory</source> <translation>Angiv databibliotek </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="15"/> - <source>Specify connection timeout (in milliseconds) -</source> + <source>Specify connection timeout (in milliseconds)</source> <translation>Angiv tilslutningstimeout (i millisekunder) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="16"/> - <source>Connect through socks4 proxy -</source> + <source>Connect through socks4 proxy</source> <translation>Tilslut via SOCKS4 proxy </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="17"/> - <source>Allow DNS lookups for addnode and connect -</source> + <source>Allow DNS lookups for addnode and connect</source> <translation>Tillad DNS-opslag for addnode og connect </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="18"/> - <source>Add a node to connect to -</source> + <source>Add a node to connect to</source> <translation>Tilføj en node til at forbinde til </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="19"/> - <source>Connect only to the specified node -</source> + <source>Connect only to the specified node</source> <translation>Tilslut kun til den angivne node </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="20"/> - <source>Don't accept connections from outside -</source> + <source>Don't accept connections from outside</source> <translation>Acceptér ikke forbindelser udefra </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="21"/> - <source>Don't attempt to use UPnP to map the listening port -</source> + <source>Don't attempt to use UPnP to map the listening port</source> <translation>Forsøg ikke at bruge UPnP til at konfigurere den lyttende port</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="22"/> - <source>Attempt to use UPnP to map the listening port -</source> + <source>Attempt to use UPnP to map the listening port</source> <translation>Forsøg at bruge UPnP til at kofnigurere den lyttende port</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="23"/> - <source>Fee per KB to add to transactions you send -</source> + <source>Fee per KB to add to transactions you send</source> <translation>Gebyr pr. KB, som skal tilføjes til transaktioner du sender </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="24"/> - <source>Accept command line and JSON-RPC commands -</source> + <source>Accept command line and JSON-RPC commands</source> <translation>Accepter kommandolinje- og JSON-RPC-kommandoer </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="25"/> - <source>Run in the background as a daemon and accept commands -</source> + <source>Run in the background as a daemon and accept commands</source> <translation>Kør i baggrunden som en service, og acceptér kommandoer </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="26"/> - <source>Use the test network -</source> + <source>Use the test network</source> <translation>Brug test-netværket </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="27"/> - <source>Username for JSON-RPC connections -</source> + <source>Username for JSON-RPC connections</source> <translation>Brugernavn til JSON-RPC-forbindelser </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="28"/> - <source>Password for JSON-RPC connections -</source> + <source>Password for JSON-RPC connections</source> <translation>Password til JSON-RPC-forbindelser </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="29"/> - <source>Listen for JSON-RPC connections on <port> (default: 8332) -</source> + <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> <translation>Lyt til JSON-RPC-forbindelser på <port> (standard: 8332) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="30"/> - <source>Allow JSON-RPC connections from specified IP address -</source> + <source>Allow JSON-RPC connections from specified IP address</source> <translation>Tillad JSON-RPC-forbindelser fra bestemt IP-adresse </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="31"/> - <source>Send commands to node running on <ip> (default: 127.0.0.1) -</source> + <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>Send kommandoer til node, der kører på <ip> (standard: 127.0.0.1) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="32"/> - <source>Set key pool size to <n> (default: 100) -</source> + <source>Set key pool size to <n> (default: 100)</source> <translation>Sæt nøglepoolstørrelse til <n> (standard: 100) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="33"/> - <source>Rescan the block chain for missing wallet transactions -</source> + <source>Rescan the block chain for missing wallet transactions</source> <translation>Gennemsøg blokkæden for manglende tegnebogstransaktioner </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="34"/> <source> -SSL options: (see the Bitcoin Wiki for SSL setup instructions) -</source> +SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation> SSL-indstillinger: (se Bitcoin Wiki for SSL opsætningsinstruktioner)</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="37"/> - <source>Use OpenSSL (https) for JSON-RPC connections -</source> + <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Brug OpenSSL (https) for JSON-RPC-forbindelser </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="38"/> - <source>Server certificate file (default: server.cert) -</source> + <source>Server certificate file (default: server.cert)</source> <translation>Servercertifikat-fil (standard: server.cert) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="39"/> - <source>Server private key (default: server.pem) -</source> + <source>Server private key (default: server.pem)</source> <translation>Server private nøgle (standard: server.pem) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="40"/> - <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) -</source> + <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation>Acceptabele ciphers (standard: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="43"/> - <source>This help message -</source> + <source>This help message</source> <translation>Denne hjælpebesked </translation> </message> @@ -1653,8 +1617,7 @@ SSL-indstillinger: (se Bitcoin Wiki for SSL opsætningsinstruktioner)</translati </message> <message> <location filename="../bitcoinstrings.cpp" line="48"/> - <source>Error loading addr.dat -</source> + <source>Error loading addr.dat </source> <translation>Fejl ved indlæsning af addr.dat </translation> </message> @@ -1665,8 +1628,7 @@ SSL-indstillinger: (se Bitcoin Wiki for SSL opsætningsinstruktioner)</translati </message> <message> <location filename="../bitcoinstrings.cpp" line="50"/> - <source>Error loading blkindex.dat -</source> + <source>Error loading blkindex.dat </source> <translation>Fejl ved indlæsning af blkindex.dat </translation> </message> @@ -1677,22 +1639,19 @@ SSL-indstillinger: (se Bitcoin Wiki for SSL opsætningsinstruktioner)</translati </message> <message> <location filename="../bitcoinstrings.cpp" line="52"/> - <source>Error loading wallet.dat: Wallet corrupted -</source> + <source>Error loading wallet.dat: Wallet corrupted </source> <translation>Fejl ved indlæsning af wallet.dat: Tegnebog ødelagt </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="53"/> - <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin -</source> + <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin </source> <translation>Fejl ved indlæsning af wallet.dat: Tegnebog kræver en nyere version af Bitcoin </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="55"/> - <source>Error loading wallet.dat -</source> + <source>Error loading wallet.dat </source> <translation>Fejl ved indlæsning af wallet.dat </translation> </message> diff --git a/src/qt/locale/bitcoin_de.ts b/src/qt/locale/bitcoin_de.ts index 394565e998..3b57d31a2c 100644 --- a/src/qt/locale/bitcoin_de.ts +++ b/src/qt/locale/bitcoin_de.ts @@ -495,8 +495,7 @@ Sind Sie sich sicher, dass Sie Ihre Brieftasche verschlüsseln möchten?</transl <source>Date: %1 Amount: %2 Type: %3 -Address: %4 -</source> +Address: %4</source> <translation>Datum: %1 Betrag: %2 Typ: %3 @@ -1398,232 +1397,197 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../bitcoinstrings.cpp" line="5"/> - <source>Send command to -server or bitcoind -</source> + <source>Send command to -server or bitcoind</source> <translation>Sende Befehl an -server oder bitcoind </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="6"/> - <source>List commands -</source> + <source>List commands</source> <translation>Befehle auflisten </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="7"/> - <source>Get help for a command -</source> + <source>Get help for a command</source> <translation>Hilfe für Befehl erhalten </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="8"/> - <source>Options: -</source> + <source>Options:</source> <translation>Einstellungen:</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="9"/> - <source>Specify configuration file (default: bitcoin.conf) -</source> + <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Bitte wählen Sie eine Konfigurationsdatei (Standard: bitcoin.conf)</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="10"/> - <source>Specify pid file (default: bitcoind.pid) -</source> + <source>Specify pid file (default: bitcoind.pid)</source> <translation>Bitte wählen Sie den Namen der PID Datei (Standard bitcoind.pid)</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="11"/> - <source>Generate coins -</source> + <source>Generate coins</source> <translation>Erarbeite Bitcoins</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="12"/> - <source>Don't generate coins -</source> + <source>Don't generate coins</source> <translation>Keine Bitcoins erarbeiten </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="13"/> - <source>Start minimized -</source> + <source>Start minimized</source> <translation>minimiert starten</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="14"/> - <source>Specify data directory -</source> + <source>Specify data directory</source> <translation>Bitte wählen Sie das Datenverzeichnis</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="15"/> - <source>Specify connection timeout (in milliseconds) -</source> + <source>Specify connection timeout (in milliseconds)</source> <translation>Netzwerkverbindungsabbruch nach (in Millisekunden)</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="16"/> - <source>Connect through socks4 proxy -</source> + <source>Connect through socks4 proxy</source> <translation>Durch SOCKS4-Proxy verbinden</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="17"/> - <source>Allow DNS lookups for addnode and connect -</source> + <source>Allow DNS lookups for addnode and connect</source> <translation>Erlaube DNS Namensauflösung für addnode und connect</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="18"/> - <source>Add a node to connect to -</source> + <source>Add a node to connect to</source> <translation>Bitcoin Knoten hinzufügen </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="19"/> - <source>Connect only to the specified node -</source> + <source>Connect only to the specified node</source> <translation>Nur zu angegebenen Knoten verbinden </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="20"/> - <source>Don't accept connections from outside -</source> + <source>Don't accept connections from outside</source> <translation>Keine externen Transatkionen akzeptieren</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="21"/> - <source>Don't attempt to use UPnP to map the listening port -</source> + <source>Don't attempt to use UPnP to map the listening port</source> <translation>UPnP nicht verwenden</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="22"/> - <source>Attempt to use UPnP to map the listening port -</source> + <source>Attempt to use UPnP to map the listening port</source> <translation>Versuche eine Verbindung mittels UPnP herzustellen</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="23"/> - <source>Fee per KB to add to transactions you send -</source> + <source>Fee per KB to add to transactions you send</source> <translation>Gebühr pro KB, die gesendeten Transaktionen hinzugefügt wird </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="24"/> - <source>Accept command line and JSON-RPC commands -</source> + <source>Accept command line and JSON-RPC commands</source> <translation>Erlaube Kommandozeilen und JSON-RPC Befehle </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="25"/> - <source>Run in the background as a daemon and accept commands -</source> + <source>Run in the background as a daemon and accept commands</source> <translation>Als Hintergrunddienst starten und Befehle akzeptieren </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="26"/> - <source>Use the test network -</source> + <source>Use the test network</source> <translation>Das Test Netzwerk verwenden </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="27"/> - <source>Username for JSON-RPC connections -</source> + <source>Username for JSON-RPC connections</source> <translation>Benutzername für JSON-RPC Verbindungen </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="28"/> - <source>Password for JSON-RPC connections -</source> + <source>Password for JSON-RPC connections</source> <translation>Passwort für JSON-RPC Verbindungen </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="29"/> - <source>Listen for JSON-RPC connections on <port> (default: 8332) -</source> + <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> <translation>Port für JSON-RPC Befehle (Standard: 8332) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="30"/> - <source>Allow JSON-RPC connections from specified IP address -</source> + <source>Allow JSON-RPC connections from specified IP address</source> <translation>JSON-RPC Befehle nur von dieser IP-Adresse erlauben </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="31"/> - <source>Send commands to node running on <ip> (default: 127.0.0.1) -</source> + <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>Befehle an Bitcoin Knoten <ip> senden (Standard: 127.0.0.1) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="32"/> - <source>Set key pool size to <n> (default: 100) -</source> + <source>Set key pool size to <n> (default: 100)</source> <translation>Menge der vorgenerierten Adressen (Standard: 100) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="33"/> - <source>Rescan the block chain for missing wallet transactions -</source> + <source>Rescan the block chain for missing wallet transactions</source> <translation>Blockkette nach verlorenen Transaktionen durchsuchen (rescan)</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="34"/> <source> -SSL options: (see the Bitcoin Wiki for SSL setup instructions) -</source> +SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation>SSL Einstellungen: (Siehe im BitCoin-Wiki für eine detallierte Beschreibung) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="37"/> - <source>Use OpenSSL (https) for JSON-RPC connections -</source> + <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>JSON-RPC Befehle über OpenSSL (https) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="38"/> - <source>Server certificate file (default: server.cert) -</source> + <source>Server certificate file (default: server.cert)</source> <translation>SSL Server Zertifikat (Standard: server.cert) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="39"/> - <source>Server private key (default: server.pem) -</source> + <source>Server private key (default: server.pem)</source> <translation>Privater SSL Schlüssel (Standard: server.pem)</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="40"/> - <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) -</source> + <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation>Erlaubte Kryptographiealgorithmen (Standard: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="43"/> - <source>This help message -</source> + <source>This help message</source> <translation>Dieser Hilfetext</translation> </message> <message> @@ -1638,8 +1602,7 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions) </message> <message> <location filename="../bitcoinstrings.cpp" line="48"/> - <source>Error loading addr.dat -</source> + <source>Error loading addr.dat </source> <translation>Fehler beim Laden der addr.dat </translation> </message> @@ -1650,8 +1613,7 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions) </message> <message> <location filename="../bitcoinstrings.cpp" line="50"/> - <source>Error loading blkindex.dat -</source> + <source>Error loading blkindex.dat </source> <translation>Fehler beim laden der blkindex.dat</translation> </message> <message> @@ -1661,22 +1623,19 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions) </message> <message> <location filename="../bitcoinstrings.cpp" line="52"/> - <source>Error loading wallet.dat: Wallet corrupted -</source> + <source>Error loading wallet.dat: Wallet corrupted </source> <translation>Fehler beim Laden von wallet.dat: Brieftasche beschädigt </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="53"/> - <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin -</source> + <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin </source> <translation>Fehler beim Laden von wallet.dat: Neuere Version von Bitcoin notwendig </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="55"/> - <source>Error loading wallet.dat -</source> + <source>Error loading wallet.dat </source> <translation>Fehler beim Laden von wallet.dat</translation> </message> <message> diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts index df964c91e6..0dfb50835d 100644 --- a/src/qt/locale/bitcoin_en.ts +++ b/src/qt/locale/bitcoin_en.ts @@ -505,8 +505,7 @@ Are you sure you wish to encrypt your wallet?</source> <source>Date: %1 Amount: %2 Type: %3 -Address: %4 -</source> +Address: %4</source> <translation type="unfinished"></translation> </message> <message> @@ -1407,213 +1406,178 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../bitcoinstrings.cpp" line="5"/> - <source>Send command to -server or bitcoind -</source> + <source>Send command to -server or bitcoind</source> <translation type="unfinished"></translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="6"/> - <source>List commands -</source> + <source>List commands</source> <translation type="unfinished"></translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="7"/> - <source>Get help for a command -</source> + <source>Get help for a command</source> <translation type="unfinished"></translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="8"/> - <source>Options: -</source> + <source>Options:</source> <translation type="unfinished"></translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="9"/> - <source>Specify configuration file (default: bitcoin.conf) -</source> + <source>Specify configuration file (default: bitcoin.conf)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="10"/> - <source>Specify pid file (default: bitcoind.pid) -</source> + <source>Specify pid file (default: bitcoind.pid)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="11"/> - <source>Generate coins -</source> + <source>Generate coins</source> <translation type="unfinished"></translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="12"/> - <source>Don't generate coins -</source> + <source>Don't generate coins</source> <translation type="unfinished"></translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="13"/> - <source>Start minimized -</source> + <source>Start minimized</source> <translation type="unfinished"></translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="14"/> - <source>Specify data directory -</source> + <source>Specify data directory</source> <translation type="unfinished"></translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="15"/> - <source>Specify connection timeout (in milliseconds) -</source> + <source>Specify connection timeout (in milliseconds)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="16"/> - <source>Connect through socks4 proxy -</source> + <source>Connect through socks4 proxy</source> <translation type="unfinished"></translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="17"/> - <source>Allow DNS lookups for addnode and connect -</source> + <source>Allow DNS lookups for addnode and connect</source> <translation type="unfinished"></translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="18"/> - <source>Add a node to connect to -</source> + <source>Add a node to connect to</source> <translation type="unfinished"></translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="19"/> - <source>Connect only to the specified node -</source> + <source>Connect only to the specified node</source> <translation type="unfinished"></translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="20"/> - <source>Don't accept connections from outside -</source> + <source>Don't accept connections from outside</source> <translation type="unfinished"></translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="21"/> - <source>Don't attempt to use UPnP to map the listening port -</source> + <source>Don't attempt to use UPnP to map the listening port</source> <translation type="unfinished"></translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="22"/> - <source>Attempt to use UPnP to map the listening port -</source> + <source>Attempt to use UPnP to map the listening port</source> <translation type="unfinished"></translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="23"/> - <source>Fee per KB to add to transactions you send -</source> + <source>Fee per KB to add to transactions you send</source> <translation type="unfinished"></translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="24"/> - <source>Accept command line and JSON-RPC commands -</source> + <source>Accept command line and JSON-RPC commands</source> <translation type="unfinished"></translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="25"/> - <source>Run in the background as a daemon and accept commands -</source> + <source>Run in the background as a daemon and accept commands</source> <translation type="unfinished"></translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="26"/> - <source>Use the test network -</source> + <source>Use the test network</source> <translation type="unfinished"></translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="27"/> - <source>Username for JSON-RPC connections -</source> + <source>Username for JSON-RPC connections</source> <translation type="unfinished"></translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="28"/> - <source>Password for JSON-RPC connections -</source> + <source>Password for JSON-RPC connections</source> <translation type="unfinished"></translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="29"/> - <source>Listen for JSON-RPC connections on <port> (default: 8332) -</source> + <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="30"/> - <source>Allow JSON-RPC connections from specified IP address -</source> + <source>Allow JSON-RPC connections from specified IP address</source> <translation type="unfinished"></translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="31"/> - <source>Send commands to node running on <ip> (default: 127.0.0.1) -</source> + <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="32"/> - <source>Set key pool size to <n> (default: 100) -</source> + <source>Set key pool size to <n> (default: 100)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="33"/> - <source>Rescan the block chain for missing wallet transactions -</source> + <source>Rescan the block chain for missing wallet transactions</source> <translation type="unfinished"></translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="34"/> <source> -SSL options: (see the Bitcoin Wiki for SSL setup instructions) -</source> +SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="37"/> - <source>Use OpenSSL (https) for JSON-RPC connections -</source> + <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation type="unfinished"></translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="38"/> - <source>Server certificate file (default: server.cert) -</source> + <source>Server certificate file (default: server.cert)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="39"/> - <source>Server private key (default: server.pem) -</source> + <source>Server private key (default: server.pem)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="40"/> - <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) -</source> + <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="43"/> - <source>This help message -</source> + <source>This help message</source> <translation type="unfinished"></translation> </message> <message> @@ -1628,8 +1592,7 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions) </message> <message> <location filename="../bitcoinstrings.cpp" line="48"/> - <source>Error loading addr.dat -</source> + <source>Error loading addr.dat </source> <translation type="unfinished"></translation> </message> <message> @@ -1639,8 +1602,7 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions) </message> <message> <location filename="../bitcoinstrings.cpp" line="50"/> - <source>Error loading blkindex.dat -</source> + <source>Error loading blkindex.dat </source> <translation type="unfinished"></translation> </message> <message> @@ -1650,20 +1612,17 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions) </message> <message> <location filename="../bitcoinstrings.cpp" line="52"/> - <source>Error loading wallet.dat: Wallet corrupted -</source> + <source>Error loading wallet.dat: Wallet corrupted </source> <translation type="unfinished"></translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="53"/> - <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin -</source> + <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin </source> <translation type="unfinished"></translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="55"/> - <source>Error loading wallet.dat -</source> + <source>Error loading wallet.dat </source> <translation type="unfinished"></translation> </message> <message> diff --git a/src/qt/locale/bitcoin_es.ts b/src/qt/locale/bitcoin_es.ts index 49e0f0a2c7..bf2c49396d 100644 --- a/src/qt/locale/bitcoin_es.ts +++ b/src/qt/locale/bitcoin_es.ts @@ -1,6 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.0" language="es"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="es" version="2.0"> <defaultcodec>UTF-8</defaultcodec> <context> <name>AboutDialog</name> @@ -428,10 +426,7 @@ Are you sure you wish to encrypt your wallet?</source> <message numerus="yes"> <location filename="../bitcoingui.cpp" line="396"/> <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> + <translation><numerusform>%n conexión activa hacia la red Bitcoin</numerusform><numerusform>%n conexiones activas hacia la red Bitcoin</numerusform></translation> </message> <message> <location filename="../bitcoingui.cpp" line="411"/> @@ -446,34 +441,22 @@ Are you sure you wish to encrypt your wallet?</source> <message numerus="yes"> <location filename="../bitcoingui.cpp" line="428"/> <source>%n second(s) ago</source> - <translation> - <numerusform>Hace %n segundo</numerusform> - <numerusform>Hace %n segundos</numerusform> - </translation> + <translation><numerusform>Hace %n segundo</numerusform><numerusform>Hace %n segundos</numerusform></translation> </message> <message numerus="yes"> <location filename="../bitcoingui.cpp" line="432"/> <source>%n minute(s) ago</source> - <translation> - <numerusform>Hace %n minuto</numerusform> - <numerusform>Hace %n minutos</numerusform> - </translation> + <translation><numerusform>Hace %n minuto</numerusform><numerusform>Hace %n minutos</numerusform></translation> </message> <message numerus="yes"> <location filename="../bitcoingui.cpp" line="436"/> <source>%n hour(s) ago</source> - <translation> - <numerusform>Hace %n hora</numerusform> - <numerusform>Hace %n horas</numerusform> - </translation> + <translation><numerusform>Hace %n hora</numerusform><numerusform>Hace %n horas</numerusform></translation> </message> <message numerus="yes"> <location filename="../bitcoingui.cpp" line="440"/> <source>%n day(s) ago</source> - <translation> - <numerusform>Hace %n día</numerusform> - <numerusform>Hace %n días</numerusform> - </translation> + <translation><numerusform>Hace %n día</numerusform><numerusform>Hace %n días</numerusform></translation> </message> <message> <location filename="../bitcoingui.cpp" line="446"/> @@ -515,8 +498,7 @@ Are you sure you wish to encrypt your wallet?</source> <source>Date: %1 Amount: %2 Type: %3 -Address: %4 -</source> +Address: %4</source> <translation>Fecha: %1 Cantidad: %2 Tipo: %3 @@ -767,12 +749,12 @@ Dirección: %4</translation> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> +</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Wallet</span></p></body></html></source> <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> +</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Cartera</span></p></body></html></translation> </message> <message> @@ -1139,10 +1121,7 @@ p, li { white-space: pre-wrap; } <message numerus="yes"> <location filename="../transactiontablemodel.cpp" line="274"/> <source>Open for %n block(s)</source> - <translation> - <numerusform>Abierto por %n bloque</numerusform> - <numerusform>Abierto por %n bloques</numerusform> - </translation> + <translation><numerusform>Abierto por %n bloque</numerusform><numerusform>Abierto por %n bloques</numerusform></translation> </message> <message> <location filename="../transactiontablemodel.cpp" line="277"/> @@ -1167,10 +1146,7 @@ p, li { white-space: pre-wrap; } <message numerus="yes"> <location filename="../transactiontablemodel.cpp" line="295"/> <source>Mined balance will be available in %n more blocks</source> - <translation> - <numerusform>El balance minado estará disponible en %n bloque mas</numerusform> - <numerusform>El balance minado estará disponible en %n bloques mas</numerusform> - </translation> + <translation><numerusform>El balance minado estará disponible en %n bloque mas</numerusform><numerusform>El balance minado estará disponible en %n bloques mas</numerusform></translation> </message> <message> <location filename="../transactiontablemodel.cpp" line="301"/> @@ -1424,247 +1400,212 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../bitcoinstrings.cpp" line="5"/> - <source>Send command to -server or bitcoind -</source> + <source>Send command to -server or bitcoind</source> <translation>Envia comando a bitcoin lanzado con -server u bitcoind </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="6"/> - <source>List commands -</source> + <source>List commands</source> <translation>Muestra comandos </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="7"/> - <source>Get help for a command -</source> + <source>Get help for a command</source> <translation>Recibir ayuda para un comando </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="8"/> - <source>Options: -</source> + <source>Options:</source> <translation>Opciones: </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="9"/> - <source>Specify configuration file (default: bitcoin.conf) -</source> + <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Especifica archivo de configuración (predeterminado: bitcoin.conf) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="10"/> - <source>Specify pid file (default: bitcoind.pid) -</source> + <source>Specify pid file (default: bitcoind.pid)</source> <translation>Especifica archivo pid (predeterminado: bitcoin.pid) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="11"/> - <source>Generate coins -</source> + <source>Generate coins</source> <translation>Genera monedas </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="12"/> - <source>Don't generate coins -</source> + <source>Don't generate coins</source> <translation>No generar monedas </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="13"/> - <source>Start minimized -</source> + <source>Start minimized</source> <translation>Arranca minimizado </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="14"/> - <source>Specify data directory -</source> + <source>Specify data directory</source> <translation>Especifica directorio para los datos </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="15"/> - <source>Specify connection timeout (in milliseconds) -</source> + <source>Specify connection timeout (in milliseconds)</source> <translation>Especifica tiempo de espera para conexion (en milisegundos) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="16"/> - <source>Connect through socks4 proxy -</source> + <source>Connect through socks4 proxy</source> <translation>Conecta mediante proxy socks4 </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="17"/> - <source>Allow DNS lookups for addnode and connect -</source> + <source>Allow DNS lookups for addnode and connect</source> <translation>Permite búsqueda DNS para addnode y connect </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="18"/> - <source>Add a node to connect to -</source> + <source>Add a node to connect to</source> <translation>Agrega un nodo para conectarse </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="19"/> - <source>Connect only to the specified node -</source> + <source>Connect only to the specified node</source> <translation>Conecta solo al nodo especificado </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="20"/> - <source>Don't accept connections from outside -</source> + <source>Don't accept connections from outside</source> <translation>No aceptar conexiones desde el exterior </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="21"/> - <source>Don't attempt to use UPnP to map the listening port -</source> + <source>Don't attempt to use UPnP to map the listening port</source> <translation>No intentar usar UPnP para mapear el puerto de entrada </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="22"/> - <source>Attempt to use UPnP to map the listening port -</source> + <source>Attempt to use UPnP to map the listening port</source> <translation>Intenta usar UPnP para mapear el puerto de escucha. </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="23"/> - <source>Fee per KB to add to transactions you send -</source> + <source>Fee per KB to add to transactions you send</source> <translation>Comisión por KB para agregar a las transacciones que envias </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="24"/> - <source>Accept command line and JSON-RPC commands -</source> + <source>Accept command line and JSON-RPC commands</source> <translation>Aceptar comandos consola y JSON-RPC </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="25"/> - <source>Run in the background as a daemon and accept commands -</source> + <source>Run in the background as a daemon and accept commands</source> <translation>Correr como demonio y acepta comandos </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="26"/> - <source>Use the test network -</source> + <source>Use the test network</source> <translation>Usa la red de pruebas </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="27"/> - <source>Username for JSON-RPC connections -</source> + <source>Username for JSON-RPC connections</source> <translation>Usuario para las conexiones JSON-RPC </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="28"/> - <source>Password for JSON-RPC connections -</source> + <source>Password for JSON-RPC connections</source> <translation>Contraseña para las conexiones JSON-RPC </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="29"/> - <source>Listen for JSON-RPC connections on <port> (default: 8332) -</source> + <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> <translation>Escucha conexiones JSON-RPC en el puerto <port> (predeterminado: 8332) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="30"/> - <source>Allow JSON-RPC connections from specified IP address -</source> + <source>Allow JSON-RPC connections from specified IP address</source> <translation>Permite conexiones JSON-RPC desde la dirección IP especificada </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="31"/> - <source>Send commands to node running on <ip> (default: 127.0.0.1) -</source> + <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>Envia comando al nodo situado en <ip> (predeterminado: 127.0.0.1) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="32"/> - <source>Set key pool size to <n> (default: 100) -</source> + <source>Set key pool size to <n> (default: 100)</source> <translation>Ajusta el numero de claves en reserva <n> (predeterminado: 100) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="33"/> - <source>Rescan the block chain for missing wallet transactions -</source> + <source>Rescan the block chain for missing wallet transactions</source> <translation>Rescanea la cadena de bloques para transacciones perdidas de la cartera </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="34"/> <source> -SSL options: (see the Bitcoin Wiki for SSL setup instructions) -</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 filename="../bitcoinstrings.cpp" line="37"/> - <source>Use OpenSSL (https) for JSON-RPC connections -</source> + <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Usa OpenSSL (https) para las conexiones JSON-RPC </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="38"/> - <source>Server certificate file (default: server.cert) -</source> + <source>Server certificate file (default: server.cert)</source> <translation>Certificado del servidor (Predeterminado: server.cert) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="39"/> - <source>Server private key (default: server.pem) -</source> + <source>Server private key (default: server.pem)</source> <translation>Clave privada del servidor (Predeterminado: server.pem) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="40"/> - <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) -</source> + <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation>Cifrados aceptados (Predeterminado: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="43"/> - <source>This help message -</source> + <source>This help message</source> <translation>Este mensaje de ayuda </translation> </message> @@ -1681,8 +1622,7 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions) </message> <message> <location filename="../bitcoinstrings.cpp" line="48"/> - <source>Error loading addr.dat -</source> + <source>Error loading addr.dat </source> <translation>Error cargando addr.dat </translation> </message> @@ -1693,8 +1633,7 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions) </message> <message> <location filename="../bitcoinstrings.cpp" line="50"/> - <source>Error loading blkindex.dat -</source> + <source>Error loading blkindex.dat </source> <translation>Error cargando blkindex.dat </translation> </message> @@ -1705,22 +1644,19 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions) </message> <message> <location filename="../bitcoinstrings.cpp" line="52"/> - <source>Error loading wallet.dat: Wallet corrupted -</source> + <source>Error loading wallet.dat: Wallet corrupted </source> <translation>Error cargando wallet.dat: Cartera dañada </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="53"/> - <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin -</source> + <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin </source> <translation>Error cargando el archivo wallet.dat: Se necesita una versión mas nueva de Bitcoin </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="55"/> - <source>Error loading wallet.dat -</source> + <source>Error loading wallet.dat </source> <translation>Error cargando wallet.dat </translation> </message> @@ -2362,4 +2298,4 @@ pero la información de los comentarios quedará en blanco.</translation> <translation>Bitcoin Qt</translation> </message> </context> -</TS> +</TS>
\ No newline at end of file diff --git a/src/qt/locale/bitcoin_es_CL.ts b/src/qt/locale/bitcoin_es_CL.ts index bb9d299790..c355a1e4a6 100644 --- a/src/qt/locale/bitcoin_es_CL.ts +++ b/src/qt/locale/bitcoin_es_CL.ts @@ -1,6 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.0" language="es_CL"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="es_CL" version="2.0"> <defaultcodec>UTF-8</defaultcodec> <context> <name>AboutDialog</name> @@ -428,10 +426,7 @@ Are you sure you wish to encrypt your wallet?</source> <message numerus="yes"> <location filename="../bitcoingui.cpp" line="396"/> <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> + <translation><numerusform>%n conexión activa hacia la red Bitcoin</numerusform><numerusform>%n conexiones activas hacia la red Bitcoin</numerusform></translation> </message> <message> <location filename="../bitcoingui.cpp" line="411"/> @@ -446,34 +441,22 @@ Are you sure you wish to encrypt your wallet?</source> <message numerus="yes"> <location filename="../bitcoingui.cpp" line="428"/> <source>%n second(s) ago</source> - <translation> - <numerusform>Hace %n segundo</numerusform> - <numerusform>Hace %n segundos</numerusform> - </translation> + <translation><numerusform>Hace %n segundo</numerusform><numerusform>Hace %n segundos</numerusform></translation> </message> <message numerus="yes"> <location filename="../bitcoingui.cpp" line="432"/> <source>%n minute(s) ago</source> - <translation> - <numerusform>Hace %n minuto</numerusform> - <numerusform>Hace %n minutos</numerusform> - </translation> + <translation><numerusform>Hace %n minuto</numerusform><numerusform>Hace %n minutos</numerusform></translation> </message> <message numerus="yes"> <location filename="../bitcoingui.cpp" line="436"/> <source>%n hour(s) ago</source> - <translation> - <numerusform>Hace %n hora</numerusform> - <numerusform>Hace %n horas</numerusform> - </translation> + <translation><numerusform>Hace %n hora</numerusform><numerusform>Hace %n horas</numerusform></translation> </message> <message numerus="yes"> <location filename="../bitcoingui.cpp" line="440"/> <source>%n day(s) ago</source> - <translation> - <numerusform>Hace %n día</numerusform> - <numerusform>Hace %n días</numerusform> - </translation> + <translation><numerusform>Hace %n día</numerusform><numerusform>Hace %n días</numerusform></translation> </message> <message> <location filename="../bitcoingui.cpp" line="446"/> @@ -515,8 +498,7 @@ Are you sure you wish to encrypt your wallet?</source> <source>Date: %1 Amount: %2 Type: %3 -Address: %4 -</source> +Address: %4</source> <translation>Fecha: %1 Cantidad: %2 Tipo: %3 @@ -767,12 +749,12 @@ Dirección: %4</translation> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> +</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Wallet</span></p></body></html></source> <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> +</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Cartera</span></p></body></html></translation> </message> <message> @@ -1139,10 +1121,7 @@ p, li { white-space: pre-wrap; } <message numerus="yes"> <location filename="../transactiontablemodel.cpp" line="274"/> <source>Open for %n block(s)</source> - <translation> - <numerusform>Abierto por %n bloque</numerusform> - <numerusform>Abierto por %n bloques</numerusform> - </translation> + <translation><numerusform>Abierto por %n bloque</numerusform><numerusform>Abierto por %n bloques</numerusform></translation> </message> <message> <location filename="../transactiontablemodel.cpp" line="277"/> @@ -1167,10 +1146,7 @@ p, li { white-space: pre-wrap; } <message numerus="yes"> <location filename="../transactiontablemodel.cpp" line="295"/> <source>Mined balance will be available in %n more blocks</source> - <translation> - <numerusform>El balance minado estará disponible en %n bloque mas</numerusform> - <numerusform>El balance minado estará disponible en %n bloques mas</numerusform> - </translation> + <translation><numerusform>El balance minado estará disponible en %n bloque mas</numerusform><numerusform>El balance minado estará disponible en %n bloques mas</numerusform></translation> </message> <message> <location filename="../transactiontablemodel.cpp" line="301"/> @@ -1424,247 +1400,212 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../bitcoinstrings.cpp" line="5"/> - <source>Send command to -server or bitcoind -</source> + <source>Send command to -server or bitcoind</source> <translation>Envia comando a bitcoin lanzado con -server u bitcoind </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="6"/> - <source>List commands -</source> + <source>List commands</source> <translation>Muestra comandos </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="7"/> - <source>Get help for a command -</source> + <source>Get help for a command</source> <translation>Recibir ayuda para un comando </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="8"/> - <source>Options: -</source> + <source>Options:</source> <translation>Opciones: </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="9"/> - <source>Specify configuration file (default: bitcoin.conf) -</source> + <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Especifica archivo de configuración (predeterminado: bitcoin.conf) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="10"/> - <source>Specify pid file (default: bitcoind.pid) -</source> + <source>Specify pid file (default: bitcoind.pid)</source> <translation>Especifica archivo pid (predeterminado: bitcoin.pid) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="11"/> - <source>Generate coins -</source> + <source>Generate coins</source> <translation>Genera monedas </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="12"/> - <source>Don't generate coins -</source> + <source>Don't generate coins</source> <translation>No generar monedas </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="13"/> - <source>Start minimized -</source> + <source>Start minimized</source> <translation>Arranca minimizado </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="14"/> - <source>Specify data directory -</source> + <source>Specify data directory</source> <translation>Especifica directorio para los datos </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="15"/> - <source>Specify connection timeout (in milliseconds) -</source> + <source>Specify connection timeout (in milliseconds)</source> <translation>Especifica tiempo de espera para conexion (en milisegundos) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="16"/> - <source>Connect through socks4 proxy -</source> + <source>Connect through socks4 proxy</source> <translation>Conecta mediante proxy socks4 </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="17"/> - <source>Allow DNS lookups for addnode and connect -</source> + <source>Allow DNS lookups for addnode and connect</source> <translation>Permite búsqueda DNS para addnode y connect </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="18"/> - <source>Add a node to connect to -</source> + <source>Add a node to connect to</source> <translation>Agrega un nodo para conectarse </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="19"/> - <source>Connect only to the specified node -</source> + <source>Connect only to the specified node</source> <translation>Conecta solo al nodo especificado </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="20"/> - <source>Don't accept connections from outside -</source> + <source>Don't accept connections from outside</source> <translation>No aceptar conexiones desde el exterior </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="21"/> - <source>Don't attempt to use UPnP to map the listening port -</source> + <source>Don't attempt to use UPnP to map the listening port</source> <translation>No intentar usar UPnP para mapear el puerto de entrada </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="22"/> - <source>Attempt to use UPnP to map the listening port -</source> + <source>Attempt to use UPnP to map the listening port</source> <translation>Intenta usar UPnP para mapear el puerto de escucha. </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="23"/> - <source>Fee per KB to add to transactions you send -</source> + <source>Fee per KB to add to transactions you send</source> <translation>Comisión por KB para agregar a las transacciones que envias </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="24"/> - <source>Accept command line and JSON-RPC commands -</source> + <source>Accept command line and JSON-RPC commands</source> <translation>Aceptar comandos consola y JSON-RPC </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="25"/> - <source>Run in the background as a daemon and accept commands -</source> + <source>Run in the background as a daemon and accept commands</source> <translation>Correr como demonio y acepta comandos </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="26"/> - <source>Use the test network -</source> + <source>Use the test network</source> <translation>Usa la red de pruebas </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="27"/> - <source>Username for JSON-RPC connections -</source> + <source>Username for JSON-RPC connections</source> <translation>Usuario para las conexiones JSON-RPC </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="28"/> - <source>Password for JSON-RPC connections -</source> + <source>Password for JSON-RPC connections</source> <translation>Contraseña para las conexiones JSON-RPC </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="29"/> - <source>Listen for JSON-RPC connections on <port> (default: 8332) -</source> + <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> <translation>Escucha conexiones JSON-RPC en el puerto <port> (predeterminado: 8332) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="30"/> - <source>Allow JSON-RPC connections from specified IP address -</source> + <source>Allow JSON-RPC connections from specified IP address</source> <translation>Permite conexiones JSON-RPC desde la dirección IP especificada </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="31"/> - <source>Send commands to node running on <ip> (default: 127.0.0.1) -</source> + <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>Envia comando al nodo situado en <ip> (predeterminado: 127.0.0.1) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="32"/> - <source>Set key pool size to <n> (default: 100) -</source> + <source>Set key pool size to <n> (default: 100)</source> <translation>Ajusta el numero de claves en reserva <n> (predeterminado: 100) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="33"/> - <source>Rescan the block chain for missing wallet transactions -</source> + <source>Rescan the block chain for missing wallet transactions</source> <translation>Rescanea la cadena de bloques para transacciones perdidas de la cartera </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="34"/> <source> -SSL options: (see the Bitcoin Wiki for SSL setup instructions) -</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 filename="../bitcoinstrings.cpp" line="37"/> - <source>Use OpenSSL (https) for JSON-RPC connections -</source> + <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Usa OpenSSL (https) para las conexiones JSON-RPC </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="38"/> - <source>Server certificate file (default: server.cert) -</source> + <source>Server certificate file (default: server.cert)</source> <translation>Certificado del servidor (Predeterminado: server.cert) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="39"/> - <source>Server private key (default: server.pem) -</source> + <source>Server private key (default: server.pem)</source> <translation>Clave privada del servidor (Predeterminado: server.pem) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="40"/> - <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) -</source> + <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation>Cifrados aceptados (Predeterminado: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="43"/> - <source>This help message -</source> + <source>This help message</source> <translation>Este mensaje de ayuda </translation> </message> @@ -1681,8 +1622,7 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions) </message> <message> <location filename="../bitcoinstrings.cpp" line="48"/> - <source>Error loading addr.dat -</source> + <source>Error loading addr.dat </source> <translation>Error cargando addr.dat </translation> </message> @@ -1693,8 +1633,7 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions) </message> <message> <location filename="../bitcoinstrings.cpp" line="50"/> - <source>Error loading blkindex.dat -</source> + <source>Error loading blkindex.dat </source> <translation>Error cargando blkindex.dat </translation> </message> @@ -1705,22 +1644,19 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions) </message> <message> <location filename="../bitcoinstrings.cpp" line="52"/> - <source>Error loading wallet.dat: Wallet corrupted -</source> + <source>Error loading wallet.dat: Wallet corrupted </source> <translation>Error cargando wallet.dat: Cartera dañada </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="53"/> - <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin -</source> + <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin </source> <translation>Error cargando el archivo wallet.dat: Se necesita una versión mas nueva de Bitcoin </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="55"/> - <source>Error loading wallet.dat -</source> + <source>Error loading wallet.dat </source> <translation>Error cargando wallet.dat </translation> </message> @@ -2362,4 +2298,4 @@ pero la información de los comentarios quedará en blanco.</translation> <translation>Bitcoin Qt</translation> </message> </context> -</TS> +</TS>
\ No newline at end of file diff --git a/src/qt/locale/bitcoin_hu.ts b/src/qt/locale/bitcoin_hu.ts index 0c460022ff..8cee3334b8 100644 --- a/src/qt/locale/bitcoin_hu.ts +++ b/src/qt/locale/bitcoin_hu.ts @@ -494,8 +494,7 @@ Biztosan kódolni akarod a tárcát?</translation> <source>Date: %1 Amount: %2 Type: %3 -Address: %4 -</source> +Address: %4</source> <translation>Dátum: %1 Összeg: %2 Típus: %3 @@ -1399,248 +1398,213 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../bitcoinstrings.cpp" line="5"/> - <source>Send command to -server or bitcoind -</source> + <source>Send command to -server or bitcoind</source> <translation>Parancs küldése a -serverhez vagy a bitcoindhez </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="6"/> - <source>List commands -</source> + <source>List commands</source> <translation>Parancsok kilistázása </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="7"/> - <source>Get help for a command -</source> + <source>Get help for a command</source> <translation>Segítség egy parancsról </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="8"/> - <source>Options: -</source> + <source>Options:</source> <translation>Opciók </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="9"/> - <source>Specify configuration file (default: bitcoin.conf) -</source> + <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Konfigurációs fájl (alapértelmezett: bitcoin.conf) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="10"/> - <source>Specify pid file (default: bitcoind.pid) -</source> + <source>Specify pid file (default: bitcoind.pid)</source> <translation>pid-fájl (alapértelmezett: bitcoind.pid) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="11"/> - <source>Generate coins -</source> + <source>Generate coins</source> <translation>Érmék generálása </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="12"/> - <source>Don't generate coins -</source> + <source>Don't generate coins</source> <translation>Bitcoin-generálás leállítása </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="13"/> - <source>Start minimized -</source> + <source>Start minimized</source> <translation>Indítás lekicsinyítve </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="14"/> - <source>Specify data directory -</source> + <source>Specify data directory</source> <translation>Adatkönyvtár </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="15"/> - <source>Specify connection timeout (in milliseconds) -</source> + <source>Specify connection timeout (in milliseconds)</source> <translation>Csatlakozás időkerete (milliszekundumban) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="16"/> - <source>Connect through socks4 proxy -</source> + <source>Connect through socks4 proxy</source> <translation>Csatlakozás SOCKS4 proxyn keresztül </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="17"/> - <source>Allow DNS lookups for addnode and connect -</source> + <source>Allow DNS lookups for addnode and connect</source> <translation>DNS-kikeresés engedélyezése az addnode-nál és a connect-nél </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="18"/> - <source>Add a node to connect to -</source> + <source>Add a node to connect to</source> <translation>Elérendő csomópont megadása </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="19"/> - <source>Connect only to the specified node -</source> + <source>Connect only to the specified node</source> <translation>Csatlakozás csak a megadott csomóponthoz </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="20"/> - <source>Don't accept connections from outside -</source> + <source>Don't accept connections from outside</source> <translation>Külső csatlakozások elutasítása </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="21"/> - <source>Don't attempt to use UPnP to map the listening port -</source> + <source>Don't attempt to use UPnP to map the listening port</source> <translation>UPnP-használat letiltása a figyelő port feltérképezésénél </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="22"/> - <source>Attempt to use UPnP to map the listening port -</source> + <source>Attempt to use UPnP to map the listening port</source> <translation>UPnP-használat engedélyezése a figyelő port feltérképezésénél </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="23"/> - <source>Fee per KB to add to transactions you send -</source> + <source>Fee per KB to add to transactions you send</source> <translation>KB-onként felajánlandó díj az általad küldött tranzakciókhoz </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="24"/> - <source>Accept command line and JSON-RPC commands -</source> + <source>Accept command line and JSON-RPC commands</source> <translation>Parancssoros és JSON-RPC parancsok elfogadása </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="25"/> - <source>Run in the background as a daemon and accept commands -</source> + <source>Run in the background as a daemon and accept commands</source> <translation>Háttérben futtatás daemonként és parancsok elfogadása </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="26"/> - <source>Use the test network -</source> + <source>Use the test network</source> <translation>Teszthálózat használata </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="27"/> - <source>Username for JSON-RPC connections -</source> + <source>Username for JSON-RPC connections</source> <translation>Felhasználói név JSON-RPC csatlakozásokhoz </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="28"/> - <source>Password for JSON-RPC connections -</source> + <source>Password for JSON-RPC connections</source> <translation>Jelszó JSON-RPC csatlakozásokhoz </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="29"/> - <source>Listen for JSON-RPC connections on <port> (default: 8332) -</source> + <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> <translation>JSON-RPC csatlakozásokhoz figyelendő <port> (alapértelmezett: 8332) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="30"/> - <source>Allow JSON-RPC connections from specified IP address -</source> + <source>Allow JSON-RPC connections from specified IP address</source> <translation>JSON-RPC csatlakozások engedélyezése meghatározott IP-címről </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="31"/> - <source>Send commands to node running on <ip> (default: 127.0.0.1) -</source> + <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>Parancsok küldése <ip> címen működő csomóponthoz (alapértelmezett: 127.0.0.1) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="32"/> - <source>Set key pool size to <n> (default: 100) -</source> + <source>Set key pool size to <n> (default: 100)</source> <translation>Kulcskarika mérete <n> (alapértelmezett: 100) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="33"/> - <source>Rescan the block chain for missing wallet transactions -</source> + <source>Rescan the block chain for missing wallet transactions</source> <translation>Blokklánc újraszkennelése hiányzó tárca-tranzakciók után </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="34"/> <source> -SSL options: (see the Bitcoin Wiki for SSL setup instructions) -</source> +SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation> SSL-opciók: (lásd a Bitcoin Wiki SSL-beállítási instrukcióit) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="37"/> - <source>Use OpenSSL (https) for JSON-RPC connections -</source> + <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>OpenSSL (https) használata JSON-RPC csatalkozásokhoz </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="38"/> - <source>Server certificate file (default: server.cert) -</source> + <source>Server certificate file (default: server.cert)</source> <translation>Szervertanúsítvány-fájl (alapértelmezett: server.cert) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="39"/> - <source>Server private key (default: server.pem) -</source> + <source>Server private key (default: server.pem)</source> <translation>Szerver titkos kulcsa (alapértelmezett: server.pem) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="40"/> - <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) -</source> + <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation>Elfogadható rejtjelkulcsok (alapértelmezett: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH ) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="43"/> - <source>This help message -</source> + <source>This help message</source> <translation>Ez a súgó-üzenet </translation> </message> @@ -1656,8 +1620,7 @@ SSL-opciók: (lásd a Bitcoin Wiki SSL-beállítási instrukcióit) </message> <message> <location filename="../bitcoinstrings.cpp" line="48"/> - <source>Error loading addr.dat -</source> + <source>Error loading addr.dat </source> <translation>Hiba az addr.dat betöltése közben </translation> </message> @@ -1668,8 +1631,7 @@ SSL-opciók: (lásd a Bitcoin Wiki SSL-beállítási instrukcióit) </message> <message> <location filename="../bitcoinstrings.cpp" line="50"/> - <source>Error loading blkindex.dat -</source> + <source>Error loading blkindex.dat </source> <translation>Hiba a blkindex.dat betöltése közben </translation> </message> @@ -1680,22 +1642,19 @@ SSL-opciók: (lásd a Bitcoin Wiki SSL-beállítási instrukcióit) </message> <message> <location filename="../bitcoinstrings.cpp" line="52"/> - <source>Error loading wallet.dat: Wallet corrupted -</source> + <source>Error loading wallet.dat: Wallet corrupted </source> <translation>Hiba a wallet.dat betöltése közben: meghibásodott tárca </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="53"/> - <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin -</source> + <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin </source> <translation>Hiba a wallet.dat betöltése közben: ehhez a tárcához újabb verziójú Bitcoin-kliens szükséges </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="55"/> - <source>Error loading wallet.dat -</source> + <source>Error loading wallet.dat </source> <translation>Hiba a wallet.dat betöltése közben </translation> </message> diff --git a/src/qt/locale/bitcoin_it.ts b/src/qt/locale/bitcoin_it.ts index c9aa980a4d..56beb98e84 100644 --- a/src/qt/locale/bitcoin_it.ts +++ b/src/qt/locale/bitcoin_it.ts @@ -495,8 +495,7 @@ Si è sicuri di voler cifrare il portamonete?</translation> <source>Date: %1 Amount: %2 Type: %3 -Address: %4 -</source> +Address: %4</source> <translation>Data: %1 Quantità: %2 Tipo: %3 @@ -1400,248 +1399,213 @@ p, li { white-space: pre-wrap; }⏎ </message> <message> <location filename="../bitcoinstrings.cpp" line="5"/> - <source>Send command to -server or bitcoind -</source> + <source>Send command to -server or bitcoind</source> <translation>Manda il comando a -server o bitcoind </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="6"/> - <source>List commands -</source> + <source>List commands</source> <translation>Lista comandi </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="7"/> - <source>Get help for a command -</source> + <source>Get help for a command</source> <translation>Aiuto su un comando </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="8"/> - <source>Options: -</source> + <source>Options:</source> <translation>Opzioni: </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="9"/> - <source>Specify configuration file (default: bitcoin.conf) -</source> + <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Specifica il file di configurazione (di default: bitcoin.conf) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="10"/> - <source>Specify pid file (default: bitcoind.pid) -</source> + <source>Specify pid file (default: bitcoind.pid)</source> <translation>Specifica il file pid (default: bitcoind.pid) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="11"/> - <source>Generate coins -</source> + <source>Generate coins</source> <translation>Genera Bitcoin </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="12"/> - <source>Don't generate coins -</source> + <source>Don't generate coins</source> <translation>Non generare Bitcoin </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="13"/> - <source>Start minimized -</source> + <source>Start minimized</source> <translation>Parti in icona </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="14"/> - <source>Specify data directory -</source> + <source>Specify data directory</source> <translation>Specifica la cartella dati </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="15"/> - <source>Specify connection timeout (in milliseconds) -</source> + <source>Specify connection timeout (in milliseconds)</source> <translation>Specifica il timeout di connessione (in millisecondi) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="16"/> - <source>Connect through socks4 proxy -</source> + <source>Connect through socks4 proxy</source> <translation>Connessione tramite socks4 proxy </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="17"/> - <source>Allow DNS lookups for addnode and connect -</source> + <source>Allow DNS lookups for addnode and connect</source> <translation>Consenti ricerche DNS per aggiungere nodi e collegare </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="18"/> - <source>Add a node to connect to -</source> + <source>Add a node to connect to</source> <translation>Aggiungi un nodo e connetti a </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="19"/> - <source>Connect only to the specified node -</source> + <source>Connect only to the specified node</source> <translation>Connetti solo al nodo specificato </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="20"/> - <source>Don't accept connections from outside -</source> + <source>Don't accept connections from outside</source> <translation>Non accettare connessioni dall'esterno </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="21"/> - <source>Don't attempt to use UPnP to map the listening port -</source> + <source>Don't attempt to use UPnP to map the listening port</source> <translation>Non usare l'UPnP per mappare la porta </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="22"/> - <source>Attempt to use UPnP to map the listening port -</source> + <source>Attempt to use UPnP to map the listening port</source> <translation>Prova ad usare l'UPnp per mappare la porta </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="23"/> - <source>Fee per KB to add to transactions you send -</source> + <source>Fee per KB to add to transactions you send</source> <translation>Commissione al KB da aggiungere alle transazioni in uscita </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="24"/> - <source>Accept command line and JSON-RPC commands -</source> + <source>Accept command line and JSON-RPC commands</source> <translation>Accetta da linea di comando e da comandi JSON-RPC </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="25"/> - <source>Run in the background as a daemon and accept commands -</source> + <source>Run in the background as a daemon and accept commands</source> <translation>Esegui in background come demone e accetta i comandi </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="26"/> - <source>Use the test network -</source> + <source>Use the test network</source> <translation>Utilizza la rete di prova </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="27"/> - <source>Username for JSON-RPC connections -</source> + <source>Username for JSON-RPC connections</source> <translation>Nome utente per connessioni JSON-RPC </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="28"/> - <source>Password for JSON-RPC connections -</source> + <source>Password for JSON-RPC connections</source> <translation>Password per connessioni JSON-RPC </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="29"/> - <source>Listen for JSON-RPC connections on <port> (default: 8332) -</source> + <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> <translation>Attendi le connessioni JSON-RPC su <porta> (default: 8332) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="30"/> - <source>Allow JSON-RPC connections from specified IP address -</source> + <source>Allow JSON-RPC connections from specified IP address</source> <translation>Consenti connessioni JSON-RPC dall'indirizzo IP specificato </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="31"/> - <source>Send commands to node running on <ip> (default: 127.0.0.1) -</source> + <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>Inviare comandi al nodo in esecuzione su <ip> (default: 127.0.0.1) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="32"/> - <source>Set key pool size to <n> (default: 100) -</source> + <source>Set key pool size to <n> (default: 100)</source> <translation>Impostare la quantità di chiavi di riserva a <n> (default: 100) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="33"/> - <source>Rescan the block chain for missing wallet transactions -</source> + <source>Rescan the block chain for missing wallet transactions</source> <translation>Ripeti analisi della catena dei blocchi per cercare le transazioni mancanti dal portamonete </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="34"/> <source> -SSL options: (see the Bitcoin Wiki for SSL setup instructions) -</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 filename="../bitcoinstrings.cpp" line="37"/> - <source>Use OpenSSL (https) for JSON-RPC connections -</source> + <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Utilizzare OpenSSL (https) per le connessioni JSON-RPC </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="38"/> - <source>Server certificate file (default: server.cert) -</source> + <source>Server certificate file (default: server.cert)</source> <translation>File certificato del server (default: server.cert) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="39"/> - <source>Server private key (default: server.pem) -</source> + <source>Server private key (default: server.pem)</source> <translation>Chiave privata del server (default: server.pem) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="40"/> - <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) -</source> + <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation>Cifrari accettabili (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="43"/> - <source>This help message -</source> + <source>This help message</source> <translation>Questo messaggio di aiuto </translation> </message> @@ -1657,8 +1621,7 @@ Opzioni SSL: (vedi il wiki di Bitcoin per le istruzioni di configurazione SSL) </message> <message> <location filename="../bitcoinstrings.cpp" line="48"/> - <source>Error loading addr.dat -</source> + <source>Error loading addr.dat </source> <translation>Errore nel caricamento di addr.dat </translation> </message> @@ -1669,8 +1632,7 @@ Opzioni SSL: (vedi il wiki di Bitcoin per le istruzioni di configurazione SSL) </message> <message> <location filename="../bitcoinstrings.cpp" line="50"/> - <source>Error loading blkindex.dat -</source> + <source>Error loading blkindex.dat </source> <translation>Errore nel caricamento di blkindex.dat </translation> </message> @@ -1681,22 +1643,19 @@ Opzioni SSL: (vedi il wiki di Bitcoin per le istruzioni di configurazione SSL) </message> <message> <location filename="../bitcoinstrings.cpp" line="52"/> - <source>Error loading wallet.dat: Wallet corrupted -</source> + <source>Error loading wallet.dat: Wallet corrupted </source> <translation>Errore nel caricamento di wallet.dat: il portamonete è danneggiato </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="53"/> - <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin -</source> + <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin </source> <translation>Errore nel caricamento di wallet.dat: il portamonete richiede una versione più recente di Bitcoin </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="55"/> - <source>Error loading wallet.dat -</source> + <source>Error loading wallet.dat </source> <translation>Errore nel caricamento di wallet.dat </translation> </message> diff --git a/src/qt/locale/bitcoin_nb.ts b/src/qt/locale/bitcoin_nb.ts index 018bc62910..95f5e9c59f 100644 --- a/src/qt/locale/bitcoin_nb.ts +++ b/src/qt/locale/bitcoin_nb.ts @@ -318,7 +318,7 @@ Er du sikker på at du vil kryptere lommeboken?</translation> <message> <location filename="../bitcoingui.cpp" line="200"/> <source>E&xit</source> - <translation type="unfinished"/> + <translation>&Avslutt</translation> </message> <message> <location filename="../bitcoingui.cpp" line="201"/> @@ -328,7 +328,7 @@ Er du sikker på at du vil kryptere lommeboken?</translation> <message> <location filename="../bitcoingui.cpp" line="204"/> <source>&About %1</source> - <translation type="unfinished"/> + <translation> &Om %1</translation> </message> <message> <location filename="../bitcoingui.cpp" line="205"/> @@ -495,8 +495,7 @@ Er du sikker på at du vil kryptere lommeboken?</translation> <source>Date: %1 Amount: %2 Type: %3 -Address: %4 -</source> +Address: %4</source> <translation>Dato: %1 Beløp: %2 Type: %3 @@ -1399,246 +1398,211 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../bitcoinstrings.cpp" line="5"/> - <source>Send command to -server or bitcoind -</source> + <source>Send command to -server or bitcoind</source> <translation>Send kommando til -server eller bitcoind </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="6"/> - <source>List commands -</source> + <source>List commands</source> <translation>Vis liste over kommandoer </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="7"/> - <source>Get help for a command -</source> + <source>Get help for a command</source> <translation>Få hjelp til kommando </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="8"/> - <source>Options: -</source> + <source>Options:</source> <translation>Innstillinger: </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="9"/> - <source>Specify configuration file (default: bitcoin.conf) -</source> + <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Angi konfigurasjonsfil (standard: bitcoin.conf) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="10"/> - <source>Specify pid file (default: bitcoind.pid) -</source> + <source>Specify pid file (default: bitcoind.pid)</source> <translation>Angi pid-fil (standard: bitcoind.pid) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="11"/> - <source>Generate coins -</source> + <source>Generate coins</source> <translation>Generer mynter </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="12"/> - <source>Don't generate coins -</source> + <source>Don't generate coins</source> <translation>Ikke generer mynter </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="13"/> - <source>Start minimized -</source> + <source>Start minimized</source> <translation>Start minimert </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="14"/> - <source>Specify data directory -</source> + <source>Specify data directory</source> <translation>Angi mappe for data </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="15"/> - <source>Specify connection timeout (in milliseconds) -</source> + <source>Specify connection timeout (in milliseconds)</source> <translation>Angi tidsavbrudd for forbindelser (i millisekunder) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="16"/> - <source>Connect through socks4 proxy -</source> + <source>Connect through socks4 proxy</source> <translation>Koble til gjennom sock4 mellomtjener </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="17"/> - <source>Allow DNS lookups for addnode and connect -</source> + <source>Allow DNS lookups for addnode and connect</source> <translation>Tillat DNS-oppslag for addnode og connect </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="18"/> - <source>Add a node to connect to -</source> + <source>Add a node to connect to</source> <translation>Legg til node for tilkobling </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="19"/> - <source>Connect only to the specified node -</source> + <source>Connect only to the specified node</source> <translation>Koble kun til en oppgitt node </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="20"/> - <source>Don't accept connections from outside -</source> + <source>Don't accept connections from outside</source> <translation>Ikke ta imot tilkoblinger fra utsiden </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="21"/> - <source>Don't attempt to use UPnP to map the listening port -</source> + <source>Don't attempt to use UPnP to map the listening port</source> <translation>Ikke forsøk å bruke UPnP for å sette opp lytteport</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="22"/> - <source>Attempt to use UPnP to map the listening port -</source> + <source>Attempt to use UPnP to map the listening port</source> <translation>Forsøk å bruke UPnP for å sette opp lytteport</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="23"/> - <source>Fee per KB to add to transactions you send -</source> + <source>Fee per KB to add to transactions you send</source> <translation>Gebyr per KB som skal legges til transaksjoner du sender </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="24"/> - <source>Accept command line and JSON-RPC commands -</source> + <source>Accept command line and JSON-RPC commands</source> <translation>Ta imot kommandoer fra både kommandolinje og JSON-RPC </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="25"/> - <source>Run in the background as a daemon and accept commands -</source> + <source>Run in the background as a daemon and accept commands</source> <translation>Kjør som bakgrunnsprosess og ta imot kommandoer </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="26"/> - <source>Use the test network -</source> + <source>Use the test network</source> <translation>Bruk testnettet </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="27"/> - <source>Username for JSON-RPC connections -</source> + <source>Username for JSON-RPC connections</source> <translation>Brukernavn for JSON-RPC forbindelser </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="28"/> - <source>Password for JSON-RPC connections -</source> + <source>Password for JSON-RPC connections</source> <translation>Passord for JSON-RPC forbindelser </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="29"/> - <source>Listen for JSON-RPC connections on <port> (default: 8332) -</source> + <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> <translation>Lytt etter JSON-RPC forbindelser på <port> (standard: 8332) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="30"/> - <source>Allow JSON-RPC connections from specified IP address -</source> + <source>Allow JSON-RPC connections from specified IP address</source> <translation>Tillat JSON-RPC forbindelser fra oppgitt IP-adresse </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="31"/> - <source>Send commands to node running on <ip> (default: 127.0.0.1) -</source> + <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>Send kommandoer til noden som kjører på <ip> (standard: 127.0.0.1) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="32"/> - <source>Set key pool size to <n> (default: 100) -</source> + <source>Set key pool size to <n> (default: 100)</source> <translation>Sett størrelsen på lager for nye nøkler til <n> (standard: 100) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="33"/> - <source>Rescan the block chain for missing wallet transactions -</source> + <source>Rescan the block chain for missing wallet transactions</source> <translation>Se igjennom blokk-kjeden på nytt etter manglende lommebokstransaksjoner </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="34"/> <source> -SSL options: (see the Bitcoin Wiki for SSL setup instructions) -</source> +SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation>SSL innstillinger: (se Bitcoin Wikien for instruksjoner for SSL-oppsett) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="37"/> - <source>Use OpenSSL (https) for JSON-RPC connections -</source> + <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Bruk OpenSSL (https) for JSON-RPC forbindelser </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="38"/> - <source>Server certificate file (default: server.cert) -</source> + <source>Server certificate file (default: server.cert)</source> <translation>Fil for tjenersertifikat (standard: server.cert) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="39"/> - <source>Server private key (default: server.pem) -</source> + <source>Server private key (default: server.pem)</source> <translation>Privat nøkkel for tjener (standard: server.pem) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="40"/> - <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) -</source> + <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation>Akseptable krypteringsmetoder (standard: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="43"/> - <source>This help message -</source> + <source>This help message</source> <translation>Denne hjelpemeldingen </translation> </message> @@ -1654,8 +1618,7 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions) </message> <message> <location filename="../bitcoinstrings.cpp" line="48"/> - <source>Error loading addr.dat -</source> + <source>Error loading addr.dat </source> <translation>Feil ved lasting av addr.dat </translation> </message> @@ -1666,8 +1629,7 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions) </message> <message> <location filename="../bitcoinstrings.cpp" line="50"/> - <source>Error loading blkindex.dat -</source> + <source>Error loading blkindex.dat </source> <translation>Feil ved lasting av blkindex.dat </translation> </message> @@ -1678,22 +1640,19 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions) </message> <message> <location filename="../bitcoinstrings.cpp" line="52"/> - <source>Error loading wallet.dat: Wallet corrupted -</source> + <source>Error loading wallet.dat: Wallet corrupted </source> <translation>Feil ved lasting av wallet.dat: Skadde data i lommeboken </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="53"/> - <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin -</source> + <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin </source> <translation>Feil ved lasting av wallet.dat: Lommeboken krever en nyere versjon av Bitcoin </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="55"/> - <source>Error loading wallet.dat -</source> + <source>Error loading wallet.dat </source> <translation>Feil ved lasting av wallet.dat </translation> </message> @@ -2332,7 +2291,7 @@ men kommentaren vil bli blank.</translation> <message> <location filename="../bitcoin.cpp" line="145"/> <source>Bitcoin Qt</source> - <translation type="unfinished"/> + <translation>Bitcoin Qt</translation> </message> </context> </TS>
\ No newline at end of file diff --git a/src/qt/locale/bitcoin_nl.ts b/src/qt/locale/bitcoin_nl.ts index 0651775e0b..408e18d6ed 100644 --- a/src/qt/locale/bitcoin_nl.ts +++ b/src/qt/locale/bitcoin_nl.ts @@ -496,8 +496,7 @@ Bent u er zeker van uw dat u uw portemonnee wilt versleutelen?</translation> <source>Date: %1 Amount: %2 Type: %3 -Address: %4 -</source> +Address: %4</source> <translation>Datum: %1 Bedrag: %2 Type: %3 @@ -1400,247 +1399,212 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../bitcoinstrings.cpp" line="5"/> - <source>Send command to -server or bitcoind -</source> + <source>Send command to -server or bitcoind</source> <translation>Stuur commando naar -server of bitcoind </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="6"/> - <source>List commands -</source> + <source>List commands</source> <translation>List van commando's </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="7"/> - <source>Get help for a command -</source> + <source>Get help for a command</source> <translation>Toon hulp voor een commando </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="8"/> - <source>Options: -</source> + <source>Options:</source> <translation>Opties: </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="9"/> - <source>Specify configuration file (default: bitcoin.conf) -</source> + <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Specifieer configuratiebestand (standaard: bitcoin.conf) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="10"/> - <source>Specify pid file (default: bitcoind.pid) -</source> + <source>Specify pid file (default: bitcoind.pid)</source> <translation>Specifieer pid-bestand (standaard: bitcoind.pid) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="11"/> - <source>Generate coins -</source> + <source>Generate coins</source> <translation>Genereer munten </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="12"/> - <source>Don't generate coins -</source> + <source>Don't generate coins</source> <translation>Genereer geen munten </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="13"/> - <source>Start minimized -</source> + <source>Start minimized</source> <translation>Geminimaliseerd starten </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="14"/> - <source>Specify data directory -</source> + <source>Specify data directory</source> <translation>Stel datamap in </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="15"/> - <source>Specify connection timeout (in milliseconds) -</source> + <source>Specify connection timeout (in milliseconds)</source> <translation>Specificeer de time-out tijd (in milliseconden) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="16"/> - <source>Connect through socks4 proxy -</source> + <source>Connect through socks4 proxy</source> <translation>Verbind via socks4 proxy </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="17"/> - <source>Allow DNS lookups for addnode and connect -</source> + <source>Allow DNS lookups for addnode and connect</source> <translation>Sta DNS-naslag toe voor addnode en connect </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="18"/> - <source>Add a node to connect to -</source> + <source>Add a node to connect to</source> <translation>Voeg een node toe om mee te verbinden </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="19"/> - <source>Connect only to the specified node -</source> + <source>Connect only to the specified node</source> <translation>Verbind alleen met deze node </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="20"/> - <source>Don't accept connections from outside -</source> + <source>Don't accept connections from outside</source> <translation>Sta geen verbindingen van buitenaf toe </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="21"/> - <source>Don't attempt to use UPnP to map the listening port -</source> + <source>Don't attempt to use UPnP to map the listening port</source> <translation>Probeer geen UPnP te gebruiken om de poort waarop geluisterd wordt te mappen </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="22"/> - <source>Attempt to use UPnP to map the listening port -</source> + <source>Attempt to use UPnP to map the listening port</source> <translation>Probeer UPnP te gebruiken om de poort waarop geluisterd wordt te mappen </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="23"/> - <source>Fee per KB to add to transactions you send -</source> + <source>Fee per KB to add to transactions you send</source> <translation>Kosten per KB om aan transacties toe te voegen die u verstuurt </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="24"/> - <source>Accept command line and JSON-RPC commands -</source> + <source>Accept command line and JSON-RPC commands</source> <translation>Aanvaard commandoregel en JSON-RPC commando's </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="25"/> - <source>Run in the background as a daemon and accept commands -</source> + <source>Run in the background as a daemon and accept commands</source> <translation>Draai in de achtergrond als daemon en aanvaard commando's </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="26"/> - <source>Use the test network -</source> + <source>Use the test network</source> <translation>Gebruik het testnetwerk </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="27"/> - <source>Username for JSON-RPC connections -</source> + <source>Username for JSON-RPC connections</source> <translation>Gebruikersnaam voor JSON-RPC verbindingen </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="28"/> - <source>Password for JSON-RPC connections -</source> + <source>Password for JSON-RPC connections</source> <translation>Wachtwoord voor JSON-RPC verbindingen </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="29"/> - <source>Listen for JSON-RPC connections on <port> (default: 8332) -</source> + <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> <translation>Luister voor JSON-RPC verbindingen op <poort> (standaard: 8332) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="30"/> - <source>Allow JSON-RPC connections from specified IP address -</source> + <source>Allow JSON-RPC connections from specified IP address</source> <translation>Sta JSON-RPC verbindingen van opgegeven IP adres toe </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="31"/> - <source>Send commands to node running on <ip> (default: 127.0.0.1) -</source> + <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>Verstuur commando's naar proces dat op <ip> draait (standaard: 127.0.0.1) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="32"/> - <source>Set key pool size to <n> (default: 100) -</source> + <source>Set key pool size to <n> (default: 100)</source> <translation>Stel sleutelpoelgrootte in op <n> (standaard: 100) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="33"/> - <source>Rescan the block chain for missing wallet transactions -</source> + <source>Rescan the block chain for missing wallet transactions</source> <translation>Doorzoek de blokkenketting op ontbrekende portemonnee-transacties </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="34"/> <source> -SSL options: (see the Bitcoin Wiki for SSL setup instructions) -</source> +SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation> SSL opties: (zie de Bitcoin wiki voor SSL instructies) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="37"/> - <source>Use OpenSSL (https) for JSON-RPC connections -</source> + <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Gebruik OpenSSL (https) voor JSON-RPC verbindingen </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="38"/> - <source>Server certificate file (default: server.cert) -</source> + <source>Server certificate file (default: server.cert)</source> <translation>Certificaat-bestand voor server (standaard: server.cert) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="39"/> - <source>Server private key (default: server.pem) -</source> + <source>Server private key (default: server.pem)</source> <translation>Geheime sleutel voor server (standaard: server.pem) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="40"/> - <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) -</source> + <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation>Aanvaardbare ciphers (standaard: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="43"/> - <source>This help message -</source> + <source>This help message</source> <translation>Dit helpbericht </translation> </message> @@ -1656,8 +1620,7 @@ SSL opties: (zie de Bitcoin wiki voor SSL instructies) </message> <message> <location filename="../bitcoinstrings.cpp" line="48"/> - <source>Error loading addr.dat -</source> + <source>Error loading addr.dat </source> <translation>Fout bij laden van bestand addr.dat </translation> </message> @@ -1668,8 +1631,7 @@ SSL opties: (zie de Bitcoin wiki voor SSL instructies) </message> <message> <location filename="../bitcoinstrings.cpp" line="50"/> - <source>Error loading blkindex.dat -</source> + <source>Error loading blkindex.dat </source> <translation>Fout bij laden van bestand addr.dat </translation> </message> @@ -1680,21 +1642,18 @@ SSL opties: (zie de Bitcoin wiki voor SSL instructies) </message> <message> <location filename="../bitcoinstrings.cpp" line="52"/> - <source>Error loading wallet.dat: Wallet corrupted -</source> + <source>Error loading wallet.dat: Wallet corrupted </source> <translation>Fout bij het laden van wallet.dat: Portemonnee corrupt </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="53"/> - <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin -</source> + <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin </source> <translation>Fout bij het laden van wallet.dat: Portemonnee vereist nieuwere versie van Bitcoin</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="55"/> - <source>Error loading wallet.dat -</source> + <source>Error loading wallet.dat </source> <translation>Fout bij laden van bestand wallet.dat </translation> </message> diff --git a/src/qt/locale/bitcoin_pt_BR.ts b/src/qt/locale/bitcoin_pt_BR.ts new file mode 100644 index 0000000000..13263de865 --- /dev/null +++ b/src/qt/locale/bitcoin_pt_BR.ts @@ -0,0 +1,2292 @@ +<?xml version="1.0" ?><!DOCTYPE TS><TS language="pt_BR" version="2.0"> +<defaultcodec>UTF-8</defaultcodec> +<context> + <name>AboutDialog</name> + <message> + <location filename="../forms/aboutdialog.ui" line="14"/> + <source>About Bitcoin</source> + <translation>Sobre o Bitcoin</translation> + </message> + <message> + <location filename="../forms/aboutdialog.ui" line="53"/> + <source><b>Bitcoin</b> version</source> + <translation><b>Bitcoin</b> versão</translation> + </message> + <message> + <location filename="../forms/aboutdialog.ui" line="85"/> + <source>Copyright © 2009-2011 Bitcoin Developers + +This is experimental software. + +Distributed under the MIT/X11 software license, see the accompanying file license.txt or http://www.opensource.org/licenses/mit-license.php. + +This product includes software developed by the OpenSSL Project for use in the 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> +</context> +<context> + <name>AddressBookPage</name> + <message> + <location filename="../forms/addressbookpage.ui" line="14"/> + <source>Address Book</source> + <translation>Catálogo de endereços</translation> + </message> + <message> + <location filename="../forms/addressbookpage.ui" line="20"/> + <source>These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you.</source> + <translation>Estes são os seus endereços Bitcoin para receber pagamentos. Você pode querer enviar um endereço diferente para cada remetente, para acompanhar quem está pagando.</translation> + </message> + <message> + <location filename="../forms/addressbookpage.ui" line="33"/> + <source>Double-click to edit address or label</source> + <translation>Clique duas vezes para editar o endereço ou o etiqueta</translation> + </message> + <message> + <location filename="../forms/addressbookpage.ui" line="57"/> + <source>Create a new address</source> + <translation>Criar um novo endereço</translation> + </message> + <message> + <location filename="../forms/addressbookpage.ui" line="60"/> + <source>&New Address...</source> + <translation>&amp; Novo endereço ...</translation> + </message> + <message> + <location filename="../forms/addressbookpage.ui" line="71"/> + <source>Copy the currently selected address to the system clipboard</source> + <translation>Copie o endereço selecionado para a área de transferência do sistema</translation> + </message> + <message> + <location filename="../forms/addressbookpage.ui" line="74"/> + <source>&Copy to Clipboard</source> + <translation>&amp; Copie para a área de transferência do sistema</translation> + </message> + <message> + <location filename="../forms/addressbookpage.ui" line="85"/> + <source>Delete the currently selected address from the list. Only sending addresses can be deleted.</source> + <translation>Excluir o endereço selecionado da lista. Apenas endereços de envio podem ser excluídos.</translation> + </message> + <message> + <location filename="../forms/addressbookpage.ui" line="88"/> + <source>&Delete</source> + <translation>&amp; Excluir</translation> + </message> + <message> + <location filename="../addressbookpage.cpp" line="204"/> + <source>Export Address Book Data</source> + <translation>Exportação de dados do Catálogo de Endereços</translation> + </message> + <message> + <location filename="../addressbookpage.cpp" line="206"/> + <source>Comma separated file (*.csv)</source> + <translation>Arquivo separado por vírgulas (*. csv)</translation> + </message> + <message> + <location filename="../addressbookpage.cpp" line="219"/> + <source>Error exporting</source> + <translation>Erro ao exportar</translation> + </message> + <message> + <location filename="../addressbookpage.cpp" line="219"/> + <source>Could not write to file %1.</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>AddressTableModel</name> + <message> + <location filename="../addresstablemodel.cpp" line="77"/> + <source>Label</source> + <translation>Rótulo</translation> + </message> + <message> + <location filename="../addresstablemodel.cpp" line="77"/> + <source>Address</source> + <translation>Endereço</translation> + </message> + <message> + <location filename="../addresstablemodel.cpp" line="113"/> + <source>(no label)</source> + <translation>(Sem rótulo)</translation> + </message> +</context> +<context> + <name>AskPassphraseDialog</name> + <message> + <location filename="../forms/askpassphrasedialog.ui" line="26"/> + <source>Dialog</source> + <translation>Diálogo</translation> + </message> + <message> + <location filename="../forms/askpassphrasedialog.ui" line="32"/> + <source>TextLabel</source> + <translation>TextoDoRótulo</translation> + </message> + <message> + <location filename="../forms/askpassphrasedialog.ui" line="47"/> + <source>Enter passphrase</source> + <translation>Digite a frase de segurança</translation> + </message> + <message> + <location filename="../forms/askpassphrasedialog.ui" line="61"/> + <source>New passphrase</source> + <translation>Nova frase de segurança</translation> + </message> + <message> + <location filename="../forms/askpassphrasedialog.ui" line="75"/> + <source>Repeat new passphrase</source> + <translation>Repita a nova frase de segurança</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="26"/> + <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>Digite 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> + <message> + <location filename="../askpassphrasedialog.cpp" line="27"/> + <source>Encrypt wallet</source> + <translation>Criptografar carteira</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="30"/> + <source>This operation needs your wallet passphrase to unlock the wallet.</source> + <translation>Esta operação precisa de sua frase de segurança para desbloquear a carteira.</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="35"/> + <source>Unlock wallet</source> + <translation>Desbloquear carteira</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="38"/> + <source>This operation needs your wallet passphrase to decrypt the wallet.</source> + <translation>Esta operação precisa de sua frase de segurança para descriptografar a carteira.</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="43"/> + <source>Decrypt wallet</source> + <translation>Descriptografar carteira</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="46"/> + <source>Change passphrase</source> + <translation>Alterar frase de segurança</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="47"/> + <source>Enter the old and new passphrase to the wallet.</source> + <translation>Digite a frase de segurança antiga e nova para a carteira.</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="91"/> + <source>Confirm wallet encryption</source> + <translation>Confirmar criptografia da carteira</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="92"/> + <source>WARNING: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>! +Are you sure you wish to encrypt your wallet?</source> + <translation>AVISO: Se você criptografar sua carteira e perder sua senha, você vai <b>perder todos os seus BITCOINS!</b> Tem certeza de que deseja criptografar sua carteira?</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="101"/> + <location filename="../askpassphrasedialog.cpp" line="149"/> + <source>Wallet encrypted</source> + <translation>Carteira criptografada</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="102"/> + <source>Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> + <translation>Lembre-se que sua carteira criptografada não poderá proteger totalmente os seus bitcoins de serem roubados por softwares maldosos que infectem seu computador.</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="106"/> + <location filename="../askpassphrasedialog.cpp" line="113"/> + <location filename="../askpassphrasedialog.cpp" line="155"/> + <location filename="../askpassphrasedialog.cpp" line="161"/> + <source>Wallet encryption failed</source> + <translation>A criptografia da carteira falhou</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="107"/> + <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> + <translation>A criptografia da carteira falhou devido a um erro interno. Sua carteira não estava criptografada.</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="114"/> + <location filename="../askpassphrasedialog.cpp" line="162"/> + <source>The supplied passphrases do not match.</source> + <translation>A frase de segurança fornecida não confere.</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="125"/> + <source>Wallet unlock failed</source> + <translation>A abertura da carteira falhou</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="126"/> + <location filename="../askpassphrasedialog.cpp" line="137"/> + <location filename="../askpassphrasedialog.cpp" line="156"/> + <source>The passphrase entered for the wallet decryption was incorrect.</source> + <translation>A frase de segurança digitada para a descriptografia da carteira estava incorreta.</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="136"/> + <source>Wallet decryption failed</source> + <translation>A descriptografia da carteira falhou</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="150"/> + <source>Wallet passphrase was succesfully changed.</source> + <translation>A frase de segurança da carteira foi alterada com êxito.</translation> + </message> +</context> +<context> + <name>BitcoinGUI</name> + <message> + <location filename="../bitcoingui.cpp" line="63"/> + <source>Bitcoin Wallet</source> + <translation>Carteira Bitcoin</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="132"/> + <source>Synchronizing with network...</source> + <translation>Sincronizando com a rede...</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="135"/> + <source>Block chain synchronization in progress</source> + <translation>Sincronização da corrente de blocos em andamento</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="164"/> + <source>&Overview</source> + <translation>&Visão geral</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="165"/> + <source>Show general overview of wallet</source> + <translation>Mostrar visão geral da carteira</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="170"/> + <source>&Transactions</source> + <translation>&Transações</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="171"/> + <source>Browse transaction history</source> + <translation>Navegar pelo histórico de transações</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="176"/> + <source>&Address Book</source> + <translation>&Catálogo de endereços</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="177"/> + <source>Edit the list of stored addresses and labels</source> + <translation>Editar a lista de endereços e rótulos</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="182"/> + <source>&Receive coins</source> + <translation>&Receber moedas</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="183"/> + <source>Show the list of addresses for receiving payments</source> + <translation>Mostrar a lista de endereços para receber pagamentos</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="188"/> + <source>&Send coins</source> + <translation>&Enviar moedas</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="189"/> + <source>Send coins to a bitcoin address</source> + <translation>Enviar moedas para um endereço bitcoin</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="200"/> + <source>E&xit</source> + <translation>E&xit</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="201"/> + <source>Quit application</source> + <translation>Sair da aplicação</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="204"/> + <source>&About %1</source> + <translation>&About %1</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="205"/> + <source>Show information about Bitcoin</source> + <translation>Mostrar informação sobre Bitcoin</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="207"/> + <source>&Options...</source> + <translation>&Opções...</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="208"/> + <source>Modify configuration options for bitcoin</source> + <translation>Modificar opções de configuração para bitcoin</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="210"/> + <source>Open &Bitcoin</source> + <translation>Abrir &Bitcoin</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="211"/> + <source>Show the Bitcoin window</source> + <translation>Mostrar a janela Bitcoin</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="212"/> + <source>&Export...</source> + <translation>&Exportar...</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="213"/> + <source>Export the current view to a file</source> + <translation>Export para arquivo</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="214"/> + <source>&Encrypt Wallet</source> + <translation>&Criptografar Carteira</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="215"/> + <source>Encrypt or decrypt wallet</source> + <translation>Criptografar ou decriptogravar carteira</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="217"/> + <source>&Change Passphrase</source> + <translation>&Mudar frase de segurança</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="218"/> + <source>Change the passphrase used for wallet encryption</source> + <translation>Mudar a frase de segurança utilizada na criptografia da carteira</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="239"/> + <source>&File</source> + <translation>&amp; Arquivo</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="242"/> + <source>&Settings</source> + <translation>E configurações</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="248"/> + <source>&Help</source> + <translation>&amp; Ajuda</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="254"/> + <source>Tabs toolbar</source> + <translation>Barra de ferramentas</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="262"/> + <source>Actions toolbar</source> + <translation>Barra de ações</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="273"/> + <source>[testnet]</source> + <translation>[testnet]</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="355"/> + <source>bitcoin-qt</source> + <translation>bitcoin-qt</translation> + </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="396"/> + <source>%n active connection(s) to Bitcoin network</source> + <translation><numerusform>%n conexão ativa na rede Bitcoin</numerusform><numerusform>%n conexões ativas na rede Bitcoin</numerusform></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="411"/> + <source>Downloaded %1 of %2 blocks of transaction history.</source> + <translation>Carregados %1 de %2 blocos do histórico de transações.</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="417"/> + <source>Downloaded %1 blocks of transaction history.</source> + <translation>Carregados %1 blocos do histórico de transações.</translation> + </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="428"/> + <source>%n second(s) ago</source> + <translation><numerusform>%n segundo atrás</numerusform><numerusform>%n segundos atrás</numerusform></translation> + </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="432"/> + <source>%n minute(s) ago</source> + <translation><numerusform>%n minutos atrás</numerusform><numerusform>%n minutos atrás</numerusform></translation> + </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="436"/> + <source>%n hour(s) ago</source> + <translation><numerusform>%n hora atrás</numerusform><numerusform>%n horas atrás</numerusform></translation> + </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="440"/> + <source>%n day(s) ago</source> + <translation><numerusform>%n dia atrás</numerusform><numerusform>%n dias atrás</numerusform></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="446"/> + <source>Up to date</source> + <translation>Atualizado</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="451"/> + <source>Catching up...</source> + <translation>Recuperando o atraso ...</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="457"/> + <source>Last received block was generated %1.</source> + <translation>Last received block was generated %1.</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="508"/> + <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source> + <translation>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="513"/> + <source>Sending...</source> + <translation>Sending...</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="538"/> + <source>Sent transaction</source> + <translation>Sent transaction</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="539"/> + <source>Incoming transaction</source> + <translation>Incoming transaction</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="540"/> + <source>Date: %1 +Amount: %2 +Type: %3 +Address: %4</source> + <translation>Date: %1 +Amount: %2 +Type: %3 +Address: %4 +</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="639"/> + <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> + <message> + <location filename="../bitcoingui.cpp" line="647"/> + <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> + <translation>Wallet is <b>encrypted</b> and currently <b>locked</b></translation> + </message> +</context> +<context> + <name>DisplayOptionsPage</name> + <message> + <location filename="../optionsdialog.cpp" line="270"/> + <source>&Unit to show amounts in: </source> + <translation>&Unit to show amounts in: </translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="274"/> + <source>Choose the default subdivision unit to show in the interface, and when sending coins</source> + <translation>Choose the default subdivision unit to show in the interface, and when sending coins</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="281"/> + <source>Display addresses in transaction list</source> + <translation>Display addresses in transaction list</translation> + </message> +</context> +<context> + <name>EditAddressDialog</name> + <message> + <location filename="../forms/editaddressdialog.ui" line="14"/> + <source>Edit Address</source> + <translation>Edit Address</translation> + </message> + <message> + <location filename="../forms/editaddressdialog.ui" line="25"/> + <source>&Label</source> + <translation>&Label</translation> + </message> + <message> + <location filename="../forms/editaddressdialog.ui" line="35"/> + <source>The label associated with this address book entry</source> + <translation>The label associated with this address book entry</translation> + </message> + <message> + <location filename="../forms/editaddressdialog.ui" line="42"/> + <source>&Address</source> + <translation>&Address</translation> + </message> + <message> + <location filename="../forms/editaddressdialog.ui" line="52"/> + <source>The address associated with this address book entry. This can only be modified for sending addresses.</source> + <translation>The address associated with this address book entry. This can only be modified for sending addresses.</translation> + </message> + <message> + <location filename="../editaddressdialog.cpp" line="20"/> + <source>New receiving address</source> + <translation>New receiving address</translation> + </message> + <message> + <location filename="../editaddressdialog.cpp" line="24"/> + <source>New sending address</source> + <translation>New sending address</translation> + </message> + <message> + <location filename="../editaddressdialog.cpp" line="27"/> + <source>Edit receiving address</source> + <translation>Edit receiving address</translation> + </message> + <message> + <location filename="../editaddressdialog.cpp" line="31"/> + <source>Edit sending address</source> + <translation>Edit sending address</translation> + </message> + <message> + <location filename="../editaddressdialog.cpp" line="87"/> + <source>The entered address "%1" is already in the address book.</source> + <translation>The entered address "%1" is already in the address book.</translation> + </message> + <message> + <location filename="../editaddressdialog.cpp" line="92"/> + <source>The entered address "%1" is not a valid bitcoin address.</source> + <translation>The entered address "%1" is not a valid bitcoin address.</translation> + </message> + <message> + <location filename="../editaddressdialog.cpp" line="97"/> + <source>Could not unlock wallet.</source> + <translation>Could not unlock wallet.</translation> + </message> + <message> + <location filename="../editaddressdialog.cpp" line="102"/> + <source>New key generation failed.</source> + <translation>New key generation failed.</translation> + </message> +</context> +<context> + <name>MainOptionsPage</name> + <message> + <location filename="../optionsdialog.cpp" line="170"/> + <source>&Start Bitcoin on window system startup</source> + <translation>&Start Bitcoin on window system startup</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="171"/> + <source>Automatically start Bitcoin after the computer is turned on</source> + <translation>Automatically start Bitcoin after the computer is turned on</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="175"/> + <source>&Minimize to the tray instead of the taskbar</source> + <translation>&Minimize to the tray instead of the taskbar</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="176"/> + <source>Show only a tray icon after minimizing the window</source> + <translation>Show only a tray icon after minimizing the window</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="180"/> + <source>Map port using &UPnP</source> + <translation>Map port using &UPnP</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="181"/> + <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> + <translation>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="185"/> + <source>M&inimize on close</source> + <translation>M&inimize on close</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="186"/> + <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>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.</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="190"/> + <source>&Connect through SOCKS4 proxy:</source> + <translation>&Connect through SOCKS4 proxy:</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="191"/> + <source>Connect to the Bitcon network through a SOCKS4 proxy (e.g. when connecting through Tor)</source> + <translation>Connect to the Bitcon network through a SOCKS4 proxy (e.g. when connecting through Tor)</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="196"/> + <source>Proxy &IP: </source> + <translation>Proxy &IP: </translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="202"/> + <source>IP address of the proxy (e.g. 127.0.0.1)</source> + <translation>IP address of the proxy (e.g. 127.0.0.1)</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="205"/> + <source>&Port: </source> + <translation>&Port: </translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="211"/> + <source>Port of the proxy (e.g. 1234)</source> + <translation>Port of the proxy (e.g. 1234)</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="217"/> + <source>Optional transaction fee per KB that helps make sure your transactions are processed quickly. Most transactions are 1KB. Fee 0.01 recommended.</source> + <translation>Optional transaction fee per KB that helps make sure your transactions are processed quickly. Most transactions are 1KB. Fee 0.01 recommended.</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="223"/> + <source>Pay transaction &fee</source> + <translation>Pay transaction &fee</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="226"/> + <source>Optional transaction fee per KB that helps make sure your transactions are processed quickly. Most transactions are 1KB. Fee 0.01 recommended.</source> + <translation>Optional transaction fee per KB that helps make sure your transactions are processed quickly. Most transactions are 1KB. Fee 0.01 recommended.</translation> + </message> +</context> +<context> + <name>OptionsDialog</name> + <message> + <location filename="../optionsdialog.cpp" line="79"/> + <source>Main</source> + <translation>Main</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="84"/> + <source>Display</source> + <translation>Display</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="104"/> + <source>Options</source> + <translation>Options</translation> + </message> +</context> +<context> + <name>OverviewPage</name> + <message> + <location filename="../forms/overviewpage.ui" line="14"/> + <source>Form</source> + <translation>Form</translation> + </message> + <message> + <location filename="../forms/overviewpage.ui" line="40"/> + <source>Balance:</source> + <translation>Balance:</translation> + </message> + <message> + <location filename="../forms/overviewpage.ui" line="47"/> + <source>123.456 BTC</source> + <translation>123.456 BTC</translation> + </message> + <message> + <location filename="../forms/overviewpage.ui" line="54"/> + <source>Number of transactions:</source> + <translation>Number of transactions:</translation> + </message> + <message> + <location filename="../forms/overviewpage.ui" line="61"/> + <source>0</source> + <translation>0</translation> + </message> + <message> + <location filename="../forms/overviewpage.ui" line="68"/> + <source>Unconfirmed:</source> + <translation>Unconfirmed:</translation> + </message> + <message> + <location filename="../forms/overviewpage.ui" line="75"/> + <source>0 BTC</source> + <translation>0 BTC</translation> + </message> + <message> + <location filename="../forms/overviewpage.ui" line="82"/> + <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Wallet</span></p></body></html></source> + <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Wallet</span></p></body></html></translation> + </message> + <message> + <location filename="../forms/overviewpage.ui" line="122"/> + <source><b>Recent transactions</b></source> + <translation><b>Recent transactions</b></translation> + </message> + <message> + <location filename="../overviewpage.cpp" line="103"/> + <source>Your current balance</source> + <translation>Your current balance</translation> + </message> + <message> + <location filename="../overviewpage.cpp" line="108"/> + <source>Total of transactions that have yet to be confirmed, and do not yet count toward the current balance</source> + <translation>Total of transactions that have yet to be confirmed, and do not yet count toward the current balance</translation> + </message> + <message> + <location filename="../overviewpage.cpp" line="111"/> + <source>Total number of transactions in wallet</source> + <translation>Total number of transactions in wallet</translation> + </message> +</context> +<context> + <name>SendCoinsDialog</name> + <message> + <location filename="../forms/sendcoinsdialog.ui" line="14"/> + <location filename="../sendcoinsdialog.cpp" line="109"/> + <location filename="../sendcoinsdialog.cpp" line="114"/> + <location filename="../sendcoinsdialog.cpp" line="119"/> + <location filename="../sendcoinsdialog.cpp" line="124"/> + <location filename="../sendcoinsdialog.cpp" line="130"/> + <location filename="../sendcoinsdialog.cpp" line="135"/> + <location filename="../sendcoinsdialog.cpp" line="140"/> + <source>Send Coins</source> + <translation>Send Coins</translation> + </message> + <message> + <location filename="../forms/sendcoinsdialog.ui" line="64"/> + <source>Send to multiple recipients at once</source> + <translation>Send to multiple recipients at once</translation> + </message> + <message> + <location filename="../forms/sendcoinsdialog.ui" line="67"/> + <source>&Add recipient...</source> + <translation>&Add recipient...</translation> + </message> + <message> + <location filename="../forms/sendcoinsdialog.ui" line="84"/> + <source>Clear all</source> + <translation>Clear all</translation> + </message> + <message> + <location filename="../forms/sendcoinsdialog.ui" line="103"/> + <source>Balance:</source> + <translation>Balance:</translation> + </message> + <message> + <location filename="../forms/sendcoinsdialog.ui" line="110"/> + <source>123.456 BTC</source> + <translation>123.456 BTC</translation> + </message> + <message> + <location filename="../forms/sendcoinsdialog.ui" line="141"/> + <source>Confirm the send action</source> + <translation>Confirm the send action</translation> + </message> + <message> + <location filename="../forms/sendcoinsdialog.ui" line="144"/> + <source>&Send</source> + <translation>&Send</translation> + </message> + <message> + <location filename="../sendcoinsdialog.cpp" line="85"/> + <source><b>%1</b> to %2 (%3)</source> + <translation><b>%1</b> to %2 (%3)</translation> + </message> + <message> + <location filename="../sendcoinsdialog.cpp" line="88"/> + <source>Confirm send coins</source> + <translation>Confirm send coins</translation> + </message> + <message> + <location filename="../sendcoinsdialog.cpp" line="89"/> + <source>Are you sure you want to send %1?</source> + <translation>Are you sure you want to send %1?</translation> + </message> + <message> + <location filename="../sendcoinsdialog.cpp" line="89"/> + <source> and </source> + <translation> and </translation> + </message> + <message> + <location filename="../sendcoinsdialog.cpp" line="110"/> + <source>The recepient address is not valid, please recheck.</source> + <translation>The recepient address is not valid, please recheck.</translation> + </message> + <message> + <location filename="../sendcoinsdialog.cpp" line="115"/> + <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 filename="../sendcoinsdialog.cpp" line="120"/> + <source>Amount exceeds your balance</source> + <translation>Amount exceeds your balance</translation> + </message> + <message> + <location filename="../sendcoinsdialog.cpp" line="125"/> + <source>Total exceeds your balance when the %1 transaction fee is included</source> + <translation>Total exceeds your balance when the %1 transaction fee is included</translation> + </message> + <message> + <location filename="../sendcoinsdialog.cpp" line="131"/> + <source>Duplicate address found, can only send to each address once in one send operation</source> + <translation>Duplicate address found, can only send to each address once in one send operation</translation> + </message> + <message> + <location filename="../sendcoinsdialog.cpp" line="136"/> + <source>Error: Transaction creation failed </source> + <translation>Error: Transaction creation failed </translation> + </message> + <message> + <location filename="../sendcoinsdialog.cpp" line="141"/> + <source>Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> + <translation>Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</translation> + </message> +</context> +<context> + <name>SendCoinsEntry</name> + <message> + <location filename="../forms/sendcoinsentry.ui" line="14"/> + <source>Form</source> + <translation>Form</translation> + </message> + <message> + <location filename="../forms/sendcoinsentry.ui" line="29"/> + <source>A&mount:</source> + <translation>A&mount:</translation> + </message> + <message> + <location filename="../forms/sendcoinsentry.ui" line="42"/> + <source>Pay &To:</source> + <translation>Pay &To:</translation> + </message> + <message> + <location filename="../forms/sendcoinsentry.ui" line="66"/> + <location filename="../sendcoinsentry.cpp" line="26"/> + <source>Enter a label for this address to add it to your address book</source> + <translation>Enter a label for this address to add it to your address book</translation> + </message> + <message> + <location filename="../forms/sendcoinsentry.ui" line="75"/> + <source>&Label:</source> + <translation>&Label:</translation> + </message> + <message> + <location filename="../forms/sendcoinsentry.ui" line="93"/> + <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="../forms/sendcoinsentry.ui" line="103"/> + <source>Choose adress from address book</source> + <translation>Choose adress from address book</translation> + </message> + <message> + <location filename="../forms/sendcoinsentry.ui" line="113"/> + <source>Alt+A</source> + <translation>Alt+A</translation> + </message> + <message> + <location filename="../forms/sendcoinsentry.ui" line="120"/> + <source>Paste address from clipboard</source> + <translation>Paste address from clipboard</translation> + </message> + <message> + <location filename="../forms/sendcoinsentry.ui" line="130"/> + <source>Alt+P</source> + <translation>Alt+P</translation> + </message> + <message> + <location filename="../forms/sendcoinsentry.ui" line="137"/> + <source>Remove this recipient</source> + <translation>Remove this recipient</translation> + </message> + <message> + <location filename="../sendcoinsentry.cpp" line="25"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> +</context> +<context> + <name>TransactionDesc</name> + <message> + <location filename="../transactiondesc.cpp" line="34"/> + <source>Open for %1 blocks</source> + <translation>Open for %1 blocks</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="36"/> + <source>Open until %1</source> + <translation>Open until %1</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="42"/> + <source>%1/offline?</source> + <translation>%1/offline?</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="44"/> + <source>%1/unconfirmed</source> + <translation>%1/unconfirmed</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="46"/> + <source>%1 confirmations</source> + <translation>%1 confirmations</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="63"/> + <source><b>Status:</b> </source> + <translation><b>Status:</b> </translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="68"/> + <source>, has not been successfully broadcast yet</source> + <translation>, has not been successfully broadcast yet</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="70"/> + <source>, broadcast through %1 node</source> + <translation>, broadcast through %1 node</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="72"/> + <source>, broadcast through %1 nodes</source> + <translation>, broadcast through %1 nodes</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="76"/> + <source><b>Date:</b> </source> + <translation><b>Date:</b> </translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="83"/> + <source><b>Source:</b> Generated<br></source> + <translation><b>Source:</b> Generated<br></translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="89"/> + <location filename="../transactiondesc.cpp" line="106"/> + <source><b>From:</b> </source> + <translation><b>From:</b> </translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="106"/> + <source>unknown</source> + <translation>unknown</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="107"/> + <location filename="../transactiondesc.cpp" line="130"/> + <location filename="../transactiondesc.cpp" line="189"/> + <source><b>To:</b> </source> + <translation><b>To:</b> </translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="110"/> + <source> (yours, label: </source> + <translation> (yours, label: </translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="112"/> + <source> (yours)</source> + <translation> (yours)</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="147"/> + <location filename="../transactiondesc.cpp" line="161"/> + <location filename="../transactiondesc.cpp" line="206"/> + <location filename="../transactiondesc.cpp" line="223"/> + <source><b>Credit:</b> </source> + <translation><b>Credit:</b> </translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="149"/> + <source>(%1 matures in %2 more blocks)</source> + <translation>(%1 matures in %2 more blocks)</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="153"/> + <source>(not accepted)</source> + <translation>(not accepted)</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="197"/> + <location filename="../transactiondesc.cpp" line="205"/> + <location filename="../transactiondesc.cpp" line="220"/> + <source><b>Debit:</b> </source> + <translation><b>Debit:</b> </translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="211"/> + <source><b>Transaction fee:</b> </source> + <translation><b>Transaction fee:</b> </translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="227"/> + <source><b>Net amount:</b> </source> + <translation><b>Net amount:</b> </translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="233"/> + <source>Message:</source> + <translation>Message:</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="235"/> + <source>Comment:</source> + <translation>Comment:</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="238"/> + <source>Generated coins must wait 120 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, it will change to "not accepted" and not be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source> + <translation>Generated coins must wait 120 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, it will change to "not accepted" and not be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</translation> + </message> +</context> +<context> + <name>TransactionDescDialog</name> + <message> + <location filename="../forms/transactiondescdialog.ui" line="14"/> + <source>Transaction details</source> + <translation>Transaction details</translation> + </message> + <message> + <location filename="../forms/transactiondescdialog.ui" line="20"/> + <source>This pane shows a detailed description of the transaction</source> + <translation>This pane shows a detailed description of the transaction</translation> + </message> +</context> +<context> + <name>TransactionTableModel</name> + <message> + <location filename="../transactiontablemodel.cpp" line="213"/> + <source>Date</source> + <translation>Date</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="213"/> + <source>Type</source> + <translation>Type</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="213"/> + <source>Address</source> + <translation>Address</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="213"/> + <source>Amount</source> + <translation>Amount</translation> + </message> + <message numerus="yes"> + <location filename="../transactiontablemodel.cpp" line="274"/> + <source>Open for %n block(s)</source> + <translation><numerusform>Open for %n block</numerusform><numerusform>Open for %n blocks</numerusform></translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="277"/> + <source>Open until %1</source> + <translation>Open until %1</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="280"/> + <source>Offline (%1 confirmations)</source> + <translation>Offline (%1 confirmations)</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="283"/> + <source>Unconfirmed (%1 of %2 confirmations)</source> + <translation>Unconfirmed (%1 of %2 confirmations)</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="286"/> + <source>Confirmed (%1 confirmations)</source> + <translation>Confirmed (%1 confirmations)</translation> + </message> + <message numerus="yes"> + <location filename="../transactiontablemodel.cpp" line="295"/> + <source>Mined balance will be available in %n more blocks</source> + <translation><numerusform>Mined balance will be available in %n more block</numerusform><numerusform>Mined balance will be available in %n more blocks</numerusform></translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="301"/> + <source>This block was not received by any other nodes and will probably not be accepted!</source> + <translation>This block was not received by any other nodes and will probably not be accepted!</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="304"/> + <source>Generated but not accepted</source> + <translation>Generated but not accepted</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="347"/> + <source>Received with</source> + <translation>Received with</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="349"/> + <source>Received from IP</source> + <translation>Received from IP</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="351"/> + <source>Sent to</source> + <translation>Sent to</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="353"/> + <source>Sent to IP</source> + <translation>Sent to IP</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="355"/> + <source>Payment to yourself</source> + <translation>Payment to yourself</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="357"/> + <source>Mined</source> + <translation>Mined</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="395"/> + <source>(n/a)</source> + <translation>(n/a)</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="594"/> + <source>Transaction status. Hover over this field to show number of confirmations.</source> + <translation>Transaction status. Hover over this field to show number of confirmations.</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="596"/> + <source>Date and time that the transaction was received.</source> + <translation>Date and time that the transaction was received.</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="598"/> + <source>Type of transaction.</source> + <translation>Type of transaction.</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="600"/> + <source>Destination address of transaction.</source> + <translation>Destination address of transaction.</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="602"/> + <source>Amount removed from or added to balance.</source> + <translation>Amount removed from or added to balance.</translation> + </message> +</context> +<context> + <name>TransactionView</name> + <message> + <location filename="../transactionview.cpp" line="55"/> + <location filename="../transactionview.cpp" line="71"/> + <source>All</source> + <translation>All</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="56"/> + <source>Today</source> + <translation>Today</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="57"/> + <source>This week</source> + <translation>This week</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="58"/> + <source>This month</source> + <translation>This month</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="59"/> + <source>Last month</source> + <translation>Last month</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="60"/> + <source>This year</source> + <translation>This year</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="61"/> + <source>Range...</source> + <translation>Range...</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="72"/> + <source>Received with</source> + <translation>Received with</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="74"/> + <source>Sent to</source> + <translation>Sent to</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="76"/> + <source>To yourself</source> + <translation>To yourself</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="77"/> + <source>Mined</source> + <translation>Mined</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="78"/> + <source>Other</source> + <translation>Other</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="84"/> + <source>Enter address or label to search</source> + <translation>Enter address or label to search</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="90"/> + <source>Min amount</source> + <translation>Min amount</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="125"/> + <source>Copy address</source> + <translation>Copy address</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="126"/> + <source>Copy label</source> + <translation>Copy label</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="127"/> + <source>Edit label</source> + <translation>Edit label</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="128"/> + <source>Show details...</source> + <translation>Show details...</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="261"/> + <source>Export Transaction Data</source> + <translation>Export Transaction Data</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="263"/> + <source>Comma separated file (*.csv)</source> + <translation>Comma separated file (*.csv)</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="271"/> + <source>Confirmed</source> + <translation>Confirmed</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="272"/> + <source>Date</source> + <translation>Date</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="273"/> + <source>Type</source> + <translation>Type</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="274"/> + <source>Label</source> + <translation>Label</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="275"/> + <source>Address</source> + <translation>Address</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="276"/> + <source>Amount</source> + <translation>Amount</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="277"/> + <source>ID</source> + <translation>ID</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="281"/> + <source>Error exporting</source> + <translation>Error exporting</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="281"/> + <source>Could not write to file %1.</source> + <translation>Could not write to file %1.</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="369"/> + <source>Range:</source> + <translation>Range:</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="377"/> + <source>to</source> + <translation>to</translation> + </message> +</context> +<context> + <name>WalletModel</name> + <message> + <location filename="../walletmodel.cpp" line="144"/> + <source>Sending...</source> + <translation>Sending...</translation> + </message> +</context> +<context> + <name>bitcoin-core</name> + <message> + <location filename="../bitcoinstrings.cpp" line="3"/> + <source>Bitcoin version</source> + <translation>Bitcoin version</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="4"/> + <source>Usage:</source> + <translation>Usage:</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="5"/> + <source>Send command to -server or bitcoind</source> + <translation>Send command to -server or bitcoind +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="6"/> + <source>List commands</source> + <translation>List commands +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="7"/> + <source>Get help for a command</source> + <translation>Get help for a command +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="8"/> + <source>Options:</source> + <translation>Options: +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="9"/> + <source>Specify configuration file (default: bitcoin.conf)</source> + <translation>Specify configuration file (default: bitcoin.conf) +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="10"/> + <source>Specify pid file (default: bitcoind.pid)</source> + <translation>Specify pid file (default: bitcoind.pid) +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="11"/> + <source>Generate coins</source> + <translation>Generate coins +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="12"/> + <source>Don't generate coins</source> + <translation>Don't generate coins +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="13"/> + <source>Start minimized</source> + <translation>Start minimized +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="14"/> + <source>Specify data directory</source> + <translation>Specify data directory +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="15"/> + <source>Specify connection timeout (in milliseconds)</source> + <translation>Specify connection timeout (in milliseconds) +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="16"/> + <source>Connect through socks4 proxy</source> + <translation>Connect through socks4 proxy +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="17"/> + <source>Allow DNS lookups for addnode and connect</source> + <translation>Allow DNS lookups for addnode and connect +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="18"/> + <source>Add a node to connect to</source> + <translation>Add a node to connect to +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="19"/> + <source>Connect only to the specified node</source> + <translation>Connect only to the specified node +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="20"/> + <source>Don't accept connections from outside</source> + <translation>Don't accept connections from outside +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="21"/> + <source>Don't attempt to use UPnP to map the listening port</source> + <translation>Don't attempt to use UPnP to map the listening port +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="22"/> + <source>Attempt to use UPnP to map the listening port</source> + <translation>Attempt to use UPnP to map the listening port +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="23"/> + <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 filename="../bitcoinstrings.cpp" line="24"/> + <source>Accept command line and JSON-RPC commands</source> + <translation>Accept command line and JSON-RPC commands +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="25"/> + <source>Run in the background as a daemon and accept commands</source> + <translation>Run in the background as a daemon and accept commands +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="26"/> + <source>Use the test network</source> + <translation>Use the test network +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="27"/> + <source>Username for JSON-RPC connections</source> + <translation>Username for JSON-RPC connections +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="28"/> + <source>Password for JSON-RPC connections</source> + <translation>Password for JSON-RPC connections +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="29"/> + <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> + <translation>Listen for JSON-RPC connections on <port> (default: 8332) +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="30"/> + <source>Allow JSON-RPC connections from specified IP address</source> + <translation>Allow JSON-RPC connections from specified IP address +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="31"/> + <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> + <translation>Send commands to node running on <ip> (default: 127.0.0.1) +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="32"/> + <source>Set key pool size to <n> (default: 100)</source> + <translation>Set key pool size to <n> (default: 100) +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="33"/> + <source>Rescan the block chain for missing wallet transactions</source> + <translation>Rescan the block chain for missing wallet transactions +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="34"/> + <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 filename="../bitcoinstrings.cpp" line="37"/> + <source>Use OpenSSL (https) for JSON-RPC connections</source> + <translation>Use OpenSSL (https) for JSON-RPC connections +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="38"/> + <source>Server certificate file (default: server.cert)</source> + <translation>Server certificate file (default: server.cert) +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="39"/> + <source>Server private key (default: server.pem)</source> + <translation>Server private key (default: server.pem) +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="40"/> + <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> + <translation>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="43"/> + <source>This help message</source> + <translation>This help message +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="44"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> + <translation>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="47"/> + <source>Loading addresses...</source> + <translation>Loading addresses...</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="48"/> + <source>Error loading addr.dat </source> + <translation>Error loading addr.dat +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="49"/> + <source>Loading block index...</source> + <translation>Loading block index...</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="50"/> + <source>Error loading blkindex.dat </source> + <translation>Error loading blkindex.dat +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="51"/> + <source>Loading wallet...</source> + <translation>Loading wallet...</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="52"/> + <source>Error loading wallet.dat: Wallet corrupted </source> + <translation>Error loading wallet.dat: Wallet corrupted +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="53"/> + <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin </source> + <translation>Error loading wallet.dat: Wallet requires newer version of Bitcoin +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="55"/> + <source>Error loading wallet.dat </source> + <translation>Error loading wallet.dat +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="56"/> + <source>Rescanning...</source> + <translation>Rescanning...</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="57"/> + <source>Done loading</source> + <translation>Done loading</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="58"/> + <source>Invalid -proxy address</source> + <translation>Invalid -proxy address</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="59"/> + <source>Invalid amount for -paytxfee=<amount></source> + <translation>Invalid amount for -paytxfee=<amount></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="60"/> + <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> + <message> + <location filename="../bitcoinstrings.cpp" line="63"/> + <source>Error: CreateThread(StartNode) failed</source> + <translation>Error: CreateThread(StartNode) failed</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="64"/> + <source>Warning: Disk space is low </source> + <translation>Warning: Disk space is low </translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="65"/> + <source>Unable to bind to port %d on this computer. Bitcoin is probably already running.</source> + <translation>Unable to bind to port %d on this computer. Bitcoin is probably already running.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="68"/> + <source>This transaction is over the size limit. You can still send it for a fee of %s, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source> + <translation>This transaction is over the size limit. You can still send it for a fee of %s, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="72"/> + <source>Enter the current passphrase to the wallet.</source> + <translation>Enter the current passphrase to the wallet.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="73"/> + <source>Passphrase</source> + <translation>Passphrase</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="74"/> + <source>Please supply the current wallet decryption passphrase.</source> + <translation>Please supply the current wallet decryption passphrase.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="75"/> + <source>The passphrase entered for the wallet decryption was incorrect.</source> + <translation>The passphrase entered for the wallet decryption was incorrect.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="76"/> + <source>Status</source> + <translation>Status</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="77"/> + <source>Date</source> + <translation>Date</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="78"/> + <source>Description</source> + <translation>Description</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="79"/> + <source>Debit</source> + <translation>Debit</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="80"/> + <source>Credit</source> + <translation>Credit</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="81"/> + <source>Open for %d blocks</source> + <translation>Open for %d blocks</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="82"/> + <source>Open until %s</source> + <translation>Open until %s</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="83"/> + <source>%d/offline?</source> + <translation>%d/offline?</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="84"/> + <source>%d/unconfirmed</source> + <translation>%d/unconfirmed</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="85"/> + <source>%d confirmations</source> + <translation>%d confirmations</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="86"/> + <source>Generated</source> + <translation>Generated</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="87"/> + <source>Generated (%s matures in %d more blocks)</source> + <translation>Generated (%s matures in %d more blocks)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="88"/> + <source>Generated - Warning: This block was not received by any other nodes and will probably not be accepted!</source> + <translation>Generated - Warning: This block was not received by any other nodes and will probably not be accepted!</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="91"/> + <source>Generated (not accepted)</source> + <translation>Generated (not accepted)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="92"/> + <source>From: </source> + <translation>From: </translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="93"/> + <source>Received with: </source> + <translation>Received with: </translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="94"/> + <source>Payment to yourself</source> + <translation>Payment to yourself</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="95"/> + <source>To: </source> + <translation>To: </translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="96"/> + <source> Generating</source> + <translation> Generating</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="97"/> + <source>(not connected)</source> + <translation>(not connected)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="98"/> + <source> %d connections %d blocks %d transactions</source> + <translation> %d connections %d blocks %d transactions</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="99"/> + <source>Wallet already encrypted.</source> + <translation>Wallet already encrypted.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="100"/> + <source>Enter the new passphrase to the wallet. +Please use a passphrase of 10 or more random characters, or eight or more words.</source> + <translation>Enter the new passphrase to the wallet. +Please use a passphrase of 10 or more random characters, or eight or more words.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="104"/> + <source>Error: The supplied passphrase was too short.</source> + <translation>Error: The supplied passphrase was too short.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="105"/> + <source>WARNING: If you encrypt your wallet and lose your passphrase, you will LOSE ALL OF YOUR BITCOINS! +Are you sure you wish to encrypt your wallet?</source> + <translation>WARNING: If you encrypt your wallet and lose your passphrase, you will LOSE ALL OF YOUR BITCOINS! +Are you sure you wish to encrypt your wallet?</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="109"/> + <source>Please re-enter your new wallet passphrase.</source> + <translation>Please re-enter your new wallet passphrase.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="110"/> + <source>Error: the supplied passphrases didn't match.</source> + <translation>Error: the supplied passphrases didn't match.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="111"/> + <source>Wallet encryption failed.</source> + <translation>Wallet encryption failed.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="112"/> + <source>Wallet Encrypted. +Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> + <translation>Wallet Encrypted. +Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="116"/> + <source>Wallet is unencrypted, please encrypt it first.</source> + <translation>Wallet is unencrypted, please encrypt it first.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="117"/> + <source>Enter the new passphrase for the wallet.</source> + <translation>Enter the new passphrase for the wallet.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="118"/> + <source>Re-enter the new passphrase for the wallet.</source> + <translation>Re-enter the new passphrase for the wallet.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="119"/> + <source>Wallet Passphrase Changed.</source> + <translation>Wallet Passphrase Changed.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="120"/> + <source>New Receiving Address</source> + <translation>New Receiving Address</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="121"/> + <source>You should use a new address for each payment you receive. + +Label</source> + <translation>You should use a new address for each payment you receive. + +Label</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="125"/> + <source><b>Status:</b> </source> + <translation><b>Status:</b> </translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="126"/> + <source>, has not been successfully broadcast yet</source> + <translation>, has not been successfully broadcast yet</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="127"/> + <source>, broadcast through %d node</source> + <translation>, broadcast through %d node</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="128"/> + <source>, broadcast through %d nodes</source> + <translation>, broadcast through %d nodes</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="129"/> + <source><b>Date:</b> </source> + <translation><b>Date:</b> </translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="130"/> + <source><b>Source:</b> Generated<br></source> + <translation><b>Source:</b> Generated<br></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="131"/> + <source><b>From:</b> </source> + <translation><b>From:</b> </translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="132"/> + <source>unknown</source> + <translation>unknown</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="133"/> + <source><b>To:</b> </source> + <translation><b>To:</b> </translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="134"/> + <source> (yours, label: </source> + <translation> (yours, label: </translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="135"/> + <source> (yours)</source> + <translation> (yours)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="136"/> + <source><b>Credit:</b> </source> + <translation><b>Credit:</b> </translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="137"/> + <source>(%s matures in %d more blocks)</source> + <translation>(%s matures in %d more blocks)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="138"/> + <source>(not accepted)</source> + <translation>(not accepted)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="139"/> + <source><b>Debit:</b> </source> + <translation><b>Debit:</b> </translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="140"/> + <source><b>Transaction fee:</b> </source> + <translation><b>Transaction fee:</b> </translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="141"/> + <source><b>Net amount:</b> </source> + <translation><b>Net amount:</b> </translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="142"/> + <source>Message:</source> + <translation>Message:</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="143"/> + <source>Comment:</source> + <translation>Comment:</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="144"/> + <source>Generated coins must wait 120 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, it will change to "not accepted" and not be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source> + <translation>Generated coins must wait 120 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, it will change to "not accepted" and not be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="150"/> + <source>Cannot write autostart/bitcoin.desktop file</source> + <translation>Cannot write autostart/bitcoin.desktop file</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="151"/> + <source>Main</source> + <translation>Main</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="152"/> + <source>&Start Bitcoin on window system startup</source> + <translation>&Start Bitcoin on window system startup</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="153"/> + <source>&Minimize on close</source> + <translation>&Minimize on close</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="154"/> + <source>version %s</source> + <translation>version %s</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="155"/> + <source>Error in amount </source> + <translation>Error in amount </translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="156"/> + <source>Send Coins</source> + <translation>Send Coins</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="157"/> + <source>Amount exceeds your balance </source> + <translation>Amount exceeds your balance </translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="158"/> + <source>Total exceeds your balance when the </source> + <translation>Total exceeds your balance when the </translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="159"/> + <source> transaction fee is included </source> + <translation> transaction fee is included </translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="160"/> + <source>Payment sent </source> + <translation>Payment sent </translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="161"/> + <source>Sending...</source> + <translation>Sending...</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="162"/> + <source>Invalid address </source> + <translation>Invalid address </translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="163"/> + <source>Sending %s to %s</source> + <translation>Sending %s to %s</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="164"/> + <source>CANCELLED</source> + <translation>CANCELLED</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="165"/> + <source>Cancelled</source> + <translation>Cancelled</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="166"/> + <source>Transfer cancelled </source> + <translation>Transfer cancelled </translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="167"/> + <source>Error: </source> + <translation>Error: </translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="168"/> + <source>Insufficient funds</source> + <translation>Insufficient funds</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="169"/> + <source>Connecting...</source> + <translation>Connecting...</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="170"/> + <source>Unable to connect</source> + <translation>Unable to connect</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="171"/> + <source>Requesting public key...</source> + <translation>Requesting public key...</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="172"/> + <source>Received public key...</source> + <translation>Received public key...</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="173"/> + <source>Recipient is not accepting transactions sent by IP address</source> + <translation>Recipient is not accepting transactions sent by IP address</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="174"/> + <source>Transfer was not accepted</source> + <translation>Transfer was not accepted</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="175"/> + <source>Invalid response received</source> + <translation>Invalid response received</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="176"/> + <source>Creating transaction...</source> + <translation>Creating transaction...</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="177"/> + <source>This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds</source> + <translation>This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="180"/> + <source>Transaction creation failed</source> + <translation>Transaction creation failed</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="181"/> + <source>Transaction aborted</source> + <translation>Transaction aborted</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="182"/> + <source>Lost connection, transaction cancelled</source> + <translation>Lost connection, transaction cancelled</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="183"/> + <source>Sending payment...</source> + <translation>Sending payment...</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="184"/> + <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>The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="188"/> + <source>Waiting for confirmation...</source> + <translation>Waiting for confirmation...</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="189"/> + <source>The payment was sent, but the recipient was unable to verify it. +The transaction is recorded and will credit to the recipient, +but the comment information will be blank.</source> + <translation>The payment was sent, but the recipient was unable to verify it. +The transaction is recorded and will credit to the recipient, +but the comment information will be blank.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="193"/> + <source>Payment was sent, but an invalid response was received</source> + <translation>Payment was sent, but an invalid response was received</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="194"/> + <source>Payment completed</source> + <translation>Payment completed</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="195"/> + <source>Name</source> + <translation>Name</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="196"/> + <source>Address</source> + <translation>Address</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="197"/> + <source>Label</source> + <translation>Label</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="198"/> + <source>Bitcoin Address</source> + <translation>Bitcoin Address</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="199"/> + <source>This is one of your own addresses for receiving payments and cannot be entered in the address book. </source> + <translation>This is one of your own addresses for receiving payments and cannot be entered in the address book. </translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="202"/> + <source>Edit Address</source> + <translation>Edit Address</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="203"/> + <source>Edit Address Label</source> + <translation>Edit Address Label</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="204"/> + <source>Add Address</source> + <translation>Add Address</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="205"/> + <source>Bitcoin</source> + <translation>Bitcoin</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="206"/> + <source>Bitcoin - Generating</source> + <translation>Bitcoin - Generating</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="207"/> + <source>Bitcoin - (not connected)</source> + <translation>Bitcoin - (not connected)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="208"/> + <source>&Open Bitcoin</source> + <translation>&Open Bitcoin</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="209"/> + <source>&Send Bitcoins</source> + <translation>&Send Bitcoins</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="210"/> + <source>O&ptions...</source> + <translation>O&ptions...</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="211"/> + <source>E&xit</source> + <translation>E&xit</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="212"/> + <source>Program has crashed and will terminate. </source> + <translation>Program has crashed and will terminate. </translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="213"/> + <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>Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="216"/> + <source>beta</source> + <translation>beta</translation> + </message> +</context> +<context> + <name>main</name> + <message> + <location filename="../bitcoin.cpp" line="145"/> + <source>Bitcoin Qt</source> + <translation>Bitcoin Qt</translation> + </message> +</context> +</TS>
\ No newline at end of file diff --git a/src/qt/locale/bitcoin_ru.ts b/src/qt/locale/bitcoin_ru.ts index 3870f35769..60332ac570 100644 --- a/src/qt/locale/bitcoin_ru.ts +++ b/src/qt/locale/bitcoin_ru.ts @@ -121,89 +121,90 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location filename="../forms/askpassphrasedialog.ui" line="26"/> <source>Dialog</source> - <translation type="unfinished"/> + <translation>Dialog</translation> </message> <message> <location filename="../forms/askpassphrasedialog.ui" line="32"/> <source>TextLabel</source> - <translation type="unfinished"/> + <translation>TextLabel</translation> </message> <message> <location filename="../forms/askpassphrasedialog.ui" line="47"/> <source>Enter passphrase</source> - <translation type="unfinished"/> + <translation>Введите пароль</translation> </message> <message> <location filename="../forms/askpassphrasedialog.ui" line="61"/> <source>New passphrase</source> - <translation type="unfinished"/> + <translation>Новый пароль</translation> </message> <message> <location filename="../forms/askpassphrasedialog.ui" line="75"/> <source>Repeat new passphrase</source> - <translation type="unfinished"/> + <translation>Повторите новый пароль</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="26"/> <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>10 or more random characters</b>, or <b>eight or more words</b>.</source> - <translation type="unfinished"/> + <translation>Введите новый пароль для бумажника. <br/> Пожалуйста, используйте фразы из <b>10 или более случайных символов,</b> или <b>восьми и более слов.</b></translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="27"/> <source>Encrypt wallet</source> - <translation type="unfinished"/> + <translation>Зашифровать бумажник</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="30"/> <source>This operation needs your wallet passphrase to unlock the wallet.</source> - <translation type="unfinished"/> + <translation>Для выполнения операции требуется пароль вашего бумажника.</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="35"/> <source>Unlock wallet</source> - <translation type="unfinished"/> + <translation>Разблокировать бумажник</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="38"/> <source>This operation needs your wallet passphrase to decrypt the wallet.</source> - <translation type="unfinished"/> + <translation>Для выполнения операции требуется пароль вашего бумажника.</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="43"/> <source>Decrypt wallet</source> - <translation type="unfinished"/> + <translation>Расшифровать бумажник</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="46"/> <source>Change passphrase</source> - <translation type="unfinished"/> + <translation>Сменить пароль</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="47"/> <source>Enter the old and new passphrase to the wallet.</source> - <translation type="unfinished"/> + <translation>Введите старый и новый пароль для бумажника.</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="91"/> <source>Confirm wallet encryption</source> - <translation type="unfinished"/> + <translation>Подтвердите шифрование бумажника</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="92"/> <source>WARNING: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>! Are you sure you wish to encrypt your wallet?</source> - <translation type="unfinished"/> + <translation>ВНИМАНИЕ: Если вы зашифруете бумажник и потеряете свой пароль, вы <b>ПОТЕРЯЕТЕ ВСЕ ВАШИ БИТКОИНЫ!</b> +Вы действительно хотите зашифровать ваш бумажник?</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="101"/> <location filename="../askpassphrasedialog.cpp" line="149"/> <source>Wallet encrypted</source> - <translation type="unfinished"/> + <translation>Бумажник зашифрован</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="102"/> <source>Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> - <translation type="unfinished"/> + <translation>Помните, что шифрование вашего бумажника не может полностью защитить ваши биткоины от кражи вредоносными программами, заражающими компьютер.</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="106"/> @@ -211,23 +212,23 @@ Are you sure you wish to encrypt your wallet?</source> <location filename="../askpassphrasedialog.cpp" line="155"/> <location filename="../askpassphrasedialog.cpp" line="161"/> <source>Wallet encryption failed</source> - <translation type="unfinished"/> + <translation>Не удалось зашифровать бумажник</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="107"/> <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> - <translation type="unfinished"/> + <translation>Шифрование бумажника не удалось из-за внутренней ошибки. Ваш бумажник не был зашифрован.</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="114"/> <location filename="../askpassphrasedialog.cpp" line="162"/> <source>The supplied passphrases do not match.</source> - <translation type="unfinished"/> + <translation>Введённые пароли не совпадают.</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="125"/> <source>Wallet unlock failed</source> - <translation type="unfinished"/> + <translation>Разблокировка бумажника не удалась</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="126"/> @@ -239,12 +240,12 @@ Are you sure you wish to encrypt your wallet?</source> <message> <location filename="../askpassphrasedialog.cpp" line="136"/> <source>Wallet decryption failed</source> - <translation type="unfinished"/> + <translation>Расшифрование бумажника не удалось</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="150"/> <source>Wallet passphrase was succesfully changed.</source> - <translation type="unfinished"/> + <translation>Пароль бумажника успешно изменён.</translation> </message> </context> <context> @@ -317,7 +318,7 @@ Are you sure you wish to encrypt your wallet?</source> <message> <location filename="../bitcoingui.cpp" line="200"/> <source>E&xit</source> - <translation type="unfinished"/> + <translation>В&ыход</translation> </message> <message> <location filename="../bitcoingui.cpp" line="201"/> @@ -327,7 +328,7 @@ Are you sure you wish to encrypt your wallet?</source> <message> <location filename="../bitcoingui.cpp" line="204"/> <source>&About %1</source> - <translation type="unfinished"/> + <translation>&О %1</translation> </message> <message> <location filename="../bitcoingui.cpp" line="205"/> @@ -367,22 +368,22 @@ Are you sure you wish to encrypt your wallet?</source> <message> <location filename="../bitcoingui.cpp" line="214"/> <source>&Encrypt Wallet</source> - <translation type="unfinished"/> + <translation>&Зашифровать бумажник</translation> </message> <message> <location filename="../bitcoingui.cpp" line="215"/> <source>Encrypt or decrypt wallet</source> - <translation type="unfinished"/> + <translation>Зашифровать или расшифровать бумажник</translation> </message> <message> <location filename="../bitcoingui.cpp" line="217"/> <source>&Change Passphrase</source> - <translation type="unfinished"/> + <translation>&Изменить пароль</translation> </message> <message> <location filename="../bitcoingui.cpp" line="218"/> <source>Change the passphrase used for wallet encryption</source> - <translation type="unfinished"/> + <translation>Изменить пароль шифрования бумажника</translation> </message> <message> <location filename="../bitcoingui.cpp" line="239"/> @@ -417,7 +418,7 @@ Are you sure you wish to encrypt your wallet?</source> <message> <location filename="../bitcoingui.cpp" line="355"/> <source>bitcoin-qt</source> - <translation type="unfinished"/> + <translation>bitcoin-qt</translation> </message> <message numerus="yes"> <location filename="../bitcoingui.cpp" line="396"/> @@ -494,19 +495,22 @@ Are you sure you wish to encrypt your wallet?</source> <source>Date: %1 Amount: %2 Type: %3 -Address: %4 -</source> - <translation type="unfinished"/> +Address: %4</source> + <translation>Дата: %1 +Количество: %2 +Тип: %3 +Адрес: %4 +</translation> </message> <message> <location filename="../bitcoingui.cpp" line="639"/> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> - <translation type="unfinished"/> + <translation>Бумажник <b>зашифрован</b> и в настоящее время <b>разблокирован</b></translation> </message> <message> <location filename="../bitcoingui.cpp" line="647"/> <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> - <translation type="unfinished"/> + <translation>Бумажник <b>зашифрован</b> и в настоящее время <b>заблокирован</b></translation> </message> </context> <context> @@ -587,12 +591,12 @@ Address: %4 <message> <location filename="../editaddressdialog.cpp" line="97"/> <source>Could not unlock wallet.</source> - <translation type="unfinished"/> + <translation>Не удается разблокировать бумажник.</translation> </message> <message> <location filename="../editaddressdialog.cpp" line="102"/> <source>New key generation failed.</source> - <translation type="unfinished"/> + <translation>Генерация нового ключа не удалась.</translation> </message> </context> <context> @@ -670,7 +674,7 @@ Address: %4 <message> <location filename="../optionsdialog.cpp" line="217"/> <source>Optional transaction fee per KB that helps make sure your transactions are processed quickly. Most transactions are 1KB. Fee 0.01 recommended.</source> - <translation>Опциональная комиссия за кадый KB транзакции, которое позволяет быть уверенным, что Ваша транзакция будет обработана быстро. Большинство транщакций занимают 1 KB. Рекомендованная комиссия: 0.01 BTC.</translation> + <translation>Опциональная комиссия за кадый KB транзакции, которое позволяет быть уверенным, что Ваша транзакция будет обработана быстро. Большинство транзакций занимают 1 KB. Рекомендованная комиссия: 0.01 BTC.</translation> </message> <message> <location filename="../optionsdialog.cpp" line="223"/> @@ -799,7 +803,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../forms/sendcoinsdialog.ui" line="84"/> <source>Clear all</source> - <translation type="unfinished"/> + <translation>Очистить всё</translation> </message> <message> <location filename="../forms/sendcoinsdialog.ui" line="103"/> @@ -918,7 +922,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../forms/sendcoinsentry.ui" line="113"/> <source>Alt+A</source> - <translation type="unfinished"/> + <translation>Alt+A</translation> </message> <message> <location filename="../forms/sendcoinsentry.ui" line="120"/> @@ -928,7 +932,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../forms/sendcoinsentry.ui" line="130"/> <source>Alt+P</source> - <translation type="unfinished"/> + <translation>Alt+P</translation> </message> <message> <location filename="../forms/sendcoinsentry.ui" line="137"/> @@ -946,12 +950,12 @@ p, li { white-space: pre-wrap; } <message> <location filename="../transactiondesc.cpp" line="34"/> <source>Open for %1 blocks</source> - <translation type="unfinished"/> + <translation>Открыто до получения %1 блоков</translation> </message> <message> <location filename="../transactiondesc.cpp" line="36"/> <source>Open until %1</source> - <translation type="unfinished"/> + <translation>Открыто до %1</translation> </message> <message> <location filename="../transactiondesc.cpp" line="42"/> @@ -1037,7 +1041,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../transactiondesc.cpp" line="149"/> <source>(%1 matures in %2 more blocks)</source> - <translation type="unfinished"/> + <translation>(%1 станет доступно через %2 блоков)</translation> </message> <message> <location filename="../transactiondesc.cpp" line="153"/> @@ -1115,12 +1119,12 @@ p, li { white-space: pre-wrap; } <message numerus="yes"> <location filename="../transactiontablemodel.cpp" line="274"/> <source>Open for %n block(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>Открыто для %n блока</numerusform><numerusform>Открыто для %n блоков</numerusform><numerusform>Открыто для %n блоков</numerusform></translation> </message> <message> <location filename="../transactiontablemodel.cpp" line="277"/> <source>Open until %1</source> - <translation type="unfinished"/> + <translation>Открыто до %1</translation> </message> <message> <location filename="../transactiontablemodel.cpp" line="280"/> @@ -1349,7 +1353,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../transactionview.cpp" line="277"/> <source>ID</source> - <translation type="unfinished"/> + <translation>ID</translation> </message> <message> <location filename="../transactionview.cpp" line="281"/> @@ -1394,246 +1398,211 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../bitcoinstrings.cpp" line="5"/> - <source>Send command to -server or bitcoind -</source> + <source>Send command to -server or bitcoind</source> <translation>Отправить команду на сервер ( -server ) или демону </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="6"/> - <source>List commands -</source> + <source>List commands</source> <translation>Список команд </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="7"/> - <source>Get help for a command -</source> + <source>Get help for a command</source> <translation>Получить помощь по команде</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="8"/> - <source>Options: -</source> + <source>Options:</source> <translation>Опции: </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="9"/> - <source>Specify configuration file (default: bitcoin.conf) -</source> + <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Указать конфигурационный файл вместо используемого по умолчанию (bitcoin.conf) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="10"/> - <source>Specify pid file (default: bitcoind.pid) -</source> + <source>Specify pid file (default: bitcoind.pid)</source> <translation>Указать pid-файл вместо используемого по умолчанию (bitcoin.pid) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="11"/> - <source>Generate coins -</source> + <source>Generate coins</source> <translation>Включить добычу монет </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="12"/> - <source>Don't generate coins -</source> + <source>Don't generate coins</source> <translation>Выключить добычу монет </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="13"/> - <source>Start minimized -</source> + <source>Start minimized</source> <translation>Запускать минимизированным </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="14"/> - <source>Specify data directory -</source> + <source>Specify data directory</source> <translation>Указать рабочую директорию </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="15"/> - <source>Specify connection timeout (in milliseconds) -</source> + <source>Specify connection timeout (in milliseconds)</source> <translation>Указать таймаут соединения (в миллисекундах) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="16"/> - <source>Connect through socks4 proxy -</source> + <source>Connect through socks4 proxy</source> <translation>Соединяться через socks4-прокси </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="17"/> - <source>Allow DNS lookups for addnode and connect -</source> + <source>Allow DNS lookups for addnode and connect</source> <translation>Разрешить поиск в DNS для комманд "addnode" и "connect" </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="18"/> - <source>Add a node to connect to -</source> + <source>Add a node to connect to</source> <translation>Добавить узел для соединения </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="19"/> - <source>Connect only to the specified node -</source> + <source>Connect only to the specified node</source> <translation>Соединяться только с указанным узлом </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="20"/> - <source>Don't accept connections from outside -</source> + <source>Don't accept connections from outside</source> <translation>Не принимать внешние соединения </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="21"/> - <source>Don't attempt to use UPnP to map the listening port -</source> + <source>Don't attempt to use UPnP to map the listening port</source> <translation>Не пытаться использовать UPnP </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="22"/> - <source>Attempt to use UPnP to map the listening port -</source> + <source>Attempt to use UPnP to map the listening port</source> <translation>Попытаться использовать UPnP для проброса прослушиваемого порта на роутере </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="23"/> - <source>Fee per KB to add to transactions you send -</source> + <source>Fee per KB to add to transactions you send</source> <translation>Комиссия (за каждый KB транзакции) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="24"/> - <source>Accept command line and JSON-RPC commands -</source> + <source>Accept command line and JSON-RPC commands</source> <translation>Принимать команды из командной строки и через JSON-RPC </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="25"/> - <source>Run in the background as a daemon and accept commands -</source> + <source>Run in the background as a daemon and accept commands</source> <translation>Запустить в бекграунде (как демон) и принимать команды </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="26"/> - <source>Use the test network -</source> + <source>Use the test network</source> <translation>Использовать тестовую сеть </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="27"/> - <source>Username for JSON-RPC connections -</source> + <source>Username for JSON-RPC connections</source> <translation>Имя пользователя для JSON-RPC соединений </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="28"/> - <source>Password for JSON-RPC connections -</source> + <source>Password for JSON-RPC connections</source> <translation>Пароль для JSON-RPC соединений </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="29"/> - <source>Listen for JSON-RPC connections on <port> (default: 8332) -</source> + <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> <translation>Слушать <порт> для JSON-RPC соединений (по умолчанию: 8332) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="30"/> - <source>Allow JSON-RPC connections from specified IP address -</source> + <source>Allow JSON-RPC connections from specified IP address</source> <translation>Разрешить JSON-RPC соединения с указанного адреса </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="31"/> - <source>Send commands to node running on <ip> (default: 127.0.0.1) -</source> + <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>Отправлять команды на узел,запущенный на <IP> (по умолчанию: 127.0.0.1) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="32"/> - <source>Set key pool size to <n> (default: 100) -</source> + <source>Set key pool size to <n> (default: 100)</source> <translation>Установить размер key pool'а в <n> (по умолчанию: 100) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="33"/> - <source>Rescan the block chain for missing wallet transactions -</source> + <source>Rescan the block chain for missing wallet transactions</source> <translation>Просканировать цепочку блоков в поисках пропущенных транзакций для бумажника </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="34"/> <source> -SSL options: (see the Bitcoin Wiki for SSL setup instructions) -</source> +SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation>Опции SSL: (см. Bitcoin Wiki для инструкций) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="37"/> - <source>Use OpenSSL (https) for JSON-RPC connections -</source> + <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Использовать OpenSSL (https) для JSON-RPC соединений </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="38"/> - <source>Server certificate file (default: server.cert) -</source> + <source>Server certificate file (default: server.cert)</source> <translation>Сертификат (публичный ключ) сервера (по умолчанию: server.cert) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="39"/> - <source>Server private key (default: server.pem) -</source> + <source>Server private key (default: server.pem)</source> <translation>Закрытый ключ сервера (по умолчанию: server.pem) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="40"/> - <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) -</source> + <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation>Допустимые Cipher'ы для сервера (по умолчанию: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="43"/> - <source>This help message -</source> + <source>This help message</source> <translation>Данная справка </translation> </message> @@ -1649,8 +1618,7 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions) </message> <message> <location filename="../bitcoinstrings.cpp" line="48"/> - <source>Error loading addr.dat -</source> + <source>Error loading addr.dat </source> <translation>Ошибка при загрузке addr.dat </translation> </message> @@ -1661,8 +1629,7 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions) </message> <message> <location filename="../bitcoinstrings.cpp" line="50"/> - <source>Error loading blkindex.dat -</source> + <source>Error loading blkindex.dat </source> <translation>Ошибка при загрузке blkindex.dat </translation> </message> @@ -1673,21 +1640,18 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions) </message> <message> <location filename="../bitcoinstrings.cpp" line="52"/> - <source>Error loading wallet.dat: Wallet corrupted -</source> + <source>Error loading wallet.dat: Wallet corrupted </source> <translation>Ошибка загрузки wallet.dat: Бумажник повреждён</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="53"/> - <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin -</source> + <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin </source> <translation>Ошибка загрузки wallet.dat: Для данного бумажника требуется более новая версия Bitcoin </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="55"/> - <source>Error loading wallet.dat -</source> + <source>Error loading wallet.dat </source> <translation>Ошибка при загрузке wallet.dat </translation> </message> @@ -2273,7 +2237,7 @@ but the comment information will be blank.</source> <message> <location filename="../bitcoinstrings.cpp" line="205"/> <source>Bitcoin</source> - <translation type="unfinished"/> + <translation>Биткоин</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="206"/> @@ -2326,7 +2290,7 @@ but the comment information will be blank.</source> <message> <location filename="../bitcoin.cpp" line="145"/> <source>Bitcoin Qt</source> - <translation type="unfinished"/> + <translation>Bitcoin Qt</translation> </message> </context> </TS>
\ No newline at end of file diff --git a/src/qt/locale/bitcoin_uk.ts b/src/qt/locale/bitcoin_uk.ts index 3ea0bcc736..8c087ac6c8 100644 --- a/src/qt/locale/bitcoin_uk.ts +++ b/src/qt/locale/bitcoin_uk.ts @@ -495,8 +495,7 @@ Are you sure you wish to encrypt your wallet?</source> <source>Date: %1 Amount: %2 Type: %3 -Address: %4 -</source> +Address: %4</source> <translation>Дата: %1 Кількість: %2 Тип: %3 @@ -1399,248 +1398,213 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../bitcoinstrings.cpp" line="5"/> - <source>Send command to -server or bitcoind -</source> + <source>Send command to -server or bitcoind</source> <translation>Відправити команду серверу -server чи демону </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="6"/> - <source>List commands -</source> + <source>List commands</source> <translation>Список команд </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="7"/> - <source>Get help for a command -</source> + <source>Get help for a command</source> <translation>Отримати довідку по команді </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="8"/> - <source>Options: -</source> + <source>Options:</source> <translation>Параметри: </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="9"/> - <source>Specify configuration file (default: bitcoin.conf) -</source> + <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Вкажіть файл конфігурації (за промовчуванням: bitcoin.conf) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="10"/> - <source>Specify pid file (default: bitcoind.pid) -</source> + <source>Specify pid file (default: bitcoind.pid)</source> <translation>Вкажіть pid-файл (за промовчуванням: bitcoind.pid) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="11"/> - <source>Generate coins -</source> + <source>Generate coins</source> <translation>Генерувати монети </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="12"/> - <source>Don't generate coins -</source> + <source>Don't generate coins</source> <translation>Не генерувати монети </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="13"/> - <source>Start minimized -</source> + <source>Start minimized</source> <translation>Запускати згорнутим </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="14"/> - <source>Specify data directory -</source> + <source>Specify data directory</source> <translation>Вкажіть робочий каталог </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="15"/> - <source>Specify connection timeout (in milliseconds) -</source> + <source>Specify connection timeout (in milliseconds)</source> <translation>Вкажіть таймаут з’єднання (в мілісекундах) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="16"/> - <source>Connect through socks4 proxy -</source> + <source>Connect through socks4 proxy</source> <translation>Підключитись через SOCKS4-проксі </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="17"/> - <source>Allow DNS lookups for addnode and connect -</source> + <source>Allow DNS lookups for addnode and connect</source> <translation>Дозволити пошук в DNS для команд «addnode» і «connect» </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="18"/> - <source>Add a node to connect to -</source> + <source>Add a node to connect to</source> <translation>Додати вузол для підключення </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="19"/> - <source>Connect only to the specified node -</source> + <source>Connect only to the specified node</source> <translation>Підключитись лише до вказаного вузла </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="20"/> - <source>Don't accept connections from outside -</source> + <source>Don't accept connections from outside</source> <translation>Не приймати підключення ззовні </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="21"/> - <source>Don't attempt to use UPnP to map the listening port -</source> + <source>Don't attempt to use UPnP to map the listening port</source> <translation>Не намагатись використовувати UPnP для відображення порту що прослуховується на роутері </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="22"/> - <source>Attempt to use UPnP to map the listening port -</source> + <source>Attempt to use UPnP to map the listening port</source> <translation>Намагатись використовувати UPnP для відображення порту що прослуховується на роутері </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="23"/> - <source>Fee per KB to add to transactions you send -</source> + <source>Fee per KB to add to transactions you send</source> <translation>Комісія за Кб </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="24"/> - <source>Accept command line and JSON-RPC commands -</source> + <source>Accept command line and JSON-RPC commands</source> <translation>Приймати команди із командного рядка та команди JSON-RPC </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="25"/> - <source>Run in the background as a daemon and accept commands -</source> + <source>Run in the background as a daemon and accept commands</source> <translation>Запустити в фоновому режимі (як демон) та приймати команди </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="26"/> - <source>Use the test network -</source> + <source>Use the test network</source> <translation>Використовувати тестову мережу </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="27"/> - <source>Username for JSON-RPC connections -</source> + <source>Username for JSON-RPC connections</source> <translation>Ім’я користувача для JSON-RPC-з’єднань </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="28"/> - <source>Password for JSON-RPC connections -</source> + <source>Password for JSON-RPC connections</source> <translation>Пароль для JSON-RPC-з’єднань </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="29"/> - <source>Listen for JSON-RPC connections on <port> (default: 8332) -</source> + <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> <translation>Прослуховувати <port> для JSON-RPC-з’єднань (за промовчуванням: 8332) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="30"/> - <source>Allow JSON-RPC connections from specified IP address -</source> + <source>Allow JSON-RPC connections from specified IP address</source> <translation>Дозволити JSON-RPC-з’єднання з вказаної IP-адреси </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="31"/> - <source>Send commands to node running on <ip> (default: 127.0.0.1) -</source> + <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>Відправляти команди на вузол, запущений на <ip> (за промовчуванням: 127.0.0.1) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="32"/> - <source>Set key pool size to <n> (default: 100) -</source> + <source>Set key pool size to <n> (default: 100)</source> <translation>Встановити розмір пулу ключів <n> (за промовчуванням: 100) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="33"/> - <source>Rescan the block chain for missing wallet transactions -</source> + <source>Rescan the block chain for missing wallet transactions</source> <translation>Пересканувати ланцюжок блоків, в пошуку втрачених переказів </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="34"/> <source> -SSL options: (see the Bitcoin Wiki for SSL setup instructions) -</source> +SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation> Параметри SSL: (див. Bitcoin Wiki) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="37"/> - <source>Use OpenSSL (https) for JSON-RPC connections -</source> + <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Використовувати OpenSSL (https) для JSON-RPC-з’єднань </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="38"/> - <source>Server certificate file (default: server.cert) -</source> + <source>Server certificate file (default: server.cert)</source> <translation>Сертифікату сервера (за промовчуванням: server.cert) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="39"/> - <source>Server private key (default: server.pem) -</source> + <source>Server private key (default: server.pem)</source> <translation>Закритий ключ сервера (за промовчуванням: server.pem) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="40"/> - <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) -</source> + <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation>Допустимі шифри (за промовчуванням: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="43"/> - <source>This help message -</source> + <source>This help message</source> <translation>Дана довідка </translation> </message> @@ -1656,8 +1620,7 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions) </message> <message> <location filename="../bitcoinstrings.cpp" line="48"/> - <source>Error loading addr.dat -</source> + <source>Error loading addr.dat </source> <translation>Помилка при завантаженні addr.dat </translation> </message> @@ -1668,8 +1631,7 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions) </message> <message> <location filename="../bitcoinstrings.cpp" line="50"/> - <source>Error loading blkindex.dat -</source> + <source>Error loading blkindex.dat </source> <translation>Помилка при завантаженні blkindex.dat </translation> </message> @@ -1680,22 +1642,19 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions) </message> <message> <location filename="../bitcoinstrings.cpp" line="52"/> - <source>Error loading wallet.dat: Wallet corrupted -</source> + <source>Error loading wallet.dat: Wallet corrupted </source> <translation>Помилка при завантаженні wallet.dat: Гаманець пошкоджено </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="53"/> - <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin -</source> + <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin </source> <translation>Помилка при завантаженні wallet.dat: Гаманець потребує новішої версії Bitcoin'а </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="55"/> - <source>Error loading wallet.dat -</source> + <source>Error loading wallet.dat </source> <translation>Помилка при завантаженні wallet.dat </translation> </message> diff --git a/src/qt/locale/bitcoin_zh_CN.ts b/src/qt/locale/bitcoin_zh_CN.ts new file mode 100644 index 0000000000..2c5b5ba244 --- /dev/null +++ b/src/qt/locale/bitcoin_zh_CN.ts @@ -0,0 +1,2297 @@ +<?xml version="1.0" ?><!DOCTYPE TS><TS language="zh_CN" version="2.0"> +<defaultcodec>UTF-8</defaultcodec> +<context> + <name>AboutDialog</name> + <message> + <location filename="../forms/aboutdialog.ui" line="14"/> + <source>About Bitcoin</source> + <translation>关于比特币</translation> + </message> + <message> + <location filename="../forms/aboutdialog.ui" line="53"/> + <source><b>Bitcoin</b> version</source> + <translation><b>比特币</b>版本</translation> + </message> + <message> + <location filename="../forms/aboutdialog.ui" line="85"/> + <source>Copyright © 2009-2011 Bitcoin Developers + +This is experimental software. + +Distributed under the MIT/X11 software license, see the accompanying file license.txt or http://www.opensource.org/licenses/mit-license.php. + +This product includes software developed by the OpenSSL Project for use in the 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>版权所有 © 2009-2011 比特币开发团队 + +本软件目前尚属测试阶段 + +本软件遵循 MIT/X11 软件协议，详细请查阅附带的 license.txt 文件，或访问 http://www.opensource.org/licenses/mit-license.php. + +本软件包含 OpenSSL 项目开发的 OpenSSL Toolkit 组件(http://www.openssl.org/)， Eric Young (eay@cryptsoft.com) 开发的加密软件以及 Thomas Bernard 开发的UPnP软件</translation> + </message> +</context> +<context> + <name>AddressBookPage</name> + <message> + <location filename="../forms/addressbookpage.ui" line="14"/> + <source>Address Book</source> + <translation>地址薄</translation> + </message> + <message> + <location filename="../forms/addressbookpage.ui" line="20"/> + <source>These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you.</source> + <translation>这些是你接受支付的比特币地址。当支付时你可以给出不同的地址，以便追踪不同的支付者。</translation> + </message> + <message> + <location filename="../forms/addressbookpage.ui" line="33"/> + <source>Double-click to edit address or label</source> + <translation>双击以编辑地址或标签</translation> + </message> + <message> + <location filename="../forms/addressbookpage.ui" line="57"/> + <source>Create a new address</source> + <translation>创建新地址</translation> + </message> + <message> + <location filename="../forms/addressbookpage.ui" line="60"/> + <source>&New Address...</source> + <translation>&新地址...</translation> + </message> + <message> + <location filename="../forms/addressbookpage.ui" line="71"/> + <source>Copy the currently selected address to the system clipboard</source> + <translation>复制当前选中地址到系统剪贴板</translation> + </message> + <message> + <location filename="../forms/addressbookpage.ui" line="74"/> + <source>&Copy to Clipboard</source> + <translation>&复制到剪贴板</translation> + </message> + <message> + <location filename="../forms/addressbookpage.ui" line="85"/> + <source>Delete the currently selected address from the list. Only sending addresses can be deleted.</source> + <translation>从列表中删除当前选中地址。只有发送地址可以被删除。</translation> + </message> + <message> + <location filename="../forms/addressbookpage.ui" line="88"/> + <source>&Delete</source> + <translation>&删除</translation> + </message> + <message> + <location filename="../addressbookpage.cpp" line="204"/> + <source>Export Address Book Data</source> + <translation>导出地址薄数据</translation> + </message> + <message> + <location filename="../addressbookpage.cpp" line="206"/> + <source>Comma separated file (*.csv)</source> + <translation>逗号分隔文件 (*.csv)</translation> + </message> + <message> + <location filename="../addressbookpage.cpp" line="219"/> + <source>Error exporting</source> + <translation>导出错误</translation> + </message> + <message> + <location filename="../addressbookpage.cpp" line="219"/> + <source>Could not write to file %1.</source> + <translation>无法写入文件 %1。</translation> + </message> +</context> +<context> + <name>AddressTableModel</name> + <message> + <location filename="../addresstablemodel.cpp" line="77"/> + <source>Label</source> + <translation>标签</translation> + </message> + <message> + <location filename="../addresstablemodel.cpp" line="77"/> + <source>Address</source> + <translation>地址</translation> + </message> + <message> + <location filename="../addresstablemodel.cpp" line="113"/> + <source>(no label)</source> + <translation>(没有标签)</translation> + </message> +</context> +<context> + <name>AskPassphraseDialog</name> + <message> + <location filename="../forms/askpassphrasedialog.ui" line="26"/> + <source>Dialog</source> + <translation>会话</translation> + </message> + <message> + <location filename="../forms/askpassphrasedialog.ui" line="32"/> + <source>TextLabel</source> + <translation>文本标签</translation> + </message> + <message> + <location filename="../forms/askpassphrasedialog.ui" line="47"/> + <source>Enter passphrase</source> + <translation>输入口令</translation> + </message> + <message> + <location filename="../forms/askpassphrasedialog.ui" line="61"/> + <source>New passphrase</source> + <translation>新口令</translation> + </message> + <message> + <location filename="../forms/askpassphrasedialog.ui" line="75"/> + <source>Repeat new passphrase</source> + <translation>重复新口令</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="26"/> + <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> + <message> + <location filename="../askpassphrasedialog.cpp" line="27"/> + <source>Encrypt wallet</source> + <translation>加密钱包</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="30"/> + <source>This operation needs your wallet passphrase to unlock the wallet.</source> + <translation>该操作需要您首先使用口令解锁钱包。</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="35"/> + <source>Unlock wallet</source> + <translation>解锁钱包</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="38"/> + <source>This operation needs your wallet passphrase to decrypt the wallet.</source> + <translation>该操作需要您首先使用口令解密钱包。</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="43"/> + <source>Decrypt wallet</source> + <translation>解密钱包</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="46"/> + <source>Change passphrase</source> + <translation>修改口令</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="47"/> + <source>Enter the old and new passphrase to the wallet.</source> + <translation>请输入钱包的旧口令与新口令。</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="91"/> + <source>Confirm wallet encryption</source> + <translation>确认加密钱包</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="92"/> + <source>WARNING: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>! +Are you sure you wish to encrypt your wallet?</source> + <translation>警告：如果您加密了您的钱包之后忘记了口令，您将会<b>失去所有的比特币</b>！ +确定要加密钱包吗？</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="101"/> + <location filename="../askpassphrasedialog.cpp" line="149"/> + <source>Wallet encrypted</source> + <translation>钱包已加密</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="102"/> + <source>Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> + <translation>请注意，当您的计算机感染恶意软件时，加密钱包并不能完全规避您的比特币被偷窃的可能。</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="106"/> + <location filename="../askpassphrasedialog.cpp" line="113"/> + <location filename="../askpassphrasedialog.cpp" line="155"/> + <location filename="../askpassphrasedialog.cpp" line="161"/> + <source>Wallet encryption failed</source> + <translation>钱包加密失败</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="107"/> + <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> + <translation>由于一个本地错误，加密钱包操作已经失败。您的钱包没有被加密。</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="114"/> + <location filename="../askpassphrasedialog.cpp" line="162"/> + <source>The supplied passphrases do not match.</source> + <translation>口令不匹配。</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="125"/> + <source>Wallet unlock failed</source> + <translation>钱包解锁失败</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="126"/> + <location filename="../askpassphrasedialog.cpp" line="137"/> + <location filename="../askpassphrasedialog.cpp" line="156"/> + <source>The passphrase entered for the wallet decryption was incorrect.</source> + <translation>用于解密钱包的口令不正确。</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="136"/> + <source>Wallet decryption failed</source> + <translation>钱包解密失败。</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="150"/> + <source>Wallet passphrase was succesfully changed.</source> + <translation>钱包口令修改成功</translation> + </message> +</context> +<context> + <name>BitcoinGUI</name> + <message> + <location filename="../bitcoingui.cpp" line="63"/> + <source>Bitcoin Wallet</source> + <translation>比特币钱包</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="132"/> + <source>Synchronizing with network...</source> + <translation>正在与网络同步...</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="135"/> + <source>Block chain synchronization in progress</source> + <translation>正在同步区域锁链</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="164"/> + <source>&Overview</source> + <translation>&概况</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="165"/> + <source>Show general overview of wallet</source> + <translation>显示钱包概况</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="170"/> + <source>&Transactions</source> + <translation>&交易</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="171"/> + <source>Browse transaction history</source> + <translation>查看交易历史</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="176"/> + <source>&Address Book</source> + <translation>&地址薄</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="177"/> + <source>Edit the list of stored addresses and labels</source> + <translation>修改存储的地址和标签列表</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="182"/> + <source>&Receive coins</source> + <translation>&接收货币</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="183"/> + <source>Show the list of addresses for receiving payments</source> + <translation>显示接收支付的地址列表</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="188"/> + <source>&Send coins</source> + <translation>&发送货币</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="189"/> + <source>Send coins to a bitcoin address</source> + <translation>将货币发送到一个比特币地址</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="200"/> + <source>E&xit</source> + <translation>退出</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="201"/> + <source>Quit application</source> + <translation>退出程序</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="204"/> + <source>&About %1</source> + <translation>&关于 %1</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="205"/> + <source>Show information about Bitcoin</source> + <translation>显示比特币的相关信息</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="207"/> + <source>&Options...</source> + <translation>&选项...</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="208"/> + <source>Modify configuration options for bitcoin</source> + <translation>修改比特币配置选项</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="210"/> + <source>Open &Bitcoin</source> + <translation>打开 &比特币</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="211"/> + <source>Show the Bitcoin window</source> + <translation>显示比特币窗口</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="212"/> + <source>&Export...</source> + <translation>&导出...</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="213"/> + <source>Export the current view to a file</source> + <translation>导出当前视图到指定文件</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="214"/> + <source>&Encrypt Wallet</source> + <translation>&加密钱包</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="215"/> + <source>Encrypt or decrypt wallet</source> + <translation>加密或解密钱包</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="217"/> + <source>&Change Passphrase</source> + <translation>&修改口令</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="218"/> + <source>Change the passphrase used for wallet encryption</source> + <translation>修改钱包加密口令</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="239"/> + <source>&File</source> + <translation>&文件</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="242"/> + <source>&Settings</source> + <translation>&设置</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="248"/> + <source>&Help</source> + <translation>&帮助</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="254"/> + <source>Tabs toolbar</source> + <translation>分页工具栏</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="262"/> + <source>Actions toolbar</source> + <translation>动作工具栏</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="273"/> + <source>[testnet]</source> + <translation>[testnet]</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="355"/> + <source>bitcoin-qt</source> + <translation>bitcoin-qt</translation> + </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="396"/> + <source>%n active connection(s) to Bitcoin network</source> + <translation><numerusform>%n 个到比特币网络的活动连接</numerusform></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="411"/> + <source>Downloaded %1 of %2 blocks of transaction history.</source> + <translation>%1 / %2 个交易历史的区块已下载</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="417"/> + <source>Downloaded %1 blocks of transaction history.</source> + <translation>%1 个交易历史的区块已下载</translation> + </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="428"/> + <source>%n second(s) ago</source> + <translation><numerusform>%n 秒前</numerusform></translation> + </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="432"/> + <source>%n minute(s) ago</source> + <translation><numerusform>%n 分种前</numerusform></translation> + </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="436"/> + <source>%n hour(s) ago</source> + <translation><numerusform>%n 小时前</numerusform></translation> + </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="440"/> + <source>%n day(s) ago</source> + <translation><numerusform>%n 天前</numerusform></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="446"/> + <source>Up to date</source> + <translation>最新状态</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="451"/> + <source>Catching up...</source> + <translation>更新中...</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="457"/> + <source>Last received block was generated %1.</source> + <translation>最新收到的区块产生于 %1。</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="508"/> + <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source> + <translation>该笔交易的数据量超限.您可以选择支付 %1 交易费， 交易费将支付给处理该笔交易的网络节点，有助于维持比特币网络的运行. 您愿意支付交易费用吗？</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="513"/> + <source>Sending...</source> + <translation>发送中</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="538"/> + <source>Sent transaction</source> + <translation>已发送交易</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="539"/> + <source>Incoming transaction</source> + <translation>流入交易</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="540"/> + <source>Date: %1 +Amount: %2 +Type: %3 +Address: %4</source> + <translation>日期: %1 +金额: %2 +类别: %3 +地址: %4 +</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="639"/> + <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> + <translation>钱包已被<b>加密</b>，当前为<b>解锁</b>状态</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="647"/> + <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> + <translation>钱包已被<b>加密</b>，当前为<b>锁定</b>状态</translation> + </message> +</context> +<context> + <name>DisplayOptionsPage</name> + <message> + <location filename="../optionsdialog.cpp" line="270"/> + <source>&Unit to show amounts in: </source> + <translation>&金额显示单位：</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="274"/> + <source>Choose the default subdivision unit to show in the interface, and when sending coins</source> + <translation>选择显示及发送比特币时使用的最小单位</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="281"/> + <source>Display addresses in transaction list</source> + <translation>在交易列表中显示地址</translation> + </message> +</context> +<context> + <name>EditAddressDialog</name> + <message> + <location filename="../forms/editaddressdialog.ui" line="14"/> + <source>Edit Address</source> + <translation>编辑地址</translation> + </message> + <message> + <location filename="../forms/editaddressdialog.ui" line="25"/> + <source>&Label</source> + <translation>&标签</translation> + </message> + <message> + <location filename="../forms/editaddressdialog.ui" line="35"/> + <source>The label associated with this address book entry</source> + <translation>与此地址条目关联的标签</translation> + </message> + <message> + <location filename="../forms/editaddressdialog.ui" line="42"/> + <source>&Address</source> + <translation>&地址</translation> + </message> + <message> + <location filename="../forms/editaddressdialog.ui" line="52"/> + <source>The address associated with this address book entry. This can only be modified for sending addresses.</source> + <translation>该地址与地址簿中的条目已关联，无法作为发送地址编辑。</translation> + </message> + <message> + <location filename="../editaddressdialog.cpp" line="20"/> + <source>New receiving address</source> + <translation>新接收地址</translation> + </message> + <message> + <location filename="../editaddressdialog.cpp" line="24"/> + <source>New sending address</source> + <translation>新发送地址</translation> + </message> + <message> + <location filename="../editaddressdialog.cpp" line="27"/> + <source>Edit receiving address</source> + <translation>编辑接收地址</translation> + </message> + <message> + <location filename="../editaddressdialog.cpp" line="31"/> + <source>Edit sending address</source> + <translation>编辑发送地址</translation> + </message> + <message> + <location filename="../editaddressdialog.cpp" line="87"/> + <source>The entered address "%1" is already in the address book.</source> + <translation>输入的地址 "%1" 已经存在于地址薄。</translation> + </message> + <message> + <location filename="../editaddressdialog.cpp" line="92"/> + <source>The entered address "%1" is not a valid bitcoin address.</source> + <translation>输入的地址 "%1" 并不是一个有效的比特币地址</translation> + </message> + <message> + <location filename="../editaddressdialog.cpp" line="97"/> + <source>Could not unlock wallet.</source> + <translation>无法解锁钱包</translation> + </message> + <message> + <location filename="../editaddressdialog.cpp" line="102"/> + <source>New key generation failed.</source> + <translation>密钥创建失败.</translation> + </message> +</context> +<context> + <name>MainOptionsPage</name> + <message> + <location filename="../optionsdialog.cpp" line="170"/> + <source>&Start Bitcoin on window system startup</source> + <translation>&开机启动比特币</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="171"/> + <source>Automatically start Bitcoin after the computer is turned on</source> + <translation>在计算机启动后自动运行比特币</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="175"/> + <source>&Minimize to the tray instead of the taskbar</source> + <translation>&最小化到托盘</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="176"/> + <source>Show only a tray icon after minimizing the window</source> + <translation>最小化窗口后只显示一个托盘标志</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="180"/> + <source>Map port using &UPnP</source> + <translation>使用 &UPnP 映射端口</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="181"/> + <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> + <translation>自动在路由器中打开比特币端口。只有当您的路由器开启 UPnP 选项时此功能才有效。</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="185"/> + <source>M&inimize on close</source> + <translation>关闭时最小化</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="186"/> + <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> + </message> + <message> + <location filename="../optionsdialog.cpp" line="190"/> + <source>&Connect through SOCKS4 proxy:</source> + <translation>&通过SOCKS4代理连接</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="191"/> + <source>Connect to the Bitcon network through a SOCKS4 proxy (e.g. when connecting through Tor)</source> + <translation>通过一个SOCKS4代理连接到比特币网络 (如使用Tor连接时)</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="196"/> + <source>Proxy &IP: </source> + <translation>代理 &IP：</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="202"/> + <source>IP address of the proxy (e.g. 127.0.0.1)</source> + <translation>代理服务器IP (如 127.0.0.1)</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="205"/> + <source>&Port: </source> + <translation>&端口：</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="211"/> + <source>Port of the proxy (e.g. 1234)</source> + <translation>代理端口 (比如 1234)</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="217"/> + <source>Optional transaction fee per KB that helps make sure your transactions are processed quickly. Most transactions are 1KB. Fee 0.01 recommended.</source> + <translation>为每1KB交易数据支付交易费将保证您的交易尽快被处理.大部分交易数据都小于1KB. 建议支付0.01个比特币的交易费. </translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="223"/> + <source>Pay transaction &fee</source> + <translation>支付交易 &费用</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="226"/> + <source>Optional transaction fee per KB that helps make sure your transactions are processed quickly. Most transactions are 1KB. Fee 0.01 recommended.</source> + <translation>为每1KB交易数据支付交易费将保证您的交易尽快被处理.大部分交易数据都小于1KB. 建议支付0.01个比特币的交易费. </translation> + </message> +</context> +<context> + <name>OptionsDialog</name> + <message> + <location filename="../optionsdialog.cpp" line="79"/> + <source>Main</source> + <translation>主要的</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="84"/> + <source>Display</source> + <translation>查看</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="104"/> + <source>Options</source> + <translation>选项</translation> + </message> +</context> +<context> + <name>OverviewPage</name> + <message> + <location filename="../forms/overviewpage.ui" line="14"/> + <source>Form</source> + <translation>表单</translation> + </message> + <message> + <location filename="../forms/overviewpage.ui" line="40"/> + <source>Balance:</source> + <translation>余额</translation> + </message> + <message> + <location filename="../forms/overviewpage.ui" line="47"/> + <source>123.456 BTC</source> + <translation>123.456 BTC</translation> + </message> + <message> + <location filename="../forms/overviewpage.ui" line="54"/> + <source>Number of transactions:</source> + <translation>交易笔数</translation> + </message> + <message> + <location filename="../forms/overviewpage.ui" line="61"/> + <source>0</source> + <translation>0</translation> + </message> + <message> + <location filename="../forms/overviewpage.ui" line="68"/> + <source>Unconfirmed:</source> + <translation>未确认：</translation> + </message> + <message> + <location filename="../forms/overviewpage.ui" line="75"/> + <source>0 BTC</source> + <translation>0 BTC</translation> + </message> + <message> + <location filename="../forms/overviewpage.ui" line="82"/> + <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Wallet</span></p></body></html></source> + <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">钱包</span></p></body></html></translation> + </message> + <message> + <location filename="../forms/overviewpage.ui" line="122"/> + <source><b>Recent transactions</b></source> + <translation><b>当前交易</b></translation> + </message> + <message> + <location filename="../overviewpage.cpp" line="103"/> + <source>Your current balance</source> + <translation>您的当前余额</translation> + </message> + <message> + <location filename="../overviewpage.cpp" line="108"/> + <source>Total of transactions that have yet to be confirmed, and do not yet count toward the current balance</source> + <translation>尚未确认的交易总额, 未计入当前余额</translation> + </message> + <message> + <location filename="../overviewpage.cpp" line="111"/> + <source>Total number of transactions in wallet</source> + <translation>钱包总交易数量</translation> + </message> +</context> +<context> + <name>SendCoinsDialog</name> + <message> + <location filename="../forms/sendcoinsdialog.ui" line="14"/> + <location filename="../sendcoinsdialog.cpp" line="109"/> + <location filename="../sendcoinsdialog.cpp" line="114"/> + <location filename="../sendcoinsdialog.cpp" line="119"/> + <location filename="../sendcoinsdialog.cpp" line="124"/> + <location filename="../sendcoinsdialog.cpp" line="130"/> + <location filename="../sendcoinsdialog.cpp" line="135"/> + <location filename="../sendcoinsdialog.cpp" line="140"/> + <source>Send Coins</source> + <translation>发送货币</translation> + </message> + <message> + <location filename="../forms/sendcoinsdialog.ui" line="64"/> + <source>Send to multiple recipients at once</source> + <translation>一次发送给多个接收者</translation> + </message> + <message> + <location filename="../forms/sendcoinsdialog.ui" line="67"/> + <source>&Add recipient...</source> + <translation>&添加接收者...</translation> + </message> + <message> + <location filename="../forms/sendcoinsdialog.ui" line="84"/> + <source>Clear all</source> + <translation>清除全部</translation> + </message> + <message> + <location filename="../forms/sendcoinsdialog.ui" line="103"/> + <source>Balance:</source> + <translation>余额</translation> + </message> + <message> + <location filename="../forms/sendcoinsdialog.ui" line="110"/> + <source>123.456 BTC</source> + <translation>123.456 BTC</translation> + </message> + <message> + <location filename="../forms/sendcoinsdialog.ui" line="141"/> + <source>Confirm the send action</source> + <translation>确认并发送货币</translation> + </message> + <message> + <location filename="../forms/sendcoinsdialog.ui" line="144"/> + <source>&Send</source> + <translation>&发送</translation> + </message> + <message> + <location filename="../sendcoinsdialog.cpp" line="85"/> + <source><b>%1</b> to %2 (%3)</source> + <translation><b>%1</b> 到 %2 (%3)</translation> + </message> + <message> + <location filename="../sendcoinsdialog.cpp" line="88"/> + <source>Confirm send coins</source> + <translation>确认发送货币</translation> + </message> + <message> + <location filename="../sendcoinsdialog.cpp" line="89"/> + <source>Are you sure you want to send %1?</source> + <translation>确定您要发送 %1?</translation> + </message> + <message> + <location filename="../sendcoinsdialog.cpp" line="89"/> + <source> and </source> + <translation> 和 </translation> + </message> + <message> + <location filename="../sendcoinsdialog.cpp" line="110"/> + <source>The recepient address is not valid, please recheck.</source> + <translation>接收者地址不合法，请检查。</translation> + </message> + <message> + <location filename="../sendcoinsdialog.cpp" line="115"/> + <source>The amount to pay must be larger than 0.</source> + <translation>支付金额必须大于0.</translation> + </message> + <message> + <location filename="../sendcoinsdialog.cpp" line="120"/> + <source>Amount exceeds your balance</source> + <translation>余额不足。</translation> + </message> + <message> + <location filename="../sendcoinsdialog.cpp" line="125"/> + <source>Total exceeds your balance when the %1 transaction fee is included</source> + <translation>计入 %1 的交易费后，您的余额不足以支付总价。</translation> + </message> + <message> + <location filename="../sendcoinsdialog.cpp" line="131"/> + <source>Duplicate address found, can only send to each address once in one send operation</source> + <translation>发现重复地址，一次操作中只可以给每个地址发送一次</translation> + </message> + <message> + <location filename="../sendcoinsdialog.cpp" line="136"/> + <source>Error: Transaction creation failed </source> + <translation>错误：交易创建失败。</translation> + </message> + <message> + <location filename="../sendcoinsdialog.cpp" line="141"/> + <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> +</context> +<context> + <name>SendCoinsEntry</name> + <message> + <location filename="../forms/sendcoinsentry.ui" line="14"/> + <source>Form</source> + <translation>表单</translation> + </message> + <message> + <location filename="../forms/sendcoinsentry.ui" line="29"/> + <source>A&mount:</source> + <translation>金额</translation> + </message> + <message> + <location filename="../forms/sendcoinsentry.ui" line="42"/> + <source>Pay &To:</source> + <translation>支付 &到：</translation> + </message> + <message> + <location filename="../forms/sendcoinsentry.ui" line="66"/> + <location filename="../sendcoinsentry.cpp" line="26"/> + <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="75"/> + <source>&Label:</source> + <translation>&标签：</translation> + </message> + <message> + <location filename="../forms/sendcoinsentry.ui" line="93"/> + <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>付款地址 (例如: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> + <message> + <location filename="../forms/sendcoinsentry.ui" line="103"/> + <source>Choose adress from address book</source> + <translation>从地址薄选择地址</translation> + </message> + <message> + <location filename="../forms/sendcoinsentry.ui" line="113"/> + <source>Alt+A</source> + <translation>Alt+A</translation> + </message> + <message> + <location filename="../forms/sendcoinsentry.ui" line="120"/> + <source>Paste address from clipboard</source> + <translation>从剪贴板粘贴地址</translation> + </message> + <message> + <location filename="../forms/sendcoinsentry.ui" line="130"/> + <source>Alt+P</source> + <translation>Alt+P</translation> + </message> + <message> + <location filename="../forms/sendcoinsentry.ui" line="137"/> + <source>Remove this recipient</source> + <translation>移除此接收者</translation> + </message> + <message> + <location filename="../sendcoinsentry.cpp" line="25"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>请输入比特币地址 (例如: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> +</context> +<context> + <name>TransactionDesc</name> + <message> + <location filename="../transactiondesc.cpp" line="34"/> + <source>Open for %1 blocks</source> + <translation>开启 %1 个数据块</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="36"/> + <source>Open until %1</source> + <translation>至 %1 个数据块时开启</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="42"/> + <source>%1/offline?</source> + <translation>%1/离线?</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="44"/> + <source>%1/unconfirmed</source> + <translation>%1/未确认</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="46"/> + <source>%1 confirmations</source> + <translation>%1 确认项</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="63"/> + <source><b>Status:</b> </source> + <translation><b>状态：</b></translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="68"/> + <source>, has not been successfully broadcast yet</source> + <translation>, 未被成功广播</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="70"/> + <source>, broadcast through %1 node</source> + <translation>，同过 %1 节点广播</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="72"/> + <source>, broadcast through %1 nodes</source> + <translation>，同过 %1 节点组广播</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="76"/> + <source><b>Date:</b> </source> + <translation><b>日期：</b></translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="83"/> + <source><b>Source:</b> Generated<br></source> + <translation><b>来源:</b> 生成<br></translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="89"/> + <location filename="../transactiondesc.cpp" line="106"/> + <source><b>From:</b> </source> + <translation><b>从：</b></translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="106"/> + <source>unknown</source> + <translation>未知</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="107"/> + <location filename="../transactiondesc.cpp" line="130"/> + <location filename="../transactiondesc.cpp" line="189"/> + <source><b>To:</b> </source> + <translation><b>到：</b></translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="110"/> + <source> (yours, label: </source> + <translation>(您的, 标签：</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="112"/> + <source> (yours)</source> + <translation>(您的)</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="147"/> + <location filename="../transactiondesc.cpp" line="161"/> + <location filename="../transactiondesc.cpp" line="206"/> + <location filename="../transactiondesc.cpp" line="223"/> + <source><b>Credit:</b> </source> + <translation><b>到帐:</b> </translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="149"/> + <source>(%1 matures in %2 more blocks)</source> + <translation>(%1 成熟于 %2 以上数据块)</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="153"/> + <source>(not accepted)</source> + <translation>(未接受)</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="197"/> + <location filename="../transactiondesc.cpp" line="205"/> + <location filename="../transactiondesc.cpp" line="220"/> + <source><b>Debit:</b> </source> + <translation>支出</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="211"/> + <source><b>Transaction fee:</b> </source> + <translation>交易费</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="227"/> + <source><b>Net amount:</b> </source> + <translation><b>网络金额：</b> </translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="233"/> + <source>Message:</source> + <translation>消息：</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="235"/> + <source>Comment:</source> + <translation>备注</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="238"/> + <source>Generated coins must wait 120 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, it will change to "not accepted" and not be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source> + <translation>新生产的比特币必须等待120个数据块之后才能被使用. 当您生产出此数据块,它将被广播至比特币网络并添加至数据链. 如果添加到数据链失败, 它的状态将变成"不被接受"，生产的比特币将不能使用. 在您生产新数据块的几秒钟内, 如果其它节点也生产出同样的数据块，有可能会发生这种情况.</translation> + </message> +</context> +<context> + <name>TransactionDescDialog</name> + <message> + <location filename="../forms/transactiondescdialog.ui" line="14"/> + <source>Transaction details</source> + <translation>交易细节</translation> + </message> + <message> + <location filename="../forms/transactiondescdialog.ui" line="20"/> + <source>This pane shows a detailed description of the transaction</source> + <translation>当前面板显示了交易的详细描述</translation> + </message> +</context> +<context> + <name>TransactionTableModel</name> + <message> + <location filename="../transactiontablemodel.cpp" line="213"/> + <source>Date</source> + <translation>日期</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="213"/> + <source>Type</source> + <translation>类型</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="213"/> + <source>Address</source> + <translation>地址</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="213"/> + <source>Amount</source> + <translation>数量</translation> + </message> + <message numerus="yes"> + <location filename="../transactiontablemodel.cpp" line="274"/> + <source>Open for %n block(s)</source> + <translation><numerusform>开启 %n 个数据块</numerusform></translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="277"/> + <source>Open until %1</source> + <translation>至 %1 个数据块时开启</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="280"/> + <source>Offline (%1 confirmations)</source> + <translation>离线 (%1 个确认项)</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="283"/> + <source>Unconfirmed (%1 of %2 confirmations)</source> + <translation>未确认 (%1 / %2 条确认信息)</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="286"/> + <source>Confirmed (%1 confirmations)</source> + <translation>已确认 (%1 条确认信息)</translation> + </message> + <message numerus="yes"> + <location filename="../transactiontablemodel.cpp" line="295"/> + <source>Mined balance will be available in %n more blocks</source> + <translation><numerusform>挖矿所得将在 %n 个数据块之后可用</numerusform></translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="301"/> + <source>This block was not received by any other nodes and will probably not be accepted!</source> + <translation>此区块未被其他节点接收，并可能不被接受！</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="304"/> + <source>Generated but not accepted</source> + <translation>已生成但未被接受</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="347"/> + <source>Received with</source> + <translation>接收于</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="349"/> + <source>Received from IP</source> + <translation>从IP接收 </translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="351"/> + <source>Sent to</source> + <translation>发送到</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="353"/> + <source>Sent to IP</source> + <translation>发送到IP</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="355"/> + <source>Payment to yourself</source> + <translation>付款给自己</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="357"/> + <source>Mined</source> + <translation>挖矿所得</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="395"/> + <source>(n/a)</source> + <translation>(n/a)</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="594"/> + <source>Transaction status. Hover over this field to show number of confirmations.</source> + <translation>交易状态。 鼠标移到此区域上可显示确认消息项的数目。</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="596"/> + <source>Date and time that the transaction was received.</source> + <translation>接收交易的时间</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="598"/> + <source>Type of transaction.</source> + <translation>交易类别。</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="600"/> + <source>Destination address of transaction.</source> + <translation>交易目的地址。</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="602"/> + <source>Amount removed from or added to balance.</source> + <translation>从余额添加或移除的金额</translation> + </message> +</context> +<context> + <name>TransactionView</name> + <message> + <location filename="../transactionview.cpp" line="55"/> + <location filename="../transactionview.cpp" line="71"/> + <source>All</source> + <translation>全部</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="56"/> + <source>Today</source> + <translation>今天</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="57"/> + <source>This week</source> + <translation>本周</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="58"/> + <source>This month</source> + <translation>本月</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="59"/> + <source>Last month</source> + <translation>上月</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="60"/> + <source>This year</source> + <translation>今年</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="61"/> + <source>Range...</source> + <translation>范围...</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="72"/> + <source>Received with</source> + <translation>接收于</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="74"/> + <source>Sent to</source> + <translation>发送到</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="76"/> + <source>To yourself</source> + <translation>到自己</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="77"/> + <source>Mined</source> + <translation>挖矿所得</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="78"/> + <source>Other</source> + <translation>其他</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="84"/> + <source>Enter address or label to search</source> + <translation>输入地址或标签进行搜索</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="90"/> + <source>Min amount</source> + <translation>最小金额</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="125"/> + <source>Copy address</source> + <translation>复制地址</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="126"/> + <source>Copy label</source> + <translation>复制标签</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="127"/> + <source>Edit label</source> + <translation>编辑标签</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="128"/> + <source>Show details...</source> + <translation>显示细节...</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="261"/> + <source>Export Transaction Data</source> + <translation>导出交易数据</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="263"/> + <source>Comma separated file (*.csv)</source> + <translation>逗号分隔文件(*.csv)</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="271"/> + <source>Confirmed</source> + <translation>已确认</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="272"/> + <source>Date</source> + <translation>日期</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="273"/> + <source>Type</source> + <translation>类别</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="274"/> + <source>Label</source> + <translation>标签</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="275"/> + <source>Address</source> + <translation>地址</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="276"/> + <source>Amount</source> + <translation>金额</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="277"/> + <source>ID</source> + <translation>ID</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="281"/> + <source>Error exporting</source> + <translation>导出错误</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="281"/> + <source>Could not write to file %1.</source> + <translation>无法写入文件 %1。</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="369"/> + <source>Range:</source> + <translation>范围：</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="377"/> + <source>to</source> + <translation>到</translation> + </message> +</context> +<context> + <name>WalletModel</name> + <message> + <location filename="../walletmodel.cpp" line="144"/> + <source>Sending...</source> + <translation>发送中...</translation> + </message> +</context> +<context> + <name>bitcoin-core</name> + <message> + <location filename="../bitcoinstrings.cpp" line="3"/> + <source>Bitcoin version</source> + <translation>比特币版本</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="4"/> + <source>Usage:</source> + <translation>使用：</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="5"/> + <source>Send command to -server or bitcoind</source> + <translation>发送命令到服务器或者 bitcoind +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="6"/> + <source>List commands</source> + <translation>列出命令 +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="7"/> + <source>Get help for a command</source> + <translation>获得某条命令的帮助 +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="8"/> + <source>Options:</source> + <translation>选项： +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="9"/> + <source>Specify configuration file (default: bitcoin.conf)</source> + <translation>指定配置文件 (默认为 bitcoin.conf) +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="10"/> + <source>Specify pid file (default: bitcoind.pid)</source> + <translation>指定 pid 文件 (默认为 bitcoind.pid) +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="11"/> + <source>Generate coins</source> + <translation>生成货币 +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="12"/> + <source>Don't generate coins</source> + <translation>不要生成货币 +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="13"/> + <source>Start minimized</source> + <translation>启动时最小化 +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="14"/> + <source>Specify data directory</source> + <translation>指定数据目录 +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="15"/> + <source>Specify connection timeout (in milliseconds)</source> + <translation>指定连接超时时间 (微秒) +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="16"/> + <source>Connect through socks4 proxy</source> + <translation>通过 socks4 代理连接 +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="17"/> + <source>Allow DNS lookups for addnode and connect</source> + <translation>连接节点时允许DNS查找 +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="18"/> + <source>Add a node to connect to</source> + <translation>连接到指定节点</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="19"/> + <source>Connect only to the specified node</source> + <translation>只连接到指定节点 +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="20"/> + <source>Don't accept connections from outside</source> + <translation>禁止接收外部连接 +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="21"/> + <source>Don't attempt to use UPnP to map the listening port</source> + <translation>禁止使用 UPnP 映射监听端口 +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="22"/> + <source>Attempt to use UPnP to map the listening port</source> + <translation>尝试使用 UPnP 映射监听端口 +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="23"/> + <source>Fee per KB to add to transactions you send</source> + <translation>每发送1KB交易所需的费用</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="24"/> + <source>Accept command line and JSON-RPC commands</source> + <translation>接受命令行和 JSON-RPC 命令 +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="25"/> + <source>Run in the background as a daemon and accept commands</source> + <translation>在后台运行并接受命令 + +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="26"/> + <source>Use the test network</source> + <translation>使用测试网络 +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="27"/> + <source>Username for JSON-RPC connections</source> + <translation>JSON-RPC连接用户名 +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="28"/> + <source>Password for JSON-RPC connections</source> + <translation>JSON-RPC连接密码 +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="29"/> + <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> + <translation>JSON-RPC连接监听<端口> (默认为 8332) +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="30"/> + <source>Allow JSON-RPC connections from specified IP address</source> + <translation>允许从指定IP接受到的JSON-RPC连接 +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="31"/> + <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> + <translation>向IP地址为 <ip> 的节点发送指令 (缺省: 127.0.0.1) +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="32"/> + <source>Set key pool size to <n> (default: 100)</source> + <translation>设置密钥池大小为 <n> (缺省: 100) +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="33"/> + <source>Rescan the block chain for missing wallet transactions</source> + <translation>重新扫描数据链以查找遗漏的交易 +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="34"/> + <source> +SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> + <translation> +SSL 选项: (SSL 安装教程具体见比特币维基百科) +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="37"/> + <source>Use OpenSSL (https) for JSON-RPC connections</source> + <translation>为 JSON-RPC 连接使用 OpenSSL (https)连接</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="38"/> + <source>Server certificate file (default: server.cert)</source> + <translation>服务器证书 (默认为 server.cert) +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="39"/> + <source>Server private key (default: server.pem)</source> + <translation>服务器私钥 (默认为 server.pem) +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="40"/> + <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> + <translation>可接受的加密器 (默认为 TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="43"/> + <source>This help message</source> + <translation>该帮助信息 +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="44"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> + <translation>无法给数据目录 %s 加锁。比特币进程可能已在运行。</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="47"/> + <source>Loading addresses...</source> + <translation>正在加载地址...</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="48"/> + <source>Error loading addr.dat </source> + <translation>加载 addr.dat 错误 +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="49"/> + <source>Loading block index...</source> + <translation>加载区块索引...</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="50"/> + <source>Error loading blkindex.dat </source> + <translation>加载 blkindex.dat 失败 +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="51"/> + <source>Loading wallet...</source> + <translation>正在加载钱包...</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="52"/> + <source>Error loading wallet.dat: Wallet corrupted </source> + <translation>加载 wallet.dat 失败：钱包崩溃 +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="53"/> + <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin </source> + <translation>加载 wallet.dat 失败：运行钱包需要一个更新版本的比特币软件 +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="55"/> + <source>Error loading wallet.dat </source> + <translation>加载 wallet.dat 失败 +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="56"/> + <source>Rescanning...</source> + <translation>正在重新扫描...</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="57"/> + <source>Done loading</source> + <translation>加载完成</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="58"/> + <source>Invalid -proxy address</source> + <translation>代理地址不合法</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="59"/> + <source>Invalid amount for -paytxfee=<amount></source> + <translation>不合适的交易费 -paytxfee=<amount></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="60"/> + <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> + <message> + <location filename="../bitcoinstrings.cpp" line="63"/> + <source>Error: CreateThread(StartNode) failed</source> + <translation>错误：线程创建(StartNode)失败</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="64"/> + <source>Warning: Disk space is low </source> + <translation>警告：磁盘空间不足</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="65"/> + <source>Unable to bind to port %d on this computer. Bitcoin is probably already running.</source> + <translation>无法绑定端口 %d 到这台计算机。比特币进程可能已在运行。</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="68"/> + <source>This transaction is over the size limit. You can still send it for a fee of %s, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source> + <translation>交易超出大小限制。你可以继续以 %s 的费用发送。这笔费用将被发送到处理此次交易的节点用以帮助支持这个网络。你想要支付此笔费用吗？</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="72"/> + <source>Enter the current passphrase to the wallet.</source> + <translation>输入当前钱包口令</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="73"/> + <source>Passphrase</source> + <translation>口令</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="74"/> + <source>Please supply the current wallet decryption passphrase.</source> + <translation>请提供当前钱包解密口令</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="75"/> + <source>The passphrase entered for the wallet decryption was incorrect.</source> + <translation>当前钱包解密口令不正确。</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="76"/> + <source>Status</source> + <translation>状态</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="77"/> + <source>Date</source> + <translation>日期 </translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="78"/> + <source>Description</source> + <translation>描述</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="79"/> + <source>Debit</source> + <translation>支出</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="80"/> + <source>Credit</source> + <translation>收入</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="81"/> + <source>Open for %d blocks</source> + <translation>开启 %d 个数据块</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="82"/> + <source>Open until %s</source> + <translation>至 %s 个数据块时开启</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="83"/> + <source>%d/offline?</source> + <translation>%d/ 离线？</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="84"/> + <source>%d/unconfirmed</source> + <translation>%d/未确认</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="85"/> + <source>%d confirmations</source> + <translation>%d 确认项</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="86"/> + <source>Generated</source> + <translation>生成</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="87"/> + <source>Generated (%s matures in %d more blocks)</source> + <translation>(%s 成熟于 %d 以上数据块)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="88"/> + <source>Generated - Warning: This block was not received by any other nodes and will probably not be accepted!</source> + <translation>已生成 - 警告：此区块未被其他接收并可能不被接受</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="91"/> + <source>Generated (not accepted)</source> + <translation>已生成(未接受)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="92"/> + <source>From: </source> + <translation>从：</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="93"/> + <source>Received with: </source> + <translation>接收于</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="94"/> + <source>Payment to yourself</source> + <translation>支付给自己</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="95"/> + <source>To: </source> + <translation>到：</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="96"/> + <source> Generating</source> + <translation>生成中</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="97"/> + <source>(not connected)</source> + <translation>(未连接)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="98"/> + <source> %d connections %d blocks %d transactions</source> + <translation> %d 个连接 %d 个数据块 %d 笔交易</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="99"/> + <source>Wallet already encrypted.</source> + <translation>钱包已被加密。</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="100"/> + <source>Enter the new passphrase to the wallet. +Please use a passphrase of 10 or more random characters, or eight or more words.</source> + <translation>请输入新的钱包密码. +密码须包含10个以上字符,或8个以上单词.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="104"/> + <source>Error: The supplied passphrase was too short.</source> + <translation>错误：提供的口令过短。</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="105"/> + <source>WARNING: If you encrypt your wallet and lose your passphrase, you will LOSE ALL OF YOUR BITCOINS! +Are you sure you wish to encrypt your wallet?</source> + <translation>警告:如果您在加密钱包后忘记密码, 你将会丢失钱包中所有的比特币! +您确定要对钱包进行加密吗?</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="109"/> + <source>Please re-enter your new wallet passphrase.</source> + <translation>请重新输入您的新钱包口令</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="110"/> + <source>Error: the supplied passphrases didn't match.</source> + <translation>错误：提供的口令不匹配。</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="111"/> + <source>Wallet encryption failed.</source> + <translation>钱包加密失败。</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="112"/> + <source>Wallet Encrypted. +Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> + <translation>钱包加密成功. +谨记:如果您的电脑感染病毒或木马,即使钱包已经加密,也不能保证您的比特币不被窃,请做好电脑防毒工作.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="116"/> + <source>Wallet is unencrypted, please encrypt it first.</source> + <translation>钱包未加密,请先加密.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="117"/> + <source>Enter the new passphrase for the wallet.</source> + <translation>为钱包输入新口令</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="118"/> + <source>Re-enter the new passphrase for the wallet.</source> + <translation>请再次输入新口令。</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="119"/> + <source>Wallet Passphrase Changed.</source> + <translation>钱包口令已改变</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="120"/> + <source>New Receiving Address</source> + <translation>新接收地址</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="121"/> + <source>You should use a new address for each payment you receive. + +Label</source> + <translation>你应该为每一笔支付使用一条新地址 + +标签</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="125"/> + <source><b>Status:</b> </source> + <translation><b>状态:</b> </translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="126"/> + <source>, has not been successfully broadcast yet</source> + <translation>，还未被成功广播。</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="127"/> + <source>, broadcast through %d node</source> + <translation>，通过%d个节点广播</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="128"/> + <source>, broadcast through %d nodes</source> + <translation>，通过%d个节点组广播</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="129"/> + <source><b>Date:</b> </source> + <translation><b>日期:</b> </translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="130"/> + <source><b>Source:</b> Generated<br></source> + <translation><b>来源:</b> 生成<br></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="131"/> + <source><b>From:</b> </source> + <translation><b>从:</b> </translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="132"/> + <source>unknown</source> + <translation>未知</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="133"/> + <source><b>To:</b> </source> + <translation><b>到:</b> </translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="134"/> + <source> (yours, label: </source> + <translation>(您的，标签：</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="135"/> + <source> (yours)</source> + <translation>(你的)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="136"/> + <source><b>Credit:</b> </source> + <translation><b>收入:</b> </translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="137"/> + <source>(%s matures in %d more blocks)</source> + <translation>(%s 成熟于 %d 以上数据块)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="138"/> + <source>(not accepted)</source> + <translation>(拒绝)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="139"/> + <source><b>Debit:</b> </source> + <translation><b>支出:</b> </translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="140"/> + <source><b>Transaction fee:</b> </source> + <translation><b>交易费：</b></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="141"/> + <source><b>Net amount:</b> </source> + <translation><b>网络金额：</b></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="142"/> + <source>Message:</source> + <translation>消息：</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="143"/> + <source>Comment:</source> + <translation>备注：</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="144"/> + <source>Generated coins must wait 120 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, it will change to "not accepted" and not be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source> + <translation>新生产的比特币必须等待120个数据块之后才能被使用. 当您生产出此数据块,它将被广播至比特币网络并添加至数据链. 如果添加到数据链失败, 它的状态将变成"不被接受"，生产的比特币将不能使用. 在您生产新数据块的几秒钟内, 如果其它节点也生产出同样的数据块，有可能会发生这种情况.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="150"/> + <source>Cannot write autostart/bitcoin.desktop file</source> + <translation>无法写入 autostart/bitcoin.desktop 文件</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="151"/> + <source>Main</source> + <translation>主要的</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="152"/> + <source>&Start Bitcoin on window system startup</source> + <translation>&系统启动时运行比特币</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="153"/> + <source>&Minimize on close</source> + <translation>&关闭时最小化</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="154"/> + <source>version %s</source> + <translation>版本 %s</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="155"/> + <source>Error in amount </source> + <translation>金额错误</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="156"/> + <source>Send Coins</source> + <translation>已发送的货币</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="157"/> + <source>Amount exceeds your balance </source> + <translation>余额不足</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="158"/> + <source>Total exceeds your balance when the </source> + <translation>总价超出您的余额：</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="159"/> + <source> transaction fee is included </source> + <translation>已包含交易费</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="160"/> + <source>Payment sent </source> + <translation>支付已发送</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="161"/> + <source>Sending...</source> + <translation>正在发送...</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="162"/> + <source>Invalid address </source> + <translation>地址不合法 </translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="163"/> + <source>Sending %s to %s</source> + <translation>正在发送 %s 到 %s</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="164"/> + <source>CANCELLED</source> + <translation>已取消</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="165"/> + <source>Cancelled</source> + <translation>已取消</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="166"/> + <source>Transfer cancelled </source> + <translation>传输已取消</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="167"/> + <source>Error: </source> + <translation>错误: </translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="168"/> + <source>Insufficient funds</source> + <translation>金额不足</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="169"/> + <source>Connecting...</source> + <translation>正在连接...</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="170"/> + <source>Unable to connect</source> + <translation>无法连接</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="171"/> + <source>Requesting public key...</source> + <translation>正在请求公钥...</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="172"/> + <source>Received public key...</source> + <translation>公钥已接收...</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="173"/> + <source>Recipient is not accepting transactions sent by IP address</source> + <translation>接收者拒绝接收该 IP 地址发送的交易</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="174"/> + <source>Transfer was not accepted</source> + <translation>传输被拒绝</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="175"/> + <source>Invalid response received</source> + <translation>收到非法应答</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="176"/> + <source>Creating transaction...</source> + <translation>创建交易...</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="177"/> + <source>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> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="180"/> + <source>Transaction creation failed</source> + <translation>交易创建失败</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="181"/> + <source>Transaction aborted</source> + <translation>交易终止</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="182"/> + <source>Lost connection, transaction cancelled</source> + <translation>连接丢失，交易已被取消</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="183"/> + <source>Sending payment...</source> + <translation>发送支付...</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="184"/> + <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 filename="../bitcoinstrings.cpp" line="188"/> + <source>Waiting for confirmation...</source> + <translation>等待确认...</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="189"/> + <source>The payment was sent, but the recipient was unable to verify it. +The transaction is recorded and will credit to the recipient, +but the comment information will be blank.</source> + <translation>已付款, 但是无法验证收款人. +这笔交易已经被记录了, 金额也会被记入至收款人的账户, +但附注信息将会是空白.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="193"/> + <source>Payment was sent, but an invalid response was received</source> + <translation>支付已发送，但收到了一个非法应答。</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="194"/> + <source>Payment completed</source> + <translation>支付已完成</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="195"/> + <source>Name</source> + <translation>姓名</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="196"/> + <source>Address</source> + <translation>地址 </translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="197"/> + <source>Label</source> + <translation>标签</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="198"/> + <source>Bitcoin Address</source> + <translation>比特币地址</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="199"/> + <source>This is one of your own addresses for receiving payments and cannot be entered in the address book. </source> + <translation>这是一条您自己的用于接收支付的地址，不可以填入地址薄。</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="202"/> + <source>Edit Address</source> + <translation>编辑地址</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="203"/> + <source>Edit Address Label</source> + <translation>编辑地址标签</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="204"/> + <source>Add Address</source> + <translation>添加地址</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="205"/> + <source>Bitcoin</source> + <translation>比特币</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="206"/> + <source>Bitcoin - Generating</source> + <translation>比特币 - 生成中</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="207"/> + <source>Bitcoin - (not connected)</source> + <translation>比特币 - (未连接)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="208"/> + <source>&Open Bitcoin</source> + <translation>&打开比特币</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="209"/> + <source>&Send Bitcoins</source> + <translation>&发送比特币</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="210"/> + <source>O&ptions...</source> + <translation>选项</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="211"/> + <source>E&xit</source> + <translation>退出</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="212"/> + <source>Program has crashed and will terminate. </source> + <translation>程序崩溃，即将终止。</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="213"/> + <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> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="216"/> + <source>beta</source> + <translation>测试</translation> + </message> +</context> +<context> + <name>main</name> + <message> + <location filename="../bitcoin.cpp" line="145"/> + <source>Bitcoin Qt</source> + <translation>比特币 Qt</translation> + </message> +</context> +</TS>
\ No newline at end of file diff --git a/src/qt/locale/bitcoin_zh_TW.ts b/src/qt/locale/bitcoin_zh_TW.ts index b150620648..f03ff82bbe 100644 --- a/src/qt/locale/bitcoin_zh_TW.ts +++ b/src/qt/locale/bitcoin_zh_TW.ts @@ -495,8 +495,7 @@ Are you sure you wish to encrypt your wallet?</source> <source>Date: %1 Amount: %2 Type: %3 -Address: %4 -</source> +Address: %4</source> <translation>日期: %1 金額: %2 類別: %3 @@ -1398,242 +1397,207 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../bitcoinstrings.cpp" line="5"/> - <source>Send command to -server or bitcoind -</source> + <source>Send command to -server or bitcoind</source> <translation>送指令至 -server 或 bitcoind </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="6"/> - <source>List commands -</source> + <source>List commands</source> <translation>列出指令 </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="7"/> - <source>Get help for a command -</source> + <source>Get help for a command</source> <translation>取得指令說明 </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="8"/> - <source>Options: -</source> + <source>Options:</source> <translation>選項: </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="9"/> - <source>Specify configuration file (default: bitcoin.conf) -</source> + <source>Specify configuration file (default: bitcoin.conf)</source> <translation>指定設定檔 (預設: bitcoin.conf) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="10"/> - <source>Specify pid file (default: bitcoind.pid) -</source> + <source>Specify pid file (default: bitcoind.pid)</source> <translation>指定行程識別碼檔案 (預設: bitcoind.pid) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="11"/> - <source>Generate coins -</source> + <source>Generate coins</source> <translation>生產位元幣 </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="12"/> - <source>Don't generate coins -</source> + <source>Don't generate coins</source> <translation>不生產位元幣 </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="13"/> - <source>Start minimized -</source> + <source>Start minimized</source> <translation>啓動時最小化 </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="14"/> - <source>Specify data directory -</source> + <source>Specify data directory</source> <translation>指定資料目錄 </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="15"/> - <source>Specify connection timeout (in milliseconds) -</source> + <source>Specify connection timeout (in milliseconds)</source> <translation>指定連線逾時時間 (毫秒) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="16"/> - <source>Connect through socks4 proxy -</source> + <source>Connect through socks4 proxy</source> <translation>透過 socks4 代理伺服器連線 </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="17"/> - <source>Allow DNS lookups for addnode and connect -</source> + <source>Allow DNS lookups for addnode and connect</source> <translation>允許 addnode 和 connect 時做域名解析 </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="18"/> - <source>Add a node to connect to -</source> + <source>Add a node to connect to</source> <translation>新增連線節點 </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="19"/> - <source>Connect only to the specified node -</source> + <source>Connect only to the specified node</source> <translation>只連線至指定節點 </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="20"/> - <source>Don't accept connections from outside -</source> + <source>Don't accept connections from outside</source> <translation>不接受外來連線 </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="21"/> - <source>Don't attempt to use UPnP to map the listening port -</source> + <source>Don't attempt to use UPnP to map the listening port</source> <translation>不嘗試用 UPnP 來設定服務連接埠的對應 </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="22"/> - <source>Attempt to use UPnP to map the listening port -</source> + <source>Attempt to use UPnP to map the listening port</source> <translation>嘗試用 UPnP 來設定服務連接埠的對應 </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="23"/> - <source>Fee per KB to add to transactions you send -</source> + <source>Fee per KB to add to transactions you send</source> <translation>交易付款時每 KB 的交易手續費 </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="24"/> - <source>Accept command line and JSON-RPC commands -</source> + <source>Accept command line and JSON-RPC commands</source> <translation>接受命令列與 JSON-RPC 指令 </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="25"/> - <source>Run in the background as a daemon and accept commands -</source> + <source>Run in the background as a daemon and accept commands</source> <translation>以背景程式執行並接受指令</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="26"/> - <source>Use the test network -</source> + <source>Use the test network</source> <translation>使用測試網路 </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="27"/> - <source>Username for JSON-RPC connections -</source> + <source>Username for JSON-RPC connections</source> <translation>JSON-RPC 連線使用者名稱</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="28"/> - <source>Password for JSON-RPC connections -</source> + <source>Password for JSON-RPC connections</source> <translation>JSON-RPC 連線密碼</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="29"/> - <source>Listen for JSON-RPC connections on <port> (default: 8332) -</source> + <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> <translation>在通訊埠 <port> 聽候 JSON-RPC 連線 (預設: 8332)</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="30"/> - <source>Allow JSON-RPC connections from specified IP address -</source> + <source>Allow JSON-RPC connections from specified IP address</source> <translation>只允許從指定網路位址來的 JSON-RPC 連線</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="31"/> - <source>Send commands to node running on <ip> (default: 127.0.0.1) -</source> + <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>送指令給在 <ip> 的節點 (預設: 127.0.0.1) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="32"/> - <source>Set key pool size to <n> (default: 100) -</source> + <source>Set key pool size to <n> (default: 100)</source> <translation>設定密鑰池大小為 <n> (預設: 100) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="33"/> - <source>Rescan the block chain for missing wallet transactions -</source> + <source>Rescan the block chain for missing wallet transactions</source> <translation>重新掃描區塊鎖鏈, 以尋找錢包所遺漏的交易.</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="34"/> <source> -SSL options: (see the Bitcoin Wiki for SSL setup instructions) -</source> +SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation> SSL 選項: (SSL 設定程序請見 Bitcoin Wiki) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="37"/> - <source>Use OpenSSL (https) for JSON-RPC connections -</source> + <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>使用 OpenSSL (https) 於JSON-RPC 連線 </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="38"/> - <source>Server certificate file (default: server.cert) -</source> + <source>Server certificate file (default: server.cert)</source> <translation>伺服器憑證檔 (預設: server.cert) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="39"/> - <source>Server private key (default: server.pem) -</source> + <source>Server private key (default: server.pem)</source> <translation>伺服器密鑰檔 (預設: server.pem) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="40"/> - <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) -</source> + <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation>可以接受的加密法 (預設: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="43"/> - <source>This help message -</source> + <source>This help message</source> <translation>此協助訊息 </translation> </message> @@ -1649,8 +1613,7 @@ SSL 選項: (SSL 設定程序請見 Bitcoin Wiki) </message> <message> <location filename="../bitcoinstrings.cpp" line="48"/> - <source>Error loading addr.dat -</source> + <source>Error loading addr.dat </source> <translation>載入 addr.dat 錯誤 </translation> </message> @@ -1661,8 +1624,7 @@ SSL 選項: (SSL 設定程序請見 Bitcoin Wiki) </message> <message> <location filename="../bitcoinstrings.cpp" line="50"/> - <source>Error loading blkindex.dat -</source> + <source>Error loading blkindex.dat </source> <translation>載入 blkindex.dat 失敗 </translation> </message> @@ -1673,22 +1635,19 @@ SSL 選項: (SSL 設定程序請見 Bitcoin Wiki) </message> <message> <location filename="../bitcoinstrings.cpp" line="52"/> - <source>Error loading wallet.dat: Wallet corrupted -</source> + <source>Error loading wallet.dat: Wallet corrupted </source> <translation>載入 wallet.dat 失敗: 錢包壞掉了 </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="53"/> - <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin -</source> + <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin </source> <translation>載入 wallet.dat 錯誤: 此錢包需要新版的 Bitcoin </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="55"/> - <source>Error loading wallet.dat -</source> + <source>Error loading wallet.dat </source> <translation>載入 wallet.dat 錯誤 </translation> </message> diff --git a/src/rpcdump.cpp b/src/rpcdump.cpp new file mode 100644 index 0000000000..f3978fbce8 --- /dev/null +++ b/src/rpcdump.cpp @@ -0,0 +1,101 @@ +// Copyright (c) 2011 Bitcoin Developers +// Distributed under the MIT/X11 software license, see the accompanying +// file license.txt or http://www.opensource.org/licenses/mit-license.php. + +#include "headers.h" +#include "init.h" // for pwalletMain +#include "bitcoinrpc.h" + +// #include <boost/asio.hpp> +// #include <boost/iostreams/concepts.hpp> +// #include <boost/iostreams/stream.hpp> +#include <boost/lexical_cast.hpp> +// #ifdef USE_SSL +// #include <boost/asio/ssl.hpp> +// typedef boost::asio::ssl::stream<boost::asio::ip::tcp::socket> SSLStream; +// #endif +// #include <boost/xpressive/xpressive_dynamic.hpp> +#include "json/json_spirit_reader_template.h" +#include "json/json_spirit_writer_template.h" +#include "json/json_spirit_utils.h" + +#define printf OutputDebugStringF + +// using namespace boost::asio; +using namespace json_spirit; +using namespace std; + +extern Object JSONRPCError(int code, const string& message); + +class CTxDump +{ +public: + CBlockIndex *pindex; + int64 nValue; + bool fSpent; + CWalletTx* ptx; + int nOut; + CTxDump(CWalletTx* ptx = NULL, int nOut = -1) + { + pindex = NULL; + nValue = 0; + fSpent = false; + this->ptx = ptx; + this->nOut = nOut; + } +}; + +Value importprivkey(const Array& params, bool fHelp) +{ + if (fHelp || params.size() < 1 || params.size() > 2) + throw runtime_error( + "importprivkey <bitcoinprivkey> [label]\n" + "Adds a private key (as returned by dumpprivkey) to your wallet."); + + string strSecret = params[0].get_str(); + string strLabel = ""; + if (params.size() > 1) + strLabel = params[1].get_str(); + CBitcoinSecret vchSecret; + bool fGood = vchSecret.SetString(strSecret); + + if (!fGood) throw JSONRPCError(-5,"Invalid private key"); + + CKey key; + key.SetSecret(vchSecret.GetSecret()); + CBitcoinAddress vchAddress = CBitcoinAddress(key.GetPubKey()); + + CRITICAL_BLOCK(cs_main) + CRITICAL_BLOCK(pwalletMain->cs_wallet) + { + pwalletMain->MarkDirty(); + pwalletMain->SetAddressBookName(vchAddress, strLabel); + + if (!pwalletMain->AddKey(key)) + throw JSONRPCError(-4,"Error adding key to wallet"); + + pwalletMain->ScanForWalletTransactions(pindexGenesisBlock, true); + pwalletMain->ReacceptWalletTransactions(); + } + + MainFrameRepaint(); + + return Value::null; +} + +Value dumpprivkey(const Array& params, bool fHelp) +{ + if (fHelp || params.size() != 1) + throw runtime_error( + "dumpprivkey <bitcoinaddress>\n" + "Reveals the private key corresponding to <bitcoinaddress>."); + + string strAddress = params[0].get_str(); + CBitcoinAddress address; + if (!address.SetString(strAddress)) + throw JSONRPCError(-5, "Invalid bitcoin address"); + CSecret vchSecret; + if (!pwalletMain->GetSecret(address, vchSecret)) + throw JSONRPCError(-4,"Private key for address " + strAddress + " is not known"); + return CBitcoinSecret(vchSecret).ToString(); +} diff --git a/src/serialize.h b/src/serialize.h index 78cff43d53..d3f6b7d703 100644 --- a/src/serialize.h +++ b/src/serialize.h @@ -60,9 +60,7 @@ class CDataStream; class CAutoFile; static const unsigned int MAX_SIZE = 0x02000000; -static const int VERSION = 50100; -static const char* pszSubVer = ""; -static const bool VERSION_IS_BETA = true; +static const int PROTOCOL_VERSION = 60000; // Used to bypass the rule against non-const reference to temporary // where it makes sense with wrappers such as CFlatData or CTxDB @@ -91,7 +89,7 @@ enum }; #define IMPLEMENT_SERIALIZE(statements) \ - unsigned int GetSerializeSize(int nType=0, int nVersion=VERSION) const \ + unsigned int GetSerializeSize(int nType=0, int nVersion=PROTOCOL_VERSION) const \ { \ CSerActionGetSerializeSize ser_action; \ const bool fGetSize = true; \ @@ -105,7 +103,7 @@ enum return nSerSize; \ } \ template<typename Stream> \ - void Serialize(Stream& s, int nType=0, int nVersion=VERSION) const \ + void Serialize(Stream& s, int nType=0, int nVersion=PROTOCOL_VERSION) const \ { \ CSerActionSerialize ser_action; \ const bool fGetSize = false; \ @@ -115,7 +113,7 @@ enum {statements} \ } \ template<typename Stream> \ - void Unserialize(Stream& s, int nType=0, int nVersion=VERSION) \ + void Unserialize(Stream& s, int nType=0, int nVersion=PROTOCOL_VERSION) \ { \ CSerActionUnserialize ser_action; \ const bool fGetSize = false; \ @@ -362,43 +360,43 @@ template<typename Stream, typename C> void Unserialize(Stream& is, std::basic_st // vector template<typename T, typename A> unsigned int GetSerializeSize_impl(const std::vector<T, A>& v, int nType, int nVersion, const boost::true_type&); template<typename T, typename A> unsigned int GetSerializeSize_impl(const std::vector<T, A>& v, int nType, int nVersion, const boost::false_type&); -template<typename T, typename A> inline unsigned int GetSerializeSize(const std::vector<T, A>& v, int nType, int nVersion=VERSION); +template<typename T, typename A> inline unsigned int GetSerializeSize(const std::vector<T, A>& v, int nType, int nVersion=PROTOCOL_VERSION); template<typename Stream, typename T, typename A> void Serialize_impl(Stream& os, const std::vector<T, A>& v, int nType, int nVersion, const boost::true_type&); template<typename Stream, typename T, typename A> void Serialize_impl(Stream& os, const std::vector<T, A>& v, int nType, int nVersion, const boost::false_type&); -template<typename Stream, typename T, typename A> inline void Serialize(Stream& os, const std::vector<T, A>& v, int nType, int nVersion=VERSION); +template<typename Stream, typename T, typename A> inline void Serialize(Stream& os, const std::vector<T, A>& v, int nType, int nVersion=PROTOCOL_VERSION); template<typename Stream, typename T, typename A> void Unserialize_impl(Stream& is, std::vector<T, A>& v, int nType, int nVersion, const boost::true_type&); template<typename Stream, typename T, typename A> void Unserialize_impl(Stream& is, std::vector<T, A>& v, int nType, int nVersion, const boost::false_type&); -template<typename Stream, typename T, typename A> inline void Unserialize(Stream& is, std::vector<T, A>& v, int nType, int nVersion=VERSION); +template<typename Stream, typename T, typename A> inline void Unserialize(Stream& is, std::vector<T, A>& v, int nType, int nVersion=PROTOCOL_VERSION); // others derived from vector -extern inline unsigned int GetSerializeSize(const CScript& v, int nType, int nVersion=VERSION); -template<typename Stream> void Serialize(Stream& os, const CScript& v, int nType, int nVersion=VERSION); -template<typename Stream> void Unserialize(Stream& is, CScript& v, int nType, int nVersion=VERSION); +extern inline unsigned int GetSerializeSize(const CScript& v, int nType, int nVersion=PROTOCOL_VERSION); +template<typename Stream> void Serialize(Stream& os, const CScript& v, int nType, int nVersion=PROTOCOL_VERSION); +template<typename Stream> void Unserialize(Stream& is, CScript& v, int nType, int nVersion=PROTOCOL_VERSION); // pair -template<typename K, typename T> unsigned int GetSerializeSize(const std::pair<K, T>& item, int nType, int nVersion=VERSION); -template<typename Stream, typename K, typename T> void Serialize(Stream& os, const std::pair<K, T>& item, int nType, int nVersion=VERSION); -template<typename Stream, typename K, typename T> void Unserialize(Stream& is, std::pair<K, T>& item, int nType, int nVersion=VERSION); +template<typename K, typename T> unsigned int GetSerializeSize(const std::pair<K, T>& item, int nType, int nVersion=PROTOCOL_VERSION); +template<typename Stream, typename K, typename T> void Serialize(Stream& os, const std::pair<K, T>& item, int nType, int nVersion=PROTOCOL_VERSION); +template<typename Stream, typename K, typename T> void Unserialize(Stream& is, std::pair<K, T>& item, int nType, int nVersion=PROTOCOL_VERSION); // 3 tuple -template<typename T0, typename T1, typename T2> unsigned int GetSerializeSize(const boost::tuple<T0, T1, T2>& item, int nType, int nVersion=VERSION); -template<typename Stream, typename T0, typename T1, typename T2> void Serialize(Stream& os, const boost::tuple<T0, T1, T2>& item, int nType, int nVersion=VERSION); -template<typename Stream, typename T0, typename T1, typename T2> void Unserialize(Stream& is, boost::tuple<T0, T1, T2>& item, int nType, int nVersion=VERSION); +template<typename T0, typename T1, typename T2> unsigned int GetSerializeSize(const boost::tuple<T0, T1, T2>& item, int nType, int nVersion=PROTOCOL_VERSION); +template<typename Stream, typename T0, typename T1, typename T2> void Serialize(Stream& os, const boost::tuple<T0, T1, T2>& item, int nType, int nVersion=PROTOCOL_VERSION); +template<typename Stream, typename T0, typename T1, typename T2> void Unserialize(Stream& is, boost::tuple<T0, T1, T2>& item, int nType, int nVersion=PROTOCOL_VERSION); // 4 tuple -template<typename T0, typename T1, typename T2, typename T3> unsigned int GetSerializeSize(const boost::tuple<T0, T1, T2, T3>& item, int nType, int nVersion=VERSION); -template<typename Stream, typename T0, typename T1, typename T2, typename T3> void Serialize(Stream& os, const boost::tuple<T0, T1, T2, T3>& item, int nType, int nVersion=VERSION); -template<typename Stream, typename T0, typename T1, typename T2, typename T3> void Unserialize(Stream& is, boost::tuple<T0, T1, T2, T3>& item, int nType, int nVersion=VERSION); +template<typename T0, typename T1, typename T2, typename T3> unsigned int GetSerializeSize(const boost::tuple<T0, T1, T2, T3>& item, int nType, int nVersion=PROTOCOL_VERSION); +template<typename Stream, typename T0, typename T1, typename T2, typename T3> void Serialize(Stream& os, const boost::tuple<T0, T1, T2, T3>& item, int nType, int nVersion=PROTOCOL_VERSION); +template<typename Stream, typename T0, typename T1, typename T2, typename T3> void Unserialize(Stream& is, boost::tuple<T0, T1, T2, T3>& item, int nType, int nVersion=PROTOCOL_VERSION); // map -template<typename K, typename T, typename Pred, typename A> unsigned int GetSerializeSize(const std::map<K, T, Pred, A>& m, int nType, int nVersion=VERSION); -template<typename Stream, typename K, typename T, typename Pred, typename A> void Serialize(Stream& os, const std::map<K, T, Pred, A>& m, int nType, int nVersion=VERSION); -template<typename Stream, typename K, typename T, typename Pred, typename A> void Unserialize(Stream& is, std::map<K, T, Pred, A>& m, int nType, int nVersion=VERSION); +template<typename K, typename T, typename Pred, typename A> unsigned int GetSerializeSize(const std::map<K, T, Pred, A>& m, int nType, int nVersion=PROTOCOL_VERSION); +template<typename Stream, typename K, typename T, typename Pred, typename A> void Serialize(Stream& os, const std::map<K, T, Pred, A>& m, int nType, int nVersion=PROTOCOL_VERSION); +template<typename Stream, typename K, typename T, typename Pred, typename A> void Unserialize(Stream& is, std::map<K, T, Pred, A>& m, int nType, int nVersion=PROTOCOL_VERSION); // set -template<typename K, typename Pred, typename A> unsigned int GetSerializeSize(const std::set<K, Pred, A>& m, int nType, int nVersion=VERSION); -template<typename Stream, typename K, typename Pred, typename A> void Serialize(Stream& os, const std::set<K, Pred, A>& m, int nType, int nVersion=VERSION); -template<typename Stream, typename K, typename Pred, typename A> void Unserialize(Stream& is, std::set<K, Pred, A>& m, int nType, int nVersion=VERSION); +template<typename K, typename Pred, typename A> unsigned int GetSerializeSize(const std::set<K, Pred, A>& m, int nType, int nVersion=PROTOCOL_VERSION); +template<typename Stream, typename K, typename Pred, typename A> void Serialize(Stream& os, const std::set<K, Pred, A>& m, int nType, int nVersion=PROTOCOL_VERSION); +template<typename Stream, typename K, typename Pred, typename A> void Unserialize(Stream& is, std::set<K, Pred, A>& m, int nType, int nVersion=PROTOCOL_VERSION); @@ -411,19 +409,19 @@ template<typename Stream, typename K, typename Pred, typename A> void Unserializ // Thanks to Boost serialization for this idea. // template<typename T> -inline unsigned int GetSerializeSize(const T& a, long nType, int nVersion=VERSION) +inline unsigned int GetSerializeSize(const T& a, long nType, int nVersion=PROTOCOL_VERSION) { return a.GetSerializeSize((int)nType, nVersion); } template<typename Stream, typename T> -inline void Serialize(Stream& os, const T& a, long nType, int nVersion=VERSION) +inline void Serialize(Stream& os, const T& a, long nType, int nVersion=PROTOCOL_VERSION) { a.Serialize(os, (int)nType, nVersion); } template<typename Stream, typename T> -inline void Unserialize(Stream& is, T& a, long nType, int nVersion=VERSION) +inline void Unserialize(Stream& is, T& a, long nType, int nVersion=PROTOCOL_VERSION) { a.Unserialize(is, (int)nType, nVersion); } @@ -857,39 +855,39 @@ public: typedef vector_type::const_iterator const_iterator; typedef vector_type::reverse_iterator reverse_iterator; - explicit CDataStream(int nTypeIn=SER_NETWORK, int nVersionIn=VERSION) + explicit CDataStream(int nTypeIn=SER_NETWORK, int nVersionIn=PROTOCOL_VERSION) { Init(nTypeIn, nVersionIn); } - CDataStream(const_iterator pbegin, const_iterator pend, int nTypeIn=SER_NETWORK, int nVersionIn=VERSION) : vch(pbegin, pend) + CDataStream(const_iterator pbegin, const_iterator pend, int nTypeIn=SER_NETWORK, int nVersionIn=PROTOCOL_VERSION) : vch(pbegin, pend) { Init(nTypeIn, nVersionIn); } #if !defined(_MSC_VER) || _MSC_VER >= 1300 - CDataStream(const char* pbegin, const char* pend, int nTypeIn=SER_NETWORK, int nVersionIn=VERSION) : vch(pbegin, pend) + CDataStream(const char* pbegin, const char* pend, int nTypeIn=SER_NETWORK, int nVersionIn=PROTOCOL_VERSION) : vch(pbegin, pend) { Init(nTypeIn, nVersionIn); } #endif - CDataStream(const vector_type& vchIn, int nTypeIn=SER_NETWORK, int nVersionIn=VERSION) : vch(vchIn.begin(), vchIn.end()) + CDataStream(const vector_type& vchIn, int nTypeIn=SER_NETWORK, int nVersionIn=PROTOCOL_VERSION) : vch(vchIn.begin(), vchIn.end()) { Init(nTypeIn, nVersionIn); } - CDataStream(const std::vector<char>& vchIn, int nTypeIn=SER_NETWORK, int nVersionIn=VERSION) : vch(vchIn.begin(), vchIn.end()) + CDataStream(const std::vector<char>& vchIn, int nTypeIn=SER_NETWORK, int nVersionIn=PROTOCOL_VERSION) : vch(vchIn.begin(), vchIn.end()) { Init(nTypeIn, nVersionIn); } - CDataStream(const std::vector<unsigned char>& vchIn, int nTypeIn=SER_NETWORK, int nVersionIn=VERSION) : vch((char*)&vchIn.begin()[0], (char*)&vchIn.end()[0]) + CDataStream(const std::vector<unsigned char>& vchIn, int nTypeIn=SER_NETWORK, int nVersionIn=PROTOCOL_VERSION) : vch((char*)&vchIn.begin()[0], (char*)&vchIn.end()[0]) { Init(nTypeIn, nVersionIn); } - void Init(int nTypeIn=SER_NETWORK, int nVersionIn=VERSION) + void Init(int nTypeIn=SER_NETWORK, int nVersionIn=PROTOCOL_VERSION) { nReadPos = 0; nType = nTypeIn; @@ -1103,7 +1101,7 @@ public: } template<typename Stream> - void Serialize(Stream& s, int nType=0, int nVersion=VERSION) const + void Serialize(Stream& s, int nType=0, int nVersion=PROTOCOL_VERSION) const { // Special case: stream << stream concatenates like stream += stream if (!vch.empty()) @@ -1212,7 +1210,7 @@ public: typedef FILE element_type; - CAutoFile(FILE* filenew=NULL, int nTypeIn=SER_DISK, int nVersionIn=VERSION) + CAutoFile(FILE* filenew=NULL, int nTypeIn=SER_DISK, int nVersionIn=PROTOCOL_VERSION) { file = filenew; nType = nTypeIn; diff --git a/src/uint256.h b/src/uint256.h index 3e20201387..b6132822c5 100644 --- a/src/uint256.h +++ b/src/uint256.h @@ -364,19 +364,19 @@ public: } - unsigned int GetSerializeSize(int nType=0, int nVersion=VERSION) const + unsigned int GetSerializeSize(int nType=0, int nVersion=PROTOCOL_VERSION) const { return sizeof(pn); } template<typename Stream> - void Serialize(Stream& s, int nType=0, int nVersion=VERSION) const + void Serialize(Stream& s, int nType=0, int nVersion=PROTOCOL_VERSION) const { s.write((char*)pn, sizeof(pn)); } template<typename Stream> - void Unserialize(Stream& s, int nType=0, int nVersion=VERSION) + void Unserialize(Stream& s, int nType=0, int nVersion=PROTOCOL_VERSION) { s.read((char*)pn, sizeof(pn)); } diff --git a/src/util.cpp b/src/util.cpp index 236c7f7c44..ef276e5103 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -4,6 +4,7 @@ // file license.txt or http://www.opensource.org/licenses/mit-license.php. #include "headers.h" #include "strlcpy.h" +#include <boost/algorithm/string/join.hpp> #include <boost/program_options/detail/config_file.hpp> #include <boost/program_options/parsers.hpp> #include <boost/filesystem.hpp> @@ -1001,7 +1002,7 @@ string FormatVersion(int nVersion) string FormatFullVersion() { - string s = FormatVersion(VERSION) + pszSubVer; + string s = FormatVersion(CLIENT_VERSION); if (VERSION_IS_BETA) { s += "-"; s += _("beta"); @@ -1009,6 +1010,17 @@ string FormatFullVersion() return s; } +// Format the subversion field according to BIP 14 spec (https://en.bitcoin.it/wiki/BIP_0014) +std::string FormatSubVersion(const std::string& name, int nClientVersion, const std::vector<std::string>& comments) +{ + std::ostringstream ss; + ss << "/"; + ss << name << ":" << FormatVersion(nClientVersion); + if (!comments.empty()) + ss << "(" << boost::algorithm::join(comments, "; ") << ")"; + ss << "/"; + return ss.str(); +} diff --git a/src/util.h b/src/util.h index 1ef0e6f15c..d9a0841a61 100644 --- a/src/util.h +++ b/src/util.h @@ -183,7 +183,6 @@ std::string DecodeBase64(const std::string& str); std::string EncodeBase64(const unsigned char* pch, size_t len); std::string EncodeBase64(const std::string& str); void ParseParameters(int argc, char* argv[]); -const char* wxGetTranslation(const char* psz); bool WildcardMatch(const char* psz, const char* mask); bool WildcardMatch(const std::string& str, const std::string& mask); int GetFilesize(FILE* file); @@ -205,7 +204,7 @@ void SetMockTime(int64 nMockTimeIn); int64 GetAdjustedTime(); void AddTimeData(unsigned int ip, int64 nTime); std::string FormatFullVersion(); - +std::string FormatSubVersion(const std::string& name, int nClientVersion, const std::vector<std::string>& comments); @@ -559,7 +558,7 @@ inline uint256 Hash(const T1 p1begin, const T1 p1end, } template<typename T> -uint256 SerializeHash(const T& obj, int nType=SER_GETHASH, int nVersion=VERSION) +uint256 SerializeHash(const T& obj, int nType=SER_GETHASH, int nVersion=PROTOCOL_VERSION) { // Most of the time is spent allocating and deallocating CDataStream's // buffer. If this ever needs to be optimized further, make a CStaticStream diff --git a/src/wallet.cpp b/src/wallet.cpp index 28babdb3e2..87f5dfd659 100644 --- a/src/wallet.cpp +++ b/src/wallet.cpp @@ -224,6 +224,15 @@ void CWallet::WalletUpdateSpent(const CTransaction &tx) } } +void CWallet::MarkDirty() +{ + CRITICAL_BLOCK(cs_wallet) + { + BOOST_FOREACH(PAIRTYPE(const uint256, CWalletTx)& item, mapWallet) + item.second.MarkDirty(); + } +} + bool CWallet::AddToWallet(const CWalletTx& wtxIn) { uint256 hash = wtxIn.GetHash(); @@ -232,7 +241,7 @@ bool CWallet::AddToWallet(const CWalletTx& wtxIn) // Inserts only if not already there, returns tx inserted or tx found pair<map<uint256, CWalletTx>::iterator, bool> ret = mapWallet.insert(make_pair(hash, wtxIn)); CWalletTx& wtx = (*ret.first).second; - wtx.pwallet = this; + wtx.BindWallet(this); bool fInsertedNew = ret.second; if (fInsertedNew) wtx.nTimeReceived = GetAdjustedTime(); @@ -299,7 +308,7 @@ bool CWallet::AddToWallet(const CWalletTx& wtxIn) // Add a transaction to the wallet, or update it. // pblock is optional, but should be provided if the transaction is known to be in a block. // If fUpdate is true, existing transactions will be updated. -bool CWallet::AddToWalletIfInvolvingMe(const CTransaction& tx, const CBlock* pblock, bool fUpdate) +bool CWallet::AddToWalletIfInvolvingMe(const CTransaction& tx, const CBlock* pblock, bool fUpdate, bool fFindBlock) { uint256 hash = tx.GetHash(); CRITICAL_BLOCK(cs_wallet) @@ -586,6 +595,15 @@ int CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, bool fUpdate) return ret; } +int CWallet::ScanForWalletTransaction(const uint256& hashTx) +{ + CTransaction tx; + tx.ReadFromDisk(COutPoint(hashTx, 0)); + if (AddToWalletIfInvolvingMe(tx, NULL, true, true)) + return 1; + return 0; +} + void CWallet::ReacceptWalletTransactions() { CTxDB txdb("r"); @@ -924,7 +942,7 @@ bool CWallet::CreateTransaction(const vector<pair<CScript, int64> >& vecSend, CW if (vecSend.empty() || nValue < 0) return false; - wtxNew.pwallet = this; + wtxNew.BindWallet(this); CRITICAL_BLOCK(cs_main) CRITICAL_BLOCK(cs_wallet) @@ -1062,7 +1080,7 @@ bool CWallet::CommitTransaction(CWalletTx& wtxNew, CReserveKey& reservekey) BOOST_FOREACH(const CTxIn& txin, wtxNew.vin) { CWalletTx &coin = mapWallet[txin.prevout.hash]; - coin.pwallet = this; + coin.BindWallet(this); coin.MarkSpent(txin.prevout.n); coin.WriteToDisk(); vWalletUpdated.push_back(coin.GetHash()); @@ -1325,6 +1343,22 @@ void CWallet::ReserveKeyFromKeyPool(int64& nIndex, CKeyPool& keypool) } } +int64 CWallet::AddReserveKey(const CKeyPool& keypool) +{ + CRITICAL_BLOCK(cs_main) + CRITICAL_BLOCK(cs_wallet) + { + CWalletDB walletdb(strWalletFile); + + int64 nIndex = 1 + *(--setKeyPool.end()); + if (!walletdb.WritePool(nIndex, keypool)) + throw runtime_error("AddReserveKey() : writing added key failed"); + setKeyPool.insert(nIndex); + return nIndex; + } + return -1; +} + void CWallet::KeepKey(int64 nIndex) { // Remove from key pool @@ -1413,3 +1447,23 @@ void CReserveKey::ReturnKey() vchPubKey.clear(); } +void CWallet::GetAllReserveAddresses(set<CBitcoinAddress>& setAddress) +{ + setAddress.clear(); + + CWalletDB walletdb(strWalletFile); + + CRITICAL_BLOCK(cs_main) + CRITICAL_BLOCK(cs_wallet) + BOOST_FOREACH(const int64& id, setKeyPool) + { + CKeyPool keypool; + if (!walletdb.ReadPool(id, keypool)) + throw runtime_error("GetAllReserveKeyHashes() : read failed"); + CBitcoinAddress address(keypool.vchPubKey); + assert(!keypool.vchPubKey.empty()); + if (!HaveKey(address)) + throw runtime_error("GetAllReserveKeyHashes() : unknown key in key pool"); + setAddress.insert(address); + } +} diff --git a/src/wallet.h b/src/wallet.h index ca7cf67317..78f055a604 100644 --- a/src/wallet.h +++ b/src/wallet.h @@ -74,11 +74,13 @@ public: bool ChangeWalletPassphrase(const SecureString& strOldWalletPassphrase, const SecureString& strNewWalletPassphrase); bool EncryptWallet(const SecureString& strWalletPassphrase); + void MarkDirty(); bool AddToWallet(const CWalletTx& wtxIn); - bool AddToWalletIfInvolvingMe(const CTransaction& tx, const CBlock* pblock, bool fUpdate = false); + bool AddToWalletIfInvolvingMe(const CTransaction& tx, const CBlock* pblock, bool fUpdate = false, bool fFindBlock = false); bool EraseFromWallet(uint256 hash); void WalletUpdateSpent(const CTransaction& prevout); int ScanForWalletTransactions(CBlockIndex* pindexStart, bool fUpdate = false); + int ScanForWalletTransaction(const uint256& hashTx); void ReacceptWalletTransactions(); void ResendWalletTransactions(); int64 GetBalance() const; @@ -92,11 +94,13 @@ public: bool NewKeyPool(); bool TopUpKeyPool(); + int64 AddReserveKey(const CKeyPool& keypool); void ReserveKeyFromKeyPool(int64& nIndex, CKeyPool& keypool); void KeepKey(int64 nIndex); void ReturnKey(int64 nIndex); bool GetKeyFromPool(std::vector<unsigned char> &key, bool fAllowReuse=true); int64 GetOldestKeyPoolTime(); + void GetAllReserveAddresses(std::set<CBitcoinAddress>& setAddress); bool IsMine(const CTxIn& txin) const; int64 GetDebit(const CTxIn& txin) const; @@ -243,9 +247,10 @@ public: // class CWalletTx : public CMerkleTx { -public: +private: const CWallet* pwallet; +public: std::vector<CMerkleTx> vtxPrev; std::map<std::string, std::string> mapValue; std::vector<std::pair<std::string, std::string> > vOrderForm; @@ -389,6 +394,12 @@ public: fChangeCached = false; } + void BindWallet(CWallet *pwalletIn) + { + pwallet = pwalletIn; + MarkDirty(); + } + void MarkSpent(unsigned int nOut) { if (nOut >= vout.size()) |