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
+bitcoin (0.5.1-natty0) natty; urgency=low
+
+ * New upstream release.
+
+ -- Matt Corallo <matt@bluematt.me> Fri, 16 Dec 2011 13:27:00 -0500
+
bitcoin (0.5.0-natty0) natty; urgency=low
* New upstream release.
--- /dev/null
+-----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-----
weight: 40
name: "Gavin Andresen"
key: gavinandresen
+ 71A3B16735405025D447E8F274810B012346C9A6
+ weight: 40
+ name: "Wladimir J. van der Laan"
+ key: laanwj
minimum_weight: 120
weight: 40
name: "Gavin Andresen"
key: gavinandresen
+ 71A3B16735405025D447E8F274810B012346C9A6
+ weight: 40
+ name: "Wladimir J. van der Laan"
+ key: laanwj
minimum_weight: 120
-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
-Bitcoin 0.5.1 BETA\r
+Bitcoin 0.5.99 BETA\r
\r
Copyright (c) 2009-2011 Bitcoin Developers\r
Distributed under the MIT/X11 software license, see the accompanying\r
* 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*
\r
# General Symbol Definitions\r
!define REGKEY "SOFTWARE\$(^Name)"\r
-!define VERSION 0.5.1\r
+!define VERSION 0.5.99\r
!define COMPANY "Bitcoin project"\r
!define URL http://www.bitcoin.org/\r
\r
!insertmacro MUI_LANGUAGE English\r
\r
# Installer attributes\r
-OutFile bitcoin-0.5.1-win32-setup.exe\r
+OutFile bitcoin-0.5.99-win32-setup.exe\r
InstallDir $PROGRAMFILES\Bitcoin\r
CRCCheck on\r
XPStyle on\r
BrandingText " "\r
ShowInstDetails show\r
-VIProductVersion 0.5.1.0\r
+VIProductVersion 0.5.99.0\r
VIAddVersionKey ProductName Bitcoin\r
VIAddVersionKey ProductVersion "${VERSION}"\r
VIAddVersionKey CompanyName "${COMPANY}"\r
return ToString(16);
}
- unsigned int GetSerializeSize(int nType=0, int nVersion=VERSION) const
+ unsigned int GetSerializeSize(int nType=0, int nVersion=PROTOCOL_VERSION) const
{
return ::GetSerializeSize(getvch(), nType, nVersion);
}
template<typename Stream>
- void Serialize(Stream& s, int nType=0, int nVersion=VERSION) const
+ void Serialize(Stream& s, int nType=0, int nVersion=PROTOCOL_VERSION) const
{
::Serialize(s, getvch(), nType, nVersion);
}
template<typename Stream>
- void Unserialize(Stream& s, int nType=0, int nVersion=VERSION)
+ void Unserialize(Stream& s, int nType=0, int nVersion=PROTOCOL_VERSION)
{
std::vector<unsigned char> vch;
::Unserialize(s, vch, nType, nVersion);
"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()));
{
bool fTmp = fReadOnly;
fReadOnly = false;
- WriteVersion(VERSION);
+ WriteVersion(CLIENT_VERSION);
fReadOnly = fTmp;
}
{
// Update version:
ssValue.clear();
- ssValue << VERSION;
+ ssValue << CLIENT_VERSION;
}
Dbt datKey(&ssKey[0], ssKey.size());
Dbt datValue(&ssValue[0], ssValue.size());
{
int nMinVersion = 0;
ssValue >> nMinVersion;
- if (nMinVersion > VERSION)
+ if (nMinVersion > CLIENT_VERSION)
return DB_TOO_NEW;
}
}
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;
_("Bitcoin version") + " " + FormatFullVersion() + "\n\n" +
_("Usage:") + "\t\t\t\t\t\t\t\t\t\t\n" +
" bitcoind [options] \t " + "\n" +
- " bitcoind [options] <command> [params]\t " + _("Send command to -server or bitcoind\n") +
- " bitcoind [options] help \t\t " + _("List commands\n") +
- " bitcoind [options] help <command> \t\t " + _("Get help for a command\n") +
- _("Options:\n") +
- " -conf=<file> \t\t " + _("Specify configuration file (default: bitcoin.conf)\n") +
- " -pid=<file> \t\t " + _("Specify pid file (default: bitcoind.pid)\n") +
- " -gen \t\t " + _("Generate coins\n") +
- " -gen=0 \t\t " + _("Don't generate coins\n") +
- " -min \t\t " + _("Start minimized\n") +
- " -datadir=<dir> \t\t " + _("Specify data directory\n") +
- " -timeout=<n> \t " + _("Specify connection timeout (in milliseconds)\n") +
- " -proxy=<ip:port> \t " + _("Connect through socks4 proxy\n") +
- " -dns \t " + _("Allow DNS lookups for addnode and connect\n") +
- " -port=<port> \t\t " + _("Listen for connections on <port> (default: 8333 or testnet: 18333)\n") +
- " -maxconnections=<n>\t " + _("Maintain at most <n> connections to peers (default: 125)\n") +
- " -addnode=<ip> \t " + _("Add a node to connect to\n") +
- " -connect=<ip> \t\t " + _("Connect only to the specified node\n") +
- " -nolisten \t " + _("Don't accept connections from outside\n") +
- " -nodnsseed \t " + _("Don't bootstrap list of peers using DNS\n") +
- " -banscore=<n> \t " + _("Threshold for disconnecting misbehaving peers (default: 100)\n") +
- " -bantime=<n> \t " + _("Number of seconds to keep misbehaving peers from reconnecting (default: 86400)\n") +
- " -maxreceivebuffer=<n>\t " + _("Maximum per-connection receive buffer, <n>*1000 bytes (default: 10000)\n") +
- " -maxsendbuffer=<n>\t " + _("Maximum per-connection send buffer, <n>*1000 bytes (default: 10000)\n") +
+ " bitcoind [options] <command> [params]\t " + _("Send command to -server or bitcoind") + "\n" +
+ " bitcoind [options] help \t\t " + _("List commands") + "\n" +
+ " bitcoind [options] help <command> \t\t " + _("Get help for a command") + "\n" +
+ _("Options:") + "\n" +
+ " -conf=<file> \t\t " + _("Specify configuration file (default: bitcoin.conf)") + "\n" +
+ " -pid=<file> \t\t " + _("Specify pid file (default: bitcoind.pid)") + "\n" +
+ " -gen \t\t " + _("Generate coins") + "\n" +
+ " -gen=0 \t\t " + _("Don't generate coins") + "\n" +
+ " -min \t\t " + _("Start minimized") + "\n" +
+ " -datadir=<dir> \t\t " + _("Specify data directory") + "\n" +
+ " -timeout=<n> \t " + _("Specify connection timeout (in milliseconds)") + "\n" +
+ " -proxy=<ip:port> \t " + _("Connect through socks4 proxy") + "\n" +
+ " -dns \t " + _("Allow DNS lookups for addnode and connect") + "\n" +
+ " -port=<port> \t\t " + _("Listen for connections on <port> (default: 8333 or testnet: 18333)") + "\n" +
+ " -maxconnections=<n>\t " + _("Maintain at most <n> connections to peers (default: 125)") + "\n" +
+ " -addnode=<ip> \t " + _("Add a node to connect to") + "\n" +
+ " -connect=<ip> \t\t " + _("Connect only to the specified node") + "\n" +
+ " -nolisten \t " + _("Don't accept connections from outside") + "\n" +
+ " -nodnsseed \t " + _("Don't bootstrap list of peers using DNS") + "\n" +
+ " -banscore=<n> \t " + _("Threshold for disconnecting misbehaving peers (default: 100)") + "\n" +
+ " -bantime=<n> \t " + _("Number of seconds to keep misbehaving peers from reconnecting (default: 86400)") + "\n" +
+ " -maxreceivebuffer=<n>\t " + _("Maximum per-connection receive buffer, <n>*1000 bytes (default: 10000)") + "\n" +
+ " -maxsendbuffer=<n>\t " + _("Maximum per-connection send buffer, <n>*1000 bytes (default: 10000)") + "\n" +
#ifdef USE_UPNP
#if USE_UPNP
- " -noupnp \t " + _("Don't attempt to use UPnP to map the listening port\n") +
+ " -noupnp \t " + _("Don't attempt to use UPnP to map the listening port") + "\n" +
#else
- " -upnp \t " + _("Attempt to use UPnP to map the listening port\n") +
+ " -upnp \t " + _("Attempt to use UPnP to map the listening port") + "\n" +
#endif
#endif
- " -paytxfee=<amt> \t " + _("Fee per KB to add to transactions you send\n") +
+ " -paytxfee=<amt> \t " + _("Fee per KB to add to transactions you send") + "\n" +
#ifdef GUI
- " -server \t\t " + _("Accept command line and JSON-RPC commands\n") +
+ " -server \t\t " + _("Accept command line and JSON-RPC commands") + "\n" +
#endif
#ifndef WIN32
- " -daemon \t\t " + _("Run in the background as a daemon and accept commands\n") +
+ " -daemon \t\t " + _("Run in the background as a daemon and accept commands") + "\n" +
#endif
- " -testnet \t\t " + _("Use the test network\n") +
- " -debug \t\t " + _("Output extra debugging information\n") +
- " -logtimestamps \t " + _("Prepend debug output with timestamp\n") +
- " -printtoconsole \t " + _("Send trace/debug info to console instead of debug.log file\n") +
+ " -testnet \t\t " + _("Use the test network") + "\n" +
+ " -debug \t\t " + _("Output extra debugging information") + "\n" +
+ " -logtimestamps \t " + _("Prepend debug output with timestamp") + "\n" +
+ " -printtoconsole \t " + _("Send trace/debug info to console instead of debug.log file") + "\n" +
#ifdef WIN32
- " -printtodebugger \t " + _("Send trace/debug info to debugger\n") +
+ " -printtodebugger \t " + _("Send trace/debug info to debugger") + "\n" +
#endif
- " -rpcuser=<user> \t " + _("Username for JSON-RPC connections\n") +
- " -rpcpassword=<pw>\t " + _("Password for JSON-RPC connections\n") +
- " -rpcport=<port> \t\t " + _("Listen for JSON-RPC connections on <port> (default: 8332)\n") +
- " -rpcallowip=<ip> \t\t " + _("Allow JSON-RPC connections from specified IP address\n") +
- " -rpcconnect=<ip> \t " + _("Send commands to node running on <ip> (default: 127.0.0.1)\n") +
- " -keypool=<n> \t " + _("Set key pool size to <n> (default: 100)\n") +
- " -rescan \t " + _("Rescan the block chain for missing wallet transactions\n");
+ " -rpcuser=<user> \t " + _("Username for JSON-RPC connections") + "\n" +
+ " -rpcpassword=<pw>\t " + _("Password for JSON-RPC connections") + "\n" +
+ " -rpcport=<port> \t\t " + _("Listen for JSON-RPC connections on <port> (default: 8332)") + "\n" +
+ " -rpcallowip=<ip> \t\t " + _("Allow JSON-RPC connections from specified IP address") + "\n" +
+ " -rpcconnect=<ip> \t " + _("Send commands to node running on <ip> (default: 127.0.0.1)") + "\n" +
+ " -keypool=<n> \t " + _("Set key pool size to <n> (default: 100)") + "\n" +
+ " -rescan \t " + _("Rescan the block chain for missing wallet transactions") + "\n";
#ifdef USE_SSL
strUsage += string() +
- _("\nSSL options: (see the Bitcoin Wiki for SSL setup instructions)\n") +
- " -rpcssl \t " + _("Use OpenSSL (https) for JSON-RPC connections\n") +
- " -rpcsslcertificatechainfile=<file.cert>\t " + _("Server certificate file (default: server.cert)\n") +
- " -rpcsslprivatekeyfile=<file.pem> \t " + _("Server private key (default: server.pem)\n") +
- " -rpcsslciphers=<ciphers> \t " + _("Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)\n");
+ _("\nSSL options: (see the Bitcoin Wiki for SSL setup instructions)") + "\n" +
+ " -rpcssl \t " + _("Use OpenSSL (https) for JSON-RPC connections") + "\n" +
+ " -rpcsslcertificatechainfile=<file.cert>\t " + _("Server certificate file (default: server.cert)") + "\n" +
+ " -rpcsslprivatekeyfile=<file.pem> \t " + _("Server private key (default: server.pem)") + "\n" +
+ " -rpcsslciphers=<ciphers> \t " + _("Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)") + "\n";
#endif
strUsage += string() +
- " -? \t\t " + _("This help message\n");
+ " -? \t\t " + _("This help message") + "\n";
// Remove tabs
strUsage.erase(std::remove(strUsage.begin(), strUsage.end(), '\t'), strUsage.end());
}
// 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..."));
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);
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;
}
// Global state
//
+// Name of client reported in the 'version' message. Report the same name
+// for both bitcoind and bitcoin-qt, to make it harder for attackers to
+// target servers or GUI users specifically.
+const std::string CLIENT_NAME("bitcoin-qt");
+
CCriticalSection cs_setpwalletRegistered;
set<CWallet*> setpwalletRegistered;
// 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)
{
else if (strCommand == "verack")
{
- pfrom->vRecv.SetVersion(min(pfrom->nVersion, VERSION));
+ pfrom->vRecv.SetVersion(min(pfrom->nVersion, PROTOCOL_VERSION));
}
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;
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)));
bool AppliesToMe() const
{
- return AppliesTo(VERSION, ::pszSubVer);
+ return AppliesTo(PROTOCOL_VERSION, FormatSubVersion(CLIENT_NAME, CLIENT_VERSION, std::vector<std::string>()));
}
bool RelayTo(CNode* pnode) const
}
+void CNode::PushVersion()
+{
+ /// when NTP implemented, change to just nTime = GetAdjustedTime()
+ int64 nTime = (fInbound ? GetAdjustedTime() : GetTime());
+ CAddress addrYou = (fUseProxy ? CAddress("0.0.0.0") : addr);
+ CAddress addrMe = (fUseProxy ? CAddress("0.0.0.0") : addrLocalHost);
+ RAND_bytes((unsigned char*)&nLocalHostNonce, sizeof(nLocalHostNonce));
+ PushMessage("version", PROTOCOL_VERSION, nLocalServices, nTime, addrYou, addrMe,
+ nLocalHostNonce, FormatSubVersion(CLIENT_NAME, CLIENT_VERSION, std::vector<string>()), nBestHeight);
+}
+
+
+
+
+
std::map<unsigned int, int64> CNode::setBanned;
CCriticalSection CNode::cs_setBanned;
static const char *strDNSSeed[] = {
"bitseed.xf2.org",
"dnsseed.bluematt.me",
+ "seed.bitcoin.sipa.be",
+ "dnsseed.bitcoin.dashjr.org",
};
void ThreadDNSAddressSeed(void* parg)
- 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)
void MainFrameRepaint()
{
+ if(guiref)
+ QMetaObject::invokeMethod(guiref, "refreshStatusBar", Qt::QueuedConnection);
}
void InitMessage(const std::string &message)
* Qt4 bitcoin GUI.
*
* W.J. van der Laan 2011
+ * The Bitcoin Developers 2011
*/
#include "bitcoingui.h"
#include "transactiontablemodel.h"
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);
}
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
@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);
// Automatically generated by extract_strings.py
static const char *bitcoin_strings[] = {QT_TRANSLATE_NOOP("bitcoin-core", "Bitcoin version"),
QT_TRANSLATE_NOOP("bitcoin-core", "Usage:"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Send command to -server or bitcoind\n"),
-QT_TRANSLATE_NOOP("bitcoin-core", "List commands\n"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Get help for a command\n"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Options:\n"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Specify configuration file (default: bitcoin.conf)\n"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Specify pid file (default: bitcoind.pid)\n"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Generate coins\n"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Don't generate coins\n"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Start minimized\n"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Specify data directory\n"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Specify connection timeout (in milliseconds)\n"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Connect through socks4 proxy\n"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Allow DNS lookups for addnode and connect\n"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Add a node to connect to\n"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Connect only to the specified node\n"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Don't accept connections from outside\n"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Threshold for disconnecting misbehaving peers (default: 100)\n"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Send command to -server or bitcoind"),
+QT_TRANSLATE_NOOP("bitcoin-core", "List commands"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Get help for a command"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Options:"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Specify configuration file (default: bitcoin.conf)"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Specify pid file (default: bitcoind.pid)"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Generate coins"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Don't generate coins"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Start minimized"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Specify data directory"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Specify connection timeout (in milliseconds)"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Connect through socks4 proxy"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Allow DNS lookups for addnode and connect"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Listen for connections on <port> (default: 8333 or testnet: 18333)"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Maintain at most <n> connections to peers (default: 125)"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Add a node to connect to"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Connect only to the specified node"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Don't accept connections from outside"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Don't bootstrap list of peers using DNS"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Threshold for disconnecting misbehaving peers (default: 100)"),
QT_TRANSLATE_NOOP("bitcoin-core", ""
"Number of seconds to keep misbehaving peers from reconnecting (default: "
-"86400)\n"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Don't attempt to use UPnP to map the listening port\n"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Attempt to use UPnP to map the listening port\n"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Fee per KB to add to transactions you send\n"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Accept command line and JSON-RPC commands\n"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Run in the background as a daemon and accept commands\n"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Use the test network\n"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Username for JSON-RPC connections\n"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Password for JSON-RPC connections\n"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Listen for JSON-RPC connections on <port> (default: 8332)\n"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Allow JSON-RPC connections from specified IP address\n"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Send commands to node running on <ip> (default: 127.0.0.1)\n"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Set key pool size to <n> (default: 100)\n"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Rescan the block chain for missing wallet transactions\n"),
+"86400)"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Maximum per-connection receive buffer, <n>*1000 bytes (default: 10000)"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Maximum per-connection send buffer, <n>*1000 bytes (default: 10000)"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Don't attempt to use UPnP to map the listening port"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Attempt to use UPnP to map the listening port"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Fee per KB to add to transactions you send"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Accept command line and JSON-RPC commands"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Run in the background as a daemon and accept commands"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Use the test network"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Output extra debugging information"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Prepend debug output with timestamp"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Send trace/debug info to console instead of debug.log file"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Send trace/debug info to debugger"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Username for JSON-RPC connections"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Password for JSON-RPC connections"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Listen for JSON-RPC connections on <port> (default: 8332)"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Allow JSON-RPC connections from specified IP address"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Send commands to node running on <ip> (default: 127.0.0.1)"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Set key pool size to <n> (default: 100)"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Rescan the block chain for missing wallet transactions"),
QT_TRANSLATE_NOOP("bitcoin-core", ""
"\n"
-"SSL options: (see the Bitcoin Wiki for SSL setup instructions)\n"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Use OpenSSL (https) for JSON-RPC connections\n"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Server certificate file (default: server.cert)\n"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Server private key (default: server.pem)\n"),
+"SSL options: (see the Bitcoin Wiki for SSL setup instructions)"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Use OpenSSL (https) for JSON-RPC connections"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Server certificate file (default: server.cert)"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Server private key (default: server.pem)"),
QT_TRANSLATE_NOOP("bitcoin-core", ""
"Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:"
-"@STRENGTH)\n"),
-QT_TRANSLATE_NOOP("bitcoin-core", "This help message\n"),
+"@STRENGTH)"),
+QT_TRANSLATE_NOOP("bitcoin-core", "This help message"),
QT_TRANSLATE_NOOP("bitcoin-core", ""
"Cannot obtain a lock on data directory %s. Bitcoin is probably already "
"running."),
QT_TRANSLATE_NOOP("bitcoin-core", "Loading addresses..."),
-QT_TRANSLATE_NOOP("bitcoin-core", "Error loading addr.dat \n"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Error loading addr.dat"),
QT_TRANSLATE_NOOP("bitcoin-core", "Loading block index..."),
-QT_TRANSLATE_NOOP("bitcoin-core", "Error loading blkindex.dat \n"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Error loading blkindex.dat"),
QT_TRANSLATE_NOOP("bitcoin-core", "Loading wallet..."),
-QT_TRANSLATE_NOOP("bitcoin-core", "Error loading wallet.dat: Wallet corrupted \n"),
-QT_TRANSLATE_NOOP("bitcoin-core", ""
-"Error loading wallet.dat: Wallet requires newer version of Bitcoin \n"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Error loading wallet.dat \n"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Error loading wallet.dat: Wallet corrupted"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Error loading wallet.dat: Wallet requires newer version of Bitcoin"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Wallet needed to be rewritten: restart Bitcoin to complete"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Error loading wallet.dat"),
QT_TRANSLATE_NOOP("bitcoin-core", "Rescanning..."),
QT_TRANSLATE_NOOP("bitcoin-core", "Done loading"),
QT_TRANSLATE_NOOP("bitcoin-core", "Invalid -proxy address"),
return GetNumBlocksOfPeers();
}
+QString ClientModel::getStatusBarWarnings() const
+{
+ return QString::fromStdString(GetWarnings("statusbar"));
+}
+
OptionsModel *ClientModel::getOptionsModel()
{
return optionsModel;
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;
<source>Date: %1
Amount: %2
Type: %3
-Address: %4
-</source>
+Address: %4</source>
<translation>Dato: %1
Beløb: %2
Type: %3
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="5"/>
- <source>Send command to -server or bitcoind
-</source>
+ <source>Send command to -server or bitcoind</source>
<translation>Send kommando til -server eller bitcoind
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="6"/>
- <source>List commands
-</source>
+ <source>List commands</source>
<translation>Liste over kommandoer
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="7"/>
- <source>Get help for a command
-</source>
+ <source>Get help for a command</source>
<translation>Få hjælp til en kommando
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="8"/>
- <source>Options:
-</source>
+ <source>Options:</source>
<translation>Indstillinger:
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="9"/>
- <source>Specify configuration file (default: bitcoin.conf)
-</source>
+ <source>Specify configuration file (default: bitcoin.conf)</source>
<translation>Angiv konfigurationsfil (standard: bitcoin.conf)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="10"/>
- <source>Specify pid file (default: bitcoind.pid)
-</source>
+ <source>Specify pid file (default: bitcoind.pid)</source>
<translation>Angiv pid-fil (default: bitcoind.pid)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="11"/>
- <source>Generate coins
-</source>
+ <source>Generate coins</source>
<translation>Generér coins
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="12"/>
- <source>Don't generate coins
-</source>
+ <source>Don't generate coins</source>
<translation>Generér ikke coins
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="13"/>
- <source>Start minimized
-</source>
+ <source>Start minimized</source>
<translation>Start minimeret
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="14"/>
- <source>Specify data directory
-</source>
+ <source>Specify data directory</source>
<translation>Angiv databibliotek
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="15"/>
- <source>Specify connection timeout (in milliseconds)
-</source>
+ <source>Specify connection timeout (in milliseconds)</source>
<translation>Angiv tilslutningstimeout (i millisekunder)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="16"/>
- <source>Connect through socks4 proxy
-</source>
+ <source>Connect through socks4 proxy</source>
<translation>Tilslut via SOCKS4 proxy
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="17"/>
- <source>Allow DNS lookups for addnode and connect
-</source>
+ <source>Allow DNS lookups for addnode and connect</source>
<translation>Tillad DNS-opslag for addnode og connect
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="18"/>
- <source>Add a node to connect to
-</source>
+ <source>Add a node to connect to</source>
<translation>Tilføj en node til at forbinde til
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="19"/>
- <source>Connect only to the specified node
-</source>
+ <source>Connect only to the specified node</source>
<translation>Tilslut kun til den angivne node
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="20"/>
- <source>Don't accept connections from outside
-</source>
+ <source>Don't accept connections from outside</source>
<translation>Acceptér ikke forbindelser udefra
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="21"/>
- <source>Don't attempt to use UPnP to map the listening port
-</source>
+ <source>Don't attempt to use UPnP to map the listening port</source>
<translation>Forsøg ikke at bruge UPnP til at konfigurere den lyttende port</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="22"/>
- <source>Attempt to use UPnP to map the listening port
-</source>
+ <source>Attempt to use UPnP to map the listening port</source>
<translation>Forsøg at bruge UPnP til at kofnigurere den lyttende port</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="23"/>
- <source>Fee per KB to add to transactions you send
-</source>
+ <source>Fee per KB to add to transactions you send</source>
<translation>Gebyr pr. KB, som skal tilføjes til transaktioner du sender
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="24"/>
- <source>Accept command line and JSON-RPC commands
-</source>
+ <source>Accept command line and JSON-RPC commands</source>
<translation>Accepter kommandolinje- og JSON-RPC-kommandoer
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="25"/>
- <source>Run in the background as a daemon and accept commands
-</source>
+ <source>Run in the background as a daemon and accept commands</source>
<translation>Kør i baggrunden som en service, og acceptér kommandoer
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="26"/>
- <source>Use the test network
-</source>
+ <source>Use the test network</source>
<translation>Brug test-netværket
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="27"/>
- <source>Username for JSON-RPC connections
-</source>
+ <source>Username for JSON-RPC connections</source>
<translation>Brugernavn til JSON-RPC-forbindelser
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="28"/>
- <source>Password for JSON-RPC connections
-</source>
+ <source>Password for JSON-RPC connections</source>
<translation>Password til JSON-RPC-forbindelser
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="29"/>
- <source>Listen for JSON-RPC connections on <port> (default: 8332)
-</source>
+ <source>Listen for JSON-RPC connections on <port> (default: 8332)</source>
<translation>Lyt til JSON-RPC-forbindelser på <port> (standard: 8332)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="30"/>
- <source>Allow JSON-RPC connections from specified IP address
-</source>
+ <source>Allow JSON-RPC connections from specified IP address</source>
<translation>Tillad JSON-RPC-forbindelser fra bestemt IP-adresse
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="31"/>
- <source>Send commands to node running on <ip> (default: 127.0.0.1)
-</source>
+ <source>Send commands to node running on <ip> (default: 127.0.0.1)</source>
<translation>Send kommandoer til node, der kører på <ip> (standard: 127.0.0.1)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="32"/>
- <source>Set key pool size to <n> (default: 100)
-</source>
+ <source>Set key pool size to <n> (default: 100)</source>
<translation>Sæt nøglepoolstørrelse til <n> (standard: 100)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="33"/>
- <source>Rescan the block chain for missing wallet transactions
-</source>
+ <source>Rescan the block chain for missing wallet transactions</source>
<translation>Gennemsøg blokkæden for manglende tegnebogstransaktioner
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="34"/>
<source>
-SSL options: (see the Bitcoin Wiki for SSL setup instructions)
-</source>
+SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation>
SSL-indstillinger: (se Bitcoin Wiki for SSL opsætningsinstruktioner)</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="37"/>
- <source>Use OpenSSL (https) for JSON-RPC connections
-</source>
+ <source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>Brug OpenSSL (https) for JSON-RPC-forbindelser
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="38"/>
- <source>Server certificate file (default: server.cert)
-</source>
+ <source>Server certificate file (default: server.cert)</source>
<translation>Servercertifikat-fil (standard: server.cert)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="39"/>
- <source>Server private key (default: server.pem)
-</source>
+ <source>Server private key (default: server.pem)</source>
<translation>Server private nøgle (standard: server.pem)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="40"/>
- <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)
-</source>
+ <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source>
<translation>Acceptabele ciphers (standard: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="43"/>
- <source>This help message
-</source>
+ <source>This help message</source>
<translation>Denne hjælpebesked
</translation>
</message>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="48"/>
- <source>Error loading addr.dat
-</source>
+ <source>Error loading addr.dat </source>
<translation>Fejl ved indlæsning af addr.dat
</translation>
</message>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="50"/>
- <source>Error loading blkindex.dat
-</source>
+ <source>Error loading blkindex.dat </source>
<translation>Fejl ved indlæsning af blkindex.dat
</translation>
</message>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="52"/>
- <source>Error loading wallet.dat: Wallet corrupted
-</source>
+ <source>Error loading wallet.dat: Wallet corrupted </source>
<translation>Fejl ved indlæsning af wallet.dat: Tegnebog ødelagt
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="53"/>
- <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin
-</source>
+ <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin </source>
<translation>Fejl ved indlæsning af wallet.dat: Tegnebog kræver en nyere version af Bitcoin
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="55"/>
- <source>Error loading wallet.dat
-</source>
+ <source>Error loading wallet.dat </source>
<translation>Fejl ved indlæsning af wallet.dat
</translation>
</message>
<source>Date: %1
Amount: %2
Type: %3
-Address: %4
-</source>
+Address: %4</source>
<translation>Datum: %1
Betrag: %2
Typ: %3
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="5"/>
- <source>Send command to -server or bitcoind
-</source>
+ <source>Send command to -server or bitcoind</source>
<translation>Sende Befehl an -server oder bitcoind
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="6"/>
- <source>List commands
-</source>
+ <source>List commands</source>
<translation>Befehle auflisten
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="7"/>
- <source>Get help for a command
-</source>
+ <source>Get help for a command</source>
<translation>Hilfe für Befehl erhalten
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="8"/>
- <source>Options:
-</source>
+ <source>Options:</source>
<translation>Einstellungen:</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="9"/>
- <source>Specify configuration file (default: bitcoin.conf)
-</source>
+ <source>Specify configuration file (default: bitcoin.conf)</source>
<translation>Bitte wählen Sie eine Konfigurationsdatei (Standard: bitcoin.conf)</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="10"/>
- <source>Specify pid file (default: bitcoind.pid)
-</source>
+ <source>Specify pid file (default: bitcoind.pid)</source>
<translation>Bitte wählen Sie den Namen der PID Datei (Standard bitcoind.pid)</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="11"/>
- <source>Generate coins
-</source>
+ <source>Generate coins</source>
<translation>Erarbeite Bitcoins</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="12"/>
- <source>Don't generate coins
-</source>
+ <source>Don't generate coins</source>
<translation>Keine Bitcoins erarbeiten
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="13"/>
- <source>Start minimized
-</source>
+ <source>Start minimized</source>
<translation>minimiert starten</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="14"/>
- <source>Specify data directory
-</source>
+ <source>Specify data directory</source>
<translation>Bitte wählen Sie das Datenverzeichnis</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="15"/>
- <source>Specify connection timeout (in milliseconds)
-</source>
+ <source>Specify connection timeout (in milliseconds)</source>
<translation>Netzwerkverbindungsabbruch nach (in Millisekunden)</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="16"/>
- <source>Connect through socks4 proxy
-</source>
+ <source>Connect through socks4 proxy</source>
<translation>Durch SOCKS4-Proxy verbinden</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="17"/>
- <source>Allow DNS lookups for addnode and connect
-</source>
+ <source>Allow DNS lookups for addnode and connect</source>
<translation>Erlaube DNS Namensauflösung für addnode und connect</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="18"/>
- <source>Add a node to connect to
-</source>
+ <source>Add a node to connect to</source>
<translation>Bitcoin Knoten hinzufügen
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="19"/>
- <source>Connect only to the specified node
-</source>
+ <source>Connect only to the specified node</source>
<translation>Nur zu angegebenen Knoten verbinden
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="20"/>
- <source>Don't accept connections from outside
-</source>
+ <source>Don't accept connections from outside</source>
<translation>Keine externen Transatkionen akzeptieren</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="21"/>
- <source>Don't attempt to use UPnP to map the listening port
-</source>
+ <source>Don't attempt to use UPnP to map the listening port</source>
<translation>UPnP nicht verwenden</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="22"/>
- <source>Attempt to use UPnP to map the listening port
-</source>
+ <source>Attempt to use UPnP to map the listening port</source>
<translation>Versuche eine Verbindung mittels UPnP herzustellen</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="23"/>
- <source>Fee per KB to add to transactions you send
-</source>
+ <source>Fee per KB to add to transactions you send</source>
<translation>Gebühr pro KB, die gesendeten Transaktionen hinzugefügt wird
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="24"/>
- <source>Accept command line and JSON-RPC commands
-</source>
+ <source>Accept command line and JSON-RPC commands</source>
<translation>Erlaube Kommandozeilen und JSON-RPC Befehle
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="25"/>
- <source>Run in the background as a daemon and accept commands
-</source>
+ <source>Run in the background as a daemon and accept commands</source>
<translation>Als Hintergrunddienst starten und Befehle akzeptieren
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="26"/>
- <source>Use the test network
-</source>
+ <source>Use the test network</source>
<translation>Das Test Netzwerk verwenden
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="27"/>
- <source>Username for JSON-RPC connections
-</source>
+ <source>Username for JSON-RPC connections</source>
<translation>Benutzername für JSON-RPC Verbindungen
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="28"/>
- <source>Password for JSON-RPC connections
-</source>
+ <source>Password for JSON-RPC connections</source>
<translation>Passwort für JSON-RPC Verbindungen
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="29"/>
- <source>Listen for JSON-RPC connections on <port> (default: 8332)
-</source>
+ <source>Listen for JSON-RPC connections on <port> (default: 8332)</source>
<translation>Port für JSON-RPC Befehle (Standard: 8332)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="30"/>
- <source>Allow JSON-RPC connections from specified IP address
-</source>
+ <source>Allow JSON-RPC connections from specified IP address</source>
<translation>JSON-RPC Befehle nur von dieser IP-Adresse erlauben
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="31"/>
- <source>Send commands to node running on <ip> (default: 127.0.0.1)
-</source>
+ <source>Send commands to node running on <ip> (default: 127.0.0.1)</source>
<translation>Befehle an Bitcoin Knoten <ip> senden (Standard: 127.0.0.1)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="32"/>
- <source>Set key pool size to <n> (default: 100)
-</source>
+ <source>Set key pool size to <n> (default: 100)</source>
<translation>Menge der vorgenerierten Adressen (Standard: 100)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="33"/>
- <source>Rescan the block chain for missing wallet transactions
-</source>
+ <source>Rescan the block chain for missing wallet transactions</source>
<translation>Blockkette nach verlorenen Transaktionen durchsuchen (rescan)</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="34"/>
<source>
-SSL options: (see the Bitcoin Wiki for SSL setup instructions)
-</source>
+SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation>SSL Einstellungen: (Siehe im BitCoin-Wiki für eine detallierte Beschreibung)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="37"/>
- <source>Use OpenSSL (https) for JSON-RPC connections
-</source>
+ <source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>JSON-RPC Befehle über OpenSSL (https)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="38"/>
- <source>Server certificate file (default: server.cert)
-</source>
+ <source>Server certificate file (default: server.cert)</source>
<translation>SSL Server Zertifikat (Standard: server.cert)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="39"/>
- <source>Server private key (default: server.pem)
-</source>
+ <source>Server private key (default: server.pem)</source>
<translation>Privater SSL Schlüssel (Standard: server.pem)</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="40"/>
- <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)
-</source>
+ <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source>
<translation>Erlaubte Kryptographiealgorithmen (Standard: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="43"/>
- <source>This help message
-</source>
+ <source>This help message</source>
<translation>Dieser Hilfetext</translation>
</message>
<message>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="48"/>
- <source>Error loading addr.dat
-</source>
+ <source>Error loading addr.dat </source>
<translation>Fehler beim Laden der addr.dat
</translation>
</message>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="50"/>
- <source>Error loading blkindex.dat
-</source>
+ <source>Error loading blkindex.dat </source>
<translation>Fehler beim laden der blkindex.dat</translation>
</message>
<message>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="52"/>
- <source>Error loading wallet.dat: Wallet corrupted
-</source>
+ <source>Error loading wallet.dat: Wallet corrupted </source>
<translation>Fehler beim Laden von wallet.dat: Brieftasche beschädigt
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="53"/>
- <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin
-</source>
+ <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin </source>
<translation>Fehler beim Laden von wallet.dat: Neuere Version von Bitcoin notwendig
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="55"/>
- <source>Error loading wallet.dat
-</source>
+ <source>Error loading wallet.dat </source>
<translation>Fehler beim Laden von wallet.dat</translation>
</message>
<message>
<source>Date: %1
Amount: %2
Type: %3
-Address: %4
-</source>
+Address: %4</source>
<translation type="unfinished"></translation>
</message>
<message>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="5"/>
- <source>Send command to -server or bitcoind
-</source>
+ <source>Send command to -server or bitcoind</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="6"/>
- <source>List commands
-</source>
+ <source>List commands</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="7"/>
- <source>Get help for a command
-</source>
+ <source>Get help for a command</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="8"/>
- <source>Options:
-</source>
+ <source>Options:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="9"/>
- <source>Specify configuration file (default: bitcoin.conf)
-</source>
+ <source>Specify configuration file (default: bitcoin.conf)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="10"/>
- <source>Specify pid file (default: bitcoind.pid)
-</source>
+ <source>Specify pid file (default: bitcoind.pid)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="11"/>
- <source>Generate coins
-</source>
+ <source>Generate coins</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="12"/>
- <source>Don't generate coins
-</source>
+ <source>Don't generate coins</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="13"/>
- <source>Start minimized
-</source>
+ <source>Start minimized</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="14"/>
- <source>Specify data directory
-</source>
+ <source>Specify data directory</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="15"/>
- <source>Specify connection timeout (in milliseconds)
-</source>
+ <source>Specify connection timeout (in milliseconds)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="16"/>
- <source>Connect through socks4 proxy
-</source>
+ <source>Connect through socks4 proxy</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="17"/>
- <source>Allow DNS lookups for addnode and connect
-</source>
+ <source>Allow DNS lookups for addnode and connect</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="18"/>
- <source>Add a node to connect to
-</source>
+ <source>Add a node to connect to</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="19"/>
- <source>Connect only to the specified node
-</source>
+ <source>Connect only to the specified node</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="20"/>
- <source>Don't accept connections from outside
-</source>
+ <source>Don't accept connections from outside</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="21"/>
- <source>Don't attempt to use UPnP to map the listening port
-</source>
+ <source>Don't attempt to use UPnP to map the listening port</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="22"/>
- <source>Attempt to use UPnP to map the listening port
-</source>
+ <source>Attempt to use UPnP to map the listening port</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="23"/>
- <source>Fee per KB to add to transactions you send
-</source>
+ <source>Fee per KB to add to transactions you send</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="24"/>
- <source>Accept command line and JSON-RPC commands
-</source>
+ <source>Accept command line and JSON-RPC commands</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="25"/>
- <source>Run in the background as a daemon and accept commands
-</source>
+ <source>Run in the background as a daemon and accept commands</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="26"/>
- <source>Use the test network
-</source>
+ <source>Use the test network</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="27"/>
- <source>Username for JSON-RPC connections
-</source>
+ <source>Username for JSON-RPC connections</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="28"/>
- <source>Password for JSON-RPC connections
-</source>
+ <source>Password for JSON-RPC connections</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="29"/>
- <source>Listen for JSON-RPC connections on <port> (default: 8332)
-</source>
+ <source>Listen for JSON-RPC connections on <port> (default: 8332)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="30"/>
- <source>Allow JSON-RPC connections from specified IP address
-</source>
+ <source>Allow JSON-RPC connections from specified IP address</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="31"/>
- <source>Send commands to node running on <ip> (default: 127.0.0.1)
-</source>
+ <source>Send commands to node running on <ip> (default: 127.0.0.1)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="32"/>
- <source>Set key pool size to <n> (default: 100)
-</source>
+ <source>Set key pool size to <n> (default: 100)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="33"/>
- <source>Rescan the block chain for missing wallet transactions
-</source>
+ <source>Rescan the block chain for missing wallet transactions</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="34"/>
<source>
-SSL options: (see the Bitcoin Wiki for SSL setup instructions)
-</source>
+SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="37"/>
- <source>Use OpenSSL (https) for JSON-RPC connections
-</source>
+ <source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="38"/>
- <source>Server certificate file (default: server.cert)
-</source>
+ <source>Server certificate file (default: server.cert)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="39"/>
- <source>Server private key (default: server.pem)
-</source>
+ <source>Server private key (default: server.pem)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="40"/>
- <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)
-</source>
+ <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="43"/>
- <source>This help message
-</source>
+ <source>This help message</source>
<translation type="unfinished"></translation>
</message>
<message>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="48"/>
- <source>Error loading addr.dat
-</source>
+ <source>Error loading addr.dat </source>
<translation type="unfinished"></translation>
</message>
<message>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="50"/>
- <source>Error loading blkindex.dat
-</source>
+ <source>Error loading blkindex.dat </source>
<translation type="unfinished"></translation>
</message>
<message>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="52"/>
- <source>Error loading wallet.dat: Wallet corrupted
-</source>
+ <source>Error loading wallet.dat: Wallet corrupted </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="53"/>
- <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin
-</source>
+ <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="55"/>
- <source>Error loading wallet.dat
-</source>
+ <source>Error loading wallet.dat </source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Date: %1
Amount: %2
Type: %3
-Address: %4
-</source>
+Address: %4</source>
<translation>Fecha: %1
Cantidad: %2
Tipo: %3
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="5"/>
- <source>Send command to -server or bitcoind
-</source>
+ <source>Send command to -server or bitcoind</source>
<translation>Envia comando a bitcoin lanzado con -server u bitcoind
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="6"/>
- <source>List commands
-</source>
+ <source>List commands</source>
<translation>Muestra comandos
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="7"/>
- <source>Get help for a command
-</source>
+ <source>Get help for a command</source>
<translation>Recibir ayuda para un comando
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="8"/>
- <source>Options:
-</source>
+ <source>Options:</source>
<translation>Opciones:
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="9"/>
- <source>Specify configuration file (default: bitcoin.conf)
-</source>
+ <source>Specify configuration file (default: bitcoin.conf)</source>
<translation>Especifica archivo de configuración (predeterminado: bitcoin.conf)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="10"/>
- <source>Specify pid file (default: bitcoind.pid)
-</source>
+ <source>Specify pid file (default: bitcoind.pid)</source>
<translation>Especifica archivo pid (predeterminado: bitcoin.pid)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="11"/>
- <source>Generate coins
-</source>
+ <source>Generate coins</source>
<translation>Genera monedas
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="12"/>
- <source>Don't generate coins
-</source>
+ <source>Don't generate coins</source>
<translation>No generar monedas
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="13"/>
- <source>Start minimized
-</source>
+ <source>Start minimized</source>
<translation>Arranca minimizado
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="14"/>
- <source>Specify data directory
-</source>
+ <source>Specify data directory</source>
<translation>Especifica directorio para los datos
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="15"/>
- <source>Specify connection timeout (in milliseconds)
-</source>
+ <source>Specify connection timeout (in milliseconds)</source>
<translation>Especifica tiempo de espera para conexion (en milisegundos)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="16"/>
- <source>Connect through socks4 proxy
-</source>
+ <source>Connect through socks4 proxy</source>
<translation>Conecta mediante proxy socks4
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="17"/>
- <source>Allow DNS lookups for addnode and connect
-</source>
+ <source>Allow DNS lookups for addnode and connect</source>
<translation>Permite búsqueda DNS para addnode y connect
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="18"/>
- <source>Add a node to connect to
-</source>
+ <source>Add a node to connect to</source>
<translation>Agrega un nodo para conectarse
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="19"/>
- <source>Connect only to the specified node
-</source>
+ <source>Connect only to the specified node</source>
<translation>Conecta solo al nodo especificado
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="20"/>
- <source>Don't accept connections from outside
-</source>
+ <source>Don't accept connections from outside</source>
<translation>No aceptar conexiones desde el exterior
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="21"/>
- <source>Don't attempt to use UPnP to map the listening port
-</source>
+ <source>Don't attempt to use UPnP to map the listening port</source>
<translation>No intentar usar UPnP para mapear el puerto de entrada
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="22"/>
- <source>Attempt to use UPnP to map the listening port
-</source>
+ <source>Attempt to use UPnP to map the listening port</source>
<translation>Intenta usar UPnP para mapear el puerto de escucha.
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="23"/>
- <source>Fee per KB to add to transactions you send
-</source>
+ <source>Fee per KB to add to transactions you send</source>
<translation>Comisión por KB para agregar a las transacciones que envias
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="24"/>
- <source>Accept command line and JSON-RPC commands
-</source>
+ <source>Accept command line and JSON-RPC commands</source>
<translation>Aceptar comandos consola y JSON-RPC
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="25"/>
- <source>Run in the background as a daemon and accept commands
-</source>
+ <source>Run in the background as a daemon and accept commands</source>
<translation>Correr como demonio y acepta comandos
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="26"/>
- <source>Use the test network
-</source>
+ <source>Use the test network</source>
<translation>Usa la red de pruebas
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="27"/>
- <source>Username for JSON-RPC connections
-</source>
+ <source>Username for JSON-RPC connections</source>
<translation>Usuario para las conexiones JSON-RPC
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="28"/>
- <source>Password for JSON-RPC connections
-</source>
+ <source>Password for JSON-RPC connections</source>
<translation>Contraseña para las conexiones JSON-RPC
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="29"/>
- <source>Listen for JSON-RPC connections on <port> (default: 8332)
-</source>
+ <source>Listen for JSON-RPC connections on <port> (default: 8332)</source>
<translation>Escucha conexiones JSON-RPC en el puerto <port> (predeterminado: 8332)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="30"/>
- <source>Allow JSON-RPC connections from specified IP address
-</source>
+ <source>Allow JSON-RPC connections from specified IP address</source>
<translation>Permite conexiones JSON-RPC desde la dirección IP especificada
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="31"/>
- <source>Send commands to node running on <ip> (default: 127.0.0.1)
-</source>
+ <source>Send commands to node running on <ip> (default: 127.0.0.1)</source>
<translation>Envia comando al nodo situado en <ip> (predeterminado: 127.0.0.1)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="32"/>
- <source>Set key pool size to <n> (default: 100)
-</source>
+ <source>Set key pool size to <n> (default: 100)</source>
<translation>Ajusta el numero de claves en reserva <n> (predeterminado: 100)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="33"/>
- <source>Rescan the block chain for missing wallet transactions
-</source>
+ <source>Rescan the block chain for missing wallet transactions</source>
<translation>Rescanea la cadena de bloques para transacciones perdidas de la cartera
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="34"/>
<source>
-SSL options: (see the Bitcoin Wiki for SSL setup instructions)
-</source>
+SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation>Opciones SSL: (ver la Bitcoin Wiki para instrucciones de configuración SSL)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="37"/>
- <source>Use OpenSSL (https) for JSON-RPC connections
-</source>
+ <source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>Usa OpenSSL (https) para las conexiones JSON-RPC
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="38"/>
- <source>Server certificate file (default: server.cert)
-</source>
+ <source>Server certificate file (default: server.cert)</source>
<translation>Certificado del servidor (Predeterminado: server.cert)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="39"/>
- <source>Server private key (default: server.pem)
-</source>
+ <source>Server private key (default: server.pem)</source>
<translation>Clave privada del servidor (Predeterminado: server.pem)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="40"/>
- <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)
-</source>
+ <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source>
<translation>Cifrados aceptados (Predeterminado: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="43"/>
- <source>This help message
-</source>
+ <source>This help message</source>
<translation>Este mensaje de ayuda
</translation>
</message>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="48"/>
- <source>Error loading addr.dat
-</source>
+ <source>Error loading addr.dat </source>
<translation>Error cargando addr.dat
</translation>
</message>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="50"/>
- <source>Error loading blkindex.dat
-</source>
+ <source>Error loading blkindex.dat </source>
<translation>Error cargando blkindex.dat
</translation>
</message>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="52"/>
- <source>Error loading wallet.dat: Wallet corrupted
-</source>
+ <source>Error loading wallet.dat: Wallet corrupted </source>
<translation>Error cargando wallet.dat: Cartera dañada
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="53"/>
- <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin
-</source>
+ <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin </source>
<translation>Error cargando el archivo wallet.dat: Se necesita una versión mas nueva de Bitcoin
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="55"/>
- <source>Error loading wallet.dat
-</source>
+ <source>Error loading wallet.dat </source>
<translation>Error cargando wallet.dat
</translation>
</message>
<source>Date: %1
Amount: %2
Type: %3
-Address: %4
-</source>
+Address: %4</source>
<translation>Fecha: %1
Cantidad: %2
Tipo: %3
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="5"/>
- <source>Send command to -server or bitcoind
-</source>
+ <source>Send command to -server or bitcoind</source>
<translation>Envia comando a bitcoin lanzado con -server u bitcoind
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="6"/>
- <source>List commands
-</source>
+ <source>List commands</source>
<translation>Muestra comandos
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="7"/>
- <source>Get help for a command
-</source>
+ <source>Get help for a command</source>
<translation>Recibir ayuda para un comando
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="8"/>
- <source>Options:
-</source>
+ <source>Options:</source>
<translation>Opciones:
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="9"/>
- <source>Specify configuration file (default: bitcoin.conf)
-</source>
+ <source>Specify configuration file (default: bitcoin.conf)</source>
<translation>Especifica archivo de configuración (predeterminado: bitcoin.conf)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="10"/>
- <source>Specify pid file (default: bitcoind.pid)
-</source>
+ <source>Specify pid file (default: bitcoind.pid)</source>
<translation>Especifica archivo pid (predeterminado: bitcoin.pid)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="11"/>
- <source>Generate coins
-</source>
+ <source>Generate coins</source>
<translation>Genera monedas
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="12"/>
- <source>Don't generate coins
-</source>
+ <source>Don't generate coins</source>
<translation>No generar monedas
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="13"/>
- <source>Start minimized
-</source>
+ <source>Start minimized</source>
<translation>Arranca minimizado
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="14"/>
- <source>Specify data directory
-</source>
+ <source>Specify data directory</source>
<translation>Especifica directorio para los datos
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="15"/>
- <source>Specify connection timeout (in milliseconds)
-</source>
+ <source>Specify connection timeout (in milliseconds)</source>
<translation>Especifica tiempo de espera para conexion (en milisegundos)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="16"/>
- <source>Connect through socks4 proxy
-</source>
+ <source>Connect through socks4 proxy</source>
<translation>Conecta mediante proxy socks4
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="17"/>
- <source>Allow DNS lookups for addnode and connect
-</source>
+ <source>Allow DNS lookups for addnode and connect</source>
<translation>Permite búsqueda DNS para addnode y connect
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="18"/>
- <source>Add a node to connect to
-</source>
+ <source>Add a node to connect to</source>
<translation>Agrega un nodo para conectarse
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="19"/>
- <source>Connect only to the specified node
-</source>
+ <source>Connect only to the specified node</source>
<translation>Conecta solo al nodo especificado
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="20"/>
- <source>Don't accept connections from outside
-</source>
+ <source>Don't accept connections from outside</source>
<translation>No aceptar conexiones desde el exterior
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="21"/>
- <source>Don't attempt to use UPnP to map the listening port
-</source>
+ <source>Don't attempt to use UPnP to map the listening port</source>
<translation>No intentar usar UPnP para mapear el puerto de entrada
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="22"/>
- <source>Attempt to use UPnP to map the listening port
-</source>
+ <source>Attempt to use UPnP to map the listening port</source>
<translation>Intenta usar UPnP para mapear el puerto de escucha.
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="23"/>
- <source>Fee per KB to add to transactions you send
-</source>
+ <source>Fee per KB to add to transactions you send</source>
<translation>Comisión por KB para agregar a las transacciones que envias
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="24"/>
- <source>Accept command line and JSON-RPC commands
-</source>
+ <source>Accept command line and JSON-RPC commands</source>
<translation>Aceptar comandos consola y JSON-RPC
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="25"/>
- <source>Run in the background as a daemon and accept commands
-</source>
+ <source>Run in the background as a daemon and accept commands</source>
<translation>Correr como demonio y acepta comandos
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="26"/>
- <source>Use the test network
-</source>
+ <source>Use the test network</source>
<translation>Usa la red de pruebas
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="27"/>
- <source>Username for JSON-RPC connections
-</source>
+ <source>Username for JSON-RPC connections</source>
<translation>Usuario para las conexiones JSON-RPC
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="28"/>
- <source>Password for JSON-RPC connections
-</source>
+ <source>Password for JSON-RPC connections</source>
<translation>Contraseña para las conexiones JSON-RPC
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="29"/>
- <source>Listen for JSON-RPC connections on <port> (default: 8332)
-</source>
+ <source>Listen for JSON-RPC connections on <port> (default: 8332)</source>
<translation>Escucha conexiones JSON-RPC en el puerto <port> (predeterminado: 8332)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="30"/>
- <source>Allow JSON-RPC connections from specified IP address
-</source>
+ <source>Allow JSON-RPC connections from specified IP address</source>
<translation>Permite conexiones JSON-RPC desde la dirección IP especificada
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="31"/>
- <source>Send commands to node running on <ip> (default: 127.0.0.1)
-</source>
+ <source>Send commands to node running on <ip> (default: 127.0.0.1)</source>
<translation>Envia comando al nodo situado en <ip> (predeterminado: 127.0.0.1)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="32"/>
- <source>Set key pool size to <n> (default: 100)
-</source>
+ <source>Set key pool size to <n> (default: 100)</source>
<translation>Ajusta el numero de claves en reserva <n> (predeterminado: 100)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="33"/>
- <source>Rescan the block chain for missing wallet transactions
-</source>
+ <source>Rescan the block chain for missing wallet transactions</source>
<translation>Rescanea la cadena de bloques para transacciones perdidas de la cartera
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="34"/>
<source>
-SSL options: (see the Bitcoin Wiki for SSL setup instructions)
-</source>
+SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation>Opciones SSL: (ver la Bitcoin Wiki para instrucciones de configuración SSL)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="37"/>
- <source>Use OpenSSL (https) for JSON-RPC connections
-</source>
+ <source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>Usa OpenSSL (https) para las conexiones JSON-RPC
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="38"/>
- <source>Server certificate file (default: server.cert)
-</source>
+ <source>Server certificate file (default: server.cert)</source>
<translation>Certificado del servidor (Predeterminado: server.cert)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="39"/>
- <source>Server private key (default: server.pem)
-</source>
+ <source>Server private key (default: server.pem)</source>
<translation>Clave privada del servidor (Predeterminado: server.pem)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="40"/>
- <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)
-</source>
+ <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source>
<translation>Cifrados aceptados (Predeterminado: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="43"/>
- <source>This help message
-</source>
+ <source>This help message</source>
<translation>Este mensaje de ayuda
</translation>
</message>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="48"/>
- <source>Error loading addr.dat
-</source>
+ <source>Error loading addr.dat </source>
<translation>Error cargando addr.dat
</translation>
</message>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="50"/>
- <source>Error loading blkindex.dat
-</source>
+ <source>Error loading blkindex.dat </source>
<translation>Error cargando blkindex.dat
</translation>
</message>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="52"/>
- <source>Error loading wallet.dat: Wallet corrupted
-</source>
+ <source>Error loading wallet.dat: Wallet corrupted </source>
<translation>Error cargando wallet.dat: Cartera dañada
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="53"/>
- <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin
-</source>
+ <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin </source>
<translation>Error cargando el archivo wallet.dat: Se necesita una versión mas nueva de Bitcoin
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="55"/>
- <source>Error loading wallet.dat
-</source>
+ <source>Error loading wallet.dat </source>
<translation>Error cargando wallet.dat
</translation>
</message>
<source>Date: %1
Amount: %2
Type: %3
-Address: %4
-</source>
+Address: %4</source>
<translation>Dátum: %1
Összeg: %2
Típus: %3
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="5"/>
- <source>Send command to -server or bitcoind
-</source>
+ <source>Send command to -server or bitcoind</source>
<translation>Parancs küldése a -serverhez vagy a bitcoindhez
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="6"/>
- <source>List commands
-</source>
+ <source>List commands</source>
<translation>Parancsok kilistázása
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="7"/>
- <source>Get help for a command
-</source>
+ <source>Get help for a command</source>
<translation>Segítség egy parancsról
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="8"/>
- <source>Options:
-</source>
+ <source>Options:</source>
<translation>Opciók
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="9"/>
- <source>Specify configuration file (default: bitcoin.conf)
-</source>
+ <source>Specify configuration file (default: bitcoin.conf)</source>
<translation>Konfigurációs fájl (alapértelmezett: bitcoin.conf)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="10"/>
- <source>Specify pid file (default: bitcoind.pid)
-</source>
+ <source>Specify pid file (default: bitcoind.pid)</source>
<translation>pid-fájl (alapértelmezett: bitcoind.pid)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="11"/>
- <source>Generate coins
-</source>
+ <source>Generate coins</source>
<translation>Érmék generálása
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="12"/>
- <source>Don't generate coins
-</source>
+ <source>Don't generate coins</source>
<translation>Bitcoin-generálás leállítása
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="13"/>
- <source>Start minimized
-</source>
+ <source>Start minimized</source>
<translation>Indítás lekicsinyítve
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="14"/>
- <source>Specify data directory
-</source>
+ <source>Specify data directory</source>
<translation>Adatkönyvtár
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="15"/>
- <source>Specify connection timeout (in milliseconds)
-</source>
+ <source>Specify connection timeout (in milliseconds)</source>
<translation>Csatlakozás időkerete (milliszekundumban)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="16"/>
- <source>Connect through socks4 proxy
-</source>
+ <source>Connect through socks4 proxy</source>
<translation>Csatlakozás SOCKS4 proxyn keresztül
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="17"/>
- <source>Allow DNS lookups for addnode and connect
-</source>
+ <source>Allow DNS lookups for addnode and connect</source>
<translation>DNS-kikeresés engedélyezése az addnode-nál és a connect-nél
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="18"/>
- <source>Add a node to connect to
-</source>
+ <source>Add a node to connect to</source>
<translation>Elérendő csomópont megadása
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="19"/>
- <source>Connect only to the specified node
-</source>
+ <source>Connect only to the specified node</source>
<translation>Csatlakozás csak a megadott csomóponthoz
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="20"/>
- <source>Don't accept connections from outside
-</source>
+ <source>Don't accept connections from outside</source>
<translation>Külső csatlakozások elutasítása
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="21"/>
- <source>Don't attempt to use UPnP to map the listening port
-</source>
+ <source>Don't attempt to use UPnP to map the listening port</source>
<translation>UPnP-használat letiltása a figyelő port feltérképezésénél
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="22"/>
- <source>Attempt to use UPnP to map the listening port
-</source>
+ <source>Attempt to use UPnP to map the listening port</source>
<translation>UPnP-használat engedélyezése a figyelő port feltérképezésénél
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="23"/>
- <source>Fee per KB to add to transactions you send
-</source>
+ <source>Fee per KB to add to transactions you send</source>
<translation>KB-onként felajánlandó díj az általad küldött tranzakciókhoz
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="24"/>
- <source>Accept command line and JSON-RPC commands
-</source>
+ <source>Accept command line and JSON-RPC commands</source>
<translation>Parancssoros és JSON-RPC parancsok elfogadása
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="25"/>
- <source>Run in the background as a daemon and accept commands
-</source>
+ <source>Run in the background as a daemon and accept commands</source>
<translation>Háttérben futtatás daemonként és parancsok elfogadása
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="26"/>
- <source>Use the test network
-</source>
+ <source>Use the test network</source>
<translation>Teszthálózat használata
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="27"/>
- <source>Username for JSON-RPC connections
-</source>
+ <source>Username for JSON-RPC connections</source>
<translation>Felhasználói név JSON-RPC csatlakozásokhoz
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="28"/>
- <source>Password for JSON-RPC connections
-</source>
+ <source>Password for JSON-RPC connections</source>
<translation>Jelszó JSON-RPC csatlakozásokhoz
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="29"/>
- <source>Listen for JSON-RPC connections on <port> (default: 8332)
-</source>
+ <source>Listen for JSON-RPC connections on <port> (default: 8332)</source>
<translation>JSON-RPC csatlakozásokhoz figyelendő <port> (alapértelmezett: 8332)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="30"/>
- <source>Allow JSON-RPC connections from specified IP address
-</source>
+ <source>Allow JSON-RPC connections from specified IP address</source>
<translation>JSON-RPC csatlakozások engedélyezése meghatározott IP-címről
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="31"/>
- <source>Send commands to node running on <ip> (default: 127.0.0.1)
-</source>
+ <source>Send commands to node running on <ip> (default: 127.0.0.1)</source>
<translation>Parancsok küldése <ip> címen működő csomóponthoz (alapértelmezett: 127.0.0.1)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="32"/>
- <source>Set key pool size to <n> (default: 100)
-</source>
+ <source>Set key pool size to <n> (default: 100)</source>
<translation>Kulcskarika mérete <n> (alapértelmezett: 100)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="33"/>
- <source>Rescan the block chain for missing wallet transactions
-</source>
+ <source>Rescan the block chain for missing wallet transactions</source>
<translation>Blokklánc újraszkennelése hiányzó tárca-tranzakciók után
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="34"/>
<source>
-SSL options: (see the Bitcoin Wiki for SSL setup instructions)
-</source>
+SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation>
SSL-opciók: (lásd a Bitcoin Wiki SSL-beállítási instrukcióit)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="37"/>
- <source>Use OpenSSL (https) for JSON-RPC connections
-</source>
+ <source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>OpenSSL (https) használata JSON-RPC csatalkozásokhoz
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="38"/>
- <source>Server certificate file (default: server.cert)
-</source>
+ <source>Server certificate file (default: server.cert)</source>
<translation>Szervertanúsítvány-fájl (alapértelmezett: server.cert)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="39"/>
- <source>Server private key (default: server.pem)
-</source>
+ <source>Server private key (default: server.pem)</source>
<translation>Szerver titkos kulcsa (alapértelmezett: server.pem)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="40"/>
- <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)
-</source>
+ <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source>
<translation>Elfogadható rejtjelkulcsok (alapértelmezett: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH )
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="43"/>
- <source>This help message
-</source>
+ <source>This help message</source>
<translation>Ez a súgó-üzenet
</translation>
</message>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="48"/>
- <source>Error loading addr.dat
-</source>
+ <source>Error loading addr.dat </source>
<translation>Hiba az addr.dat betöltése közben
</translation>
</message>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="50"/>
- <source>Error loading blkindex.dat
-</source>
+ <source>Error loading blkindex.dat </source>
<translation>Hiba a blkindex.dat betöltése közben
</translation>
</message>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="52"/>
- <source>Error loading wallet.dat: Wallet corrupted
-</source>
+ <source>Error loading wallet.dat: Wallet corrupted </source>
<translation>Hiba a wallet.dat betöltése közben: meghibásodott tárca
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="53"/>
- <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin
-</source>
+ <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin </source>
<translation>Hiba a wallet.dat betöltése közben: ehhez a tárcához újabb verziójú Bitcoin-kliens szükséges
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="55"/>
- <source>Error loading wallet.dat
-</source>
+ <source>Error loading wallet.dat </source>
<translation>Hiba a wallet.dat betöltése közben
</translation>
</message>
<source>Date: %1
Amount: %2
Type: %3
-Address: %4
-</source>
+Address: %4</source>
<translation>Data: %1
Quantità: %2
Tipo: %3
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="5"/>
- <source>Send command to -server or bitcoind
-</source>
+ <source>Send command to -server or bitcoind</source>
<translation>Manda il comando a -server o bitcoind
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="6"/>
- <source>List commands
-</source>
+ <source>List commands</source>
<translation>Lista comandi
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="7"/>
- <source>Get help for a command
-</source>
+ <source>Get help for a command</source>
<translation>Aiuto su un comando
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="8"/>
- <source>Options:
-</source>
+ <source>Options:</source>
<translation>Opzioni:
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="9"/>
- <source>Specify configuration file (default: bitcoin.conf)
-</source>
+ <source>Specify configuration file (default: bitcoin.conf)</source>
<translation>Specifica il file di configurazione (di default: bitcoin.conf)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="10"/>
- <source>Specify pid file (default: bitcoind.pid)
-</source>
+ <source>Specify pid file (default: bitcoind.pid)</source>
<translation>Specifica il file pid (default: bitcoind.pid)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="11"/>
- <source>Generate coins
-</source>
+ <source>Generate coins</source>
<translation>Genera Bitcoin
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="12"/>
- <source>Don't generate coins
-</source>
+ <source>Don't generate coins</source>
<translation>Non generare Bitcoin
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="13"/>
- <source>Start minimized
-</source>
+ <source>Start minimized</source>
<translation>Parti in icona
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="14"/>
- <source>Specify data directory
-</source>
+ <source>Specify data directory</source>
<translation>Specifica la cartella dati
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="15"/>
- <source>Specify connection timeout (in milliseconds)
-</source>
+ <source>Specify connection timeout (in milliseconds)</source>
<translation>Specifica il timeout di connessione (in millisecondi)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="16"/>
- <source>Connect through socks4 proxy
-</source>
+ <source>Connect through socks4 proxy</source>
<translation>Connessione tramite socks4 proxy
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="17"/>
- <source>Allow DNS lookups for addnode and connect
-</source>
+ <source>Allow DNS lookups for addnode and connect</source>
<translation>Consenti ricerche DNS per aggiungere nodi e collegare
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="18"/>
- <source>Add a node to connect to
-</source>
+ <source>Add a node to connect to</source>
<translation>Aggiungi un nodo e connetti a
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="19"/>
- <source>Connect only to the specified node
-</source>
+ <source>Connect only to the specified node</source>
<translation>Connetti solo al nodo specificato
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="20"/>
- <source>Don't accept connections from outside
-</source>
+ <source>Don't accept connections from outside</source>
<translation>Non accettare connessioni dall'esterno
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="21"/>
- <source>Don't attempt to use UPnP to map the listening port
-</source>
+ <source>Don't attempt to use UPnP to map the listening port</source>
<translation>Non usare l'UPnP per mappare la porta
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="22"/>
- <source>Attempt to use UPnP to map the listening port
-</source>
+ <source>Attempt to use UPnP to map the listening port</source>
<translation>Prova ad usare l'UPnp per mappare la porta
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="23"/>
- <source>Fee per KB to add to transactions you send
-</source>
+ <source>Fee per KB to add to transactions you send</source>
<translation>Commissione al KB da aggiungere alle transazioni in uscita
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="24"/>
- <source>Accept command line and JSON-RPC commands
-</source>
+ <source>Accept command line and JSON-RPC commands</source>
<translation>Accetta da linea di comando e da comandi JSON-RPC
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="25"/>
- <source>Run in the background as a daemon and accept commands
-</source>
+ <source>Run in the background as a daemon and accept commands</source>
<translation>Esegui in background come demone e accetta i comandi
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="26"/>
- <source>Use the test network
-</source>
+ <source>Use the test network</source>
<translation>Utilizza la rete di prova
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="27"/>
- <source>Username for JSON-RPC connections
-</source>
+ <source>Username for JSON-RPC connections</source>
<translation>Nome utente per connessioni JSON-RPC
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="28"/>
- <source>Password for JSON-RPC connections
-</source>
+ <source>Password for JSON-RPC connections</source>
<translation>Password per connessioni JSON-RPC
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="29"/>
- <source>Listen for JSON-RPC connections on <port> (default: 8332)
-</source>
+ <source>Listen for JSON-RPC connections on <port> (default: 8332)</source>
<translation>Attendi le connessioni JSON-RPC su <porta> (default: 8332)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="30"/>
- <source>Allow JSON-RPC connections from specified IP address
-</source>
+ <source>Allow JSON-RPC connections from specified IP address</source>
<translation>Consenti connessioni JSON-RPC dall'indirizzo IP specificato
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="31"/>
- <source>Send commands to node running on <ip> (default: 127.0.0.1)
-</source>
+ <source>Send commands to node running on <ip> (default: 127.0.0.1)</source>
<translation>Inviare comandi al nodo in esecuzione su <ip> (default: 127.0.0.1)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="32"/>
- <source>Set key pool size to <n> (default: 100)
-</source>
+ <source>Set key pool size to <n> (default: 100)</source>
<translation>Impostare la quantità di chiavi di riserva a <n> (default: 100)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="33"/>
- <source>Rescan the block chain for missing wallet transactions
-</source>
+ <source>Rescan the block chain for missing wallet transactions</source>
<translation>Ripeti analisi della catena dei blocchi per cercare le transazioni mancanti dal portamonete
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="34"/>
<source>
-SSL options: (see the Bitcoin Wiki for SSL setup instructions)
-</source>
+SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation>
Opzioni SSL: (vedi il wiki di Bitcoin per le istruzioni di configurazione SSL)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="37"/>
- <source>Use OpenSSL (https) for JSON-RPC connections
-</source>
+ <source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>Utilizzare OpenSSL (https) per le connessioni JSON-RPC
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="38"/>
- <source>Server certificate file (default: server.cert)
-</source>
+ <source>Server certificate file (default: server.cert)</source>
<translation>File certificato del server (default: server.cert)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="39"/>
- <source>Server private key (default: server.pem)
-</source>
+ <source>Server private key (default: server.pem)</source>
<translation>Chiave privata del server (default: server.pem)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="40"/>
- <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)
-</source>
+ <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source>
<translation>Cifrari accettabili (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="43"/>
- <source>This help message
-</source>
+ <source>This help message</source>
<translation>Questo messaggio di aiuto
</translation>
</message>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="48"/>
- <source>Error loading addr.dat
-</source>
+ <source>Error loading addr.dat </source>
<translation>Errore nel caricamento di addr.dat
</translation>
</message>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="50"/>
- <source>Error loading blkindex.dat
-</source>
+ <source>Error loading blkindex.dat </source>
<translation>Errore nel caricamento di blkindex.dat
</translation>
</message>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="52"/>
- <source>Error loading wallet.dat: Wallet corrupted
-</source>
+ <source>Error loading wallet.dat: Wallet corrupted </source>
<translation>Errore nel caricamento di wallet.dat: il portamonete è danneggiato
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="53"/>
- <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin
-</source>
+ <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin </source>
<translation>Errore nel caricamento di wallet.dat: il portamonete richiede una versione più recente di Bitcoin
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="55"/>
- <source>Error loading wallet.dat
-</source>
+ <source>Error loading wallet.dat </source>
<translation>Errore nel caricamento di wallet.dat
</translation>
</message>
<source>Date: %1
Amount: %2
Type: %3
-Address: %4
-</source>
+Address: %4</source>
<translation>Dato: %1
Beløp: %2
Type: %3
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="5"/>
- <source>Send command to -server or bitcoind
-</source>
+ <source>Send command to -server or bitcoind</source>
<translation>Send kommando til -server eller bitcoind
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="6"/>
- <source>List commands
-</source>
+ <source>List commands</source>
<translation>Vis liste over kommandoer
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="7"/>
- <source>Get help for a command
-</source>
+ <source>Get help for a command</source>
<translation>Få hjelp til kommando
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="8"/>
- <source>Options:
-</source>
+ <source>Options:</source>
<translation>Innstillinger:
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="9"/>
- <source>Specify configuration file (default: bitcoin.conf)
-</source>
+ <source>Specify configuration file (default: bitcoin.conf)</source>
<translation>Angi konfigurasjonsfil (standard: bitcoin.conf)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="10"/>
- <source>Specify pid file (default: bitcoind.pid)
-</source>
+ <source>Specify pid file (default: bitcoind.pid)</source>
<translation>Angi pid-fil (standard: bitcoind.pid)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="11"/>
- <source>Generate coins
-</source>
+ <source>Generate coins</source>
<translation>Generer mynter
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="12"/>
- <source>Don't generate coins
-</source>
+ <source>Don't generate coins</source>
<translation>Ikke generer mynter
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="13"/>
- <source>Start minimized
-</source>
+ <source>Start minimized</source>
<translation>Start minimert
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="14"/>
- <source>Specify data directory
-</source>
+ <source>Specify data directory</source>
<translation>Angi mappe for data
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="15"/>
- <source>Specify connection timeout (in milliseconds)
-</source>
+ <source>Specify connection timeout (in milliseconds)</source>
<translation>Angi tidsavbrudd for forbindelser (i millisekunder)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="16"/>
- <source>Connect through socks4 proxy
-</source>
+ <source>Connect through socks4 proxy</source>
<translation>Koble til gjennom sock4 mellomtjener
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="17"/>
- <source>Allow DNS lookups for addnode and connect
-</source>
+ <source>Allow DNS lookups for addnode and connect</source>
<translation>Tillat DNS-oppslag for addnode og connect
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="18"/>
- <source>Add a node to connect to
-</source>
+ <source>Add a node to connect to</source>
<translation>Legg til node for tilkobling
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="19"/>
- <source>Connect only to the specified node
-</source>
+ <source>Connect only to the specified node</source>
<translation>Koble kun til en oppgitt node
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="20"/>
- <source>Don't accept connections from outside
-</source>
+ <source>Don't accept connections from outside</source>
<translation>Ikke ta imot tilkoblinger fra utsiden
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="21"/>
- <source>Don't attempt to use UPnP to map the listening port
-</source>
+ <source>Don't attempt to use UPnP to map the listening port</source>
<translation>Ikke forsøk å bruke UPnP for å sette opp lytteport</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="22"/>
- <source>Attempt to use UPnP to map the listening port
-</source>
+ <source>Attempt to use UPnP to map the listening port</source>
<translation>Forsøk å bruke UPnP for å sette opp lytteport</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="23"/>
- <source>Fee per KB to add to transactions you send
-</source>
+ <source>Fee per KB to add to transactions you send</source>
<translation>Gebyr per KB som skal legges til transaksjoner du sender
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="24"/>
- <source>Accept command line and JSON-RPC commands
-</source>
+ <source>Accept command line and JSON-RPC commands</source>
<translation>Ta imot kommandoer fra både kommandolinje og JSON-RPC
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="25"/>
- <source>Run in the background as a daemon and accept commands
-</source>
+ <source>Run in the background as a daemon and accept commands</source>
<translation>Kjør som bakgrunnsprosess og ta imot kommandoer
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="26"/>
- <source>Use the test network
-</source>
+ <source>Use the test network</source>
<translation>Bruk testnettet
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="27"/>
- <source>Username for JSON-RPC connections
-</source>
+ <source>Username for JSON-RPC connections</source>
<translation>Brukernavn for JSON-RPC forbindelser
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="28"/>
- <source>Password for JSON-RPC connections
-</source>
+ <source>Password for JSON-RPC connections</source>
<translation>Passord for JSON-RPC forbindelser
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="29"/>
- <source>Listen for JSON-RPC connections on <port> (default: 8332)
-</source>
+ <source>Listen for JSON-RPC connections on <port> (default: 8332)</source>
<translation>Lytt etter JSON-RPC forbindelser på <port> (standard: 8332)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="30"/>
- <source>Allow JSON-RPC connections from specified IP address
-</source>
+ <source>Allow JSON-RPC connections from specified IP address</source>
<translation>Tillat JSON-RPC forbindelser fra oppgitt IP-adresse
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="31"/>
- <source>Send commands to node running on <ip> (default: 127.0.0.1)
-</source>
+ <source>Send commands to node running on <ip> (default: 127.0.0.1)</source>
<translation>Send kommandoer til noden som kjører på <ip> (standard: 127.0.0.1)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="32"/>
- <source>Set key pool size to <n> (default: 100)
-</source>
+ <source>Set key pool size to <n> (default: 100)</source>
<translation>Sett størrelsen på lager for nye nøkler til <n> (standard: 100)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="33"/>
- <source>Rescan the block chain for missing wallet transactions
-</source>
+ <source>Rescan the block chain for missing wallet transactions</source>
<translation>Se igjennom blokk-kjeden på nytt etter manglende lommebokstransaksjoner
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="34"/>
<source>
-SSL options: (see the Bitcoin Wiki for SSL setup instructions)
-</source>
+SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation>SSL innstillinger: (se Bitcoin Wikien for instruksjoner for SSL-oppsett)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="37"/>
- <source>Use OpenSSL (https) for JSON-RPC connections
-</source>
+ <source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>Bruk OpenSSL (https) for JSON-RPC forbindelser
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="38"/>
- <source>Server certificate file (default: server.cert)
-</source>
+ <source>Server certificate file (default: server.cert)</source>
<translation>Fil for tjenersertifikat (standard: server.cert)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="39"/>
- <source>Server private key (default: server.pem)
-</source>
+ <source>Server private key (default: server.pem)</source>
<translation>Privat nøkkel for tjener (standard: server.pem)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="40"/>
- <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)
-</source>
+ <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source>
<translation>Akseptable krypteringsmetoder (standard: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="43"/>
- <source>This help message
-</source>
+ <source>This help message</source>
<translation>Denne hjelpemeldingen
</translation>
</message>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="48"/>
- <source>Error loading addr.dat
-</source>
+ <source>Error loading addr.dat </source>
<translation>Feil ved lasting av addr.dat
</translation>
</message>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="50"/>
- <source>Error loading blkindex.dat
-</source>
+ <source>Error loading blkindex.dat </source>
<translation>Feil ved lasting av blkindex.dat
</translation>
</message>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="52"/>
- <source>Error loading wallet.dat: Wallet corrupted
-</source>
+ <source>Error loading wallet.dat: Wallet corrupted </source>
<translation>Feil ved lasting av wallet.dat: Skadde data i lommeboken
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="53"/>
- <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin
-</source>
+ <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin </source>
<translation>Feil ved lasting av wallet.dat: Lommeboken krever en nyere versjon av Bitcoin
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="55"/>
- <source>Error loading wallet.dat
-</source>
+ <source>Error loading wallet.dat </source>
<translation>Feil ved lasting av wallet.dat
</translation>
</message>
<source>Date: %1
Amount: %2
Type: %3
-Address: %4
-</source>
+Address: %4</source>
<translation>Datum: %1
Bedrag: %2
Type: %3
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="5"/>
- <source>Send command to -server or bitcoind
-</source>
+ <source>Send command to -server or bitcoind</source>
<translation>Stuur commando naar -server of bitcoind
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="6"/>
- <source>List commands
-</source>
+ <source>List commands</source>
<translation>List van commando's
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="7"/>
- <source>Get help for a command
-</source>
+ <source>Get help for a command</source>
<translation>Toon hulp voor een commando
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="8"/>
- <source>Options:
-</source>
+ <source>Options:</source>
<translation>Opties:
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="9"/>
- <source>Specify configuration file (default: bitcoin.conf)
-</source>
+ <source>Specify configuration file (default: bitcoin.conf)</source>
<translation>Specifieer configuratiebestand (standaard: bitcoin.conf)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="10"/>
- <source>Specify pid file (default: bitcoind.pid)
-</source>
+ <source>Specify pid file (default: bitcoind.pid)</source>
<translation>Specifieer pid-bestand (standaard: bitcoind.pid)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="11"/>
- <source>Generate coins
-</source>
+ <source>Generate coins</source>
<translation>Genereer munten
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="12"/>
- <source>Don't generate coins
-</source>
+ <source>Don't generate coins</source>
<translation>Genereer geen munten
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="13"/>
- <source>Start minimized
-</source>
+ <source>Start minimized</source>
<translation>Geminimaliseerd starten
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="14"/>
- <source>Specify data directory
-</source>
+ <source>Specify data directory</source>
<translation>Stel datamap in
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="15"/>
- <source>Specify connection timeout (in milliseconds)
-</source>
+ <source>Specify connection timeout (in milliseconds)</source>
<translation>Specificeer de time-out tijd (in milliseconden)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="16"/>
- <source>Connect through socks4 proxy
-</source>
+ <source>Connect through socks4 proxy</source>
<translation>Verbind via socks4 proxy
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="17"/>
- <source>Allow DNS lookups for addnode and connect
-</source>
+ <source>Allow DNS lookups for addnode and connect</source>
<translation>Sta DNS-naslag toe voor addnode en connect
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="18"/>
- <source>Add a node to connect to
-</source>
+ <source>Add a node to connect to</source>
<translation>Voeg een node toe om mee te verbinden
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="19"/>
- <source>Connect only to the specified node
-</source>
+ <source>Connect only to the specified node</source>
<translation>Verbind alleen met deze node
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="20"/>
- <source>Don't accept connections from outside
-</source>
+ <source>Don't accept connections from outside</source>
<translation>Sta geen verbindingen van buitenaf toe
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="21"/>
- <source>Don't attempt to use UPnP to map the listening port
-</source>
+ <source>Don't attempt to use UPnP to map the listening port</source>
<translation>Probeer geen UPnP te gebruiken om de poort waarop geluisterd wordt te mappen
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="22"/>
- <source>Attempt to use UPnP to map the listening port
-</source>
+ <source>Attempt to use UPnP to map the listening port</source>
<translation>Probeer UPnP te gebruiken om de poort waarop geluisterd wordt te mappen
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="23"/>
- <source>Fee per KB to add to transactions you send
-</source>
+ <source>Fee per KB to add to transactions you send</source>
<translation>Kosten per KB om aan transacties toe te voegen die u verstuurt
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="24"/>
- <source>Accept command line and JSON-RPC commands
-</source>
+ <source>Accept command line and JSON-RPC commands</source>
<translation>Aanvaard commandoregel en JSON-RPC commando's
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="25"/>
- <source>Run in the background as a daemon and accept commands
-</source>
+ <source>Run in the background as a daemon and accept commands</source>
<translation>Draai in de achtergrond als daemon en aanvaard commando's
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="26"/>
- <source>Use the test network
-</source>
+ <source>Use the test network</source>
<translation>Gebruik het testnetwerk
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="27"/>
- <source>Username for JSON-RPC connections
-</source>
+ <source>Username for JSON-RPC connections</source>
<translation>Gebruikersnaam voor JSON-RPC verbindingen
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="28"/>
- <source>Password for JSON-RPC connections
-</source>
+ <source>Password for JSON-RPC connections</source>
<translation>Wachtwoord voor JSON-RPC verbindingen
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="29"/>
- <source>Listen for JSON-RPC connections on <port> (default: 8332)
-</source>
+ <source>Listen for JSON-RPC connections on <port> (default: 8332)</source>
<translation>Luister voor JSON-RPC verbindingen op <poort> (standaard: 8332)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="30"/>
- <source>Allow JSON-RPC connections from specified IP address
-</source>
+ <source>Allow JSON-RPC connections from specified IP address</source>
<translation>Sta JSON-RPC verbindingen van opgegeven IP adres toe
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="31"/>
- <source>Send commands to node running on <ip> (default: 127.0.0.1)
-</source>
+ <source>Send commands to node running on <ip> (default: 127.0.0.1)</source>
<translation>Verstuur commando's naar proces dat op <ip> draait (standaard: 127.0.0.1)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="32"/>
- <source>Set key pool size to <n> (default: 100)
-</source>
+ <source>Set key pool size to <n> (default: 100)</source>
<translation>Stel sleutelpoelgrootte in op <n> (standaard: 100)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="33"/>
- <source>Rescan the block chain for missing wallet transactions
-</source>
+ <source>Rescan the block chain for missing wallet transactions</source>
<translation>Doorzoek de blokkenketting op ontbrekende portemonnee-transacties
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="34"/>
<source>
-SSL options: (see the Bitcoin Wiki for SSL setup instructions)
-</source>
+SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation>
SSL opties: (zie de Bitcoin wiki voor SSL instructies)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="37"/>
- <source>Use OpenSSL (https) for JSON-RPC connections
-</source>
+ <source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>Gebruik OpenSSL (https) voor JSON-RPC verbindingen
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="38"/>
- <source>Server certificate file (default: server.cert)
-</source>
+ <source>Server certificate file (default: server.cert)</source>
<translation>Certificaat-bestand voor server (standaard: server.cert)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="39"/>
- <source>Server private key (default: server.pem)
-</source>
+ <source>Server private key (default: server.pem)</source>
<translation>Geheime sleutel voor server (standaard: server.pem)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="40"/>
- <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)
-</source>
+ <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source>
<translation>Aanvaardbare ciphers (standaard: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="43"/>
- <source>This help message
-</source>
+ <source>This help message</source>
<translation>Dit helpbericht
</translation>
</message>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="48"/>
- <source>Error loading addr.dat
-</source>
+ <source>Error loading addr.dat </source>
<translation>Fout bij laden van bestand addr.dat
</translation>
</message>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="50"/>
- <source>Error loading blkindex.dat
-</source>
+ <source>Error loading blkindex.dat </source>
<translation>Fout bij laden van bestand addr.dat
</translation>
</message>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="52"/>
- <source>Error loading wallet.dat: Wallet corrupted
-</source>
+ <source>Error loading wallet.dat: Wallet corrupted </source>
<translation>Fout bij het laden van wallet.dat: Portemonnee corrupt
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="53"/>
- <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin
-</source>
+ <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin </source>
<translation>Fout bij het laden van wallet.dat: Portemonnee vereist nieuwere versie van Bitcoin</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="55"/>
- <source>Error loading wallet.dat
-</source>
+ <source>Error loading wallet.dat </source>
<translation>Fout bij laden van bestand wallet.dat
</translation>
</message>
<source>Date: %1
Amount: %2
Type: %3
-Address: %4
-</source>
+Address: %4</source>
<translation>Date: %1
Amount: %2
Type: %3
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="5"/>
- <source>Send command to -server or bitcoind
-</source>
+ <source>Send command to -server or bitcoind</source>
<translation>Send command to -server or bitcoind
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="6"/>
- <source>List commands
-</source>
+ <source>List commands</source>
<translation>List commands
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="7"/>
- <source>Get help for a command
-</source>
+ <source>Get help for a command</source>
<translation>Get help for a command
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="8"/>
- <source>Options:
-</source>
+ <source>Options:</source>
<translation>Options:
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="9"/>
- <source>Specify configuration file (default: bitcoin.conf)
-</source>
+ <source>Specify configuration file (default: bitcoin.conf)</source>
<translation>Specify configuration file (default: bitcoin.conf)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="10"/>
- <source>Specify pid file (default: bitcoind.pid)
-</source>
+ <source>Specify pid file (default: bitcoind.pid)</source>
<translation>Specify pid file (default: bitcoind.pid)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="11"/>
- <source>Generate coins
-</source>
+ <source>Generate coins</source>
<translation>Generate coins
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="12"/>
- <source>Don't generate coins
-</source>
+ <source>Don't generate coins</source>
<translation>Don't generate coins
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="13"/>
- <source>Start minimized
-</source>
+ <source>Start minimized</source>
<translation>Start minimized
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="14"/>
- <source>Specify data directory
-</source>
+ <source>Specify data directory</source>
<translation>Specify data directory
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="15"/>
- <source>Specify connection timeout (in milliseconds)
-</source>
+ <source>Specify connection timeout (in milliseconds)</source>
<translation>Specify connection timeout (in milliseconds)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="16"/>
- <source>Connect through socks4 proxy
-</source>
+ <source>Connect through socks4 proxy</source>
<translation>Connect through socks4 proxy
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="17"/>
- <source>Allow DNS lookups for addnode and connect
-</source>
+ <source>Allow DNS lookups for addnode and connect</source>
<translation>Allow DNS lookups for addnode and connect
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="18"/>
- <source>Add a node to connect to
-</source>
+ <source>Add a node to connect to</source>
<translation>Add a node to connect to
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="19"/>
- <source>Connect only to the specified node
-</source>
+ <source>Connect only to the specified node</source>
<translation>Connect only to the specified node
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="20"/>
- <source>Don't accept connections from outside
-</source>
+ <source>Don't accept connections from outside</source>
<translation>Don't accept connections from outside
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="21"/>
- <source>Don't attempt to use UPnP to map the listening port
-</source>
+ <source>Don't attempt to use UPnP to map the listening port</source>
<translation>Don't attempt to use UPnP to map the listening port
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="22"/>
- <source>Attempt to use UPnP to map the listening port
-</source>
+ <source>Attempt to use UPnP to map the listening port</source>
<translation>Attempt to use UPnP to map the listening port
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="23"/>
- <source>Fee per KB to add to transactions you send
-</source>
+ <source>Fee per KB to add to transactions you send</source>
<translation>Fee per KB to add to transactions you send
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="24"/>
- <source>Accept command line and JSON-RPC commands
-</source>
+ <source>Accept command line and JSON-RPC commands</source>
<translation>Accept command line and JSON-RPC commands
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="25"/>
- <source>Run in the background as a daemon and accept commands
-</source>
+ <source>Run in the background as a daemon and accept commands</source>
<translation>Run in the background as a daemon and accept commands
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="26"/>
- <source>Use the test network
-</source>
+ <source>Use the test network</source>
<translation>Use the test network
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="27"/>
- <source>Username for JSON-RPC connections
-</source>
+ <source>Username for JSON-RPC connections</source>
<translation>Username for JSON-RPC connections
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="28"/>
- <source>Password for JSON-RPC connections
-</source>
+ <source>Password for JSON-RPC connections</source>
<translation>Password for JSON-RPC connections
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="29"/>
- <source>Listen for JSON-RPC connections on <port> (default: 8332)
-</source>
+ <source>Listen for JSON-RPC connections on <port> (default: 8332)</source>
<translation>Listen for JSON-RPC connections on <port> (default: 8332)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="30"/>
- <source>Allow JSON-RPC connections from specified IP address
-</source>
+ <source>Allow JSON-RPC connections from specified IP address</source>
<translation>Allow JSON-RPC connections from specified IP address
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="31"/>
- <source>Send commands to node running on <ip> (default: 127.0.0.1)
-</source>
+ <source>Send commands to node running on <ip> (default: 127.0.0.1)</source>
<translation>Send commands to node running on <ip> (default: 127.0.0.1)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="32"/>
- <source>Set key pool size to <n> (default: 100)
-</source>
+ <source>Set key pool size to <n> (default: 100)</source>
<translation>Set key pool size to <n> (default: 100)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="33"/>
- <source>Rescan the block chain for missing wallet transactions
-</source>
+ <source>Rescan the block chain for missing wallet transactions</source>
<translation>Rescan the block chain for missing wallet transactions
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="34"/>
<source>
-SSL options: (see the Bitcoin Wiki for SSL setup instructions)
-</source>
+SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation>
SSL options: (see the Bitcoin Wiki for SSL setup instructions)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="37"/>
- <source>Use OpenSSL (https) for JSON-RPC connections
-</source>
+ <source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>Use OpenSSL (https) for JSON-RPC connections
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="38"/>
- <source>Server certificate file (default: server.cert)
-</source>
+ <source>Server certificate file (default: server.cert)</source>
<translation>Server certificate file (default: server.cert)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="39"/>
- <source>Server private key (default: server.pem)
-</source>
+ <source>Server private key (default: server.pem)</source>
<translation>Server private key (default: server.pem)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="40"/>
- <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)
-</source>
+ <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source>
<translation>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="43"/>
- <source>This help message
-</source>
+ <source>This help message</source>
<translation>This help message
</translation>
</message>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="48"/>
- <source>Error loading addr.dat
-</source>
+ <source>Error loading addr.dat </source>
<translation>Error loading addr.dat
</translation>
</message>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="50"/>
- <source>Error loading blkindex.dat
-</source>
+ <source>Error loading blkindex.dat </source>
<translation>Error loading blkindex.dat
</translation>
</message>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="52"/>
- <source>Error loading wallet.dat: Wallet corrupted
-</source>
+ <source>Error loading wallet.dat: Wallet corrupted </source>
<translation>Error loading wallet.dat: Wallet corrupted
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="53"/>
- <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin
-</source>
+ <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin </source>
<translation>Error loading wallet.dat: Wallet requires newer version of Bitcoin
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="55"/>
- <source>Error loading wallet.dat
-</source>
+ <source>Error loading wallet.dat </source>
<translation>Error loading wallet.dat
</translation>
</message>
<source>Date: %1
Amount: %2
Type: %3
-Address: %4
-</source>
+Address: %4</source>
<translation>Дата: %1
Количество: %2
Тип: %3
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="5"/>
- <source>Send command to -server or bitcoind
-</source>
+ <source>Send command to -server or bitcoind</source>
<translation>Отправить команду на сервер ( -server ) или демону
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="6"/>
- <source>List commands
-</source>
+ <source>List commands</source>
<translation>Список команд
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="7"/>
- <source>Get help for a command
-</source>
+ <source>Get help for a command</source>
<translation>Получить помощь по команде</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="8"/>
- <source>Options:
-</source>
+ <source>Options:</source>
<translation>Опции:
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="9"/>
- <source>Specify configuration file (default: bitcoin.conf)
-</source>
+ <source>Specify configuration file (default: bitcoin.conf)</source>
<translation>Указать конфигурационный файл вместо используемого по умолчанию (bitcoin.conf)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="10"/>
- <source>Specify pid file (default: bitcoind.pid)
-</source>
+ <source>Specify pid file (default: bitcoind.pid)</source>
<translation>Указать pid-файл вместо используемого по умолчанию (bitcoin.pid)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="11"/>
- <source>Generate coins
-</source>
+ <source>Generate coins</source>
<translation>Включить добычу монет
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="12"/>
- <source>Don't generate coins
-</source>
+ <source>Don't generate coins</source>
<translation>Выключить добычу монет
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="13"/>
- <source>Start minimized
-</source>
+ <source>Start minimized</source>
<translation>Запускать минимизированным
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="14"/>
- <source>Specify data directory
-</source>
+ <source>Specify data directory</source>
<translation>Указать рабочую директорию
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="15"/>
- <source>Specify connection timeout (in milliseconds)
-</source>
+ <source>Specify connection timeout (in milliseconds)</source>
<translation>Указать таймаут соединения (в миллисекундах)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="16"/>
- <source>Connect through socks4 proxy
-</source>
+ <source>Connect through socks4 proxy</source>
<translation>Соединяться через socks4-прокси
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="17"/>
- <source>Allow DNS lookups for addnode and connect
-</source>
+ <source>Allow DNS lookups for addnode and connect</source>
<translation>Разрешить поиск в DNS для комманд "addnode" и "connect"
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="18"/>
- <source>Add a node to connect to
-</source>
+ <source>Add a node to connect to</source>
<translation>Добавить узел для соединения
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="19"/>
- <source>Connect only to the specified node
-</source>
+ <source>Connect only to the specified node</source>
<translation>Соединяться только с указанным узлом
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="20"/>
- <source>Don't accept connections from outside
-</source>
+ <source>Don't accept connections from outside</source>
<translation>Не принимать внешние соединения
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="21"/>
- <source>Don't attempt to use UPnP to map the listening port
-</source>
+ <source>Don't attempt to use UPnP to map the listening port</source>
<translation>Не пытаться использовать UPnP
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="22"/>
- <source>Attempt to use UPnP to map the listening port
-</source>
+ <source>Attempt to use UPnP to map the listening port</source>
<translation>Попытаться использовать UPnP для проброса прослушиваемого порта на роутере
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="23"/>
- <source>Fee per KB to add to transactions you send
-</source>
+ <source>Fee per KB to add to transactions you send</source>
<translation>Комиссия (за каждый KB транзакции)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="24"/>
- <source>Accept command line and JSON-RPC commands
-</source>
+ <source>Accept command line and JSON-RPC commands</source>
<translation>Принимать команды из командной строки и через JSON-RPC
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="25"/>
- <source>Run in the background as a daemon and accept commands
-</source>
+ <source>Run in the background as a daemon and accept commands</source>
<translation>Запустить в бекграунде (как демон) и принимать команды
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="26"/>
- <source>Use the test network
-</source>
+ <source>Use the test network</source>
<translation>Использовать тестовую сеть
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="27"/>
- <source>Username for JSON-RPC connections
-</source>
+ <source>Username for JSON-RPC connections</source>
<translation>Имя пользователя для JSON-RPC соединений
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="28"/>
- <source>Password for JSON-RPC connections
-</source>
+ <source>Password for JSON-RPC connections</source>
<translation>Пароль для JSON-RPC соединений
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="29"/>
- <source>Listen for JSON-RPC connections on <port> (default: 8332)
-</source>
+ <source>Listen for JSON-RPC connections on <port> (default: 8332)</source>
<translation>Слушать <порт> для JSON-RPC соединений (по умолчанию: 8332)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="30"/>
- <source>Allow JSON-RPC connections from specified IP address
-</source>
+ <source>Allow JSON-RPC connections from specified IP address</source>
<translation>Разрешить JSON-RPC соединения с указанного адреса
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="31"/>
- <source>Send commands to node running on <ip> (default: 127.0.0.1)
-</source>
+ <source>Send commands to node running on <ip> (default: 127.0.0.1)</source>
<translation>Отправлять команды на узел,запущенный на <IP> (по умолчанию: 127.0.0.1)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="32"/>
- <source>Set key pool size to <n> (default: 100)
-</source>
+ <source>Set key pool size to <n> (default: 100)</source>
<translation>Установить размер key pool'а в <n> (по умолчанию: 100)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="33"/>
- <source>Rescan the block chain for missing wallet transactions
-</source>
+ <source>Rescan the block chain for missing wallet transactions</source>
<translation>Просканировать цепочку блоков в поисках пропущенных транзакций для бумажника
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="34"/>
<source>
-SSL options: (see the Bitcoin Wiki for SSL setup instructions)
-</source>
+SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation>Опции SSL: (см. Bitcoin Wiki для инструкций)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="37"/>
- <source>Use OpenSSL (https) for JSON-RPC connections
-</source>
+ <source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>Использовать OpenSSL (https) для JSON-RPC соединений
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="38"/>
- <source>Server certificate file (default: server.cert)
-</source>
+ <source>Server certificate file (default: server.cert)</source>
<translation>Сертификат (публичный ключ) сервера (по умолчанию: server.cert)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="39"/>
- <source>Server private key (default: server.pem)
-</source>
+ <source>Server private key (default: server.pem)</source>
<translation>Закрытый ключ сервера (по умолчанию: server.pem)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="40"/>
- <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)
-</source>
+ <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source>
<translation>Допустимые Cipher'ы для сервера (по умолчанию: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="43"/>
- <source>This help message
-</source>
+ <source>This help message</source>
<translation>Данная справка
</translation>
</message>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="48"/>
- <source>Error loading addr.dat
-</source>
+ <source>Error loading addr.dat </source>
<translation>Ошибка при загрузке addr.dat
</translation>
</message>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="50"/>
- <source>Error loading blkindex.dat
-</source>
+ <source>Error loading blkindex.dat </source>
<translation>Ошибка при загрузке blkindex.dat
</translation>
</message>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="52"/>
- <source>Error loading wallet.dat: Wallet corrupted
-</source>
+ <source>Error loading wallet.dat: Wallet corrupted </source>
<translation>Ошибка загрузки wallet.dat: Бумажник повреждён</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="53"/>
- <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin
-</source>
+ <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin </source>
<translation>Ошибка загрузки wallet.dat: Для данного бумажника требуется более новая версия Bitcoin
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="55"/>
- <source>Error loading wallet.dat
-</source>
+ <source>Error loading wallet.dat </source>
<translation>Ошибка при загрузке wallet.dat
</translation>
</message>
<source>Date: %1
Amount: %2
Type: %3
-Address: %4
-</source>
+Address: %4</source>
<translation>Дата: %1
Кількість: %2
Тип: %3
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="5"/>
- <source>Send command to -server or bitcoind
-</source>
+ <source>Send command to -server or bitcoind</source>
<translation>Відправити команду серверу -server чи демону
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="6"/>
- <source>List commands
-</source>
+ <source>List commands</source>
<translation>Список команд
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="7"/>
- <source>Get help for a command
-</source>
+ <source>Get help for a command</source>
<translation>Отримати довідку по команді
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="8"/>
- <source>Options:
-</source>
+ <source>Options:</source>
<translation>Параметри:
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="9"/>
- <source>Specify configuration file (default: bitcoin.conf)
-</source>
+ <source>Specify configuration file (default: bitcoin.conf)</source>
<translation>Вкажіть файл конфігурації (за промовчуванням: bitcoin.conf)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="10"/>
- <source>Specify pid file (default: bitcoind.pid)
-</source>
+ <source>Specify pid file (default: bitcoind.pid)</source>
<translation>Вкажіть pid-файл (за промовчуванням: bitcoind.pid)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="11"/>
- <source>Generate coins
-</source>
+ <source>Generate coins</source>
<translation>Генерувати монети
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="12"/>
- <source>Don't generate coins
-</source>
+ <source>Don't generate coins</source>
<translation>Не генерувати монети
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="13"/>
- <source>Start minimized
-</source>
+ <source>Start minimized</source>
<translation>Запускати згорнутим
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="14"/>
- <source>Specify data directory
-</source>
+ <source>Specify data directory</source>
<translation>Вкажіть робочий каталог
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="15"/>
- <source>Specify connection timeout (in milliseconds)
-</source>
+ <source>Specify connection timeout (in milliseconds)</source>
<translation>Вкажіть таймаут з’єднання (в мілісекундах)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="16"/>
- <source>Connect through socks4 proxy
-</source>
+ <source>Connect through socks4 proxy</source>
<translation>Підключитись через SOCKS4-проксі
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="17"/>
- <source>Allow DNS lookups for addnode and connect
-</source>
+ <source>Allow DNS lookups for addnode and connect</source>
<translation>Дозволити пошук в DNS для команд «addnode» і «connect»
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="18"/>
- <source>Add a node to connect to
-</source>
+ <source>Add a node to connect to</source>
<translation>Додати вузол для підключення
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="19"/>
- <source>Connect only to the specified node
-</source>
+ <source>Connect only to the specified node</source>
<translation>Підключитись лише до вказаного вузла
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="20"/>
- <source>Don't accept connections from outside
-</source>
+ <source>Don't accept connections from outside</source>
<translation>Не приймати підключення ззовні
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="21"/>
- <source>Don't attempt to use UPnP to map the listening port
-</source>
+ <source>Don't attempt to use UPnP to map the listening port</source>
<translation>Не намагатись використовувати UPnP для відображення порту що прослуховується на роутері
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="22"/>
- <source>Attempt to use UPnP to map the listening port
-</source>
+ <source>Attempt to use UPnP to map the listening port</source>
<translation>Намагатись використовувати UPnP для відображення порту що прослуховується на роутері
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="23"/>
- <source>Fee per KB to add to transactions you send
-</source>
+ <source>Fee per KB to add to transactions you send</source>
<translation>Комісія за Кб
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="24"/>
- <source>Accept command line and JSON-RPC commands
-</source>
+ <source>Accept command line and JSON-RPC commands</source>
<translation>Приймати команди із командного рядка та команди JSON-RPC
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="25"/>
- <source>Run in the background as a daemon and accept commands
-</source>
+ <source>Run in the background as a daemon and accept commands</source>
<translation>Запустити в фоновому режимі (як демон) та приймати команди
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="26"/>
- <source>Use the test network
-</source>
+ <source>Use the test network</source>
<translation>Використовувати тестову мережу
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="27"/>
- <source>Username for JSON-RPC connections
-</source>
+ <source>Username for JSON-RPC connections</source>
<translation>Ім’я користувача для JSON-RPC-з’єднань
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="28"/>
- <source>Password for JSON-RPC connections
-</source>
+ <source>Password for JSON-RPC connections</source>
<translation>Пароль для JSON-RPC-з’єднань
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="29"/>
- <source>Listen for JSON-RPC connections on <port> (default: 8332)
-</source>
+ <source>Listen for JSON-RPC connections on <port> (default: 8332)</source>
<translation>Прослуховувати <port> для JSON-RPC-з’єднань (за промовчуванням: 8332)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="30"/>
- <source>Allow JSON-RPC connections from specified IP address
-</source>
+ <source>Allow JSON-RPC connections from specified IP address</source>
<translation>Дозволити JSON-RPC-з’єднання з вказаної IP-адреси
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="31"/>
- <source>Send commands to node running on <ip> (default: 127.0.0.1)
-</source>
+ <source>Send commands to node running on <ip> (default: 127.0.0.1)</source>
<translation>Відправляти команди на вузол, запущений на <ip> (за промовчуванням: 127.0.0.1)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="32"/>
- <source>Set key pool size to <n> (default: 100)
-</source>
+ <source>Set key pool size to <n> (default: 100)</source>
<translation>Встановити розмір пулу ключів <n> (за промовчуванням: 100)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="33"/>
- <source>Rescan the block chain for missing wallet transactions
-</source>
+ <source>Rescan the block chain for missing wallet transactions</source>
<translation>Пересканувати ланцюжок блоків, в пошуку втрачених переказів
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="34"/>
<source>
-SSL options: (see the Bitcoin Wiki for SSL setup instructions)
-</source>
+SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation>
Параметри SSL: (див. Bitcoin Wiki)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="37"/>
- <source>Use OpenSSL (https) for JSON-RPC connections
-</source>
+ <source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>Використовувати OpenSSL (https) для JSON-RPC-з’єднань
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="38"/>
- <source>Server certificate file (default: server.cert)
-</source>
+ <source>Server certificate file (default: server.cert)</source>
<translation>Сертифікату сервера (за промовчуванням: server.cert)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="39"/>
- <source>Server private key (default: server.pem)
-</source>
+ <source>Server private key (default: server.pem)</source>
<translation>Закритий ключ сервера (за промовчуванням: server.pem)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="40"/>
- <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)
-</source>
+ <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source>
<translation>Допустимі шифри (за промовчуванням: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="43"/>
- <source>This help message
-</source>
+ <source>This help message</source>
<translation>Дана довідка
</translation>
</message>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="48"/>
- <source>Error loading addr.dat
-</source>
+ <source>Error loading addr.dat </source>
<translation>Помилка при завантаженні addr.dat
</translation>
</message>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="50"/>
- <source>Error loading blkindex.dat
-</source>
+ <source>Error loading blkindex.dat </source>
<translation>Помилка при завантаженні blkindex.dat
</translation>
</message>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="52"/>
- <source>Error loading wallet.dat: Wallet corrupted
-</source>
+ <source>Error loading wallet.dat: Wallet corrupted </source>
<translation>Помилка при завантаженні wallet.dat: Гаманець пошкоджено
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="53"/>
- <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin
-</source>
+ <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin </source>
<translation>Помилка при завантаженні wallet.dat: Гаманець потребує новішої версії Bitcoin'а
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="55"/>
- <source>Error loading wallet.dat
-</source>
+ <source>Error loading wallet.dat </source>
<translation>Помилка при завантаженні wallet.dat
</translation>
</message>
<source>Date: %1
Amount: %2
Type: %3
-Address: %4
-</source>
+Address: %4</source>
<translation>日期: %1
金额: %2
类别: %3
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="5"/>
- <source>Send command to -server or bitcoind
-</source>
+ <source>Send command to -server or bitcoind</source>
<translation>发送命令到服务器或者 bitcoind
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="6"/>
- <source>List commands
-</source>
+ <source>List commands</source>
<translation>列出命令
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="7"/>
- <source>Get help for a command
-</source>
+ <source>Get help for a command</source>
<translation>获得某条命令的帮助
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="8"/>
- <source>Options:
-</source>
+ <source>Options:</source>
<translation>选项：
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="9"/>
- <source>Specify configuration file (default: bitcoin.conf)
-</source>
+ <source>Specify configuration file (default: bitcoin.conf)</source>
<translation>指定配置文件 (默认为 bitcoin.conf)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="10"/>
- <source>Specify pid file (default: bitcoind.pid)
-</source>
+ <source>Specify pid file (default: bitcoind.pid)</source>
<translation>指定 pid 文件 (默认为 bitcoind.pid)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="11"/>
- <source>Generate coins
-</source>
+ <source>Generate coins</source>
<translation>生成货币
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="12"/>
- <source>Don't generate coins
-</source>
+ <source>Don't generate coins</source>
<translation>不要生成货币
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="13"/>
- <source>Start minimized
-</source>
+ <source>Start minimized</source>
<translation>启动时最小化
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="14"/>
- <source>Specify data directory
-</source>
+ <source>Specify data directory</source>
<translation>指定数据目录
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="15"/>
- <source>Specify connection timeout (in milliseconds)
-</source>
+ <source>Specify connection timeout (in milliseconds)</source>
<translation>指定连接超时时间 (微秒)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="16"/>
- <source>Connect through socks4 proxy
-</source>
+ <source>Connect through socks4 proxy</source>
<translation>通过 socks4 代理连接
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="17"/>
- <source>Allow DNS lookups for addnode and connect
-</source>
+ <source>Allow DNS lookups for addnode and connect</source>
<translation>连接节点时允许DNS查找
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="18"/>
- <source>Add a node to connect to
-</source>
+ <source>Add a node to connect to</source>
<translation>连接到指定节点</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="19"/>
- <source>Connect only to the specified node
-</source>
+ <source>Connect only to the specified node</source>
<translation>只连接到指定节点
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="20"/>
- <source>Don't accept connections from outside
-</source>
+ <source>Don't accept connections from outside</source>
<translation>禁止接收外部连接
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="21"/>
- <source>Don't attempt to use UPnP to map the listening port
-</source>
+ <source>Don't attempt to use UPnP to map the listening port</source>
<translation>禁止使用 UPnP 映射监听端口
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="22"/>
- <source>Attempt to use UPnP to map the listening port
-</source>
+ <source>Attempt to use UPnP to map the listening port</source>
<translation>尝试使用 UPnP 映射监听端口
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="23"/>
- <source>Fee per KB to add to transactions you send
-</source>
+ <source>Fee per KB to add to transactions you send</source>
<translation>每发送1KB交易所需的费用</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="24"/>
- <source>Accept command line and JSON-RPC commands
-</source>
+ <source>Accept command line and JSON-RPC commands</source>
<translation>接受命令行和 JSON-RPC 命令
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="25"/>
- <source>Run in the background as a daemon and accept commands
-</source>
+ <source>Run in the background as a daemon and accept commands</source>
<translation>在后台运行并接受命令
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="26"/>
- <source>Use the test network
-</source>
+ <source>Use the test network</source>
<translation>使用测试网络
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="27"/>
- <source>Username for JSON-RPC connections
-</source>
+ <source>Username for JSON-RPC connections</source>
<translation>JSON-RPC连接用户名
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="28"/>
- <source>Password for JSON-RPC connections
-</source>
+ <source>Password for JSON-RPC connections</source>
<translation>JSON-RPC连接密码
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="29"/>
- <source>Listen for JSON-RPC connections on <port> (default: 8332)
-</source>
+ <source>Listen for JSON-RPC connections on <port> (default: 8332)</source>
<translation>JSON-RPC连接监听<端口> (默认为 8332)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="30"/>
- <source>Allow JSON-RPC connections from specified IP address
-</source>
+ <source>Allow JSON-RPC connections from specified IP address</source>
<translation>允许从指定IP接受到的JSON-RPC连接
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="31"/>
- <source>Send commands to node running on <ip> (default: 127.0.0.1)
-</source>
+ <source>Send commands to node running on <ip> (default: 127.0.0.1)</source>
<translation>向IP地址为 <ip> 的节点发送指令 (缺省: 127.0.0.1)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="32"/>
- <source>Set key pool size to <n> (default: 100)
-</source>
+ <source>Set key pool size to <n> (default: 100)</source>
<translation>设置密钥池大小为 <n> (缺省: 100)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="33"/>
- <source>Rescan the block chain for missing wallet transactions
-</source>
+ <source>Rescan the block chain for missing wallet transactions</source>
<translation>重新扫描数据链以查找遗漏的交易
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="34"/>
<source>
-SSL options: (see the Bitcoin Wiki for SSL setup instructions)
-</source>
+SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation>
SSL 选项: (SSL 安装教程具体见比特币维基百科)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="37"/>
- <source>Use OpenSSL (https) for JSON-RPC connections
-</source>
+ <source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>为 JSON-RPC 连接使用 OpenSSL (https)连接</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="38"/>
- <source>Server certificate file (default: server.cert)
-</source>
+ <source>Server certificate file (default: server.cert)</source>
<translation>服务器证书 (默认为 server.cert)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="39"/>
- <source>Server private key (default: server.pem)
-</source>
+ <source>Server private key (default: server.pem)</source>
<translation>服务器私钥 (默认为 server.pem)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="40"/>
- <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)
-</source>
+ <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source>
<translation>可接受的加密器 (默认为 TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="43"/>
- <source>This help message
-</source>
+ <source>This help message</source>
<translation>该帮助信息
</translation>
</message>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="48"/>
- <source>Error loading addr.dat
-</source>
+ <source>Error loading addr.dat </source>
<translation>加载 addr.dat 错误
</translation>
</message>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="50"/>
- <source>Error loading blkindex.dat
-</source>
+ <source>Error loading blkindex.dat </source>
<translation>加载 blkindex.dat 失败
</translation>
</message>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="52"/>
- <source>Error loading wallet.dat: Wallet corrupted
-</source>
+ <source>Error loading wallet.dat: Wallet corrupted </source>
<translation>加载 wallet.dat 失败：钱包崩溃
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="53"/>
- <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin
-</source>
+ <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin </source>
<translation>加载 wallet.dat 失败：运行钱包需要一个更新版本的比特币软件
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="55"/>
- <source>Error loading wallet.dat
-</source>
+ <source>Error loading wallet.dat </source>
<translation>加载 wallet.dat 失败
</translation>
</message>
<source>Date: %1
Amount: %2
Type: %3
-Address: %4
-</source>
+Address: %4</source>
<translation>日期: %1
金額: %2
類別: %3
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="5"/>
- <source>Send command to -server or bitcoind
-</source>
+ <source>Send command to -server or bitcoind</source>
<translation>送指令至 -server 或 bitcoind
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="6"/>
- <source>List commands
-</source>
+ <source>List commands</source>
<translation>列出指令
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="7"/>
- <source>Get help for a command
-</source>
+ <source>Get help for a command</source>
<translation>取得指令說明
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="8"/>
- <source>Options:
-</source>
+ <source>Options:</source>
<translation>選項:
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="9"/>
- <source>Specify configuration file (default: bitcoin.conf)
-</source>
+ <source>Specify configuration file (default: bitcoin.conf)</source>
<translation>指定設定檔 (預設: bitcoin.conf)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="10"/>
- <source>Specify pid file (default: bitcoind.pid)
-</source>
+ <source>Specify pid file (default: bitcoind.pid)</source>
<translation>指定行程識別碼檔案 (預設: bitcoind.pid)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="11"/>
- <source>Generate coins
-</source>
+ <source>Generate coins</source>
<translation>生產位元幣
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="12"/>
- <source>Don't generate coins
-</source>
+ <source>Don't generate coins</source>
<translation>不生產位元幣
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="13"/>
- <source>Start minimized
-</source>
+ <source>Start minimized</source>
<translation>啓動時最小化
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="14"/>
- <source>Specify data directory
-</source>
+ <source>Specify data directory</source>
<translation>指定資料目錄
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="15"/>
- <source>Specify connection timeout (in milliseconds)
-</source>
+ <source>Specify connection timeout (in milliseconds)</source>
<translation>指定連線逾時時間 (毫秒)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="16"/>
- <source>Connect through socks4 proxy
-</source>
+ <source>Connect through socks4 proxy</source>
<translation>透過 socks4 代理伺服器連線
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="17"/>
- <source>Allow DNS lookups for addnode and connect
-</source>
+ <source>Allow DNS lookups for addnode and connect</source>
<translation>允許 addnode 和 connect 時做域名解析
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="18"/>
- <source>Add a node to connect to
-</source>
+ <source>Add a node to connect to</source>
<translation>新增連線節點
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="19"/>
- <source>Connect only to the specified node
-</source>
+ <source>Connect only to the specified node</source>
<translation>只連線至指定節點
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="20"/>
- <source>Don't accept connections from outside
-</source>
+ <source>Don't accept connections from outside</source>
<translation>不接受外來連線
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="21"/>
- <source>Don't attempt to use UPnP to map the listening port
-</source>
+ <source>Don't attempt to use UPnP to map the listening port</source>
<translation>不嘗試用 UPnP 來設定服務連接埠的對應
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="22"/>
- <source>Attempt to use UPnP to map the listening port
-</source>
+ <source>Attempt to use UPnP to map the listening port</source>
<translation>嘗試用 UPnP 來設定服務連接埠的對應
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="23"/>
- <source>Fee per KB to add to transactions you send
-</source>
+ <source>Fee per KB to add to transactions you send</source>
<translation>交易付款時每 KB 的交易手續費
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="24"/>
- <source>Accept command line and JSON-RPC commands
-</source>
+ <source>Accept command line and JSON-RPC commands</source>
<translation>接受命令列與 JSON-RPC 指令
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="25"/>
- <source>Run in the background as a daemon and accept commands
-</source>
+ <source>Run in the background as a daemon and accept commands</source>
<translation>以背景程式執行並接受指令</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="26"/>
- <source>Use the test network
-</source>
+ <source>Use the test network</source>
<translation>使用測試網路
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="27"/>
- <source>Username for JSON-RPC connections
-</source>
+ <source>Username for JSON-RPC connections</source>
<translation>JSON-RPC 連線使用者名稱</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="28"/>
- <source>Password for JSON-RPC connections
-</source>
+ <source>Password for JSON-RPC connections</source>
<translation>JSON-RPC 連線密碼</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="29"/>
- <source>Listen for JSON-RPC connections on <port> (default: 8332)
-</source>
+ <source>Listen for JSON-RPC connections on <port> (default: 8332)</source>
<translation>在通訊埠 <port> 聽候 JSON-RPC 連線 (預設: 8332)</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="30"/>
- <source>Allow JSON-RPC connections from specified IP address
-</source>
+ <source>Allow JSON-RPC connections from specified IP address</source>
<translation>只允許從指定網路位址來的 JSON-RPC 連線</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="31"/>
- <source>Send commands to node running on <ip> (default: 127.0.0.1)
-</source>
+ <source>Send commands to node running on <ip> (default: 127.0.0.1)</source>
<translation>送指令給在 <ip> 的節點 (預設: 127.0.0.1)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="32"/>
- <source>Set key pool size to <n> (default: 100)
-</source>
+ <source>Set key pool size to <n> (default: 100)</source>
<translation>設定密鑰池大小為 <n> (預設: 100)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="33"/>
- <source>Rescan the block chain for missing wallet transactions
-</source>
+ <source>Rescan the block chain for missing wallet transactions</source>
<translation>重新掃描區塊鎖鏈, 以尋找錢包所遺漏的交易.</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="34"/>
<source>
-SSL options: (see the Bitcoin Wiki for SSL setup instructions)
-</source>
+SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation>
SSL 選項: (SSL 設定程序請見 Bitcoin Wiki)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="37"/>
- <source>Use OpenSSL (https) for JSON-RPC connections
-</source>
+ <source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>使用 OpenSSL (https) 於JSON-RPC 連線
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="38"/>
- <source>Server certificate file (default: server.cert)
-</source>
+ <source>Server certificate file (default: server.cert)</source>
<translation>伺服器憑證檔 (預設: server.cert)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="39"/>
- <source>Server private key (default: server.pem)
-</source>
+ <source>Server private key (default: server.pem)</source>
<translation>伺服器密鑰檔 (預設: server.pem)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="40"/>
- <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)
-</source>
+ <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source>
<translation>可以接受的加密法 (預設: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="43"/>
- <source>This help message
-</source>
+ <source>This help message</source>
<translation>此協助訊息
</translation>
</message>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="48"/>
- <source>Error loading addr.dat
-</source>
+ <source>Error loading addr.dat </source>
<translation>載入 addr.dat 錯誤
</translation>
</message>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="50"/>
- <source>Error loading blkindex.dat
-</source>
+ <source>Error loading blkindex.dat </source>
<translation>載入 blkindex.dat 失敗
</translation>
</message>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="52"/>
- <source>Error loading wallet.dat: Wallet corrupted
-</source>
+ <source>Error loading wallet.dat: Wallet corrupted </source>
<translation>載入 wallet.dat 失敗: 錢包壞掉了
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="53"/>
- <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin
-</source>
+ <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin </source>
<translation>載入 wallet.dat 錯誤: 此錢包需要新版的 Bitcoin
</translation>
</message>
<message>
<location filename="../bitcoinstrings.cpp" line="55"/>
- <source>Error loading wallet.dat
-</source>
+ <source>Error loading wallet.dat </source>
<translation>載入 wallet.dat 錯誤
</translation>
</message>
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
};
#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; \
return nSerSize; \
} \
template<typename Stream> \
- void Serialize(Stream& s, int nType=0, int nVersion=VERSION) const \
+ void Serialize(Stream& s, int nType=0, int nVersion=PROTOCOL_VERSION) const \
{ \
CSerActionSerialize ser_action; \
const bool fGetSize = false; \
{statements} \
} \
template<typename Stream> \
- void Unserialize(Stream& s, int nType=0, int nVersion=VERSION) \
+ void Unserialize(Stream& s, int nType=0, int nVersion=PROTOCOL_VERSION) \
{ \
CSerActionUnserialize ser_action; \
const bool fGetSize = false; \
// vector
template<typename T, typename A> unsigned int GetSerializeSize_impl(const std::vector<T, A>& v, int nType, int nVersion, const boost::true_type&);
template<typename T, typename A> unsigned int GetSerializeSize_impl(const std::vector<T, A>& v, int nType, int nVersion, const boost::false_type&);
-template<typename T, typename A> inline unsigned int GetSerializeSize(const std::vector<T, A>& v, int nType, int nVersion=VERSION);
+template<typename T, typename A> inline unsigned int GetSerializeSize(const std::vector<T, A>& v, int nType, int nVersion=PROTOCOL_VERSION);
template<typename Stream, typename T, typename A> void Serialize_impl(Stream& os, const std::vector<T, A>& v, int nType, int nVersion, const boost::true_type&);
template<typename Stream, typename T, typename A> void Serialize_impl(Stream& os, const std::vector<T, A>& v, int nType, int nVersion, const boost::false_type&);
-template<typename Stream, typename T, typename A> inline void Serialize(Stream& os, const std::vector<T, A>& v, int nType, int nVersion=VERSION);
+template<typename Stream, typename T, typename A> inline void Serialize(Stream& os, const std::vector<T, A>& v, int nType, int nVersion=PROTOCOL_VERSION);
template<typename Stream, typename T, typename A> void Unserialize_impl(Stream& is, std::vector<T, A>& v, int nType, int nVersion, const boost::true_type&);
template<typename Stream, typename T, typename A> void Unserialize_impl(Stream& is, std::vector<T, A>& v, int nType, int nVersion, const boost::false_type&);
-template<typename Stream, typename T, typename A> inline void Unserialize(Stream& is, std::vector<T, A>& v, int nType, int nVersion=VERSION);
+template<typename Stream, typename T, typename A> inline void Unserialize(Stream& is, std::vector<T, A>& v, int nType, int nVersion=PROTOCOL_VERSION);
// others derived from vector
-extern inline unsigned int GetSerializeSize(const CScript& v, int nType, int nVersion=VERSION);
-template<typename Stream> void Serialize(Stream& os, const CScript& v, int nType, int nVersion=VERSION);
-template<typename Stream> void Unserialize(Stream& is, CScript& v, int nType, int nVersion=VERSION);
+extern inline unsigned int GetSerializeSize(const CScript& v, int nType, int nVersion=PROTOCOL_VERSION);
+template<typename Stream> void Serialize(Stream& os, const CScript& v, int nType, int nVersion=PROTOCOL_VERSION);
+template<typename Stream> void Unserialize(Stream& is, CScript& v, int nType, int nVersion=PROTOCOL_VERSION);
// pair
-template<typename K, typename T> unsigned int GetSerializeSize(const std::pair<K, T>& item, int nType, int nVersion=VERSION);
-template<typename Stream, typename K, typename T> void Serialize(Stream& os, const std::pair<K, T>& item, int nType, int nVersion=VERSION);
-template<typename Stream, typename K, typename T> void Unserialize(Stream& is, std::pair<K, T>& item, int nType, int nVersion=VERSION);
+template<typename K, typename T> unsigned int GetSerializeSize(const std::pair<K, T>& item, int nType, int nVersion=PROTOCOL_VERSION);
+template<typename Stream, typename K, typename T> void Serialize(Stream& os, const std::pair<K, T>& item, int nType, int nVersion=PROTOCOL_VERSION);
+template<typename Stream, typename K, typename T> void Unserialize(Stream& is, std::pair<K, T>& item, int nType, int nVersion=PROTOCOL_VERSION);
// 3 tuple
-template<typename T0, typename T1, typename T2> unsigned int GetSerializeSize(const boost::tuple<T0, T1, T2>& item, int nType, int nVersion=VERSION);
-template<typename Stream, typename T0, typename T1, typename T2> void Serialize(Stream& os, const boost::tuple<T0, T1, T2>& item, int nType, int nVersion=VERSION);
-template<typename Stream, typename T0, typename T1, typename T2> void Unserialize(Stream& is, boost::tuple<T0, T1, T2>& item, int nType, int nVersion=VERSION);
+template<typename T0, typename T1, typename T2> unsigned int GetSerializeSize(const boost::tuple<T0, T1, T2>& item, int nType, int nVersion=PROTOCOL_VERSION);
+template<typename Stream, typename T0, typename T1, typename T2> void Serialize(Stream& os, const boost::tuple<T0, T1, T2>& item, int nType, int nVersion=PROTOCOL_VERSION);
+template<typename Stream, typename T0, typename T1, typename T2> void Unserialize(Stream& is, boost::tuple<T0, T1, T2>& item, int nType, int nVersion=PROTOCOL_VERSION);
// 4 tuple
-template<typename T0, typename T1, typename T2, typename T3> unsigned int GetSerializeSize(const boost::tuple<T0, T1, T2, T3>& item, int nType, int nVersion=VERSION);
-template<typename Stream, typename T0, typename T1, typename T2, typename T3> void Serialize(Stream& os, const boost::tuple<T0, T1, T2, T3>& item, int nType, int nVersion=VERSION);
-template<typename Stream, typename T0, typename T1, typename T2, typename T3> void Unserialize(Stream& is, boost::tuple<T0, T1, T2, T3>& item, int nType, int nVersion=VERSION);
+template<typename T0, typename T1, typename T2, typename T3> unsigned int GetSerializeSize(const boost::tuple<T0, T1, T2, T3>& item, int nType, int nVersion=PROTOCOL_VERSION);
+template<typename Stream, typename T0, typename T1, typename T2, typename T3> void Serialize(Stream& os, const boost::tuple<T0, T1, T2, T3>& item, int nType, int nVersion=PROTOCOL_VERSION);
+template<typename Stream, typename T0, typename T1, typename T2, typename T3> void Unserialize(Stream& is, boost::tuple<T0, T1, T2, T3>& item, int nType, int nVersion=PROTOCOL_VERSION);
// map
-template<typename K, typename T, typename Pred, typename A> unsigned int GetSerializeSize(const std::map<K, T, Pred, A>& m, int nType, int nVersion=VERSION);
-template<typename Stream, typename K, typename T, typename Pred, typename A> void Serialize(Stream& os, const std::map<K, T, Pred, A>& m, int nType, int nVersion=VERSION);
-template<typename Stream, typename K, typename T, typename Pred, typename A> void Unserialize(Stream& is, std::map<K, T, Pred, A>& m, int nType, int nVersion=VERSION);
+template<typename K, typename T, typename Pred, typename A> unsigned int GetSerializeSize(const std::map<K, T, Pred, A>& m, int nType, int nVersion=PROTOCOL_VERSION);
+template<typename Stream, typename K, typename T, typename Pred, typename A> void Serialize(Stream& os, const std::map<K, T, Pred, A>& m, int nType, int nVersion=PROTOCOL_VERSION);
+template<typename Stream, typename K, typename T, typename Pred, typename A> void Unserialize(Stream& is, std::map<K, T, Pred, A>& m, int nType, int nVersion=PROTOCOL_VERSION);
// set
-template<typename K, typename Pred, typename A> unsigned int GetSerializeSize(const std::set<K, Pred, A>& m, int nType, int nVersion=VERSION);
-template<typename Stream, typename K, typename Pred, typename A> void Serialize(Stream& os, const std::set<K, Pred, A>& m, int nType, int nVersion=VERSION);
-template<typename Stream, typename K, typename Pred, typename A> void Unserialize(Stream& is, std::set<K, Pred, A>& m, int nType, int nVersion=VERSION);
+template<typename K, typename Pred, typename A> unsigned int GetSerializeSize(const std::set<K, Pred, A>& m, int nType, int nVersion=PROTOCOL_VERSION);
+template<typename Stream, typename K, typename Pred, typename A> void Serialize(Stream& os, const std::set<K, Pred, A>& m, int nType, int nVersion=PROTOCOL_VERSION);
+template<typename Stream, typename K, typename Pred, typename A> void Unserialize(Stream& is, std::set<K, Pred, A>& m, int nType, int nVersion=PROTOCOL_VERSION);
// Thanks to Boost serialization for this idea.
//
template<typename T>
-inline unsigned int GetSerializeSize(const T& a, long nType, int nVersion=VERSION)
+inline unsigned int GetSerializeSize(const T& a, long nType, int nVersion=PROTOCOL_VERSION)
{
return a.GetSerializeSize((int)nType, nVersion);
}
template<typename Stream, typename T>
-inline void Serialize(Stream& os, const T& a, long nType, int nVersion=VERSION)
+inline void Serialize(Stream& os, const T& a, long nType, int nVersion=PROTOCOL_VERSION)
{
a.Serialize(os, (int)nType, nVersion);
}
template<typename Stream, typename T>
-inline void Unserialize(Stream& is, T& a, long nType, int nVersion=VERSION)
+inline void Unserialize(Stream& is, T& a, long nType, int nVersion=PROTOCOL_VERSION)
{
a.Unserialize(is, (int)nType, nVersion);
}
typedef vector_type::const_iterator const_iterator;
typedef vector_type::reverse_iterator reverse_iterator;
- explicit CDataStream(int nTypeIn=SER_NETWORK, int nVersionIn=VERSION)
+ explicit CDataStream(int nTypeIn=SER_NETWORK, int nVersionIn=PROTOCOL_VERSION)
{
Init(nTypeIn, nVersionIn);
}
- CDataStream(const_iterator pbegin, const_iterator pend, int nTypeIn=SER_NETWORK, int nVersionIn=VERSION) : vch(pbegin, pend)
+ CDataStream(const_iterator pbegin, const_iterator pend, int nTypeIn=SER_NETWORK, int nVersionIn=PROTOCOL_VERSION) : vch(pbegin, pend)
{
Init(nTypeIn, nVersionIn);
}
#if !defined(_MSC_VER) || _MSC_VER >= 1300
- CDataStream(const char* pbegin, const char* pend, int nTypeIn=SER_NETWORK, int nVersionIn=VERSION) : vch(pbegin, pend)
+ CDataStream(const char* pbegin, const char* pend, int nTypeIn=SER_NETWORK, int nVersionIn=PROTOCOL_VERSION) : vch(pbegin, pend)
{
Init(nTypeIn, nVersionIn);
}
#endif
- CDataStream(const vector_type& vchIn, int nTypeIn=SER_NETWORK, int nVersionIn=VERSION) : vch(vchIn.begin(), vchIn.end())
+ CDataStream(const vector_type& vchIn, int nTypeIn=SER_NETWORK, int nVersionIn=PROTOCOL_VERSION) : vch(vchIn.begin(), vchIn.end())
{
Init(nTypeIn, nVersionIn);
}
- CDataStream(const std::vector<char>& vchIn, int nTypeIn=SER_NETWORK, int nVersionIn=VERSION) : vch(vchIn.begin(), vchIn.end())
+ CDataStream(const std::vector<char>& vchIn, int nTypeIn=SER_NETWORK, int nVersionIn=PROTOCOL_VERSION) : vch(vchIn.begin(), vchIn.end())
{
Init(nTypeIn, nVersionIn);
}
- CDataStream(const std::vector<unsigned char>& vchIn, int nTypeIn=SER_NETWORK, int nVersionIn=VERSION) : vch((char*)&vchIn.begin()[0], (char*)&vchIn.end()[0])
+ CDataStream(const std::vector<unsigned char>& vchIn, int nTypeIn=SER_NETWORK, int nVersionIn=PROTOCOL_VERSION) : vch((char*)&vchIn.begin()[0], (char*)&vchIn.end()[0])
{
Init(nTypeIn, nVersionIn);
}
- void Init(int nTypeIn=SER_NETWORK, int nVersionIn=VERSION)
+ void Init(int nTypeIn=SER_NETWORK, int nVersionIn=PROTOCOL_VERSION)
{
nReadPos = 0;
nType = nTypeIn;
}
template<typename Stream>
- void Serialize(Stream& s, int nType=0, int nVersion=VERSION) const
+ void Serialize(Stream& s, int nType=0, int nVersion=PROTOCOL_VERSION) const
{
// Special case: stream << stream concatenates like stream += stream
if (!vch.empty())
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;
}
- unsigned int GetSerializeSize(int nType=0, int nVersion=VERSION) const
+ unsigned int GetSerializeSize(int nType=0, int nVersion=PROTOCOL_VERSION) const
{
return sizeof(pn);
}
template<typename Stream>
- void Serialize(Stream& s, int nType=0, int nVersion=VERSION) const
+ void Serialize(Stream& s, int nType=0, int nVersion=PROTOCOL_VERSION) const
{
s.write((char*)pn, sizeof(pn));
}
template<typename Stream>
- void Unserialize(Stream& s, int nType=0, int nVersion=VERSION)
+ void Unserialize(Stream& s, int nType=0, int nVersion=PROTOCOL_VERSION)
{
s.read((char*)pn, sizeof(pn));
}
// file license.txt or http://www.opensource.org/licenses/mit-license.php.
#include "headers.h"
#include "strlcpy.h"
+#include <boost/algorithm/string/join.hpp>
#include <boost/program_options/detail/config_file.hpp>
#include <boost/program_options/parsers.hpp>
#include <boost/filesystem.hpp>
string FormatFullVersion()
{
- string s = FormatVersion(VERSION) + pszSubVer;
+ string s = FormatVersion(CLIENT_VERSION);
if (VERSION_IS_BETA) {
s += "-";
s += _("beta");
return s;
}
+// Format the subversion field according to BIP 14 spec (https://en.bitcoin.it/wiki/BIP_0014)
+std::string FormatSubVersion(const std::string& name, int nClientVersion, const std::vector<std::string>& comments)
+{
+ std::ostringstream ss;
+ ss << "/";
+ ss << name << ":" << FormatVersion(nClientVersion);
+ if (!comments.empty())
+ ss << "(" << boost::algorithm::join(comments, "; ") << ")";
+ ss << "/";
+ return ss.str();
+}
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);
int64 GetAdjustedTime();
void AddTimeData(unsigned int ip, int64 nTime);
std::string FormatFullVersion();
-
+std::string FormatSubVersion(const std::string& name, int nClientVersion, const std::vector<std::string>& comments);
}
template<typename T>
-uint256 SerializeHash(const T& obj, int nType=SER_GETHASH, int nVersion=VERSION)
+uint256 SerializeHash(const T& obj, int nType=SER_GETHASH, int nVersion=PROTOCOL_VERSION)
{
// Most of the time is spent allocating and deallocating CDataStream's
// buffer. If this ever needs to be optimized further, make a CStaticStream
git://git.novaco.in / novacoin.git / commitdiff