From: Gavin Andresen Date: Mon, 19 Dec 2011 15:26:14 +0000 (-0800) Subject: Merge pull request #699 from laanwj/about_qt X-Git-Tag: v0.4.0-unstable~129^2~315 X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=fc90967876a0b8c762cba4a9f40a80db7a8b0432;hp=01ea41b203d86d8577227a17760a54578630a3d2 Merge pull request #699 from laanwj/about_qt Add "About Qt" menu option to show built-in Qt About dialog --- diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro index 66b53c2..2b980ba 100644 --- a/bitcoin-qt.pro +++ b/bitcoin-qt.pro @@ -1,6 +1,6 @@ TEMPLATE = app TARGET = -VERSION = 0.5.1 +VERSION = 0.5.99 INCLUDEPATH += src src/json src/qt DEFINES += QT_GUI BOOST_THREAD_USE_LIB CONFIG += no_include_pwd diff --git a/contrib/debian/changelog b/contrib/debian/changelog index 6355141..b7992f7 100644 --- a/contrib/debian/changelog +++ b/contrib/debian/changelog @@ -1,3 +1,9 @@ +bitcoin (0.5.1-natty0) natty; urgency=low + + * New upstream release. + + -- Matt Corallo Fri, 16 Dec 2011 13:27:00 -0500 + bitcoin (0.5.0-natty0) natty; urgency=low * New upstream release. diff --git a/contrib/gitian-downloader/laanwj-key.pgp b/contrib/gitian-downloader/laanwj-key.pgp new file mode 100644 index 0000000..5592951 --- /dev/null +++ b/contrib/gitian-downloader/laanwj-key.pgp @@ -0,0 +1,28 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: SKS 1.1.0 + +mQENBE5UtMEBCADOUz2i9l/D8xYINCmfUDnxi+DXvX5LmZ39ZdvsoE+ugO0SRRGdIHEFO2is +0xezX50wXu9aneb+tEqM0BuiLo6VxaXpxrkxHpr6c4jf37SkE/H0qsi/txEUp7337y3+4HMG +lUjiuh802I72p1qusjsKBnmnnR0rwNouTcoDmGUDh7jpKCtzFv+2TR2dRthJn7vmmjq3+bG6 +PYfqoFY1yHrAGT1lrDBULZsQ/NBLI2+J4oo2LYv3GCq8GNnzrovqvTvui50VSROhLrOe58o2 +shE+sjQShAy5wYkPt1R1fQnpfx+5vf+TPnkxVwRb3h5GhCp0YL8XC/BXsd5vM4KlVH2rABEB +AAG0K1dsYWRpbWlyIEouIHZhbiBkZXIgTGFhbiA8bGFhbndqQGdtYWlsLmNvbT6JATgEEwEC +ACIFAk5UtMECGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEHSBCwEjRsmmy6YIAK09 +buNXyYQrJBsX16sXxEhx5QPKyF3uHJDFJv66SdnpvIkNoznsaPiRJkbTANop93FZmaGa6wVn +zGDiz7jPA8Dpxx5aAYPhIT+zPJAdXWM3wJ/Gio9besRNzniai8Lwi5MZ9R/5yFGBobm6/AcN +4sUoqA3NSV2U3I29R0Vwlzo8GVtmyi9ENSi6Oo7AcXNTRt69cxW4nAHkB+amwwDJlcAb31ex +bogYXPhScwqQZixRr+JBkKxBjkTXXnQypT4KI5SegYwQVYfyiZmDP7UHKe/u6pSKKbVphLg8 +xLB5spcXse8/a2+onrbNlw6y8TXiJ++Z54PE7zztWTXf2huakeG5AQ0ETlS0wQEIAMNO3OkP +xoPRKWzBLcI7JRITAW+HNaLTq3uN2+4WxA57DEjbL9EDoAv+7wTkDAL40f0T+xiu6GJcLFjw +GJZu/tYu7+mErHjrdo+K4suCQt7w5EXCBvOLjhW4tyYMzNx8hP+oqzOW9iEC+6VV91+DYeqt +EkJuyVXOI4vzBlTw8uGow8aMMsCq8XVvKUZFTPsjGl197Q5B3A+ZOFCR8xqiqdPjuz6MglVV +oFdDNu3EZn8zkGsQlovXoE9ndVeVzx/XMNmsxFaMYsReUs253RIf1FEfgExID0fg2OnyLCjS +2iFW1RgajS+/saIkKl+N1iuMzJA7wMAM0plhRueOG0MtZSsAEQEAAYkBHwQYAQIACQUCTlS0 +wQIbDAAKCRB0gQsBI0bJpmsDB/4waenn2CvSHXyomykfpwf5lMte1V5LvH3z5R2LY+1NopRv +LSz3iC39x69XWiTbhywDfgafnGPW4pWBOff2/bu5/A6z1Hnan1vyrRRD/hx1uMJ7S6q+bIvZ +iVIg1p0jH6tdIIhwX3cydhdRZHo7e9oSMgOUWsr6Ar59NRo9CENwGPE4U61HXfOnxWdrFWoA +XdwZczBeLxmUy6Vo6sKqv+gE4bqrtAM0sY/MsQ9cU95x+52ox/sq44lQMwd3ZBYUP7B1qbHI +hZSZuch6MLi5scLPeau0ZvCaljiaMeivP5+x0gWPRs0kI+9sZxInbqvrsJ6oOBJM3xYGhtn1 +zZ7qmZR7 +=si/k +-----END PGP PUBLIC KEY BLOCK----- diff --git a/contrib/gitian-downloader/linux-download-config b/contrib/gitian-downloader/linux-download-config index d21bb07..36f5f68 100644 --- a/contrib/gitian-downloader/linux-download-config +++ b/contrib/gitian-downloader/linux-download-config @@ -27,4 +27,8 @@ signers: weight: 40 name: "Gavin Andresen" key: gavinandresen + 71A3B16735405025D447E8F274810B012346C9A6 + weight: 40 + name: "Wladimir J. van der Laan" + key: laanwj minimum_weight: 120 diff --git a/contrib/gitian-downloader/win32-download-config b/contrib/gitian-downloader/win32-download-config index c0de21c..b1e1c73 100644 --- a/contrib/gitian-downloader/win32-download-config +++ b/contrib/gitian-downloader/win32-download-config @@ -27,4 +27,8 @@ signers: weight: 40 name: "Gavin Andresen" key: gavinandresen + 71A3B16735405025D447E8F274810B012346C9A6 + weight: 40 + name: "Wladimir J. van der Laan" + key: laanwj minimum_weight: 120 diff --git a/doc/README b/doc/README index 5e0f8ee..d8453a4 100644 --- a/doc/README +++ b/doc/README @@ -1,4 +1,4 @@ -Bitcoin 0.5.1 BETA +Bitcoin 0.5.99 BETA Copyright (c) 2009-2011 Bitcoin Developers Distributed under the MIT/X11 software license, see the accompanying diff --git a/doc/README_windows.txt b/doc/README_windows.txt index d237615..f3e9811 100644 --- a/doc/README_windows.txt +++ b/doc/README_windows.txt @@ -1,4 +1,4 @@ -Bitcoin 0.5.1 BETA +Bitcoin 0.5.99 BETA Copyright (c) 2009-2011 Bitcoin Developers Distributed under the MIT/X11 software license, see the accompanying diff --git a/doc/release-process.txt b/doc/release-process.txt index 14d8efe..ee1a5d4 100644 --- a/doc/release-process.txt +++ b/doc/release-process.txt @@ -1,6 +1,6 @@ * update (commit) version in sources bitcoin-qt.pro - src/serialize.h + src/main.h (CLIENT_VERSION : PROTOCOL_VERSION in serialize.h is updated only on protocol changes) share/setup.nsi doc/README* diff --git a/share/setup.nsi b/share/setup.nsi index 0c0fa04..eb7a9bc 100644 --- a/share/setup.nsi +++ b/share/setup.nsi @@ -5,7 +5,7 @@ SetCompressor /SOLID lzma # General Symbol Definitions !define REGKEY "SOFTWARE\$(^Name)" -!define VERSION 0.5.1 +!define VERSION 0.5.99 !define COMPANY "Bitcoin project" !define URL http://www.bitcoin.org/ @@ -45,13 +45,13 @@ Var StartMenuGroup !insertmacro MUI_LANGUAGE English # Installer attributes -OutFile bitcoin-0.5.1-win32-setup.exe +OutFile bitcoin-0.5.99-win32-setup.exe InstallDir $PROGRAMFILES\Bitcoin CRCCheck on XPStyle on BrandingText " " ShowInstDetails show -VIProductVersion 0.5.1.0 +VIProductVersion 0.5.99.0 VIAddVersionKey ProductName Bitcoin VIAddVersionKey ProductVersion "${VERSION}" VIAddVersionKey CompanyName "${COMPANY}" diff --git a/src/bignum.h b/src/bignum.h index 1a2406b..f5d545f 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 - 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 - void Unserialize(Stream& s, int nType=0, int nVersion=VERSION) + void Unserialize(Stream& s, int nType=0, int nVersion=PROTOCOL_VERSION) { std::vector vch; ::Unserialize(s, vch, nType, nVersion); diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp index bb8d8e2..f29b9dd 100644 --- a/src/bitcoinrpc.cpp +++ b/src/bitcoinrpc.cpp @@ -304,7 +304,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())); diff --git a/src/db.cpp b/src/db.cpp index 9ac93b3..696fc73 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()); @@ -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 dd8bdf5..7631755 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -173,69 +173,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] [params]\t " + _("Send command to -server or bitcoind\n") + - " bitcoind [options] help \t\t " + _("List commands\n") + - " bitcoind [options] help \t\t " + _("Get help for a command\n") + - _("Options:\n") + - " -conf= \t\t " + _("Specify configuration file (default: bitcoin.conf)\n") + - " -pid= \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= \t\t " + _("Specify data directory\n") + - " -timeout= \t " + _("Specify connection timeout (in milliseconds)\n") + - " -proxy= \t " + _("Connect through socks4 proxy\n") + - " -dns \t " + _("Allow DNS lookups for addnode and connect\n") + - " -port= \t\t " + _("Listen for connections on (default: 8333 or testnet: 18333)\n") + - " -maxconnections=\t " + _("Maintain at most connections to peers (default: 125)\n") + - " -addnode= \t " + _("Add a node to connect to\n") + - " -connect= \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= \t " + _("Threshold for disconnecting misbehaving peers (default: 100)\n") + - " -bantime= \t " + _("Number of seconds to keep misbehaving peers from reconnecting (default: 86400)\n") + - " -maxreceivebuffer=\t " + _("Maximum per-connection receive buffer, *1000 bytes (default: 10000)\n") + - " -maxsendbuffer=\t " + _("Maximum per-connection send buffer, *1000 bytes (default: 10000)\n") + + " bitcoind [options] [params]\t " + _("Send command to -server or bitcoind") + "\n" + + " bitcoind [options] help \t\t " + _("List commands") + "\n" + + " bitcoind [options] help \t\t " + _("Get help for a command") + "\n" + + _("Options:") + "\n" + + " -conf= \t\t " + _("Specify configuration file (default: bitcoin.conf)") + "\n" + + " -pid= \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= \t\t " + _("Specify data directory") + "\n" + + " -timeout= \t " + _("Specify connection timeout (in milliseconds)") + "\n" + + " -proxy= \t " + _("Connect through socks4 proxy") + "\n" + + " -dns \t " + _("Allow DNS lookups for addnode and connect") + "\n" + + " -port= \t\t " + _("Listen for connections on (default: 8333 or testnet: 18333)") + "\n" + + " -maxconnections=\t " + _("Maintain at most connections to peers (default: 125)") + "\n" + + " -addnode= \t " + _("Add a node to connect to") + "\n" + + " -connect= \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= \t " + _("Threshold for disconnecting misbehaving peers (default: 100)") + "\n" + + " -bantime= \t " + _("Number of seconds to keep misbehaving peers from reconnecting (default: 86400)") + "\n" + + " -maxreceivebuffer=\t " + _("Maximum per-connection receive buffer, *1000 bytes (default: 10000)") + "\n" + + " -maxsendbuffer=\t " + _("Maximum per-connection send buffer, *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= \t " + _("Fee per KB to add to transactions you send\n") + + " -paytxfee= \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= \t " + _("Username for JSON-RPC connections\n") + - " -rpcpassword=\t " + _("Password for JSON-RPC connections\n") + - " -rpcport= \t\t " + _("Listen for JSON-RPC connections on (default: 8332)\n") + - " -rpcallowip= \t\t " + _("Allow JSON-RPC connections from specified IP address\n") + - " -rpcconnect= \t " + _("Send commands to node running on (default: 127.0.0.1)\n") + - " -keypool= \t " + _("Set key pool size to (default: 100)\n") + - " -rescan \t " + _("Rescan the block chain for missing wallet transactions\n"); + " -rpcuser= \t " + _("Username for JSON-RPC connections") + "\n" + + " -rpcpassword=\t " + _("Password for JSON-RPC connections") + "\n" + + " -rpcport= \t\t " + _("Listen for JSON-RPC connections on (default: 8332)") + "\n" + + " -rpcallowip= \t\t " + _("Allow JSON-RPC connections from specified IP address") + "\n" + + " -rpcconnect= \t " + _("Send commands to node running on (default: 127.0.0.1)") + "\n" + + " -keypool= \t " + _("Set key pool size to (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=\t " + _("Server certificate file (default: server.cert)\n") + - " -rpcsslprivatekeyfile= \t " + _("Server private key (default: server.pem)\n") + - " -rpcsslciphers= \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=\t " + _("Server certificate file (default: server.cert)") + "\n" + + " -rpcsslprivatekeyfile= \t " + _("Server private key (default: server.pem)") + "\n" + + " -rpcsslciphers= \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()); @@ -329,36 +329,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...")); @@ -370,17 +370,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); @@ -408,16 +408,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/main.cpp b/src/main.cpp index a7871fc..1da28d4 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 setpwalletRegistered; @@ -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 3870cee..e519ef6 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; @@ -1521,6 +1525,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 +1533,7 @@ public: bool AppliesToMe() const { - return AppliesTo(VERSION, ::pszSubVer); + return AppliesTo(PROTOCOL_VERSION, FormatSubVersion(CLIENT_NAME, CLIENT_VERSION, std::vector())); } bool RelayTo(CNode* pnode) const diff --git a/src/net.cpp b/src/net.cpp index e0ac2ab..7d2f18b 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()), nBestHeight); +} + + + + + std::map CNode::setBanned; CCriticalSection CNode::cs_setBanned; @@ -1225,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) diff --git a/src/net.h b/src/net.h index 03da382..c2637dc 100644 --- a/src/net.h +++ b/src/net.h @@ -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/bitcoin.cpp b/src/qt/bitcoin.cpp index 4aaad6b..dd326a6 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -91,6 +91,8 @@ void UIThreadCall(boost::function0 fn) void MainFrameRepaint() { + if(guiref) + QMetaObject::invokeMethod(guiref, "refreshStatusBar", Qt::QueuedConnection); } void InitMessage(const std::string &message) diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 81cebfb..1c49683 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" @@ -423,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); } @@ -480,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 diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h index 3f5d818..a0905e4 100644 --- a/src/qt/bitcoingui.h +++ b/src/qt/bitcoingui.h @@ -109,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 647adb9..624ff58 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 (default: 8333 or testnet: 18333)"), +QT_TRANSLATE_NOOP("bitcoin-core", "Maintain at most 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 (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 (default: 127.0.0.1)\n"), -QT_TRANSLATE_NOOP("bitcoin-core", "Set key pool size to (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, *1000 bytes (default: 10000)"), +QT_TRANSLATE_NOOP("bitcoin-core", "Maximum per-connection send buffer, *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 (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 (default: 127.0.0.1)"), +QT_TRANSLATE_NOOP("bitcoin-core", "Set key pool size to (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 2ed3ce5..5a0b4aa 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 b4054b5..5a12c4f 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/locale/bitcoin_da.ts b/src/qt/locale/bitcoin_da.ts index 19dde6a..c6ef676 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? Date: %1 Amount: %2 Type: %3 -Address: %4 - +Address: %4 Dato: %1 Beløb: %2 Type: %3 @@ -1399,245 +1398,210 @@ p, li { white-space: pre-wrap; } - Send command to -server or bitcoind - + Send command to -server or bitcoind Send kommando til -server eller bitcoind - List commands - + List commands Liste over kommandoer - Get help for a command - + Get help for a command Få hjælp til en kommando - Options: - + Options: Indstillinger: - Specify configuration file (default: bitcoin.conf) - + Specify configuration file (default: bitcoin.conf) Angiv konfigurationsfil (standard: bitcoin.conf) - Specify pid file (default: bitcoind.pid) - + Specify pid file (default: bitcoind.pid) Angiv pid-fil (default: bitcoind.pid) - Generate coins - + Generate coins Generér coins - Don't generate coins - + Don't generate coins Generér ikke coins - Start minimized - + Start minimized Start minimeret - Specify data directory - + Specify data directory Angiv databibliotek - Specify connection timeout (in milliseconds) - + Specify connection timeout (in milliseconds) Angiv tilslutningstimeout (i millisekunder) - Connect through socks4 proxy - + Connect through socks4 proxy Tilslut via SOCKS4 proxy - Allow DNS lookups for addnode and connect - + Allow DNS lookups for addnode and connect Tillad DNS-opslag for addnode og connect - Add a node to connect to - + Add a node to connect to Tilføj en node til at forbinde til - Connect only to the specified node - + Connect only to the specified node Tilslut kun til den angivne node - Don't accept connections from outside - + Don't accept connections from outside Acceptér ikke forbindelser udefra - Don't attempt to use UPnP to map the listening port - + Don't attempt to use UPnP to map the listening port Forsøg ikke at bruge UPnP til at konfigurere den lyttende port - Attempt to use UPnP to map the listening port - + Attempt to use UPnP to map the listening port Forsøg at bruge UPnP til at kofnigurere den lyttende port - Fee per KB to add to transactions you send - + Fee per KB to add to transactions you send Gebyr pr. KB, som skal tilføjes til transaktioner du sender - Accept command line and JSON-RPC commands - + Accept command line and JSON-RPC commands Accepter kommandolinje- og JSON-RPC-kommandoer - Run in the background as a daemon and accept commands - + Run in the background as a daemon and accept commands Kør i baggrunden som en service, og acceptér kommandoer - Use the test network - + Use the test network Brug test-netværket - Username for JSON-RPC connections - + Username for JSON-RPC connections Brugernavn til JSON-RPC-forbindelser - Password for JSON-RPC connections - + Password for JSON-RPC connections Password til JSON-RPC-forbindelser - Listen for JSON-RPC connections on <port> (default: 8332) - + Listen for JSON-RPC connections on <port> (default: 8332) Lyt til JSON-RPC-forbindelser på <port> (standard: 8332) - Allow JSON-RPC connections from specified IP address - + Allow JSON-RPC connections from specified IP address Tillad JSON-RPC-forbindelser fra bestemt IP-adresse - Send commands to node running on <ip> (default: 127.0.0.1) - + Send commands to node running on <ip> (default: 127.0.0.1) Send kommandoer til node, der kører på <ip> (standard: 127.0.0.1) - Set key pool size to <n> (default: 100) - + Set key pool size to <n> (default: 100) Sæt nøglepoolstørrelse til <n> (standard: 100) - Rescan the block chain for missing wallet transactions - + Rescan the block chain for missing wallet transactions Gennemsøg blokkæden for manglende tegnebogstransaktioner -SSL options: (see the Bitcoin Wiki for SSL setup instructions) - +SSL options: (see the Bitcoin Wiki for SSL setup instructions) SSL-indstillinger: (se Bitcoin Wiki for SSL opsætningsinstruktioner) - Use OpenSSL (https) for JSON-RPC connections - + Use OpenSSL (https) for JSON-RPC connections Brug OpenSSL (https) for JSON-RPC-forbindelser - Server certificate file (default: server.cert) - + Server certificate file (default: server.cert) Servercertifikat-fil (standard: server.cert) - Server private key (default: server.pem) - + Server private key (default: server.pem) Server private nøgle (standard: server.pem) - Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) Acceptabele ciphers (standard: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - This help message - + This help message Denne hjælpebesked @@ -1653,8 +1617,7 @@ SSL-indstillinger: (se Bitcoin Wiki for SSL opsætningsinstruktioner) - Error loading addr.dat - + Error loading addr.dat Fejl ved indlæsning af addr.dat @@ -1665,8 +1628,7 @@ SSL-indstillinger: (se Bitcoin Wiki for SSL opsætningsinstruktioner) - Error loading blkindex.dat - + Error loading blkindex.dat Fejl ved indlæsning af blkindex.dat @@ -1677,22 +1639,19 @@ SSL-indstillinger: (se Bitcoin Wiki for SSL opsætningsinstruktioner) - Error loading wallet.dat: Wallet corrupted - + Error loading wallet.dat: Wallet corrupted Fejl ved indlæsning af wallet.dat: Tegnebog ødelagt - Error loading wallet.dat: Wallet requires newer version of Bitcoin - + Error loading wallet.dat: Wallet requires newer version of Bitcoin Fejl ved indlæsning af wallet.dat: Tegnebog kræver en nyere version af Bitcoin - Error loading wallet.dat - + Error loading wallet.dat Fejl ved indlæsning af wallet.dat diff --git a/src/qt/locale/bitcoin_de.ts b/src/qt/locale/bitcoin_de.ts index 394565e..3b57d31 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?Date: %1 Amount: %2 Type: %3 -Address: %4 - +Address: %4 Datum: %1 Betrag: %2 Typ: %3 @@ -1398,232 +1397,197 @@ p, li { white-space: pre-wrap; } - Send command to -server or bitcoind - + Send command to -server or bitcoind Sende Befehl an -server oder bitcoind - List commands - + List commands Befehle auflisten - Get help for a command - + Get help for a command Hilfe für Befehl erhalten - Options: - + Options: Einstellungen: - Specify configuration file (default: bitcoin.conf) - + Specify configuration file (default: bitcoin.conf) Bitte wählen Sie eine Konfigurationsdatei (Standard: bitcoin.conf) - Specify pid file (default: bitcoind.pid) - + Specify pid file (default: bitcoind.pid) Bitte wählen Sie den Namen der PID Datei (Standard bitcoind.pid) - Generate coins - + Generate coins Erarbeite Bitcoins - Don't generate coins - + Don't generate coins Keine Bitcoins erarbeiten - Start minimized - + Start minimized minimiert starten - Specify data directory - + Specify data directory Bitte wählen Sie das Datenverzeichnis - Specify connection timeout (in milliseconds) - + Specify connection timeout (in milliseconds) Netzwerkverbindungsabbruch nach (in Millisekunden) - Connect through socks4 proxy - + Connect through socks4 proxy Durch SOCKS4-Proxy verbinden - Allow DNS lookups for addnode and connect - + Allow DNS lookups for addnode and connect Erlaube DNS Namensauflösung für addnode und connect - Add a node to connect to - + Add a node to connect to Bitcoin Knoten hinzufügen - Connect only to the specified node - + Connect only to the specified node Nur zu angegebenen Knoten verbinden - Don't accept connections from outside - + Don't accept connections from outside Keine externen Transatkionen akzeptieren - Don't attempt to use UPnP to map the listening port - + Don't attempt to use UPnP to map the listening port UPnP nicht verwenden - Attempt to use UPnP to map the listening port - + Attempt to use UPnP to map the listening port Versuche eine Verbindung mittels UPnP herzustellen - Fee per KB to add to transactions you send - + Fee per KB to add to transactions you send Gebühr pro KB, die gesendeten Transaktionen hinzugefügt wird - Accept command line and JSON-RPC commands - + Accept command line and JSON-RPC commands Erlaube Kommandozeilen und JSON-RPC Befehle - Run in the background as a daemon and accept commands - + Run in the background as a daemon and accept commands Als Hintergrunddienst starten und Befehle akzeptieren - Use the test network - + Use the test network Das Test Netzwerk verwenden - Username for JSON-RPC connections - + Username for JSON-RPC connections Benutzername für JSON-RPC Verbindungen - Password for JSON-RPC connections - + Password for JSON-RPC connections Passwort für JSON-RPC Verbindungen - Listen for JSON-RPC connections on <port> (default: 8332) - + Listen for JSON-RPC connections on <port> (default: 8332) Port für JSON-RPC Befehle (Standard: 8332) - Allow JSON-RPC connections from specified IP address - + Allow JSON-RPC connections from specified IP address JSON-RPC Befehle nur von dieser IP-Adresse erlauben - Send commands to node running on <ip> (default: 127.0.0.1) - + Send commands to node running on <ip> (default: 127.0.0.1) Befehle an Bitcoin Knoten <ip> senden (Standard: 127.0.0.1) - Set key pool size to <n> (default: 100) - + Set key pool size to <n> (default: 100) Menge der vorgenerierten Adressen (Standard: 100) - Rescan the block chain for missing wallet transactions - + Rescan the block chain for missing wallet transactions Blockkette nach verlorenen Transaktionen durchsuchen (rescan) -SSL options: (see the Bitcoin Wiki for SSL setup instructions) - +SSL options: (see the Bitcoin Wiki for SSL setup instructions) SSL Einstellungen: (Siehe im BitCoin-Wiki für eine detallierte Beschreibung) - Use OpenSSL (https) for JSON-RPC connections - + Use OpenSSL (https) for JSON-RPC connections JSON-RPC Befehle über OpenSSL (https) - Server certificate file (default: server.cert) - + Server certificate file (default: server.cert) SSL Server Zertifikat (Standard: server.cert) - Server private key (default: server.pem) - + Server private key (default: server.pem) Privater SSL Schlüssel (Standard: server.pem) - Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) Erlaubte Kryptographiealgorithmen (Standard: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - This help message - + This help message Dieser Hilfetext @@ -1638,8 +1602,7 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions) - Error loading addr.dat - + Error loading addr.dat Fehler beim Laden der addr.dat @@ -1650,8 +1613,7 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions) - Error loading blkindex.dat - + Error loading blkindex.dat Fehler beim laden der blkindex.dat @@ -1661,22 +1623,19 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions) - Error loading wallet.dat: Wallet corrupted - + Error loading wallet.dat: Wallet corrupted Fehler beim Laden von wallet.dat: Brieftasche beschädigt - Error loading wallet.dat: Wallet requires newer version of Bitcoin - + Error loading wallet.dat: Wallet requires newer version of Bitcoin Fehler beim Laden von wallet.dat: Neuere Version von Bitcoin notwendig - Error loading wallet.dat - + Error loading wallet.dat Fehler beim Laden von wallet.dat diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts index df964c9..0dfb508 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? Date: %1 Amount: %2 Type: %3 -Address: %4 - +Address: %4 @@ -1407,213 +1406,178 @@ p, li { white-space: pre-wrap; } - Send command to -server or bitcoind - + Send command to -server or bitcoind - List commands - + List commands - Get help for a command - + Get help for a command - Options: - + Options: - Specify configuration file (default: bitcoin.conf) - + Specify configuration file (default: bitcoin.conf) - Specify pid file (default: bitcoind.pid) - + Specify pid file (default: bitcoind.pid) - Generate coins - + Generate coins - Don't generate coins - + Don't generate coins - Start minimized - + Start minimized - Specify data directory - + Specify data directory - Specify connection timeout (in milliseconds) - + Specify connection timeout (in milliseconds) - Connect through socks4 proxy - + Connect through socks4 proxy - Allow DNS lookups for addnode and connect - + Allow DNS lookups for addnode and connect - Add a node to connect to - + Add a node to connect to - Connect only to the specified node - + Connect only to the specified node - Don't accept connections from outside - + Don't accept connections from outside - Don't attempt to use UPnP to map the listening port - + Don't attempt to use UPnP to map the listening port - Attempt to use UPnP to map the listening port - + Attempt to use UPnP to map the listening port - Fee per KB to add to transactions you send - + Fee per KB to add to transactions you send - Accept command line and JSON-RPC commands - + Accept command line and JSON-RPC commands - Run in the background as a daemon and accept commands - + Run in the background as a daemon and accept commands - Use the test network - + Use the test network - Username for JSON-RPC connections - + Username for JSON-RPC connections - Password for JSON-RPC connections - + Password for JSON-RPC connections - Listen for JSON-RPC connections on <port> (default: 8332) - + Listen for JSON-RPC connections on <port> (default: 8332) - Allow JSON-RPC connections from specified IP address - + Allow JSON-RPC connections from specified IP address - Send commands to node running on <ip> (default: 127.0.0.1) - + Send commands to node running on <ip> (default: 127.0.0.1) - Set key pool size to <n> (default: 100) - + Set key pool size to <n> (default: 100) - Rescan the block chain for missing wallet transactions - + Rescan the block chain for missing wallet transactions -SSL options: (see the Bitcoin Wiki for SSL setup instructions) - +SSL options: (see the Bitcoin Wiki for SSL setup instructions) - Use OpenSSL (https) for JSON-RPC connections - + Use OpenSSL (https) for JSON-RPC connections - Server certificate file (default: server.cert) - + Server certificate file (default: server.cert) - Server private key (default: server.pem) - + Server private key (default: server.pem) - Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - This help message - + This help message @@ -1628,8 +1592,7 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions) - Error loading addr.dat - + Error loading addr.dat @@ -1639,8 +1602,7 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions) - Error loading blkindex.dat - + Error loading blkindex.dat @@ -1650,20 +1612,17 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions) - Error loading wallet.dat: Wallet corrupted - + Error loading wallet.dat: Wallet corrupted - Error loading wallet.dat: Wallet requires newer version of Bitcoin - + Error loading wallet.dat: Wallet requires newer version of Bitcoin - Error loading wallet.dat - + Error loading wallet.dat diff --git a/src/qt/locale/bitcoin_es.ts b/src/qt/locale/bitcoin_es.ts index 4c1fc1a..bf2c493 100644 --- a/src/qt/locale/bitcoin_es.ts +++ b/src/qt/locale/bitcoin_es.ts @@ -498,8 +498,7 @@ Are you sure you wish to encrypt your wallet? Date: %1 Amount: %2 Type: %3 -Address: %4 - +Address: %4 Fecha: %1 Cantidad: %2 Tipo: %3 @@ -1401,247 +1400,212 @@ p, li { white-space: pre-wrap; } - Send command to -server or bitcoind - + Send command to -server or bitcoind Envia comando a bitcoin lanzado con -server u bitcoind - List commands - + List commands Muestra comandos - Get help for a command - + Get help for a command Recibir ayuda para un comando - Options: - + Options: Opciones: - Specify configuration file (default: bitcoin.conf) - + Specify configuration file (default: bitcoin.conf) Especifica archivo de configuración (predeterminado: bitcoin.conf) - Specify pid file (default: bitcoind.pid) - + Specify pid file (default: bitcoind.pid) Especifica archivo pid (predeterminado: bitcoin.pid) - Generate coins - + Generate coins Genera monedas - Don't generate coins - + Don't generate coins No generar monedas - Start minimized - + Start minimized Arranca minimizado - Specify data directory - + Specify data directory Especifica directorio para los datos - Specify connection timeout (in milliseconds) - + Specify connection timeout (in milliseconds) Especifica tiempo de espera para conexion (en milisegundos) - Connect through socks4 proxy - + Connect through socks4 proxy Conecta mediante proxy socks4 - Allow DNS lookups for addnode and connect - + Allow DNS lookups for addnode and connect Permite búsqueda DNS para addnode y connect - Add a node to connect to - + Add a node to connect to Agrega un nodo para conectarse - Connect only to the specified node - + Connect only to the specified node Conecta solo al nodo especificado - Don't accept connections from outside - + Don't accept connections from outside No aceptar conexiones desde el exterior - Don't attempt to use UPnP to map the listening port - + Don't attempt to use UPnP to map the listening port No intentar usar UPnP para mapear el puerto de entrada - Attempt to use UPnP to map the listening port - + Attempt to use UPnP to map the listening port Intenta usar UPnP para mapear el puerto de escucha. - Fee per KB to add to transactions you send - + Fee per KB to add to transactions you send Comisión por KB para agregar a las transacciones que envias - Accept command line and JSON-RPC commands - + Accept command line and JSON-RPC commands Aceptar comandos consola y JSON-RPC - Run in the background as a daemon and accept commands - + Run in the background as a daemon and accept commands Correr como demonio y acepta comandos - Use the test network - + Use the test network Usa la red de pruebas - Username for JSON-RPC connections - + Username for JSON-RPC connections Usuario para las conexiones JSON-RPC - Password for JSON-RPC connections - + Password for JSON-RPC connections Contraseña para las conexiones JSON-RPC - Listen for JSON-RPC connections on <port> (default: 8332) - + Listen for JSON-RPC connections on <port> (default: 8332) Escucha conexiones JSON-RPC en el puerto <port> (predeterminado: 8332) - Allow JSON-RPC connections from specified IP address - + Allow JSON-RPC connections from specified IP address Permite conexiones JSON-RPC desde la dirección IP especificada - Send commands to node running on <ip> (default: 127.0.0.1) - + Send commands to node running on <ip> (default: 127.0.0.1) Envia comando al nodo situado en <ip> (predeterminado: 127.0.0.1) - Set key pool size to <n> (default: 100) - + Set key pool size to <n> (default: 100) Ajusta el numero de claves en reserva <n> (predeterminado: 100) - Rescan the block chain for missing wallet transactions - + Rescan the block chain for missing wallet transactions Rescanea la cadena de bloques para transacciones perdidas de la cartera -SSL options: (see the Bitcoin Wiki for SSL setup instructions) - +SSL options: (see the Bitcoin Wiki for SSL setup instructions) Opciones SSL: (ver la Bitcoin Wiki para instrucciones de configuración SSL) - Use OpenSSL (https) for JSON-RPC connections - + Use OpenSSL (https) for JSON-RPC connections Usa OpenSSL (https) para las conexiones JSON-RPC - Server certificate file (default: server.cert) - + Server certificate file (default: server.cert) Certificado del servidor (Predeterminado: server.cert) - Server private key (default: server.pem) - + Server private key (default: server.pem) Clave privada del servidor (Predeterminado: server.pem) - Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) Cifrados aceptados (Predeterminado: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - This help message - + This help message Este mensaje de ayuda @@ -1658,8 +1622,7 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions) - Error loading addr.dat - + Error loading addr.dat Error cargando addr.dat @@ -1670,8 +1633,7 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions) - Error loading blkindex.dat - + Error loading blkindex.dat Error cargando blkindex.dat @@ -1682,22 +1644,19 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions) - Error loading wallet.dat: Wallet corrupted - + Error loading wallet.dat: Wallet corrupted Error cargando wallet.dat: Cartera dañada - Error loading wallet.dat: Wallet requires newer version of Bitcoin - + Error loading wallet.dat: Wallet requires newer version of Bitcoin Error cargando el archivo wallet.dat: Se necesita una versión mas nueva de Bitcoin - Error loading wallet.dat - + Error loading wallet.dat Error cargando wallet.dat diff --git a/src/qt/locale/bitcoin_es_CL.ts b/src/qt/locale/bitcoin_es_CL.ts index c9e18a0..c355a1e 100644 --- a/src/qt/locale/bitcoin_es_CL.ts +++ b/src/qt/locale/bitcoin_es_CL.ts @@ -498,8 +498,7 @@ Are you sure you wish to encrypt your wallet? Date: %1 Amount: %2 Type: %3 -Address: %4 - +Address: %4 Fecha: %1 Cantidad: %2 Tipo: %3 @@ -1401,247 +1400,212 @@ p, li { white-space: pre-wrap; } - Send command to -server or bitcoind - + Send command to -server or bitcoind Envia comando a bitcoin lanzado con -server u bitcoind - List commands - + List commands Muestra comandos - Get help for a command - + Get help for a command Recibir ayuda para un comando - Options: - + Options: Opciones: - Specify configuration file (default: bitcoin.conf) - + Specify configuration file (default: bitcoin.conf) Especifica archivo de configuración (predeterminado: bitcoin.conf) - Specify pid file (default: bitcoind.pid) - + Specify pid file (default: bitcoind.pid) Especifica archivo pid (predeterminado: bitcoin.pid) - Generate coins - + Generate coins Genera monedas - Don't generate coins - + Don't generate coins No generar monedas - Start minimized - + Start minimized Arranca minimizado - Specify data directory - + Specify data directory Especifica directorio para los datos - Specify connection timeout (in milliseconds) - + Specify connection timeout (in milliseconds) Especifica tiempo de espera para conexion (en milisegundos) - Connect through socks4 proxy - + Connect through socks4 proxy Conecta mediante proxy socks4 - Allow DNS lookups for addnode and connect - + Allow DNS lookups for addnode and connect Permite búsqueda DNS para addnode y connect - Add a node to connect to - + Add a node to connect to Agrega un nodo para conectarse - Connect only to the specified node - + Connect only to the specified node Conecta solo al nodo especificado - Don't accept connections from outside - + Don't accept connections from outside No aceptar conexiones desde el exterior - Don't attempt to use UPnP to map the listening port - + Don't attempt to use UPnP to map the listening port No intentar usar UPnP para mapear el puerto de entrada - Attempt to use UPnP to map the listening port - + Attempt to use UPnP to map the listening port Intenta usar UPnP para mapear el puerto de escucha. - Fee per KB to add to transactions you send - + Fee per KB to add to transactions you send Comisión por KB para agregar a las transacciones que envias - Accept command line and JSON-RPC commands - + Accept command line and JSON-RPC commands Aceptar comandos consola y JSON-RPC - Run in the background as a daemon and accept commands - + Run in the background as a daemon and accept commands Correr como demonio y acepta comandos - Use the test network - + Use the test network Usa la red de pruebas - Username for JSON-RPC connections - + Username for JSON-RPC connections Usuario para las conexiones JSON-RPC - Password for JSON-RPC connections - + Password for JSON-RPC connections Contraseña para las conexiones JSON-RPC - Listen for JSON-RPC connections on <port> (default: 8332) - + Listen for JSON-RPC connections on <port> (default: 8332) Escucha conexiones JSON-RPC en el puerto <port> (predeterminado: 8332) - Allow JSON-RPC connections from specified IP address - + Allow JSON-RPC connections from specified IP address Permite conexiones JSON-RPC desde la dirección IP especificada - Send commands to node running on <ip> (default: 127.0.0.1) - + Send commands to node running on <ip> (default: 127.0.0.1) Envia comando al nodo situado en <ip> (predeterminado: 127.0.0.1) - Set key pool size to <n> (default: 100) - + Set key pool size to <n> (default: 100) Ajusta el numero de claves en reserva <n> (predeterminado: 100) - Rescan the block chain for missing wallet transactions - + Rescan the block chain for missing wallet transactions Rescanea la cadena de bloques para transacciones perdidas de la cartera -SSL options: (see the Bitcoin Wiki for SSL setup instructions) - +SSL options: (see the Bitcoin Wiki for SSL setup instructions) Opciones SSL: (ver la Bitcoin Wiki para instrucciones de configuración SSL) - Use OpenSSL (https) for JSON-RPC connections - + Use OpenSSL (https) for JSON-RPC connections Usa OpenSSL (https) para las conexiones JSON-RPC - Server certificate file (default: server.cert) - + Server certificate file (default: server.cert) Certificado del servidor (Predeterminado: server.cert) - Server private key (default: server.pem) - + Server private key (default: server.pem) Clave privada del servidor (Predeterminado: server.pem) - Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) Cifrados aceptados (Predeterminado: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - This help message - + This help message Este mensaje de ayuda @@ -1658,8 +1622,7 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions) - Error loading addr.dat - + Error loading addr.dat Error cargando addr.dat @@ -1670,8 +1633,7 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions) - Error loading blkindex.dat - + Error loading blkindex.dat Error cargando blkindex.dat @@ -1682,22 +1644,19 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions) - Error loading wallet.dat: Wallet corrupted - + Error loading wallet.dat: Wallet corrupted Error cargando wallet.dat: Cartera dañada - Error loading wallet.dat: Wallet requires newer version of Bitcoin - + Error loading wallet.dat: Wallet requires newer version of Bitcoin Error cargando el archivo wallet.dat: Se necesita una versión mas nueva de Bitcoin - Error loading wallet.dat - + Error loading wallet.dat Error cargando wallet.dat diff --git a/src/qt/locale/bitcoin_hu.ts b/src/qt/locale/bitcoin_hu.ts index 0c46002..8cee333 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? Date: %1 Amount: %2 Type: %3 -Address: %4 - +Address: %4 Dátum: %1 Összeg: %2 Típus: %3 @@ -1399,248 +1398,213 @@ p, li { white-space: pre-wrap; } - Send command to -server or bitcoind - + Send command to -server or bitcoind Parancs küldése a -serverhez vagy a bitcoindhez - List commands - + List commands Parancsok kilistázása - Get help for a command - + Get help for a command Segítség egy parancsról - Options: - + Options: Opciók - Specify configuration file (default: bitcoin.conf) - + Specify configuration file (default: bitcoin.conf) Konfigurációs fájl (alapértelmezett: bitcoin.conf) - Specify pid file (default: bitcoind.pid) - + Specify pid file (default: bitcoind.pid) pid-fájl (alapértelmezett: bitcoind.pid) - Generate coins - + Generate coins Érmék generálása - Don't generate coins - + Don't generate coins Bitcoin-generálás leállítása - Start minimized - + Start minimized Indítás lekicsinyítve - Specify data directory - + Specify data directory Adatkönyvtár - Specify connection timeout (in milliseconds) - + Specify connection timeout (in milliseconds) Csatlakozás időkerete (milliszekundumban) - Connect through socks4 proxy - + Connect through socks4 proxy Csatlakozás SOCKS4 proxyn keresztül - Allow DNS lookups for addnode and connect - + Allow DNS lookups for addnode and connect DNS-kikeresés engedélyezése az addnode-nál és a connect-nél - Add a node to connect to - + Add a node to connect to Elérendő csomópont megadása - Connect only to the specified node - + Connect only to the specified node Csatlakozás csak a megadott csomóponthoz - Don't accept connections from outside - + Don't accept connections from outside Külső csatlakozások elutasítása - Don't attempt to use UPnP to map the listening port - + Don't attempt to use UPnP to map the listening port UPnP-használat letiltása a figyelő port feltérképezésénél - Attempt to use UPnP to map the listening port - + Attempt to use UPnP to map the listening port UPnP-használat engedélyezése a figyelő port feltérképezésénél - Fee per KB to add to transactions you send - + Fee per KB to add to transactions you send KB-onként felajánlandó díj az általad küldött tranzakciókhoz - Accept command line and JSON-RPC commands - + Accept command line and JSON-RPC commands Parancssoros és JSON-RPC parancsok elfogadása - Run in the background as a daemon and accept commands - + Run in the background as a daemon and accept commands Háttérben futtatás daemonként és parancsok elfogadása - Use the test network - + Use the test network Teszthálózat használata - Username for JSON-RPC connections - + Username for JSON-RPC connections Felhasználói név JSON-RPC csatlakozásokhoz - Password for JSON-RPC connections - + Password for JSON-RPC connections Jelszó JSON-RPC csatlakozásokhoz - Listen for JSON-RPC connections on <port> (default: 8332) - + Listen for JSON-RPC connections on <port> (default: 8332) JSON-RPC csatlakozásokhoz figyelendő <port> (alapértelmezett: 8332) - Allow JSON-RPC connections from specified IP address - + Allow JSON-RPC connections from specified IP address JSON-RPC csatlakozások engedélyezése meghatározott IP-címről - Send commands to node running on <ip> (default: 127.0.0.1) - + Send commands to node running on <ip> (default: 127.0.0.1) Parancsok küldése <ip> címen működő csomóponthoz (alapértelmezett: 127.0.0.1) - Set key pool size to <n> (default: 100) - + Set key pool size to <n> (default: 100) Kulcskarika mérete <n> (alapértelmezett: 100) - Rescan the block chain for missing wallet transactions - + Rescan the block chain for missing wallet transactions Blokklánc újraszkennelése hiányzó tárca-tranzakciók után -SSL options: (see the Bitcoin Wiki for SSL setup instructions) - +SSL options: (see the Bitcoin Wiki for SSL setup instructions) SSL-opciók: (lásd a Bitcoin Wiki SSL-beállítási instrukcióit) - Use OpenSSL (https) for JSON-RPC connections - + Use OpenSSL (https) for JSON-RPC connections OpenSSL (https) használata JSON-RPC csatalkozásokhoz - Server certificate file (default: server.cert) - + Server certificate file (default: server.cert) Szervertanúsítvány-fájl (alapértelmezett: server.cert) - Server private key (default: server.pem) - + Server private key (default: server.pem) Szerver titkos kulcsa (alapértelmezett: server.pem) - Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) Elfogadható rejtjelkulcsok (alapértelmezett: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH ) - This help message - + This help message Ez a súgó-üzenet @@ -1656,8 +1620,7 @@ SSL-opciók: (lásd a Bitcoin Wiki SSL-beállítási instrukcióit) - Error loading addr.dat - + Error loading addr.dat Hiba az addr.dat betöltése közben @@ -1668,8 +1631,7 @@ SSL-opciók: (lásd a Bitcoin Wiki SSL-beállítási instrukcióit) - Error loading blkindex.dat - + Error loading blkindex.dat Hiba a blkindex.dat betöltése közben @@ -1680,22 +1642,19 @@ SSL-opciók: (lásd a Bitcoin Wiki SSL-beállítási instrukcióit) - Error loading wallet.dat: Wallet corrupted - + Error loading wallet.dat: Wallet corrupted Hiba a wallet.dat betöltése közben: meghibásodott tárca - Error loading wallet.dat: Wallet requires newer version of Bitcoin - + Error loading wallet.dat: Wallet requires newer version of Bitcoin Hiba a wallet.dat betöltése közben: ehhez a tárcához újabb verziójú Bitcoin-kliens szükséges - Error loading wallet.dat - + Error loading wallet.dat Hiba a wallet.dat betöltése közben diff --git a/src/qt/locale/bitcoin_it.ts b/src/qt/locale/bitcoin_it.ts index c9aa980..56beb98 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? Date: %1 Amount: %2 Type: %3 -Address: %4 - +Address: %4 Data: %1 Quantità: %2 Tipo: %3 @@ -1400,248 +1399,213 @@ p, li { white-space: pre-wrap; }⏎ - Send command to -server or bitcoind - + Send command to -server or bitcoind Manda il comando a -server o bitcoind - List commands - + List commands Lista comandi - Get help for a command - + Get help for a command Aiuto su un comando - Options: - + Options: Opzioni: - Specify configuration file (default: bitcoin.conf) - + Specify configuration file (default: bitcoin.conf) Specifica il file di configurazione (di default: bitcoin.conf) - Specify pid file (default: bitcoind.pid) - + Specify pid file (default: bitcoind.pid) Specifica il file pid (default: bitcoind.pid) - Generate coins - + Generate coins Genera Bitcoin - Don't generate coins - + Don't generate coins Non generare Bitcoin - Start minimized - + Start minimized Parti in icona - Specify data directory - + Specify data directory Specifica la cartella dati - Specify connection timeout (in milliseconds) - + Specify connection timeout (in milliseconds) Specifica il timeout di connessione (in millisecondi) - Connect through socks4 proxy - + Connect through socks4 proxy Connessione tramite socks4 proxy - Allow DNS lookups for addnode and connect - + Allow DNS lookups for addnode and connect Consenti ricerche DNS per aggiungere nodi e collegare - Add a node to connect to - + Add a node to connect to Aggiungi un nodo e connetti a - Connect only to the specified node - + Connect only to the specified node Connetti solo al nodo specificato - Don't accept connections from outside - + Don't accept connections from outside Non accettare connessioni dall'esterno - Don't attempt to use UPnP to map the listening port - + Don't attempt to use UPnP to map the listening port Non usare l'UPnP per mappare la porta - Attempt to use UPnP to map the listening port - + Attempt to use UPnP to map the listening port Prova ad usare l'UPnp per mappare la porta - Fee per KB to add to transactions you send - + Fee per KB to add to transactions you send Commissione al KB da aggiungere alle transazioni in uscita - Accept command line and JSON-RPC commands - + Accept command line and JSON-RPC commands Accetta da linea di comando e da comandi JSON-RPC - Run in the background as a daemon and accept commands - + Run in the background as a daemon and accept commands Esegui in background come demone e accetta i comandi - Use the test network - + Use the test network Utilizza la rete di prova - Username for JSON-RPC connections - + Username for JSON-RPC connections Nome utente per connessioni JSON-RPC - Password for JSON-RPC connections - + Password for JSON-RPC connections Password per connessioni JSON-RPC - Listen for JSON-RPC connections on <port> (default: 8332) - + Listen for JSON-RPC connections on <port> (default: 8332) Attendi le connessioni JSON-RPC su <porta> (default: 8332) - Allow JSON-RPC connections from specified IP address - + Allow JSON-RPC connections from specified IP address Consenti connessioni JSON-RPC dall'indirizzo IP specificato - Send commands to node running on <ip> (default: 127.0.0.1) - + Send commands to node running on <ip> (default: 127.0.0.1) Inviare comandi al nodo in esecuzione su <ip> (default: 127.0.0.1) - Set key pool size to <n> (default: 100) - + Set key pool size to <n> (default: 100) Impostare la quantità di chiavi di riserva a <n> (default: 100) - Rescan the block chain for missing wallet transactions - + Rescan the block chain for missing wallet transactions Ripeti analisi della catena dei blocchi per cercare le transazioni mancanti dal portamonete -SSL options: (see the Bitcoin Wiki for SSL setup instructions) - +SSL options: (see the Bitcoin Wiki for SSL setup instructions) Opzioni SSL: (vedi il wiki di Bitcoin per le istruzioni di configurazione SSL) - Use OpenSSL (https) for JSON-RPC connections - + Use OpenSSL (https) for JSON-RPC connections Utilizzare OpenSSL (https) per le connessioni JSON-RPC - Server certificate file (default: server.cert) - + Server certificate file (default: server.cert) File certificato del server (default: server.cert) - Server private key (default: server.pem) - + Server private key (default: server.pem) Chiave privata del server (default: server.pem) - Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) Cifrari accettabili (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - This help message - + This help message Questo messaggio di aiuto @@ -1657,8 +1621,7 @@ Opzioni SSL: (vedi il wiki di Bitcoin per le istruzioni di configurazione SSL) - Error loading addr.dat - + Error loading addr.dat Errore nel caricamento di addr.dat @@ -1669,8 +1632,7 @@ Opzioni SSL: (vedi il wiki di Bitcoin per le istruzioni di configurazione SSL) - Error loading blkindex.dat - + Error loading blkindex.dat Errore nel caricamento di blkindex.dat @@ -1681,22 +1643,19 @@ Opzioni SSL: (vedi il wiki di Bitcoin per le istruzioni di configurazione SSL) - Error loading wallet.dat: Wallet corrupted - + Error loading wallet.dat: Wallet corrupted Errore nel caricamento di wallet.dat: il portamonete è danneggiato - Error loading wallet.dat: Wallet requires newer version of Bitcoin - + Error loading wallet.dat: Wallet requires newer version of Bitcoin Errore nel caricamento di wallet.dat: il portamonete richiede una versione più recente di Bitcoin - Error loading wallet.dat - + Error loading wallet.dat Errore nel caricamento di wallet.dat diff --git a/src/qt/locale/bitcoin_nb.ts b/src/qt/locale/bitcoin_nb.ts index 6a3a410..95f5e9c 100644 --- a/src/qt/locale/bitcoin_nb.ts +++ b/src/qt/locale/bitcoin_nb.ts @@ -495,8 +495,7 @@ Er du sikker på at du vil kryptere lommeboken? Date: %1 Amount: %2 Type: %3 -Address: %4 - +Address: %4 Dato: %1 Beløp: %2 Type: %3 @@ -1399,246 +1398,211 @@ p, li { white-space: pre-wrap; } - Send command to -server or bitcoind - + Send command to -server or bitcoind Send kommando til -server eller bitcoind - List commands - + List commands Vis liste over kommandoer - Get help for a command - + Get help for a command Få hjelp til kommando - Options: - + Options: Innstillinger: - Specify configuration file (default: bitcoin.conf) - + Specify configuration file (default: bitcoin.conf) Angi konfigurasjonsfil (standard: bitcoin.conf) - Specify pid file (default: bitcoind.pid) - + Specify pid file (default: bitcoind.pid) Angi pid-fil (standard: bitcoind.pid) - Generate coins - + Generate coins Generer mynter - Don't generate coins - + Don't generate coins Ikke generer mynter - Start minimized - + Start minimized Start minimert - Specify data directory - + Specify data directory Angi mappe for data - Specify connection timeout (in milliseconds) - + Specify connection timeout (in milliseconds) Angi tidsavbrudd for forbindelser (i millisekunder) - Connect through socks4 proxy - + Connect through socks4 proxy Koble til gjennom sock4 mellomtjener - Allow DNS lookups for addnode and connect - + Allow DNS lookups for addnode and connect Tillat DNS-oppslag for addnode og connect - Add a node to connect to - + Add a node to connect to Legg til node for tilkobling - Connect only to the specified node - + Connect only to the specified node Koble kun til en oppgitt node - Don't accept connections from outside - + Don't accept connections from outside Ikke ta imot tilkoblinger fra utsiden - Don't attempt to use UPnP to map the listening port - + Don't attempt to use UPnP to map the listening port Ikke forsøk å bruke UPnP for å sette opp lytteport - Attempt to use UPnP to map the listening port - + Attempt to use UPnP to map the listening port Forsøk å bruke UPnP for å sette opp lytteport - Fee per KB to add to transactions you send - + Fee per KB to add to transactions you send Gebyr per KB som skal legges til transaksjoner du sender - Accept command line and JSON-RPC commands - + Accept command line and JSON-RPC commands Ta imot kommandoer fra både kommandolinje og JSON-RPC - Run in the background as a daemon and accept commands - + Run in the background as a daemon and accept commands Kjør som bakgrunnsprosess og ta imot kommandoer - Use the test network - + Use the test network Bruk testnettet - Username for JSON-RPC connections - + Username for JSON-RPC connections Brukernavn for JSON-RPC forbindelser - Password for JSON-RPC connections - + Password for JSON-RPC connections Passord for JSON-RPC forbindelser - Listen for JSON-RPC connections on <port> (default: 8332) - + Listen for JSON-RPC connections on <port> (default: 8332) Lytt etter JSON-RPC forbindelser på <port> (standard: 8332) - Allow JSON-RPC connections from specified IP address - + Allow JSON-RPC connections from specified IP address Tillat JSON-RPC forbindelser fra oppgitt IP-adresse - Send commands to node running on <ip> (default: 127.0.0.1) - + Send commands to node running on <ip> (default: 127.0.0.1) Send kommandoer til noden som kjører på <ip> (standard: 127.0.0.1) - Set key pool size to <n> (default: 100) - + Set key pool size to <n> (default: 100) Sett størrelsen på lager for nye nøkler til <n> (standard: 100) - Rescan the block chain for missing wallet transactions - + Rescan the block chain for missing wallet transactions Se igjennom blokk-kjeden på nytt etter manglende lommebokstransaksjoner -SSL options: (see the Bitcoin Wiki for SSL setup instructions) - +SSL options: (see the Bitcoin Wiki for SSL setup instructions) SSL innstillinger: (se Bitcoin Wikien for instruksjoner for SSL-oppsett) - Use OpenSSL (https) for JSON-RPC connections - + Use OpenSSL (https) for JSON-RPC connections Bruk OpenSSL (https) for JSON-RPC forbindelser - Server certificate file (default: server.cert) - + Server certificate file (default: server.cert) Fil for tjenersertifikat (standard: server.cert) - Server private key (default: server.pem) - + Server private key (default: server.pem) Privat nøkkel for tjener (standard: server.pem) - Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) Akseptable krypteringsmetoder (standard: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - This help message - + This help message Denne hjelpemeldingen @@ -1654,8 +1618,7 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions) - Error loading addr.dat - + Error loading addr.dat Feil ved lasting av addr.dat @@ -1666,8 +1629,7 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions) - Error loading blkindex.dat - + Error loading blkindex.dat Feil ved lasting av blkindex.dat @@ -1678,22 +1640,19 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions) - Error loading wallet.dat: Wallet corrupted - + Error loading wallet.dat: Wallet corrupted Feil ved lasting av wallet.dat: Skadde data i lommeboken - Error loading wallet.dat: Wallet requires newer version of Bitcoin - + Error loading wallet.dat: Wallet requires newer version of Bitcoin Feil ved lasting av wallet.dat: Lommeboken krever en nyere versjon av Bitcoin - Error loading wallet.dat - + Error loading wallet.dat Feil ved lasting av wallet.dat diff --git a/src/qt/locale/bitcoin_nl.ts b/src/qt/locale/bitcoin_nl.ts index 0651775..408e18d 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? Date: %1 Amount: %2 Type: %3 -Address: %4 - +Address: %4 Datum: %1 Bedrag: %2 Type: %3 @@ -1400,247 +1399,212 @@ p, li { white-space: pre-wrap; } - Send command to -server or bitcoind - + Send command to -server or bitcoind Stuur commando naar -server of bitcoind - List commands - + List commands List van commando's - Get help for a command - + Get help for a command Toon hulp voor een commando - Options: - + Options: Opties: - Specify configuration file (default: bitcoin.conf) - + Specify configuration file (default: bitcoin.conf) Specifieer configuratiebestand (standaard: bitcoin.conf) - Specify pid file (default: bitcoind.pid) - + Specify pid file (default: bitcoind.pid) Specifieer pid-bestand (standaard: bitcoind.pid) - Generate coins - + Generate coins Genereer munten - Don't generate coins - + Don't generate coins Genereer geen munten - Start minimized - + Start minimized Geminimaliseerd starten - Specify data directory - + Specify data directory Stel datamap in - Specify connection timeout (in milliseconds) - + Specify connection timeout (in milliseconds) Specificeer de time-out tijd (in milliseconden) - Connect through socks4 proxy - + Connect through socks4 proxy Verbind via socks4 proxy - Allow DNS lookups for addnode and connect - + Allow DNS lookups for addnode and connect Sta DNS-naslag toe voor addnode en connect - Add a node to connect to - + Add a node to connect to Voeg een node toe om mee te verbinden - Connect only to the specified node - + Connect only to the specified node Verbind alleen met deze node - Don't accept connections from outside - + Don't accept connections from outside Sta geen verbindingen van buitenaf toe - Don't attempt to use UPnP to map the listening port - + Don't attempt to use UPnP to map the listening port Probeer geen UPnP te gebruiken om de poort waarop geluisterd wordt te mappen - Attempt to use UPnP to map the listening port - + Attempt to use UPnP to map the listening port Probeer UPnP te gebruiken om de poort waarop geluisterd wordt te mappen - Fee per KB to add to transactions you send - + Fee per KB to add to transactions you send Kosten per KB om aan transacties toe te voegen die u verstuurt - Accept command line and JSON-RPC commands - + Accept command line and JSON-RPC commands Aanvaard commandoregel en JSON-RPC commando's - Run in the background as a daemon and accept commands - + Run in the background as a daemon and accept commands Draai in de achtergrond als daemon en aanvaard commando's - Use the test network - + Use the test network Gebruik het testnetwerk - Username for JSON-RPC connections - + Username for JSON-RPC connections Gebruikersnaam voor JSON-RPC verbindingen - Password for JSON-RPC connections - + Password for JSON-RPC connections Wachtwoord voor JSON-RPC verbindingen - Listen for JSON-RPC connections on <port> (default: 8332) - + Listen for JSON-RPC connections on <port> (default: 8332) Luister voor JSON-RPC verbindingen op <poort> (standaard: 8332) - Allow JSON-RPC connections from specified IP address - + Allow JSON-RPC connections from specified IP address Sta JSON-RPC verbindingen van opgegeven IP adres toe - Send commands to node running on <ip> (default: 127.0.0.1) - + Send commands to node running on <ip> (default: 127.0.0.1) Verstuur commando's naar proces dat op <ip> draait (standaard: 127.0.0.1) - Set key pool size to <n> (default: 100) - + Set key pool size to <n> (default: 100) Stel sleutelpoelgrootte in op <n> (standaard: 100) - Rescan the block chain for missing wallet transactions - + Rescan the block chain for missing wallet transactions Doorzoek de blokkenketting op ontbrekende portemonnee-transacties -SSL options: (see the Bitcoin Wiki for SSL setup instructions) - +SSL options: (see the Bitcoin Wiki for SSL setup instructions) SSL opties: (zie de Bitcoin wiki voor SSL instructies) - Use OpenSSL (https) for JSON-RPC connections - + Use OpenSSL (https) for JSON-RPC connections Gebruik OpenSSL (https) voor JSON-RPC verbindingen - Server certificate file (default: server.cert) - + Server certificate file (default: server.cert) Certificaat-bestand voor server (standaard: server.cert) - Server private key (default: server.pem) - + Server private key (default: server.pem) Geheime sleutel voor server (standaard: server.pem) - Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) Aanvaardbare ciphers (standaard: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - This help message - + This help message Dit helpbericht @@ -1656,8 +1620,7 @@ SSL opties: (zie de Bitcoin wiki voor SSL instructies) - Error loading addr.dat - + Error loading addr.dat Fout bij laden van bestand addr.dat @@ -1668,8 +1631,7 @@ SSL opties: (zie de Bitcoin wiki voor SSL instructies) - Error loading blkindex.dat - + Error loading blkindex.dat Fout bij laden van bestand addr.dat @@ -1680,21 +1642,18 @@ SSL opties: (zie de Bitcoin wiki voor SSL instructies) - Error loading wallet.dat: Wallet corrupted - + Error loading wallet.dat: Wallet corrupted Fout bij het laden van wallet.dat: Portemonnee corrupt - Error loading wallet.dat: Wallet requires newer version of Bitcoin - + Error loading wallet.dat: Wallet requires newer version of Bitcoin Fout bij het laden van wallet.dat: Portemonnee vereist nieuwere versie van Bitcoin - Error loading wallet.dat - + Error loading wallet.dat Fout bij laden van bestand wallet.dat diff --git a/src/qt/locale/bitcoin_pt_BR.ts b/src/qt/locale/bitcoin_pt_BR.ts index eb6c18c..13263de 100644 --- a/src/qt/locale/bitcoin_pt_BR.ts +++ b/src/qt/locale/bitcoin_pt_BR.ts @@ -488,8 +488,7 @@ Are you sure you wish to encrypt your wallet? Date: %1 Amount: %2 Type: %3 -Address: %4 - +Address: %4 Date: %1 Amount: %2 Type: %3 @@ -1392,248 +1391,213 @@ p, li { white-space: pre-wrap; } - Send command to -server or bitcoind - + Send command to -server or bitcoind Send command to -server or bitcoind - List commands - + List commands List commands - Get help for a command - + Get help for a command Get help for a command - Options: - + Options: Options: - Specify configuration file (default: bitcoin.conf) - + Specify configuration file (default: bitcoin.conf) Specify configuration file (default: bitcoin.conf) - Specify pid file (default: bitcoind.pid) - + Specify pid file (default: bitcoind.pid) Specify pid file (default: bitcoind.pid) - Generate coins - + Generate coins Generate coins - Don't generate coins - + Don't generate coins Don't generate coins - Start minimized - + Start minimized Start minimized - Specify data directory - + Specify data directory Specify data directory - Specify connection timeout (in milliseconds) - + Specify connection timeout (in milliseconds) Specify connection timeout (in milliseconds) - Connect through socks4 proxy - + Connect through socks4 proxy Connect through socks4 proxy - Allow DNS lookups for addnode and connect - + Allow DNS lookups for addnode and connect Allow DNS lookups for addnode and connect - Add a node to connect to - + Add a node to connect to Add a node to connect to - Connect only to the specified node - + Connect only to the specified node Connect only to the specified node - Don't accept connections from outside - + Don't accept connections from outside Don't accept connections from outside - Don't attempt to use UPnP to map the listening port - + Don't attempt to use UPnP to map the listening port Don't attempt to use UPnP to map the listening port - Attempt to use UPnP to map the listening port - + Attempt to use UPnP to map the listening port Attempt to use UPnP to map the listening port - Fee per KB to add to transactions you send - + Fee per KB to add to transactions you send Fee per KB to add to transactions you send - Accept command line and JSON-RPC commands - + Accept command line and JSON-RPC commands Accept command line and JSON-RPC commands - Run in the background as a daemon and accept commands - + Run in the background as a daemon and accept commands Run in the background as a daemon and accept commands - Use the test network - + Use the test network Use the test network - Username for JSON-RPC connections - + Username for JSON-RPC connections Username for JSON-RPC connections - Password for JSON-RPC connections - + Password for JSON-RPC connections Password for JSON-RPC connections - Listen for JSON-RPC connections on <port> (default: 8332) - + Listen for JSON-RPC connections on <port> (default: 8332) Listen for JSON-RPC connections on <port> (default: 8332) - Allow JSON-RPC connections from specified IP address - + Allow JSON-RPC connections from specified IP address Allow JSON-RPC connections from specified IP address - Send commands to node running on <ip> (default: 127.0.0.1) - + Send commands to node running on <ip> (default: 127.0.0.1) Send commands to node running on <ip> (default: 127.0.0.1) - Set key pool size to <n> (default: 100) - + Set key pool size to <n> (default: 100) Set key pool size to <n> (default: 100) - Rescan the block chain for missing wallet transactions - + Rescan the block chain for missing wallet transactions Rescan the block chain for missing wallet transactions -SSL options: (see the Bitcoin Wiki for SSL setup instructions) - +SSL options: (see the Bitcoin Wiki for SSL setup instructions) SSL options: (see the Bitcoin Wiki for SSL setup instructions) - Use OpenSSL (https) for JSON-RPC connections - + Use OpenSSL (https) for JSON-RPC connections Use OpenSSL (https) for JSON-RPC connections - Server certificate file (default: server.cert) - + Server certificate file (default: server.cert) Server certificate file (default: server.cert) - Server private key (default: server.pem) - + Server private key (default: server.pem) Server private key (default: server.pem) - Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - This help message - + This help message This help message @@ -1649,8 +1613,7 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions) - Error loading addr.dat - + Error loading addr.dat Error loading addr.dat @@ -1661,8 +1624,7 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions) - Error loading blkindex.dat - + Error loading blkindex.dat Error loading blkindex.dat @@ -1673,22 +1635,19 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions) - Error loading wallet.dat: Wallet corrupted - + Error loading wallet.dat: Wallet corrupted Error loading wallet.dat: Wallet corrupted - Error loading wallet.dat: Wallet requires newer version of Bitcoin - + Error loading wallet.dat: Wallet requires newer version of Bitcoin Error loading wallet.dat: Wallet requires newer version of Bitcoin - Error loading wallet.dat - + Error loading wallet.dat Error loading wallet.dat diff --git a/src/qt/locale/bitcoin_ru.ts b/src/qt/locale/bitcoin_ru.ts index 358c4f1..60332ac 100644 --- a/src/qt/locale/bitcoin_ru.ts +++ b/src/qt/locale/bitcoin_ru.ts @@ -495,8 +495,7 @@ Are you sure you wish to encrypt your wallet? Date: %1 Amount: %2 Type: %3 -Address: %4 - +Address: %4 Дата: %1 Количество: %2 Тип: %3 @@ -1399,246 +1398,211 @@ p, li { white-space: pre-wrap; } - Send command to -server or bitcoind - + Send command to -server or bitcoind Отправить команду на сервер ( -server ) или демону - List commands - + List commands Список команд - Get help for a command - + Get help for a command Получить помощь по команде - Options: - + Options: Опции: - Specify configuration file (default: bitcoin.conf) - + Specify configuration file (default: bitcoin.conf) Указать конфигурационный файл вместо используемого по умолчанию (bitcoin.conf) - Specify pid file (default: bitcoind.pid) - + Specify pid file (default: bitcoind.pid) Указать pid-файл вместо используемого по умолчанию (bitcoin.pid) - Generate coins - + Generate coins Включить добычу монет - Don't generate coins - + Don't generate coins Выключить добычу монет - Start minimized - + Start minimized Запускать минимизированным - Specify data directory - + Specify data directory Указать рабочую директорию - Specify connection timeout (in milliseconds) - + Specify connection timeout (in milliseconds) Указать таймаут соединения (в миллисекундах) - Connect through socks4 proxy - + Connect through socks4 proxy Соединяться через socks4-прокси - Allow DNS lookups for addnode and connect - + Allow DNS lookups for addnode and connect Разрешить поиск в DNS для комманд "addnode" и "connect" - Add a node to connect to - + Add a node to connect to Добавить узел для соединения - Connect only to the specified node - + Connect only to the specified node Соединяться только с указанным узлом - Don't accept connections from outside - + Don't accept connections from outside Не принимать внешние соединения - Don't attempt to use UPnP to map the listening port - + Don't attempt to use UPnP to map the listening port Не пытаться использовать UPnP - Attempt to use UPnP to map the listening port - + Attempt to use UPnP to map the listening port Попытаться использовать UPnP для проброса прослушиваемого порта на роутере - Fee per KB to add to transactions you send - + Fee per KB to add to transactions you send Комиссия (за каждый KB транзакции) - Accept command line and JSON-RPC commands - + Accept command line and JSON-RPC commands Принимать команды из командной строки и через JSON-RPC - Run in the background as a daemon and accept commands - + Run in the background as a daemon and accept commands Запустить в бекграунде (как демон) и принимать команды - Use the test network - + Use the test network Использовать тестовую сеть - Username for JSON-RPC connections - + Username for JSON-RPC connections Имя пользователя для JSON-RPC соединений - Password for JSON-RPC connections - + Password for JSON-RPC connections Пароль для JSON-RPC соединений - Listen for JSON-RPC connections on <port> (default: 8332) - + Listen for JSON-RPC connections on <port> (default: 8332) Слушать <порт> для JSON-RPC соединений (по умолчанию: 8332) - Allow JSON-RPC connections from specified IP address - + Allow JSON-RPC connections from specified IP address Разрешить JSON-RPC соединения с указанного адреса - Send commands to node running on <ip> (default: 127.0.0.1) - + Send commands to node running on <ip> (default: 127.0.0.1) Отправлять команды на узел,запущенный на <IP> (по умолчанию: 127.0.0.1) - Set key pool size to <n> (default: 100) - + Set key pool size to <n> (default: 100) Установить размер key pool'а в <n> (по умолчанию: 100) - Rescan the block chain for missing wallet transactions - + Rescan the block chain for missing wallet transactions Просканировать цепочку блоков в поисках пропущенных транзакций для бумажника -SSL options: (see the Bitcoin Wiki for SSL setup instructions) - +SSL options: (see the Bitcoin Wiki for SSL setup instructions) Опции SSL: (см. Bitcoin Wiki для инструкций) - Use OpenSSL (https) for JSON-RPC connections - + Use OpenSSL (https) for JSON-RPC connections Использовать OpenSSL (https) для JSON-RPC соединений - Server certificate file (default: server.cert) - + Server certificate file (default: server.cert) Сертификат (публичный ключ) сервера (по умолчанию: server.cert) - Server private key (default: server.pem) - + Server private key (default: server.pem) Закрытый ключ сервера (по умолчанию: server.pem) - Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) Допустимые Cipher'ы для сервера (по умолчанию: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - This help message - + This help message Данная справка @@ -1654,8 +1618,7 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions) - Error loading addr.dat - + Error loading addr.dat Ошибка при загрузке addr.dat @@ -1666,8 +1629,7 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions) - Error loading blkindex.dat - + Error loading blkindex.dat Ошибка при загрузке blkindex.dat @@ -1678,21 +1640,18 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions) - Error loading wallet.dat: Wallet corrupted - + Error loading wallet.dat: Wallet corrupted Ошибка загрузки wallet.dat: Бумажник повреждён - Error loading wallet.dat: Wallet requires newer version of Bitcoin - + Error loading wallet.dat: Wallet requires newer version of Bitcoin Ошибка загрузки wallet.dat: Для данного бумажника требуется более новая версия Bitcoin - Error loading wallet.dat - + Error loading wallet.dat Ошибка при загрузке wallet.dat diff --git a/src/qt/locale/bitcoin_uk.ts b/src/qt/locale/bitcoin_uk.ts index 3ea0bcc..8c087ac 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? Date: %1 Amount: %2 Type: %3 -Address: %4 - +Address: %4 Дата: %1 Кількість: %2 Тип: %3 @@ -1399,248 +1398,213 @@ p, li { white-space: pre-wrap; } - Send command to -server or bitcoind - + Send command to -server or bitcoind Відправити команду серверу -server чи демону - List commands - + List commands Список команд - Get help for a command - + Get help for a command Отримати довідку по команді - Options: - + Options: Параметри: - Specify configuration file (default: bitcoin.conf) - + Specify configuration file (default: bitcoin.conf) Вкажіть файл конфігурації (за промовчуванням: bitcoin.conf) - Specify pid file (default: bitcoind.pid) - + Specify pid file (default: bitcoind.pid) Вкажіть pid-файл (за промовчуванням: bitcoind.pid) - Generate coins - + Generate coins Генерувати монети - Don't generate coins - + Don't generate coins Не генерувати монети - Start minimized - + Start minimized Запускати згорнутим - Specify data directory - + Specify data directory Вкажіть робочий каталог - Specify connection timeout (in milliseconds) - + Specify connection timeout (in milliseconds) Вкажіть таймаут з’єднання (в мілісекундах) - Connect through socks4 proxy - + Connect through socks4 proxy Підключитись через SOCKS4-проксі - Allow DNS lookups for addnode and connect - + Allow DNS lookups for addnode and connect Дозволити пошук в DNS для команд «addnode» і «connect» - Add a node to connect to - + Add a node to connect to Додати вузол для підключення - Connect only to the specified node - + Connect only to the specified node Підключитись лише до вказаного вузла - Don't accept connections from outside - + Don't accept connections from outside Не приймати підключення ззовні - Don't attempt to use UPnP to map the listening port - + Don't attempt to use UPnP to map the listening port Не намагатись використовувати UPnP для відображення порту що прослуховується на роутері - Attempt to use UPnP to map the listening port - + Attempt to use UPnP to map the listening port Намагатись використовувати UPnP для відображення порту що прослуховується на роутері - Fee per KB to add to transactions you send - + Fee per KB to add to transactions you send Комісія за Кб - Accept command line and JSON-RPC commands - + Accept command line and JSON-RPC commands Приймати команди із командного рядка та команди JSON-RPC - Run in the background as a daemon and accept commands - + Run in the background as a daemon and accept commands Запустити в фоновому режимі (як демон) та приймати команди - Use the test network - + Use the test network Використовувати тестову мережу - Username for JSON-RPC connections - + Username for JSON-RPC connections Ім’я користувача для JSON-RPC-з’єднань - Password for JSON-RPC connections - + Password for JSON-RPC connections Пароль для JSON-RPC-з’єднань - Listen for JSON-RPC connections on <port> (default: 8332) - + Listen for JSON-RPC connections on <port> (default: 8332) Прослуховувати <port> для JSON-RPC-з’єднань (за промовчуванням: 8332) - Allow JSON-RPC connections from specified IP address - + Allow JSON-RPC connections from specified IP address Дозволити JSON-RPC-з’єднання з вказаної IP-адреси - Send commands to node running on <ip> (default: 127.0.0.1) - + Send commands to node running on <ip> (default: 127.0.0.1) Відправляти команди на вузол, запущений на <ip> (за промовчуванням: 127.0.0.1) - Set key pool size to <n> (default: 100) - + Set key pool size to <n> (default: 100) Встановити розмір пулу ключів <n> (за промовчуванням: 100) - Rescan the block chain for missing wallet transactions - + Rescan the block chain for missing wallet transactions Пересканувати ланцюжок блоків, в пошуку втрачених переказів -SSL options: (see the Bitcoin Wiki for SSL setup instructions) - +SSL options: (see the Bitcoin Wiki for SSL setup instructions) Параметри SSL: (див. Bitcoin Wiki) - Use OpenSSL (https) for JSON-RPC connections - + Use OpenSSL (https) for JSON-RPC connections Використовувати OpenSSL (https) для JSON-RPC-з’єднань - Server certificate file (default: server.cert) - + Server certificate file (default: server.cert) Сертифікату сервера (за промовчуванням: server.cert) - Server private key (default: server.pem) - + Server private key (default: server.pem) Закритий ключ сервера (за промовчуванням: server.pem) - Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) Допустимі шифри (за промовчуванням: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - This help message - + This help message Дана довідка @@ -1656,8 +1620,7 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions) - Error loading addr.dat - + Error loading addr.dat Помилка при завантаженні addr.dat @@ -1668,8 +1631,7 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions) - Error loading blkindex.dat - + Error loading blkindex.dat Помилка при завантаженні blkindex.dat @@ -1680,22 +1642,19 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions) - Error loading wallet.dat: Wallet corrupted - + Error loading wallet.dat: Wallet corrupted Помилка при завантаженні wallet.dat: Гаманець пошкоджено - Error loading wallet.dat: Wallet requires newer version of Bitcoin - + Error loading wallet.dat: Wallet requires newer version of Bitcoin Помилка при завантаженні wallet.dat: Гаманець потребує новішої версії Bitcoin'а - Error loading wallet.dat - + Error loading wallet.dat Помилка при завантаженні wallet.dat diff --git a/src/qt/locale/bitcoin_zh_CN.ts b/src/qt/locale/bitcoin_zh_CN.ts index acd8fa9..2c5b5ba 100644 --- a/src/qt/locale/bitcoin_zh_CN.ts +++ b/src/qt/locale/bitcoin_zh_CN.ts @@ -495,8 +495,7 @@ Are you sure you wish to encrypt your wallet? Date: %1 Amount: %2 Type: %3 -Address: %4 - +Address: %4 日期: %1 金额: %2 类别: %3 @@ -1399,246 +1398,211 @@ p, li { white-space: pre-wrap; } - Send command to -server or bitcoind - + Send command to -server or bitcoind 发送命令到服务器或者 bitcoind - List commands - + List commands 列出命令 - Get help for a command - + Get help for a command 获得某条命令的帮助 - Options: - + Options: 选项： - Specify configuration file (default: bitcoin.conf) - + Specify configuration file (default: bitcoin.conf) 指定配置文件 (默认为 bitcoin.conf) - Specify pid file (default: bitcoind.pid) - + Specify pid file (default: bitcoind.pid) 指定 pid 文件 (默认为 bitcoind.pid) - Generate coins - + Generate coins 生成货币 - Don't generate coins - + Don't generate coins 不要生成货币 - Start minimized - + Start minimized 启动时最小化 - Specify data directory - + Specify data directory 指定数据目录 - Specify connection timeout (in milliseconds) - + Specify connection timeout (in milliseconds) 指定连接超时时间 (微秒) - Connect through socks4 proxy - + Connect through socks4 proxy 通过 socks4 代理连接 - Allow DNS lookups for addnode and connect - + Allow DNS lookups for addnode and connect 连接节点时允许DNS查找 - Add a node to connect to - + Add a node to connect to 连接到指定节点 - Connect only to the specified node - + Connect only to the specified node 只连接到指定节点 - Don't accept connections from outside - + Don't accept connections from outside 禁止接收外部连接 - Don't attempt to use UPnP to map the listening port - + Don't attempt to use UPnP to map the listening port 禁止使用 UPnP 映射监听端口 - Attempt to use UPnP to map the listening port - + Attempt to use UPnP to map the listening port 尝试使用 UPnP 映射监听端口 - Fee per KB to add to transactions you send - + Fee per KB to add to transactions you send 每发送1KB交易所需的费用 - Accept command line and JSON-RPC commands - + Accept command line and JSON-RPC commands 接受命令行和 JSON-RPC 命令 - Run in the background as a daemon and accept commands - + Run in the background as a daemon and accept commands 在后台运行并接受命令 - Use the test network - + Use the test network 使用测试网络 - Username for JSON-RPC connections - + Username for JSON-RPC connections JSON-RPC连接用户名 - Password for JSON-RPC connections - + Password for JSON-RPC connections JSON-RPC连接密码 - Listen for JSON-RPC connections on <port> (default: 8332) - + Listen for JSON-RPC connections on <port> (default: 8332) JSON-RPC连接监听<端口> (默认为 8332) - Allow JSON-RPC connections from specified IP address - + Allow JSON-RPC connections from specified IP address 允许从指定IP接受到的JSON-RPC连接 - Send commands to node running on <ip> (default: 127.0.0.1) - + Send commands to node running on <ip> (default: 127.0.0.1) 向IP地址为 <ip> 的节点发送指令 (缺省: 127.0.0.1) - Set key pool size to <n> (default: 100) - + Set key pool size to <n> (default: 100) 设置密钥池大小为 <n> (缺省: 100) - Rescan the block chain for missing wallet transactions - + Rescan the block chain for missing wallet transactions 重新扫描数据链以查找遗漏的交易 -SSL options: (see the Bitcoin Wiki for SSL setup instructions) - +SSL options: (see the Bitcoin Wiki for SSL setup instructions) SSL 选项: (SSL 安装教程具体见比特币维基百科) - Use OpenSSL (https) for JSON-RPC connections - + Use OpenSSL (https) for JSON-RPC connections 为 JSON-RPC 连接使用 OpenSSL (https)连接 - Server certificate file (default: server.cert) - + Server certificate file (default: server.cert) 服务器证书 (默认为 server.cert) - Server private key (default: server.pem) - + Server private key (default: server.pem) 服务器私钥 (默认为 server.pem) - Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) 可接受的加密器 (默认为 TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - This help message - + This help message 该帮助信息 @@ -1654,8 +1618,7 @@ SSL 选项: (SSL 安装教程具体见比特币维基百科) - Error loading addr.dat - + Error loading addr.dat 加载 addr.dat 错误 @@ -1666,8 +1629,7 @@ SSL 选项: (SSL 安装教程具体见比特币维基百科) - Error loading blkindex.dat - + Error loading blkindex.dat 加载 blkindex.dat 失败 @@ -1678,22 +1640,19 @@ SSL 选项: (SSL 安装教程具体见比特币维基百科) - Error loading wallet.dat: Wallet corrupted - + Error loading wallet.dat: Wallet corrupted 加载 wallet.dat 失败：钱包崩溃 - Error loading wallet.dat: Wallet requires newer version of Bitcoin - + Error loading wallet.dat: Wallet requires newer version of Bitcoin 加载 wallet.dat 失败：运行钱包需要一个更新版本的比特币软件 - Error loading wallet.dat - + Error loading wallet.dat 加载 wallet.dat 失败 diff --git a/src/qt/locale/bitcoin_zh_TW.ts b/src/qt/locale/bitcoin_zh_TW.ts index b150620..f03ff82 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? Date: %1 Amount: %2 Type: %3 -Address: %4 - +Address: %4 日期: %1 金額: %2 類別: %3 @@ -1398,242 +1397,207 @@ p, li { white-space: pre-wrap; } - Send command to -server or bitcoind - + Send command to -server or bitcoind 送指令至 -server 或 bitcoind - List commands - + List commands 列出指令 - Get help for a command - + Get help for a command 取得指令說明 - Options: - + Options: 選項: - Specify configuration file (default: bitcoin.conf) - + Specify configuration file (default: bitcoin.conf) 指定設定檔 (預設: bitcoin.conf) - Specify pid file (default: bitcoind.pid) - + Specify pid file (default: bitcoind.pid) 指定行程識別碼檔案 (預設: bitcoind.pid) - Generate coins - + Generate coins 生產位元幣 - Don't generate coins - + Don't generate coins 不生產位元幣 - Start minimized - + Start minimized 啓動時最小化 - Specify data directory - + Specify data directory 指定資料目錄 - Specify connection timeout (in milliseconds) - + Specify connection timeout (in milliseconds) 指定連線逾時時間 (毫秒) - Connect through socks4 proxy - + Connect through socks4 proxy 透過 socks4 代理伺服器連線 - Allow DNS lookups for addnode and connect - + Allow DNS lookups for addnode and connect 允許 addnode 和 connect 時做域名解析 - Add a node to connect to - + Add a node to connect to 新增連線節點 - Connect only to the specified node - + Connect only to the specified node 只連線至指定節點 - Don't accept connections from outside - + Don't accept connections from outside 不接受外來連線 - Don't attempt to use UPnP to map the listening port - + Don't attempt to use UPnP to map the listening port 不嘗試用 UPnP 來設定服務連接埠的對應 - Attempt to use UPnP to map the listening port - + Attempt to use UPnP to map the listening port 嘗試用 UPnP 來設定服務連接埠的對應 - Fee per KB to add to transactions you send - + Fee per KB to add to transactions you send 交易付款時每 KB 的交易手續費 - Accept command line and JSON-RPC commands - + Accept command line and JSON-RPC commands 接受命令列與 JSON-RPC 指令 - Run in the background as a daemon and accept commands - + Run in the background as a daemon and accept commands 以背景程式執行並接受指令 - Use the test network - + Use the test network 使用測試網路 - Username for JSON-RPC connections - + Username for JSON-RPC connections JSON-RPC 連線使用者名稱 - Password for JSON-RPC connections - + Password for JSON-RPC connections JSON-RPC 連線密碼 - Listen for JSON-RPC connections on <port> (default: 8332) - + Listen for JSON-RPC connections on <port> (default: 8332) 在通訊埠 <port> 聽候 JSON-RPC 連線 (預設: 8332) - Allow JSON-RPC connections from specified IP address - + Allow JSON-RPC connections from specified IP address 只允許從指定網路位址來的 JSON-RPC 連線 - Send commands to node running on <ip> (default: 127.0.0.1) - + Send commands to node running on <ip> (default: 127.0.0.1) 送指令給在 <ip> 的節點 (預設: 127.0.0.1) - Set key pool size to <n> (default: 100) - + Set key pool size to <n> (default: 100) 設定密鑰池大小為 <n> (預設: 100) - Rescan the block chain for missing wallet transactions - + Rescan the block chain for missing wallet transactions 重新掃描區塊鎖鏈, 以尋找錢包所遺漏的交易. -SSL options: (see the Bitcoin Wiki for SSL setup instructions) - +SSL options: (see the Bitcoin Wiki for SSL setup instructions) SSL 選項: (SSL 設定程序請見 Bitcoin Wiki) - Use OpenSSL (https) for JSON-RPC connections - + Use OpenSSL (https) for JSON-RPC connections 使用 OpenSSL (https) 於JSON-RPC 連線 - Server certificate file (default: server.cert) - + Server certificate file (default: server.cert) 伺服器憑證檔 (預設: server.cert) - Server private key (default: server.pem) - + Server private key (default: server.pem) 伺服器密鑰檔 (預設: server.pem) - Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - + Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) 可以接受的加密法 (預設: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - This help message - + This help message 此協助訊息 @@ -1649,8 +1613,7 @@ SSL 選項: (SSL 設定程序請見 Bitcoin Wiki) - Error loading addr.dat - + Error loading addr.dat 載入 addr.dat 錯誤 @@ -1661,8 +1624,7 @@ SSL 選項: (SSL 設定程序請見 Bitcoin Wiki) - Error loading blkindex.dat - + Error loading blkindex.dat 載入 blkindex.dat 失敗 @@ -1673,22 +1635,19 @@ SSL 選項: (SSL 設定程序請見 Bitcoin Wiki) - Error loading wallet.dat: Wallet corrupted - + Error loading wallet.dat: Wallet corrupted 載入 wallet.dat 失敗: 錢包壞掉了 - Error loading wallet.dat: Wallet requires newer version of Bitcoin - + Error loading wallet.dat: Wallet requires newer version of Bitcoin 載入 wallet.dat 錯誤: 此錢包需要新版的 Bitcoin - Error loading wallet.dat - + Error loading wallet.dat 載入 wallet.dat 錯誤 diff --git a/src/serialize.h b/src/serialize.h index 78cff43..d3f6b7d 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 \ - 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 \ - 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 void Unserialize(Stream& is, std::basic_st // vector template unsigned int GetSerializeSize_impl(const std::vector& v, int nType, int nVersion, const boost::true_type&); template unsigned int GetSerializeSize_impl(const std::vector& v, int nType, int nVersion, const boost::false_type&); -template inline unsigned int GetSerializeSize(const std::vector& v, int nType, int nVersion=VERSION); +template inline unsigned int GetSerializeSize(const std::vector& v, int nType, int nVersion=PROTOCOL_VERSION); template void Serialize_impl(Stream& os, const std::vector& v, int nType, int nVersion, const boost::true_type&); template void Serialize_impl(Stream& os, const std::vector& v, int nType, int nVersion, const boost::false_type&); -template inline void Serialize(Stream& os, const std::vector& v, int nType, int nVersion=VERSION); +template inline void Serialize(Stream& os, const std::vector& v, int nType, int nVersion=PROTOCOL_VERSION); template void Unserialize_impl(Stream& is, std::vector& v, int nType, int nVersion, const boost::true_type&); template void Unserialize_impl(Stream& is, std::vector& v, int nType, int nVersion, const boost::false_type&); -template inline void Unserialize(Stream& is, std::vector& v, int nType, int nVersion=VERSION); +template inline void Unserialize(Stream& is, std::vector& 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 void Serialize(Stream& os, const CScript& v, int nType, int nVersion=VERSION); -template 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 void Serialize(Stream& os, const CScript& v, int nType, int nVersion=PROTOCOL_VERSION); +template void Unserialize(Stream& is, CScript& v, int nType, int nVersion=PROTOCOL_VERSION); // pair -template unsigned int GetSerializeSize(const std::pair& item, int nType, int nVersion=VERSION); -template void Serialize(Stream& os, const std::pair& item, int nType, int nVersion=VERSION); -template void Unserialize(Stream& is, std::pair& item, int nType, int nVersion=VERSION); +template unsigned int GetSerializeSize(const std::pair& item, int nType, int nVersion=PROTOCOL_VERSION); +template void Serialize(Stream& os, const std::pair& item, int nType, int nVersion=PROTOCOL_VERSION); +template void Unserialize(Stream& is, std::pair& item, int nType, int nVersion=PROTOCOL_VERSION); // 3 tuple -template unsigned int GetSerializeSize(const boost::tuple& item, int nType, int nVersion=VERSION); -template void Serialize(Stream& os, const boost::tuple& item, int nType, int nVersion=VERSION); -template void Unserialize(Stream& is, boost::tuple& item, int nType, int nVersion=VERSION); +template unsigned int GetSerializeSize(const boost::tuple& item, int nType, int nVersion=PROTOCOL_VERSION); +template void Serialize(Stream& os, const boost::tuple& item, int nType, int nVersion=PROTOCOL_VERSION); +template void Unserialize(Stream& is, boost::tuple& item, int nType, int nVersion=PROTOCOL_VERSION); // 4 tuple -template unsigned int GetSerializeSize(const boost::tuple& item, int nType, int nVersion=VERSION); -template void Serialize(Stream& os, const boost::tuple& item, int nType, int nVersion=VERSION); -template void Unserialize(Stream& is, boost::tuple& item, int nType, int nVersion=VERSION); +template unsigned int GetSerializeSize(const boost::tuple& item, int nType, int nVersion=PROTOCOL_VERSION); +template void Serialize(Stream& os, const boost::tuple& item, int nType, int nVersion=PROTOCOL_VERSION); +template void Unserialize(Stream& is, boost::tuple& item, int nType, int nVersion=PROTOCOL_VERSION); // map -template unsigned int GetSerializeSize(const std::map& m, int nType, int nVersion=VERSION); -template void Serialize(Stream& os, const std::map& m, int nType, int nVersion=VERSION); -template void Unserialize(Stream& is, std::map& m, int nType, int nVersion=VERSION); +template unsigned int GetSerializeSize(const std::map& m, int nType, int nVersion=PROTOCOL_VERSION); +template void Serialize(Stream& os, const std::map& m, int nType, int nVersion=PROTOCOL_VERSION); +template void Unserialize(Stream& is, std::map& m, int nType, int nVersion=PROTOCOL_VERSION); // set -template unsigned int GetSerializeSize(const std::set& m, int nType, int nVersion=VERSION); -template void Serialize(Stream& os, const std::set& m, int nType, int nVersion=VERSION); -template void Unserialize(Stream& is, std::set& m, int nType, int nVersion=VERSION); +template unsigned int GetSerializeSize(const std::set& m, int nType, int nVersion=PROTOCOL_VERSION); +template void Serialize(Stream& os, const std::set& m, int nType, int nVersion=PROTOCOL_VERSION); +template void Unserialize(Stream& is, std::set& m, int nType, int nVersion=PROTOCOL_VERSION); @@ -411,19 +409,19 @@ template void Unserializ // Thanks to Boost serialization for this idea. // template -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 -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 -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& vchIn, int nTypeIn=SER_NETWORK, int nVersionIn=VERSION) : vch(vchIn.begin(), vchIn.end()) + CDataStream(const std::vector& vchIn, int nTypeIn=SER_NETWORK, int nVersionIn=PROTOCOL_VERSION) : vch(vchIn.begin(), vchIn.end()) { Init(nTypeIn, nVersionIn); } - CDataStream(const std::vector& vchIn, int nTypeIn=SER_NETWORK, int nVersionIn=VERSION) : vch((char*)&vchIn.begin()[0], (char*)&vchIn.end()[0]) + CDataStream(const std::vector& 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 - 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 3e20201..b613282 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 - 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 - 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 236c7f7..ef276e5 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 #include #include #include @@ -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& 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 1ef0e6f..d9a0841 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& comments); @@ -559,7 +558,7 @@ inline uint256 Hash(const T1 p1begin, const T1 p1end, } template -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