From 8447120e8658e917f2d2fd4d3d85d53114ec8c9e Mon Sep 17 00:00:00 2001 From: vertoe Date: Fri, 12 Dec 2014 12:09:19 +0100 Subject: [PATCH 1/2] Update README.md --- README.md | 90 +++++++++++++++++-------------------------------------- TODO.md | 50 ------------------------------- 2 files changed, 27 insertions(+), 113 deletions(-) delete mode 100644 TODO.md diff --git a/README.md b/README.md index 98edf87ee..aa418f40b 100644 --- a/README.md +++ b/README.md @@ -1,86 +1,50 @@ -Bitcoin Core integration/staging tree -===================================== +Darkcoin Core integration/staging tree 0.11 +=========================================== -http://www.bitcoin.org +http://www.darkcoin.io Copyright (c) 2009-2014 Bitcoin Core Developers +Copyright (c) 2014 Darkcoin Core Developers -What is Bitcoin? + +What is Darkcoin? ---------------- -Bitcoin is an experimental new digital currency that enables instant payments to -anyone, anywhere in the world. Bitcoin uses peer-to-peer technology to operate -with no central authority: managing transactions and issuing money are carried -out collectively by the network. Bitcoin Core is the name of open source -software which enables the use of this currency. +Darkcoin is an experimental new digital currency that enables anonymous, instant +payments to anyone, anywhere in the world. Darkcoin uses peer-to-peer technology +to operate with no central authority: managing transactions and issuing money +are carried out collectively by the network. Darkcoin Core is the name of open +source software which enables the use of this currency. For more information, as well as an immediately useable, binary version of -the Bitcoin Core software, see http://www.bitcoin.org/en/download. +the Darkcoin Core software, see http://www.darkcoin.io/downloads. + License ------- -Bitcoin Core is released under the terms of the MIT license. See [COPYING](COPYING) for more +Darkcoin Core is released under the terms of the MIT license. See [COPYING](COPYING) for more information or see http://opensource.org/licenses/MIT. -Development process -------------------- -Developers work in their own trees, then submit pull requests when they think -their feature or bug fix is ready. +Building process +----------------- -If it is a simple/trivial/non-controversial change, then one of the Bitcoin -development team members simply pulls it. +**compiling Darkcoin from git** -If it is a *more complicated or potentially controversial* change, then the patch -submitter will be asked to start a discussion (if they haven't already) on the -[mailing list](http://sourceforge.net/mailarchive/forum.php?forum_name=bitcoin-development). +Use the autogen script to prepare the build environment. -The patch will be accepted if there is broad consensus that it is a good thing. -Developers should expect to rework and resubmit patches if the code doesn't -match the project's coding conventions (see [doc/coding.md](doc/coding.md)) or are -controversial. + ./autogen.sh + ./configure + make -The `master` branch is regularly built and tested, but is not guaranteed to be -completely stable. [Tags](https://github.com/bitcoin/bitcoin/tags) are created -regularly to indicate new official, stable release versions of Bitcoin. +**precompiled binaries** -Testing -------- +Precompiled binaries are available at github, see +https://github.com/darkcoinproject/darkcoin-binaries -Testing and code review is the bottleneck for development; we get more pull -requests than we can review and test. Please be patient and help out, and -remember this is a security-critical project where any mistake might cost people -lots of money. +Always verify the signatures and checksums. -### Automated Testing - -Developers are strongly encouraged to write unit tests for new code, and to -submit new unit tests for old code. Unit tests can be compiled and run (assuming they weren't disabled in configure) with: `make check` - -Every pull request is built for both Windows and Linux on a dedicated server, -and unit and sanity tests are automatically run. The binaries produced may be -used for manual QA testing — a link to them will appear in a comment on the -pull request posted by [BitcoinPullTester](https://github.com/BitcoinPullTester). See https://github.com/TheBlueMatt/test-scripts -for the build/test scripts. - -### Manual Quality Assurance (QA) Testing - -Large changes should have a test plan, and should be tested by somebody other -than the developer who wrote the code. -See https://github.com/bitcoin/QA/ for how to create a test plan. - -Translations ------------- - -Changes to translations as well as new translations can be submitted to -[Bitcoin Core's Transifex page](https://www.transifex.com/projects/p/bitcoin/). - -Periodically the translations are pulled from Transifex and merged into the git repository. See the -[translation process](doc/translation_process.md) for details on how this works. - -**Important**: We do not accept translation changes as github pull request because the next -pull from Transifex would automatically overwrite them again. Development tips and tricks --------------------------- @@ -103,7 +67,7 @@ to see it. **testnet and regtest modes** -Run with the -testnet option to run with "play bitcoins" on the test network, if you +Run with the -testnet option to run with "play darkcoins" on the test network, if you are testing multi-machine code that needs to operate across the internet. If you are testing something that can run on one machine, run with the -regtest option. @@ -112,7 +76,7 @@ that run in -regest mode. **DEBUG_LOCKORDER** -Bitcoin Core is a multithreaded application, and deadlocks or other multithreading bugs +Darkcoin Core is a multithreaded application, and deadlocks or other multithreading bugs can be very difficult to track down. Compiling with -DDEBUG_LOCKORDER (configure CXXFLAGS="-DDEBUG_LOCKORDER -g") inserts run-time checks to keep track of what locks are held, and adds warning to the debug.log file if inconsistencies are detected. diff --git a/TODO.md b/TODO.md deleted file mode 100644 index aa2546607..000000000 --- a/TODO.md +++ /dev/null @@ -1,50 +0,0 @@ -Porting Bitcoin 0.9.3 to Darkcoin -================================= - -Staging tree for Darkcoin-0.11.0. - - -DONE: ------ - -- Strings in config, path and pid (~/.darkcoin) -- Ports for communication and RPC (port=9999; rpcport=9998) -- Version numbers, protocol version, wallet version (compatible with DRK network) -- Added darkcoin seednodes -- Updated address versions (Public keys, Multisig keys) -- Changed genesisblockhash and timestamp -- Reviewed and updated checkpoints -- Adjusted algorithm (X11) -- Updated subsidity function (Block value) -- Adjusted wallet keypool size to 1000 and added loading indicator on fresh wallet load -- Adjusted difficulty and blockvalue (KGW, DGW based on blockheight) -- Defined regression test genesis block -- Updated wallet layout and branding -- Reset testnet (v4) with new genesis and address version (start with x) -- BIP0032 addresses xpub and xpriv start with x (unchanged by design) -- Changed Darkcoin units to DRK and added duffs -- Fixed internal walletminer - - -MANDATORY: ----------- - -- Check rpcminer (should be working though) - - -BUGS: ------ - -- Daemon and CLI tool can't connect to testnet/regtest instances (wrong port?) -- Daemon and CLI tool can't authenticate via RPC (uh-oh?) -- Qt wallet can't find the config file in testnet mode (wrong path?) - - -ADDITIONAL: ------------ - -- Include trusted public key for message signing -- Masternodes, Enforcement, Darksend, InstantX, Atomic Transfers, ... -- Remove Bitcoin dead weight (SHA256, hardcoded keys, seednodes, ...) -- Update strings -- Write tests From adbd2274e0d52a5a8bf515dd979576ce700e2181 Mon Sep 17 00:00:00 2001 From: vertoe Date: Fri, 12 Dec 2014 12:44:25 +0100 Subject: [PATCH 2/2] Update strings. --- qa/rpc-tests/util.py | 2 +- qa/rpc-tests/util.sh | 2 +- qa/rpc-tests/walletbackup.sh | 2 +- src/chainparams.cpp | 2 +- src/checkpoints.cpp | 2 +- src/core.cpp | 2 +- src/darkcoin-cli.cpp | 9 +- src/darkcoind.cpp | 2 +- src/hash.h | 2 +- src/init.cpp | 6 +- src/main.cpp | 8 +- src/main.h | 2 +- src/miner.cpp | 19 +- src/net.cpp | 7 +- src/noui.cpp | 3 +- src/qt/addressbookpage.cpp | 7 +- src/qt/addresstablemodel.cpp | 5 +- src/qt/askpassphrasedialog.cpp | 9 +- src/qt/bitcoinaddressvalidator.cpp | 3 +- src/qt/bitcoingui.cpp | 2 +- src/qt/bitcoinstrings.cpp | 396 ++++++++++++++--------------- src/qt/bitcoinunits.cpp | 2 +- src/qt/bitcoinunits.h | 2 +- src/qt/clientmodel.cpp | 2 +- src/qt/clientmodel.h | 2 +- src/qt/coincontroldialog.cpp | 2 +- src/qt/darkcoin.cpp | 4 +- src/qt/editaddressdialog.cpp | 5 +- src/qt/guiutil.cpp | 2 +- src/qt/intro.cpp | 2 +- src/qt/openuridialog.cpp | 7 +- src/qt/optionsmodel.cpp | 2 +- src/qt/overviewpage.cpp | 2 +- src/qt/paymentserver.cpp | 31 +-- src/qt/rpcconsole.cpp | 3 +- src/qt/sendcoinsdialog.cpp | 3 +- src/qt/sendcoinsentry.cpp | 7 +- src/qt/signverifymessagedialog.cpp | 2 +- src/qt/splashscreen.cpp | 2 +- src/qt/transactiondesc.cpp | 3 +- src/qt/transactionrecord.cpp | 5 +- src/qt/utilitydialog.cpp | 5 +- src/qt/walletmodel.cpp | 5 +- src/rpcblockchain.cpp | 8 +- src/rpcclient.cpp | 2 +- src/rpcdump.cpp | 17 +- src/rpcmining.cpp | 10 +- src/rpcmisc.cpp | 21 +- src/rpcnet.cpp | 4 +- src/rpcprotocol.cpp | 9 +- src/rpcrawtransaction.cpp | 19 +- src/rpcserver.cpp | 2 +- src/rpcwallet.cpp | 22 +- src/script.cpp | 5 +- src/test/main_tests.cpp | 2 +- src/test/netbase_tests.cpp | 2 +- src/uint256.h | 2 +- src/util.cpp | 2 +- src/util.h | 2 +- src/version.cpp | 2 +- src/version.h | 2 +- src/wallet.cpp | 8 +- src/wallet.h | 2 +- src/walletdb.cpp | 3 +- 64 files changed, 381 insertions(+), 357 deletions(-) diff --git a/qa/rpc-tests/util.py b/qa/rpc-tests/util.py index 00943aadf..985677bbc 100644 --- a/qa/rpc-tests/util.py +++ b/qa/rpc-tests/util.py @@ -1,5 +1,5 @@ # Copyright (c) 2014 The Bitcoin Core developers -# Copyright (c) 2014 vertoe & the Darkcoin developers +# Copyright (c) 2014 The Darkcoin developers # Distributed under the MIT/X11 software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. # diff --git a/qa/rpc-tests/util.sh b/qa/rpc-tests/util.sh index c9da17e4c..0cc1ce176 100644 --- a/qa/rpc-tests/util.sh +++ b/qa/rpc-tests/util.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # Copyright (c) 2014 The Bitcoin Core developers -# Copyright (c) 2014 vertoe & the Darkcoin developers +# Copyright (c) 2014 The Darkcoin developers # Distributed under the MIT/X11 software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/qa/rpc-tests/walletbackup.sh b/qa/rpc-tests/walletbackup.sh index bddd5f039..3a22eed9c 100755 --- a/qa/rpc-tests/walletbackup.sh +++ b/qa/rpc-tests/walletbackup.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # Copyright (c) 2014 The Bitcoin Core developers -# Copyright (c) 2014 vertoe & the Darkcoin developers +# Copyright (c) 2014 The Darkcoin developers # Distributed under the MIT/X11 software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 5b8b8aa4f..fee54cfc6 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers -// Copyright (c) 2014 vertoe & the Darkcoin developers +// Copyright (c) 2014 The Darkcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp index 15a5aa4e0..1a88fe91f 100644 --- a/src/checkpoints.cpp +++ b/src/checkpoints.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2014 The Bitcoin developers -// Copyright (c) 2014 vertoe & the Darkcoin developers +// Copyright (c) 2014 The Darkcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/core.cpp b/src/core.cpp index 5954ee716..086fadb07 100644 --- a/src/core.cpp +++ b/src/core.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers -// Copyright (c) 2014 vertoe & the Darkcoin developers +// Copyright (c) 2014 The Darkcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/darkcoin-cli.cpp b/src/darkcoin-cli.cpp index ce9e7a402..f3c807020 100644 --- a/src/darkcoin-cli.cpp +++ b/src/darkcoin-cli.cpp @@ -1,5 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2013 The Bitcoin developers +// Copyright (c) 2009-2013 The Darkcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -42,11 +43,11 @@ static bool AppInitRPC(int argc, char* argv[]) if (argc<2 || mapArgs.count("-?") || mapArgs.count("--help")) { // First part of help message is specific to RPC client - std::string strUsage = _("Bitcoin Core RPC client version") + " " + FormatFullVersion() + "\n\n" + + std::string strUsage = _("Darkcoin Core RPC client version") + " " + FormatFullVersion() + "\n\n" + _("Usage:") + "\n" + - " bitcoin-cli [options] [params] " + _("Send command to Bitcoin Core") + "\n" + - " bitcoin-cli [options] help " + _("List commands") + "\n" + - " bitcoin-cli [options] help " + _("Get help for a command") + "\n"; + " darkcoin-cli [options] [params] " + _("Send command to Darkcoin Core") + "\n" + + " darkcoin-cli [options] help " + _("List commands") + "\n" + + " darkcoin-cli [options] help " + _("Get help for a command") + "\n"; strUsage += "\n" + HelpMessageCli(true); diff --git a/src/darkcoind.cpp b/src/darkcoind.cpp index 84619f550..f8e92301c 100644 --- a/src/darkcoind.cpp +++ b/src/darkcoind.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers -// Copyright (c) 2014 vertoe & the Darkcoin developers +// Copyright (c) 2014 The Darkcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/hash.h b/src/hash.h index 8d529083c..2c76000d1 100644 --- a/src/hash.h +++ b/src/hash.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers -// Copyright (c) 2014 vertoe & the Darkcoin developers +// Copyright (c) 2014 The Darkcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/init.cpp b/src/init.cpp index 883d7cb87..7d88b5f99 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers -// Copyright (c) 2014 vertoe & the Darkcoin developers +// Copyright (c) 2014 The Darkcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -113,7 +113,7 @@ void Shutdown() TRY_LOCK(cs_Shutdown, lockShutdown); if (!lockShutdown) return; - RenameThread("bitcoin-shutoff"); + RenameThread("darkcoin-shutoff"); mempool.AddTransactionsUpdated(1); StopRPCThreads(); ShutdownRPCMining(); @@ -341,7 +341,7 @@ struct CImportingNow void ThreadImport(std::vector vImportFiles) { - RenameThread("bitcoin-loadblk"); + RenameThread("darkcoin-loadblk"); // -reindex if (fReindex) { diff --git a/src/main.cpp b/src/main.cpp index 7bc01201c..05165d2de 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers -// Copyright (c) 2014 vertoe & the Darkcoin developers +// Copyright (c) 2014 The Darkcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -28,7 +28,7 @@ using namespace std; using namespace boost; #if defined(NDEBUG) -# error "Bitcoin cannot be compiled without assertions." +# error "Darkcoin cannot be compiled without assertions." #endif // @@ -74,7 +74,7 @@ void EraseOrphansFor(NodeId peer); // Constant stuff for coinbase transactions we create: CScript COINBASE_FLAGS; -const string strMessageMagic = "Bitcoin Signed Message:\n"; +const string strMessageMagic = "Darkcoin Signed Message:\n"; // Internal stuff namespace { @@ -1960,7 +1960,7 @@ bool FindUndoPos(CValidationState &state, int nFile, CDiskBlockPos &pos, unsigne static CCheckQueue scriptcheckqueue(128); void ThreadScriptCheck() { - RenameThread("bitcoin-scriptch"); + RenameThread("darkcoin-scriptch"); scriptcheckqueue.Thread(); } diff --git a/src/main.h b/src/main.h index 144a6fb84..015e43d6d 100644 --- a/src/main.h +++ b/src/main.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers -// Copyright (c) 2014 vertoe & the Darkcoin developers +// Copyright (c) 2014 The Darkcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/miner.cpp b/src/miner.cpp index 5354b9741..dd51cca26 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers -// Copyright (c) 2014 vertoe & the Darkcoin developers +// Copyright (c) 2014 The Darkcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -12,9 +12,10 @@ #ifdef ENABLE_WALLET #include "wallet.h" #endif + ////////////////////////////////////////////////////////////////////////////// // -// BitcoinMiner +// DarkcoinMiner // int static FormatHashBlocks(void* pbuffer, unsigned int len) @@ -435,7 +436,7 @@ bool CheckWork(CBlock* pblock, CWallet& wallet, CReserveKey& reservekey) return false; //// debug print - LogPrintf("BitcoinMiner:\n"); + LogPrintf("DarkcoinMiner:\n"); LogPrintf("proof-of-work found \n hash: %s \ntarget: %s\n", hash.GetHex(), hashTarget.GetHex()); pblock->print(); LogPrintf("generated %s\n", FormatMoney(pblock->vtx[0].vout[0].nValue)); @@ -444,7 +445,7 @@ bool CheckWork(CBlock* pblock, CWallet& wallet, CReserveKey& reservekey) { LOCK(cs_main); if (pblock->hashPrevBlock != chainActive.Tip()->GetBlockHash()) - return error("BitcoinMiner : generated block is stale"); + return error("DarkcoinMiner : generated block is stale"); // Remove key from key pool reservekey.KeepKey(); @@ -458,7 +459,7 @@ bool CheckWork(CBlock* pblock, CWallet& wallet, CReserveKey& reservekey) // Process this block the same as if we had received it from another node CValidationState state; if (!ProcessBlock(state, NULL, pblock)) - return error("BitcoinMiner : ProcessBlock, block not accepted"); + return error("DarkcoinMiner : ProcessBlock, block not accepted"); } return true; @@ -466,9 +467,9 @@ bool CheckWork(CBlock* pblock, CWallet& wallet, CReserveKey& reservekey) void static BitcoinMiner(CWallet *pwallet) { - LogPrintf("BitcoinMiner started\n"); + LogPrintf("DarkcoinMiner started\n"); SetThreadPriority(THREAD_PRIORITY_LOWEST); - RenameThread("bitcoin-miner"); + RenameThread("darkcoin-miner"); // Each thread has its own key and counter CReserveKey reservekey(pwallet); @@ -494,7 +495,7 @@ void static BitcoinMiner(CWallet *pwallet) CBlock *pblock = &pblocktemplate->block; IncrementExtraNonce(pblock, pindexPrev, nExtraNonce); - LogPrintf("Running BitcoinMiner with %u transactions in block (%u bytes)\n", pblock->vtx.size(), + LogPrintf("Running DarkcoinMiner with %u transactions in block (%u bytes)\n", pblock->vtx.size(), ::GetSerializeSize(*pblock, SER_NETWORK, PROTOCOL_VERSION)); // @@ -595,7 +596,7 @@ void static BitcoinMiner(CWallet *pwallet) } } catch (boost::thread_interrupted) { - LogPrintf("BitcoinMiner terminated\n"); + LogPrintf("DarkcoinMiner terminated\n"); throw; } } diff --git a/src/net.cpp b/src/net.cpp index 3db2ecd69..f5d01113f 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -1,5 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers +// Copyright (c) 2014 The Darkcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -600,7 +601,7 @@ void CNode::copyStats(CNodeStats &stats) nPingUsecWait = GetTimeMicros() - nPingUsecStart; } - // Raw ping time is in microseconds, but show it to user as whole seconds (Bitcoin users should be well used to small numbers with many decimal places by now :) + // Raw ping time is in microseconds, but show it to user as whole seconds (Darkcoin users should be well used to small numbers with many decimal places by now :) stats.dPingTime = (((double)nPingUsecTime) / 1e6); stats.dPingWait = (((double)nPingUsecWait) / 1e6); @@ -1090,7 +1091,7 @@ void ThreadMapPort() } } - string strDesc = "Bitcoin " + FormatFullVersion(); + string strDesc = "Darkcoin " + FormatFullVersion(); try { while (true) { @@ -1627,7 +1628,7 @@ bool BindListenPort(const CService &addrBind, string& strError) { int nErr = WSAGetLastError(); if (nErr == WSAEADDRINUSE) - strError = strprintf(_("Unable to bind to %s on this computer. Bitcoin Core is probably already running."), addrBind.ToString()); + strError = strprintf(_("Unable to bind to %s on this computer. Darkcoin Core is probably already running."), addrBind.ToString()); else strError = strprintf(_("Unable to bind to %s on this computer (bind returned error %s)"), addrBind.ToString(), NetworkErrorString(nErr)); LogPrintf("%s\n", strError); diff --git a/src/noui.cpp b/src/noui.cpp index 32c861b0d..878a8d96e 100644 --- a/src/noui.cpp +++ b/src/noui.cpp @@ -1,5 +1,6 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers +// Copyright (c) 2014 The Darkcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -41,7 +42,7 @@ static void noui_InitMessage(const std::string &message) void noui_connect() { - // Connect bitcoind signal handlers + // Connect darkcoind signal handlers uiInterface.ThreadSafeMessageBox.connect(noui_ThreadSafeMessageBox); uiInterface.InitMessage.connect(noui_InitMessage); } diff --git a/src/qt/addressbookpage.cpp b/src/qt/addressbookpage.cpp index 2dc56a510..271c95021 100644 --- a/src/qt/addressbookpage.cpp +++ b/src/qt/addressbookpage.cpp @@ -1,4 +1,5 @@ -// Copyright (c) 2011-2013 The Bitcoin developers +// Copyright (c) 2011-2014 The Bitcoin developers +// Copyright (c) 2014 The Darkcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -61,11 +62,11 @@ AddressBookPage::AddressBookPage(Mode mode, Tabs tab, QWidget *parent) : switch(tab) { case SendingTab: - ui->labelExplanation->setText(tr("These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.")); + ui->labelExplanation->setText(tr("These are your Darkcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.")); ui->deleteAddress->setVisible(true); break; case ReceivingTab: - ui->labelExplanation->setText(tr("These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.")); + ui->labelExplanation->setText(tr("These are your Darkcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.")); ui->deleteAddress->setVisible(false); break; } diff --git a/src/qt/addresstablemodel.cpp b/src/qt/addresstablemodel.cpp index dfbd445ce..9ea422495 100644 --- a/src/qt/addresstablemodel.cpp +++ b/src/qt/addresstablemodel.cpp @@ -1,4 +1,5 @@ -// Copyright (c) 2011-2013 The Bitcoin developers +// Copyright (c) 2011-2014 The Bitcoin developers +// Copyright (c) 2014 The Darkcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -336,7 +337,7 @@ QModelIndex AddressTableModel::index(int row, int column, const QModelIndex &par void AddressTableModel::updateEntry(const QString &address, const QString &label, bool isMine, const QString &purpose, int status) { - // Update address book model from Bitcoin core + // Update address book model from Darkcoin core priv->updateEntry(address, label, isMine, purpose, status); } diff --git a/src/qt/askpassphrasedialog.cpp b/src/qt/askpassphrasedialog.cpp index 2a6d6abc3..46b1de541 100644 --- a/src/qt/askpassphrasedialog.cpp +++ b/src/qt/askpassphrasedialog.cpp @@ -1,4 +1,5 @@ -// Copyright (c) 2011-2013 The Bitcoin developers +// Copyright (c) 2011-2014 The Bitcoin developers +// Copyright (c) 2014 The Darkcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -105,7 +106,7 @@ void AskPassphraseDialog::accept() break; } QMessageBox::StandardButton retval = QMessageBox::question(this, tr("Confirm wallet encryption"), - tr("Warning: If you encrypt your wallet and lose your passphrase, you will LOSE ALL OF YOUR BITCOINS!") + "

" + tr("Are you sure you wish to encrypt your wallet?"), + tr("Warning: If you encrypt your wallet and lose your passphrase, you will LOSE ALL OF YOUR DARKCOINS!") + "

" + tr("Are you sure you wish to encrypt your wallet?"), QMessageBox::Yes|QMessageBox::Cancel, QMessageBox::Cancel); if(retval == QMessageBox::Yes) @@ -116,9 +117,9 @@ void AskPassphraseDialog::accept() { QMessageBox::warning(this, tr("Wallet encrypted"), "" + - tr("Bitcoin will close now to finish the encryption process. " + tr("Darkcoin will close now to finish the encryption process. " "Remember that encrypting your wallet cannot fully protect " - "your bitcoins from being stolen by malware infecting your computer.") + + "your darkcoins from being stolen by malware infecting your computer.") + "

" + tr("IMPORTANT: Any previous backups you have made of your wallet file " "should be replaced with the newly generated, encrypted wallet file. " diff --git a/src/qt/bitcoinaddressvalidator.cpp b/src/qt/bitcoinaddressvalidator.cpp index 293cc168b..a6eef80d2 100644 --- a/src/qt/bitcoinaddressvalidator.cpp +++ b/src/qt/bitcoinaddressvalidator.cpp @@ -1,4 +1,5 @@ // Copyright (c) 2011-2014 The Bitcoin developers +// Copyright (c) 2014 The Darkcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -88,7 +89,7 @@ BitcoinAddressCheckValidator::BitcoinAddressCheckValidator(QObject *parent) : QValidator::State BitcoinAddressCheckValidator::validate(QString &input, int &pos) const { Q_UNUSED(pos); - // Validate the passed Bitcoin address + // Validate the passed Darkcoin address CBitcoinAddress addr(input.toStdString()); if (addr.IsValid()) return QValidator::Acceptable; diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index cac12658e..218ccc76e 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2011-2014 The Bitcoin developers -// Copyright (c) 2014 vertoe & the Darkcoin developers +// Copyright (c) 2014 The Darkcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp index 1226a70eb..1c758f98c 100644 --- a/src/qt/bitcoinstrings.cpp +++ b/src/qt/bitcoinstrings.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2014 The Bitcoin developers -// Copyright (c) 2014 vertoe & the Darkcoin developers +// Copyright (c) 2014 The Darkcoin developers #include @@ -10,274 +10,274 @@ #define UNUSED #endif static const char UNUSED *bitcoin_strings[] = { -QT_TRANSLATE_NOOP("bitcoin-core", "" +QT_TRANSLATE_NOOP("darkcoin-core", "" "%s, you must set a rpcpassword in the configuration file:\n" "%s\n" "It is recommended you use the following random password:\n" -"rpcuser=bitcoinrpc\n" +"rpcuser=darkcoinrpc\n" "rpcpassword=%s\n" "(you do not need to remember this password)\n" "The username and password MUST NOT be the same.\n" "If the file does not exist, create it with owner-readable-only file " "permissions.\n" "It is also recommended to set alertnotify so you are notified of problems;\n" -"for example: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@foo.com\n"), -QT_TRANSLATE_NOOP("bitcoin-core", "" +"for example: alertnotify=echo %%s | mail -s \"Darkcoin Alert\" admin@foo.com\n"), +QT_TRANSLATE_NOOP("darkcoin-core", "" "Acceptable ciphers (default: TLSv1.2+HIGH:TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!" "3DES:@STRENGTH)"), -QT_TRANSLATE_NOOP("bitcoin-core", "" +QT_TRANSLATE_NOOP("darkcoin-core", "" "An error occurred while setting up the RPC port %u for listening on IPv4: %s"), -QT_TRANSLATE_NOOP("bitcoin-core", "" +QT_TRANSLATE_NOOP("darkcoin-core", "" "An error occurred while setting up the RPC port %u for listening on IPv6, " "falling back to IPv4: %s"), -QT_TRANSLATE_NOOP("bitcoin-core", "" +QT_TRANSLATE_NOOP("darkcoin-core", "" "Bind to given address and always listen on it. Use [host]:port notation for " "IPv6"), -QT_TRANSLATE_NOOP("bitcoin-core", "" -"Cannot obtain a lock on data directory %s. Bitcoin Core is probably already " +QT_TRANSLATE_NOOP("darkcoin-core", "" +"Cannot obtain a lock on data directory %s. Darkcoin Core is probably already " "running."), -QT_TRANSLATE_NOOP("bitcoin-core", "" +QT_TRANSLATE_NOOP("darkcoin-core", "" "Continuously rate-limit free transactions to *1000 bytes per minute " "(default:15)"), -QT_TRANSLATE_NOOP("bitcoin-core", "" +QT_TRANSLATE_NOOP("darkcoin-core", "" "Enter regression test mode, which uses a special chain in which blocks can " "be solved instantly. This is intended for regression testing tools and app " "development."), -QT_TRANSLATE_NOOP("bitcoin-core", "" +QT_TRANSLATE_NOOP("darkcoin-core", "" "Enter regression test mode, which uses a special chain in which blocks can " "be solved instantly."), -QT_TRANSLATE_NOOP("bitcoin-core", "" +QT_TRANSLATE_NOOP("darkcoin-core", "" "Error: Listening for incoming connections failed (listen returned error %d)"), -QT_TRANSLATE_NOOP("bitcoin-core", "" +QT_TRANSLATE_NOOP("darkcoin-core", "" "Error: The transaction was rejected! This might happen if some of the coins " "in your wallet were already spent, such as if you used a copy of wallet.dat " "and coins were spent in the copy but not marked as spent here."), -QT_TRANSLATE_NOOP("bitcoin-core", "" +QT_TRANSLATE_NOOP("darkcoin-core", "" "Error: This transaction requires a transaction fee of at least %s because of " "its amount, complexity, or use of recently received funds!"), -QT_TRANSLATE_NOOP("bitcoin-core", "" +QT_TRANSLATE_NOOP("darkcoin-core", "" "Execute command when a relevant alert is received or we see a really long " "fork (%s in cmd is replaced by message)"), -QT_TRANSLATE_NOOP("bitcoin-core", "" +QT_TRANSLATE_NOOP("darkcoin-core", "" "Execute command when a wallet transaction changes (%s in cmd is replaced by " "TxID)"), -QT_TRANSLATE_NOOP("bitcoin-core", "" +QT_TRANSLATE_NOOP("darkcoin-core", "" "Execute command when the best block changes (%s in cmd is replaced by block " "hash)"), -QT_TRANSLATE_NOOP("bitcoin-core", "" +QT_TRANSLATE_NOOP("darkcoin-core", "" "Fees smaller than this are considered zero fee (for transaction creation) " "(default:"), -QT_TRANSLATE_NOOP("bitcoin-core", "" +QT_TRANSLATE_NOOP("darkcoin-core", "" "Flush database activity from memory pool to disk log every megabytes " "(default: 100)"), -QT_TRANSLATE_NOOP("bitcoin-core", "" +QT_TRANSLATE_NOOP("darkcoin-core", "" "How thorough the block verification of -checkblocks is (0-4, default: 3)"), -QT_TRANSLATE_NOOP("bitcoin-core", "" +QT_TRANSLATE_NOOP("darkcoin-core", "" "In this mode -genproclimit controls how many blocks are generated " "immediately."), -QT_TRANSLATE_NOOP("bitcoin-core", "" +QT_TRANSLATE_NOOP("darkcoin-core", "" "Listen for JSON-RPC connections on (default: 9998 or testnet: 19998)"), -QT_TRANSLATE_NOOP("bitcoin-core", "" +QT_TRANSLATE_NOOP("darkcoin-core", "" "Number of seconds to keep misbehaving peers from reconnecting (default: " "86400)"), -QT_TRANSLATE_NOOP("bitcoin-core", "" +QT_TRANSLATE_NOOP("darkcoin-core", "" "Output debugging information (default: 0, supplying is optional)"), -QT_TRANSLATE_NOOP("bitcoin-core", "" +QT_TRANSLATE_NOOP("darkcoin-core", "" "Set maximum size of high-priority/low-fee transactions in bytes (default: %d)"), -QT_TRANSLATE_NOOP("bitcoin-core", "" +QT_TRANSLATE_NOOP("darkcoin-core", "" "Set the number of script verification threads (%u to %d, 0 = auto, <0 = " "leave that many cores free, default: %d)"), -QT_TRANSLATE_NOOP("bitcoin-core", "" +QT_TRANSLATE_NOOP("darkcoin-core", "" "Set the processor limit for when generation is on (-1 = unlimited, default: " "-1)"), -QT_TRANSLATE_NOOP("bitcoin-core", "" +QT_TRANSLATE_NOOP("darkcoin-core", "" "This is a pre-release test build - use at your own risk - do not use for " "mining or merchant applications"), -QT_TRANSLATE_NOOP("bitcoin-core", "" -"Unable to bind to %s on this computer. Bitcoin Core is probably already " +QT_TRANSLATE_NOOP("darkcoin-core", "" +"Unable to bind to %s on this computer. Darkcoin Core is probably already " "running."), -QT_TRANSLATE_NOOP("bitcoin-core", "" +QT_TRANSLATE_NOOP("darkcoin-core", "" "Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -" "proxy)"), -QT_TRANSLATE_NOOP("bitcoin-core", "" +QT_TRANSLATE_NOOP("darkcoin-core", "" "Warning: -paytxfee is set very high! This is the transaction fee you will " "pay if you send a transaction."), -QT_TRANSLATE_NOOP("bitcoin-core", "" +QT_TRANSLATE_NOOP("darkcoin-core", "" "Warning: Please check that your computer's date and time are correct! If " -"your clock is wrong Bitcoin will not work properly."), -QT_TRANSLATE_NOOP("bitcoin-core", "" +"your clock is wrong Darkcoin will not work properly."), +QT_TRANSLATE_NOOP("darkcoin-core", "" "Warning: The network does not appear to fully agree! Some miners appear to " "be experiencing issues."), -QT_TRANSLATE_NOOP("bitcoin-core", "" +QT_TRANSLATE_NOOP("darkcoin-core", "" "Warning: We do not appear to fully agree with our peers! You may need to " "upgrade, or other nodes may need to upgrade."), -QT_TRANSLATE_NOOP("bitcoin-core", "" +QT_TRANSLATE_NOOP("darkcoin-core", "" "Warning: error reading wallet.dat! All keys read correctly, but transaction " "data or address book entries might be missing or incorrect."), -QT_TRANSLATE_NOOP("bitcoin-core", "" +QT_TRANSLATE_NOOP("darkcoin-core", "" "Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as " "wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect " "you should restore from a backup."), -QT_TRANSLATE_NOOP("bitcoin-core", "" +QT_TRANSLATE_NOOP("darkcoin-core", "" "You must set rpcpassword= in the configuration file:\n" "%s\n" "If the file does not exist, create it with owner-readable-only file " "permissions."), -QT_TRANSLATE_NOOP("bitcoin-core", "(default: 1)"), -QT_TRANSLATE_NOOP("bitcoin-core", "(default: wallet.dat)"), -QT_TRANSLATE_NOOP("bitcoin-core", " can be:"), -QT_TRANSLATE_NOOP("bitcoin-core", "Accept command line and JSON-RPC commands"), -QT_TRANSLATE_NOOP("bitcoin-core", "Accept connections from outside (default: 1 if no -proxy or -connect)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Add a node to connect to and attempt to keep the connection open"), -QT_TRANSLATE_NOOP("bitcoin-core", "Allow DNS lookups for -addnode, -seednode and -connect"), -QT_TRANSLATE_NOOP("bitcoin-core", "Allow JSON-RPC connections from specified IP address"), -QT_TRANSLATE_NOOP("bitcoin-core", "Attempt to recover private keys from a corrupt wallet.dat"), -QT_TRANSLATE_NOOP("bitcoin-core", "Bitcoin Core Daemon"), -QT_TRANSLATE_NOOP("bitcoin-core", "Bitcoin Core RPC client version"), -QT_TRANSLATE_NOOP("bitcoin-core", "Block creation options:"), -QT_TRANSLATE_NOOP("bitcoin-core", "Cannot downgrade wallet"), -QT_TRANSLATE_NOOP("bitcoin-core", "Cannot resolve -bind address: '%s'"), -QT_TRANSLATE_NOOP("bitcoin-core", "Cannot resolve -externalip address: '%s'"), -QT_TRANSLATE_NOOP("bitcoin-core", "Cannot write default address"), -QT_TRANSLATE_NOOP("bitcoin-core", "Clear list of wallet transactions (diagnostic tool; implies -rescan)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Connect only to the specified node(s)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Connect through SOCKS proxy"), -QT_TRANSLATE_NOOP("bitcoin-core", "Connect to JSON-RPC on (default: 9998 or testnet: 19998)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Connect to a node to retrieve peer addresses, and disconnect"), -QT_TRANSLATE_NOOP("bitcoin-core", "Connection options:"), -QT_TRANSLATE_NOOP("bitcoin-core", "Corrupted block database detected"), -QT_TRANSLATE_NOOP("bitcoin-core", "Debugging/Testing options:"), -QT_TRANSLATE_NOOP("bitcoin-core", "Disable safemode, override a real safe mode event (default: 0)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Discover own IP address (default: 1 when listening and no -externalip)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Do not load the wallet and disable wallet RPC calls"), -QT_TRANSLATE_NOOP("bitcoin-core", "Do you want to rebuild the block database now?"), -QT_TRANSLATE_NOOP("bitcoin-core", "Done loading"), -QT_TRANSLATE_NOOP("bitcoin-core", "Error initializing block database"), -QT_TRANSLATE_NOOP("bitcoin-core", "Error initializing wallet database environment %s!"), -QT_TRANSLATE_NOOP("bitcoin-core", "Error loading block database"), -QT_TRANSLATE_NOOP("bitcoin-core", "Error loading wallet.dat"), -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", "Error opening block database"), -QT_TRANSLATE_NOOP("bitcoin-core", "Error"), -QT_TRANSLATE_NOOP("bitcoin-core", "Error: Disk space is low!"), -QT_TRANSLATE_NOOP("bitcoin-core", "Error: Wallet locked, unable to create transaction!"), -QT_TRANSLATE_NOOP("bitcoin-core", "Error: system error: "), -QT_TRANSLATE_NOOP("bitcoin-core", "Failed to listen on any port. Use -listen=0 if you want this."), -QT_TRANSLATE_NOOP("bitcoin-core", "Failed to read block info"), -QT_TRANSLATE_NOOP("bitcoin-core", "Failed to read block"), -QT_TRANSLATE_NOOP("bitcoin-core", "Failed to sync block index"), -QT_TRANSLATE_NOOP("bitcoin-core", "Failed to write block index"), -QT_TRANSLATE_NOOP("bitcoin-core", "Failed to write block info"), -QT_TRANSLATE_NOOP("bitcoin-core", "Failed to write block"), -QT_TRANSLATE_NOOP("bitcoin-core", "Failed to write file info"), -QT_TRANSLATE_NOOP("bitcoin-core", "Failed to write to coin database"), -QT_TRANSLATE_NOOP("bitcoin-core", "Failed to write transaction index"), -QT_TRANSLATE_NOOP("bitcoin-core", "Failed to write undo data"), -QT_TRANSLATE_NOOP("bitcoin-core", "Fee per kB to add to transactions you send"), -QT_TRANSLATE_NOOP("bitcoin-core", "Fees smaller than this are considered zero fee (for relaying) (default:"), -QT_TRANSLATE_NOOP("bitcoin-core", "Find peers using DNS lookup (default: 1 unless -connect)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Force safe mode (default: 0)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Generate coins (default: 0)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Get help for a command"), -QT_TRANSLATE_NOOP("bitcoin-core", "How many blocks to check at startup (default: 288, 0 = all)"), -QT_TRANSLATE_NOOP("bitcoin-core", "If is not supplied, output all debugging information."), -QT_TRANSLATE_NOOP("bitcoin-core", "Importing..."), -QT_TRANSLATE_NOOP("bitcoin-core", "Imports blocks from external blk000??.dat file"), -QT_TRANSLATE_NOOP("bitcoin-core", "Incorrect or no genesis block found. Wrong datadir for network?"), -QT_TRANSLATE_NOOP("bitcoin-core", "Information"), -QT_TRANSLATE_NOOP("bitcoin-core", "Insufficient funds"), -QT_TRANSLATE_NOOP("bitcoin-core", "Invalid -onion address: '%s'"), -QT_TRANSLATE_NOOP("bitcoin-core", "Invalid -proxy address: '%s'"), -QT_TRANSLATE_NOOP("bitcoin-core", "Invalid amount for -minrelaytxfee=: '%s'"), -QT_TRANSLATE_NOOP("bitcoin-core", "Invalid amount for -mintxfee=: '%s'"), -QT_TRANSLATE_NOOP("bitcoin-core", "Invalid amount for -paytxfee=: '%s'"), -QT_TRANSLATE_NOOP("bitcoin-core", "Invalid amount"), -QT_TRANSLATE_NOOP("bitcoin-core", "Limit size of signature cache to entries (default: 50000)"), -QT_TRANSLATE_NOOP("bitcoin-core", "List commands"), -QT_TRANSLATE_NOOP("bitcoin-core", "Listen for connections on (default: 9999 or testnet: 19999)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Loading addresses..."), -QT_TRANSLATE_NOOP("bitcoin-core", "Loading block index..."), -QT_TRANSLATE_NOOP("bitcoin-core", "Loading wallet..."), -QT_TRANSLATE_NOOP("bitcoin-core", "Log transaction priority and fee per kB when mining blocks (default: 0)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Maintain a full transaction index (default: 0)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Maintain at most connections to peers (default: 125)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Maximum per-connection receive buffer, *1000 bytes (default: 5000)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Maximum per-connection send buffer, *1000 bytes (default: 1000)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Not enough file descriptors available."), -QT_TRANSLATE_NOOP("bitcoin-core", "Only accept block chain matching built-in checkpoints (default: 1)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Only connect to nodes in network (IPv4, IPv6 or Tor)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Options:"), -QT_TRANSLATE_NOOP("bitcoin-core", "Password for JSON-RPC connections"), -QT_TRANSLATE_NOOP("bitcoin-core", "Prepend debug output with timestamp (default: 1)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Print block on startup, if found in block index"), -QT_TRANSLATE_NOOP("bitcoin-core", "Print block tree on startup (default: 0)"), -QT_TRANSLATE_NOOP("bitcoin-core", "RPC SSL options: (see the Bitcoin Wiki for SSL setup instructions)"), -QT_TRANSLATE_NOOP("bitcoin-core", "RPC client options:"), -QT_TRANSLATE_NOOP("bitcoin-core", "RPC server options:"), -QT_TRANSLATE_NOOP("bitcoin-core", "Randomly drop 1 of every network messages"), -QT_TRANSLATE_NOOP("bitcoin-core", "Randomly fuzz 1 of every network messages"), -QT_TRANSLATE_NOOP("bitcoin-core", "Rebuild block chain index from current blk000??.dat files"), -QT_TRANSLATE_NOOP("bitcoin-core", "Rescan the block chain for missing wallet transactions"), -QT_TRANSLATE_NOOP("bitcoin-core", "Rescanning..."), -QT_TRANSLATE_NOOP("bitcoin-core", "Run a thread to flush wallet periodically (default: 1)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Run in the background as a daemon and accept commands"), -QT_TRANSLATE_NOOP("bitcoin-core", "SSL options: (see the Bitcoin Wiki for SSL setup instructions)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Select SOCKS version for -proxy (4 or 5, default: 5)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Send command to Bitcoin Core"), -QT_TRANSLATE_NOOP("bitcoin-core", "Send commands to node running on (default: 127.0.0.1)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Send trace/debug info to console instead of debug.log file"), -QT_TRANSLATE_NOOP("bitcoin-core", "Server certificate file (default: server.cert)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Server private key (default: server.pem)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Set database cache size in megabytes (%d to %d, default: %d)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Set key pool size to (default: 100)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Set maximum block size in bytes (default: %d)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Set minimum block size in bytes (default: 0)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Set the number of threads to service RPC calls (default: 4)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Sets the DB_PRIVATE flag in the wallet db environment (default: 1)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Show all debugging options (usage: --help -help-debug)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Show benchmark information (default: 0)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Shrink debug.log file on client startup (default: 1 when no -debug)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Signing transaction failed"), -QT_TRANSLATE_NOOP("bitcoin-core", "Specify configuration file (default: darkcoin.conf)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Specify connection timeout in milliseconds (default: 5000)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Specify data directory"), -QT_TRANSLATE_NOOP("bitcoin-core", "Specify pid file (default: bitcoind.pid)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Specify wallet file (within data directory)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Specify your own public address"), -QT_TRANSLATE_NOOP("bitcoin-core", "Spend unconfirmed change when sending transactions (default: 1)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Start Bitcoin Core Daemon"), -QT_TRANSLATE_NOOP("bitcoin-core", "System error: "), -QT_TRANSLATE_NOOP("bitcoin-core", "This help message"), -QT_TRANSLATE_NOOP("bitcoin-core", "This is intended for regression testing tools and app development."), -QT_TRANSLATE_NOOP("bitcoin-core", "Threshold for disconnecting misbehaving peers (default: 100)"), -QT_TRANSLATE_NOOP("bitcoin-core", "To use the %s option"), -QT_TRANSLATE_NOOP("bitcoin-core", "Transaction amount too small"), -QT_TRANSLATE_NOOP("bitcoin-core", "Transaction amounts must be positive"), -QT_TRANSLATE_NOOP("bitcoin-core", "Transaction too large"), -QT_TRANSLATE_NOOP("bitcoin-core", "Unable to bind to %s on this computer (bind returned error %d, %s)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Unknown -socks proxy version requested: %i"), -QT_TRANSLATE_NOOP("bitcoin-core", "Unknown network specified in -onlynet: '%s'"), -QT_TRANSLATE_NOOP("bitcoin-core", "Upgrade wallet to latest format"), -QT_TRANSLATE_NOOP("bitcoin-core", "Usage (deprecated, use bitcoin-cli):"), -QT_TRANSLATE_NOOP("bitcoin-core", "Usage:"), -QT_TRANSLATE_NOOP("bitcoin-core", "Use OpenSSL (https) for JSON-RPC connections"), -QT_TRANSLATE_NOOP("bitcoin-core", "Use UPnP to map the listening port (default: 0)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Use UPnP to map the listening port (default: 1 when listening)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Use the test network"), -QT_TRANSLATE_NOOP("bitcoin-core", "Username for JSON-RPC connections"), -QT_TRANSLATE_NOOP("bitcoin-core", "Verifying blocks..."), -QT_TRANSLATE_NOOP("bitcoin-core", "Verifying wallet..."), -QT_TRANSLATE_NOOP("bitcoin-core", "Wait for RPC server to start"), -QT_TRANSLATE_NOOP("bitcoin-core", "Wallet %s resides outside data directory %s"), -QT_TRANSLATE_NOOP("bitcoin-core", "Wallet needed to be rewritten: restart Bitcoin to complete"), -QT_TRANSLATE_NOOP("bitcoin-core", "Wallet options:"), -QT_TRANSLATE_NOOP("bitcoin-core", "Warning"), -QT_TRANSLATE_NOOP("bitcoin-core", "Warning: Deprecated argument -debugnet ignored, use -debug=net"), -QT_TRANSLATE_NOOP("bitcoin-core", "Warning: This version is obsolete, upgrade required!"), -QT_TRANSLATE_NOOP("bitcoin-core", "You need to rebuild the database using -reindex to change -txindex"), -QT_TRANSLATE_NOOP("bitcoin-core", "Zapping all transactions from wallet..."), -QT_TRANSLATE_NOOP("bitcoin-core", "on startup"), -QT_TRANSLATE_NOOP("bitcoin-core", "version"), -QT_TRANSLATE_NOOP("bitcoin-core", "wallet.dat corrupt, salvage failed"), +QT_TRANSLATE_NOOP("darkcoin-core", "(default: 1)"), +QT_TRANSLATE_NOOP("darkcoin-core", "(default: wallet.dat)"), +QT_TRANSLATE_NOOP("darkcoin-core", " can be:"), +QT_TRANSLATE_NOOP("darkcoin-core", "Accept command line and JSON-RPC commands"), +QT_TRANSLATE_NOOP("darkcoin-core", "Accept connections from outside (default: 1 if no -proxy or -connect)"), +QT_TRANSLATE_NOOP("darkcoin-core", "Add a node to connect to and attempt to keep the connection open"), +QT_TRANSLATE_NOOP("darkcoin-core", "Allow DNS lookups for -addnode, -seednode and -connect"), +QT_TRANSLATE_NOOP("darkcoin-core", "Allow JSON-RPC connections from specified IP address"), +QT_TRANSLATE_NOOP("darkcoin-core", "Attempt to recover private keys from a corrupt wallet.dat"), +QT_TRANSLATE_NOOP("darkcoin-core", "Darkcoin Core Daemon"), +QT_TRANSLATE_NOOP("darkcoin-core", "Darkcoin Core RPC client version"), +QT_TRANSLATE_NOOP("darkcoin-core", "Block creation options:"), +QT_TRANSLATE_NOOP("darkcoin-core", "Cannot downgrade wallet"), +QT_TRANSLATE_NOOP("darkcoin-core", "Cannot resolve -bind address: '%s'"), +QT_TRANSLATE_NOOP("darkcoin-core", "Cannot resolve -externalip address: '%s'"), +QT_TRANSLATE_NOOP("darkcoin-core", "Cannot write default address"), +QT_TRANSLATE_NOOP("darkcoin-core", "Clear list of wallet transactions (diagnostic tool; implies -rescan)"), +QT_TRANSLATE_NOOP("darkcoin-core", "Connect only to the specified node(s)"), +QT_TRANSLATE_NOOP("darkcoin-core", "Connect through SOCKS proxy"), +QT_TRANSLATE_NOOP("darkcoin-core", "Connect to JSON-RPC on (default: 9998 or testnet: 19998)"), +QT_TRANSLATE_NOOP("darkcoin-core", "Connect to a node to retrieve peer addresses, and disconnect"), +QT_TRANSLATE_NOOP("darkcoin-core", "Connection options:"), +QT_TRANSLATE_NOOP("darkcoin-core", "Corrupted block database detected"), +QT_TRANSLATE_NOOP("darkcoin-core", "Debugging/Testing options:"), +QT_TRANSLATE_NOOP("darkcoin-core", "Disable safemode, override a real safe mode event (default: 0)"), +QT_TRANSLATE_NOOP("darkcoin-core", "Discover own IP address (default: 1 when listening and no -externalip)"), +QT_TRANSLATE_NOOP("darkcoin-core", "Do not load the wallet and disable wallet RPC calls"), +QT_TRANSLATE_NOOP("darkcoin-core", "Do you want to rebuild the block database now?"), +QT_TRANSLATE_NOOP("darkcoin-core", "Done loading"), +QT_TRANSLATE_NOOP("darkcoin-core", "Error initializing block database"), +QT_TRANSLATE_NOOP("darkcoin-core", "Error initializing wallet database environment %s!"), +QT_TRANSLATE_NOOP("darkcoin-core", "Error loading block database"), +QT_TRANSLATE_NOOP("darkcoin-core", "Error loading wallet.dat"), +QT_TRANSLATE_NOOP("darkcoin-core", "Error loading wallet.dat: Wallet corrupted"), +QT_TRANSLATE_NOOP("darkcoin-core", "Error loading wallet.dat: Wallet requires newer version of Darkcoin"), +QT_TRANSLATE_NOOP("darkcoin-core", "Error opening block database"), +QT_TRANSLATE_NOOP("darkcoin-core", "Error"), +QT_TRANSLATE_NOOP("darkcoin-core", "Error: Disk space is low!"), +QT_TRANSLATE_NOOP("darkcoin-core", "Error: Wallet locked, unable to create transaction!"), +QT_TRANSLATE_NOOP("darkcoin-core", "Error: system error: "), +QT_TRANSLATE_NOOP("darkcoin-core", "Failed to listen on any port. Use -listen=0 if you want this."), +QT_TRANSLATE_NOOP("darkcoin-core", "Failed to read block info"), +QT_TRANSLATE_NOOP("darkcoin-core", "Failed to read block"), +QT_TRANSLATE_NOOP("darkcoin-core", "Failed to sync block index"), +QT_TRANSLATE_NOOP("darkcoin-core", "Failed to write block index"), +QT_TRANSLATE_NOOP("darkcoin-core", "Failed to write block info"), +QT_TRANSLATE_NOOP("darkcoin-core", "Failed to write block"), +QT_TRANSLATE_NOOP("darkcoin-core", "Failed to write file info"), +QT_TRANSLATE_NOOP("darkcoin-core", "Failed to write to coin database"), +QT_TRANSLATE_NOOP("darkcoin-core", "Failed to write transaction index"), +QT_TRANSLATE_NOOP("darkcoin-core", "Failed to write undo data"), +QT_TRANSLATE_NOOP("darkcoin-core", "Fee per kB to add to transactions you send"), +QT_TRANSLATE_NOOP("darkcoin-core", "Fees smaller than this are considered zero fee (for relaying) (default:"), +QT_TRANSLATE_NOOP("darkcoin-core", "Find peers using DNS lookup (default: 1 unless -connect)"), +QT_TRANSLATE_NOOP("darkcoin-core", "Force safe mode (default: 0)"), +QT_TRANSLATE_NOOP("darkcoin-core", "Generate coins (default: 0)"), +QT_TRANSLATE_NOOP("darkcoin-core", "Get help for a command"), +QT_TRANSLATE_NOOP("darkcoin-core", "How many blocks to check at startup (default: 288, 0 = all)"), +QT_TRANSLATE_NOOP("darkcoin-core", "If is not supplied, output all debugging information."), +QT_TRANSLATE_NOOP("darkcoin-core", "Importing..."), +QT_TRANSLATE_NOOP("darkcoin-core", "Imports blocks from external blk000??.dat file"), +QT_TRANSLATE_NOOP("darkcoin-core", "Incorrect or no genesis block found. Wrong datadir for network?"), +QT_TRANSLATE_NOOP("darkcoin-core", "Information"), +QT_TRANSLATE_NOOP("darkcoin-core", "Insufficient funds"), +QT_TRANSLATE_NOOP("darkcoin-core", "Invalid -onion address: '%s'"), +QT_TRANSLATE_NOOP("darkcoin-core", "Invalid -proxy address: '%s'"), +QT_TRANSLATE_NOOP("darkcoin-core", "Invalid amount for -minrelaytxfee=: '%s'"), +QT_TRANSLATE_NOOP("darkcoin-core", "Invalid amount for -mintxfee=: '%s'"), +QT_TRANSLATE_NOOP("darkcoin-core", "Invalid amount for -paytxfee=: '%s'"), +QT_TRANSLATE_NOOP("darkcoin-core", "Invalid amount"), +QT_TRANSLATE_NOOP("darkcoin-core", "Limit size of signature cache to entries (default: 50000)"), +QT_TRANSLATE_NOOP("darkcoin-core", "List commands"), +QT_TRANSLATE_NOOP("darkcoin-core", "Listen for connections on (default: 9999 or testnet: 19999)"), +QT_TRANSLATE_NOOP("darkcoin-core", "Loading addresses..."), +QT_TRANSLATE_NOOP("darkcoin-core", "Loading block index..."), +QT_TRANSLATE_NOOP("darkcoin-core", "Loading wallet..."), +QT_TRANSLATE_NOOP("darkcoin-core", "Log transaction priority and fee per kB when mining blocks (default: 0)"), +QT_TRANSLATE_NOOP("darkcoin-core", "Maintain a full transaction index (default: 0)"), +QT_TRANSLATE_NOOP("darkcoin-core", "Maintain at most connections to peers (default: 125)"), +QT_TRANSLATE_NOOP("darkcoin-core", "Maximum per-connection receive buffer, *1000 bytes (default: 5000)"), +QT_TRANSLATE_NOOP("darkcoin-core", "Maximum per-connection send buffer, *1000 bytes (default: 1000)"), +QT_TRANSLATE_NOOP("darkcoin-core", "Not enough file descriptors available."), +QT_TRANSLATE_NOOP("darkcoin-core", "Only accept block chain matching built-in checkpoints (default: 1)"), +QT_TRANSLATE_NOOP("darkcoin-core", "Only connect to nodes in network (IPv4, IPv6 or Tor)"), +QT_TRANSLATE_NOOP("darkcoin-core", "Options:"), +QT_TRANSLATE_NOOP("darkcoin-core", "Password for JSON-RPC connections"), +QT_TRANSLATE_NOOP("darkcoin-core", "Prepend debug output with timestamp (default: 1)"), +QT_TRANSLATE_NOOP("darkcoin-core", "Print block on startup, if found in block index"), +QT_TRANSLATE_NOOP("darkcoin-core", "Print block tree on startup (default: 0)"), +QT_TRANSLATE_NOOP("darkcoin-core", "RPC SSL options: (see the Bitcoin Wiki for SSL setup instructions)"), +QT_TRANSLATE_NOOP("darkcoin-core", "RPC client options:"), +QT_TRANSLATE_NOOP("darkcoin-core", "RPC server options:"), +QT_TRANSLATE_NOOP("darkcoin-core", "Randomly drop 1 of every network messages"), +QT_TRANSLATE_NOOP("darkcoin-core", "Randomly fuzz 1 of every network messages"), +QT_TRANSLATE_NOOP("darkcoin-core", "Rebuild block chain index from current blk000??.dat files"), +QT_TRANSLATE_NOOP("darkcoin-core", "Rescan the block chain for missing wallet transactions"), +QT_TRANSLATE_NOOP("darkcoin-core", "Rescanning..."), +QT_TRANSLATE_NOOP("darkcoin-core", "Run a thread to flush wallet periodically (default: 1)"), +QT_TRANSLATE_NOOP("darkcoin-core", "Run in the background as a daemon and accept commands"), +QT_TRANSLATE_NOOP("darkcoin-core", "SSL options: (see the Bitcoin Wiki for SSL setup instructions)"), +QT_TRANSLATE_NOOP("darkcoin-core", "Select SOCKS version for -proxy (4 or 5, default: 5)"), +QT_TRANSLATE_NOOP("darkcoin-core", "Send command to Darkcoin Core"), +QT_TRANSLATE_NOOP("darkcoin-core", "Send commands to node running on (default: 127.0.0.1)"), +QT_TRANSLATE_NOOP("darkcoin-core", "Send trace/debug info to console instead of debug.log file"), +QT_TRANSLATE_NOOP("darkcoin-core", "Server certificate file (default: server.cert)"), +QT_TRANSLATE_NOOP("darkcoin-core", "Server private key (default: server.pem)"), +QT_TRANSLATE_NOOP("darkcoin-core", "Set database cache size in megabytes (%d to %d, default: %d)"), +QT_TRANSLATE_NOOP("darkcoin-core", "Set key pool size to (default: 100)"), +QT_TRANSLATE_NOOP("darkcoin-core", "Set maximum block size in bytes (default: %d)"), +QT_TRANSLATE_NOOP("darkcoin-core", "Set minimum block size in bytes (default: 0)"), +QT_TRANSLATE_NOOP("darkcoin-core", "Set the number of threads to service RPC calls (default: 4)"), +QT_TRANSLATE_NOOP("darkcoin-core", "Sets the DB_PRIVATE flag in the wallet db environment (default: 1)"), +QT_TRANSLATE_NOOP("darkcoin-core", "Show all debugging options (usage: --help -help-debug)"), +QT_TRANSLATE_NOOP("darkcoin-core", "Show benchmark information (default: 0)"), +QT_TRANSLATE_NOOP("darkcoin-core", "Shrink debug.log file on client startup (default: 1 when no -debug)"), +QT_TRANSLATE_NOOP("darkcoin-core", "Signing transaction failed"), +QT_TRANSLATE_NOOP("darkcoin-core", "Specify configuration file (default: darkcoin.conf)"), +QT_TRANSLATE_NOOP("darkcoin-core", "Specify connection timeout in milliseconds (default: 5000)"), +QT_TRANSLATE_NOOP("darkcoin-core", "Specify data directory"), +QT_TRANSLATE_NOOP("darkcoin-core", "Specify pid file (default: darkcoind.pid)"), +QT_TRANSLATE_NOOP("darkcoin-core", "Specify wallet file (within data directory)"), +QT_TRANSLATE_NOOP("darkcoin-core", "Specify your own public address"), +QT_TRANSLATE_NOOP("darkcoin-core", "Spend unconfirmed change when sending transactions (default: 1)"), +QT_TRANSLATE_NOOP("darkcoin-core", "Start Darkcoin Core Daemon"), +QT_TRANSLATE_NOOP("darkcoin-core", "System error: "), +QT_TRANSLATE_NOOP("darkcoin-core", "This help message"), +QT_TRANSLATE_NOOP("darkcoin-core", "This is intended for regression testing tools and app development."), +QT_TRANSLATE_NOOP("darkcoin-core", "Threshold for disconnecting misbehaving peers (default: 100)"), +QT_TRANSLATE_NOOP("darkcoin-core", "To use the %s option"), +QT_TRANSLATE_NOOP("darkcoin-core", "Transaction amount too small"), +QT_TRANSLATE_NOOP("darkcoin-core", "Transaction amounts must be positive"), +QT_TRANSLATE_NOOP("darkcoin-core", "Transaction too large"), +QT_TRANSLATE_NOOP("darkcoin-core", "Unable to bind to %s on this computer (bind returned error %d, %s)"), +QT_TRANSLATE_NOOP("darkcoin-core", "Unknown -socks proxy version requested: %i"), +QT_TRANSLATE_NOOP("darkcoin-core", "Unknown network specified in -onlynet: '%s'"), +QT_TRANSLATE_NOOP("darkcoin-core", "Upgrade wallet to latest format"), +QT_TRANSLATE_NOOP("darkcoin-core", "Usage (deprecated, use darkcoin-cli):"), +QT_TRANSLATE_NOOP("darkcoin-core", "Usage:"), +QT_TRANSLATE_NOOP("darkcoin-core", "Use OpenSSL (https) for JSON-RPC connections"), +QT_TRANSLATE_NOOP("darkcoin-core", "Use UPnP to map the listening port (default: 0)"), +QT_TRANSLATE_NOOP("darkcoin-core", "Use UPnP to map the listening port (default: 1 when listening)"), +QT_TRANSLATE_NOOP("darkcoin-core", "Use the test network"), +QT_TRANSLATE_NOOP("darkcoin-core", "Username for JSON-RPC connections"), +QT_TRANSLATE_NOOP("darkcoin-core", "Verifying blocks..."), +QT_TRANSLATE_NOOP("darkcoin-core", "Verifying wallet..."), +QT_TRANSLATE_NOOP("darkcoin-core", "Wait for RPC server to start"), +QT_TRANSLATE_NOOP("darkcoin-core", "Wallet %s resides outside data directory %s"), +QT_TRANSLATE_NOOP("darkcoin-core", "Wallet needed to be rewritten: restart Darkcoin to complete"), +QT_TRANSLATE_NOOP("darkcoin-core", "Wallet options:"), +QT_TRANSLATE_NOOP("darkcoin-core", "Warning"), +QT_TRANSLATE_NOOP("darkcoin-core", "Warning: Deprecated argument -debugnet ignored, use -debug=net"), +QT_TRANSLATE_NOOP("darkcoin-core", "Warning: This version is obsolete, upgrade required!"), +QT_TRANSLATE_NOOP("darkcoin-core", "You need to rebuild the database using -reindex to change -txindex"), +QT_TRANSLATE_NOOP("darkcoin-core", "Zapping all transactions from wallet..."), +QT_TRANSLATE_NOOP("darkcoin-core", "on startup"), +QT_TRANSLATE_NOOP("darkcoin-core", "version"), +QT_TRANSLATE_NOOP("darkcoin-core", "wallet.dat corrupt, salvage failed"), }; diff --git a/src/qt/bitcoinunits.cpp b/src/qt/bitcoinunits.cpp index 7fdc32fc3..74ab9c3d9 100644 --- a/src/qt/bitcoinunits.cpp +++ b/src/qt/bitcoinunits.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2011-2014 The Bitcoin developers -// Copyright (c) 2014 vertoe & the Darkcoin developers +// Copyright (c) 2014 The Darkcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/bitcoinunits.h b/src/qt/bitcoinunits.h index 549e80a04..8546c3783 100644 --- a/src/qt/bitcoinunits.h +++ b/src/qt/bitcoinunits.h @@ -1,5 +1,5 @@ // Copyright (c) 2011-2014 The Bitcoin developers -// Copyright (c) 2014 vertoe & the Darkcoin developers +// Copyright (c) 2014 The Darkcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp index 45ffb572c..1601086b0 100644 --- a/src/qt/clientmodel.cpp +++ b/src/qt/clientmodel.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2011-2014 The Bitcoin developers -// Copyright (c) 2014 vertoe & the Darkcoin developers +// Copyright (c) 2014 The Darkcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/clientmodel.h b/src/qt/clientmodel.h index a22593164..0fd35fa2a 100644 --- a/src/qt/clientmodel.h +++ b/src/qt/clientmodel.h @@ -1,5 +1,5 @@ // Copyright (c) 2011-2014 The Bitcoin developers -// Copyright (c) 2014 vertoe & the Darkcoin developers +// Copyright (c) 2014 The Darkcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp index 7b78c5950..27bf714e9 100644 --- a/src/qt/coincontroldialog.cpp +++ b/src/qt/coincontroldialog.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2011-2014 The Bitcoin developers -// Copyright (c) 2014 vertoe & the Darkcoin developers +// Copyright (c) 2014 The Darkcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/darkcoin.cpp b/src/qt/darkcoin.cpp index 88016437e..c1e9ac0ac 100644 --- a/src/qt/darkcoin.cpp +++ b/src/qt/darkcoin.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2014 The Bitcoin developers -// Copyright (c) 2014 vertoe & the Darkcoin developers +// Copyright (c) 2014 The Darkcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -164,7 +164,7 @@ private: void handleRunawayException(std::exception *e); }; -/** Main Bitcoin application object */ +/** Main Darkcoin application object */ class BitcoinApplication: public QApplication { Q_OBJECT diff --git a/src/qt/editaddressdialog.cpp b/src/qt/editaddressdialog.cpp index 46982cc33..840746024 100644 --- a/src/qt/editaddressdialog.cpp +++ b/src/qt/editaddressdialog.cpp @@ -1,4 +1,5 @@ -// Copyright (c) 2011-2013 The Bitcoin developers +// Copyright (c) 2011-2014 The Bitcoin developers +// Copyright (c) 2014 The Darkcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -107,7 +108,7 @@ void EditAddressDialog::accept() break; case AddressTableModel::INVALID_ADDRESS: QMessageBox::warning(this, windowTitle(), - tr("The entered address \"%1\" is not a valid Bitcoin address.").arg(ui->addressEdit->text()), + tr("The entered address \"%1\" is not a valid Darkcoin address.").arg(ui->addressEdit->text()), QMessageBox::Ok, QMessageBox::Ok); break; case AddressTableModel::DUPLICATE_ADDRESS: diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp index c51c5df24..dafe4ac85 100644 --- a/src/qt/guiutil.cpp +++ b/src/qt/guiutil.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2011-2014 The Bitcoin developers -// Copyright (c) 2014 vertoe & the Darkcoin developers +// Copyright (c) 2014 The Darkcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/intro.cpp b/src/qt/intro.cpp index 12461a2c5..46989067d 100644 --- a/src/qt/intro.cpp +++ b/src/qt/intro.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2011-2014 The Bitcoin developers -// Copyright (c) 2014 vertoe & the Darkcoin developers +// Copyright (c) 2014 The Darkcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/openuridialog.cpp b/src/qt/openuridialog.cpp index 06189aeaf..f953f5cd0 100644 --- a/src/qt/openuridialog.cpp +++ b/src/qt/openuridialog.cpp @@ -1,4 +1,5 @@ -// Copyright (c) 2011-2013 The Bitcoin developers +// Copyright (c) 2011-2014 The Bitcoin developers +// Copyright (c) 2014 The Darkcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -16,7 +17,7 @@ OpenURIDialog::OpenURIDialog(QWidget *parent) : { ui->setupUi(this); #if QT_VERSION >= 0x040700 - ui->uriEdit->setPlaceholderText("bitcoin:"); + ui->uriEdit->setPlaceholderText("darkcoin:"); #endif } @@ -48,5 +49,5 @@ void OpenURIDialog::on_selectFileButton_clicked() if(filename.isEmpty()) return; QUrl fileUri = QUrl::fromLocalFile(filename); - ui->uriEdit->setText("bitcoin:?r=" + QUrl::toPercentEncoding(fileUri.toString())); + ui->uriEdit->setText("darkcoin:?r=" + QUrl::toPercentEncoding(fileUri.toString())); } diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp index 711878800..4130469f7 100644 --- a/src/qt/optionsmodel.cpp +++ b/src/qt/optionsmodel.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2011-2014 The Bitcoin developers -// Copyright (c) 2014 vertoe & the Darkcoin developers +// Copyright (c) 2014 The Darkcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp index 3844356c9..8f93b7e44 100644 --- a/src/qt/overviewpage.cpp +++ b/src/qt/overviewpage.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2011-2014 The Bitcoin developers -// Copyright (c) 2014 vertoe & the Darkcoin developers +// Copyright (c) 2014 The Darkcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp index e43b350a9..9daedf169 100644 --- a/src/qt/paymentserver.cpp +++ b/src/qt/paymentserver.cpp @@ -1,4 +1,5 @@ -// Copyright (c) 2011-2013 The Bitcoin developers +// Copyright (c) 2011-2014 The Bitcoin developers +// Copyright (c) 2014 The Darkcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -47,10 +48,10 @@ using namespace boost; const int BITCOIN_IPC_CONNECT_TIMEOUT = 1000; // milliseconds -const QString BITCOIN_IPC_PREFIX("bitcoin:"); -const char* BITCOIN_REQUEST_MIMETYPE = "application/bitcoin-paymentrequest"; -const char* BITCOIN_PAYMENTACK_MIMETYPE = "application/bitcoin-paymentack"; -const char* BITCOIN_PAYMENTACK_CONTENTTYPE = "application/bitcoin-payment"; +const QString BITCOIN_IPC_PREFIX("darkcoin:"); +const char* BITCOIN_REQUEST_MIMETYPE = "application/darkcoin-paymentrequest"; +const char* BITCOIN_PAYMENTACK_MIMETYPE = "application/darkcoin-paymentack"; +const char* BITCOIN_PAYMENTACK_CONTENTTYPE = "application/darkcoin-payment"; X509_STORE* PaymentServer::certStore = NULL; void PaymentServer::freeCertStore() @@ -69,7 +70,7 @@ void PaymentServer::freeCertStore() // static QString ipcServerName() { - QString name("BitcoinQt"); + QString name("DarkcoinQt"); // Append a simple hash of the datadir // Note that GetDataDir(true) returns a different path @@ -186,7 +187,7 @@ bool PaymentServer::ipcParseCommandLine(int argc, char* argv[]) if (arg.startsWith("-")) continue; - if (arg.startsWith(BITCOIN_IPC_PREFIX, Qt::CaseInsensitive)) // bitcoin: URI + if (arg.startsWith(BITCOIN_IPC_PREFIX, Qt::CaseInsensitive)) // darkcoin: URI { savedPaymentRequests.append(arg); @@ -273,7 +274,7 @@ PaymentServer::PaymentServer(QObject* parent, bool startLocalServer) : GOOGLE_PROTOBUF_VERIFY_VERSION; // Install global event filter to catch QFileOpenEvents - // on Mac: sent when you click bitcoin: links + // on Mac: sent when you click darkcoin: links // other OSes: helpful when dealing with payment request files (in the future) if (parent) parent->installEventFilter(this); @@ -290,7 +291,7 @@ PaymentServer::PaymentServer(QObject* parent, bool startLocalServer) : if (!uriServer->listen(name)) { // constructor is called early in init, so don't use "emit message()" here QMessageBox::critical(0, tr("Payment request error"), - tr("Cannot start bitcoin: click-to-pay handler")); + tr("Cannot start darkcoin: click-to-pay handler")); } else { connect(uriServer, SIGNAL(newConnection()), this, SLOT(handleURIConnection())); @@ -305,12 +306,12 @@ PaymentServer::~PaymentServer() } // -// OSX-specific way of handling bitcoin: URIs and +// OSX-specific way of handling darkcoin: URIs and // PaymentRequest mime types // bool PaymentServer::eventFilter(QObject *object, QEvent *event) { - // clicking on bitcoin: URIs creates FileOpen events on the Mac + // clicking on darkcoin: URIs creates FileOpen events on the Mac if (event->type() == QEvent::FileOpen) { QFileOpenEvent *fileEvent = static_cast(event); @@ -332,7 +333,7 @@ void PaymentServer::initNetManager() if (netManager != NULL) delete netManager; - // netManager is used to fetch paymentrequests given in bitcoin: URIs + // netManager is used to fetch paymentrequests given in darkcoin: URIs netManager = new QNetworkAccessManager(this); QNetworkProxy proxy; @@ -378,7 +379,7 @@ void PaymentServer::handleURIOrFile(const QString& s) return; } - if (s.startsWith(BITCOIN_IPC_PREFIX, Qt::CaseInsensitive)) // bitcoin: URI + if (s.startsWith(BITCOIN_IPC_PREFIX, Qt::CaseInsensitive)) // darkcoin: URI { #if QT_VERSION < 0x050000 QUrl uri(s); @@ -414,7 +415,7 @@ void PaymentServer::handleURIOrFile(const QString& s) emit receivedPaymentRequest(recipient); else emit message(tr("URI handling"), - tr("URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters."), + tr("URI can not be parsed! This can be caused by an invalid Darkcoin address or malformed URI parameters."), CClientUIInterface::ICON_WARNING); return; @@ -498,7 +499,7 @@ bool PaymentServer::processPaymentRequest(PaymentRequestPlus& request, SendCoins addresses.append(QString::fromStdString(CBitcoinAddress(dest).ToString())); } else if (!recipient.authenticatedMerchant.isEmpty()){ - // Insecure payments to custom bitcoin addresses are not supported + // Insecure payments to custom darkcoin addresses are not supported // (there is no good way to tell the user where they are paying in a way // they'd have a chance of understanding). emit message(tr("Payment request error"), diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp index 0a46a722e..0fdaf1f5d 100644 --- a/src/qt/rpcconsole.cpp +++ b/src/qt/rpcconsole.cpp @@ -1,4 +1,5 @@ // Copyright (c) 2011-2014 The Bitcoin developers +// Copyright (c) 2014 The Darkcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -326,7 +327,7 @@ void RPCConsole::clear() "b { color: #006060; } " ); - message(CMD_REPLY, (tr("Welcome to the Bitcoin RPC console.") + "
" + + message(CMD_REPLY, (tr("Welcome to the Darkcoin RPC console.") + "
" + tr("Use up and down arrows to navigate history, and Ctrl-L to clear screen.") + "
" + tr("Type help for an overview of available commands.")), true); } diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp index 33621e54b..b6206c981 100644 --- a/src/qt/sendcoinsdialog.cpp +++ b/src/qt/sendcoinsdialog.cpp @@ -1,4 +1,5 @@ // Copyright (c) 2011-2014 The Bitcoin developers +// Copyright (c) 2014 The Darkcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -561,7 +562,7 @@ void SendCoinsDialog::coinControlChangeEdited(const QString& text) } else if (!addr.IsValid()) // Invalid address { - ui->labelCoinControlChangeLabel->setText(tr("Warning: Invalid Bitcoin address")); + ui->labelCoinControlChangeLabel->setText(tr("Warning: Invalid Darkcoin address")); } else // Valid address { diff --git a/src/qt/sendcoinsentry.cpp b/src/qt/sendcoinsentry.cpp index e0f56f8cd..34346d6c0 100644 --- a/src/qt/sendcoinsentry.cpp +++ b/src/qt/sendcoinsentry.cpp @@ -1,4 +1,5 @@ -// Copyright (c) 2011-2013 The Bitcoin developers +// Copyright (c) 2011-2014 The Bitcoin developers +// Copyright (c) 2014 The Darkcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -30,9 +31,9 @@ SendCoinsEntry::SendCoinsEntry(QWidget *parent) : ui->addAsLabel->setPlaceholderText(tr("Enter a label for this address to add it to your address book")); #endif - // normal bitcoin address field + // normal darkcoin address field GUIUtil::setupAddressWidget(ui->payTo, this); - // just a label for displaying bitcoin address(es) + // just a label for displaying darkcoin address(es) ui->payTo_is->setFont(GUIUtil::bitcoinAddressFont()); } diff --git a/src/qt/signverifymessagedialog.cpp b/src/qt/signverifymessagedialog.cpp index b3268faf8..893bb0073 100644 --- a/src/qt/signverifymessagedialog.cpp +++ b/src/qt/signverifymessagedialog.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2011-2014 The Bitcoin developers -// Copyright (c) 2014 vertoe & the Darkcoin developers +// Copyright (c) 2014 The Darkcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/splashscreen.cpp b/src/qt/splashscreen.cpp index d4eaed0d8..923b6f4c7 100644 --- a/src/qt/splashscreen.cpp +++ b/src/qt/splashscreen.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2011-2014 The Bitcoin developers -// Copyright (c) 2014 vertoe & the Darkcoin developers +// Copyright (c) 2014 The Darkcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp index 45fb3d40c..1f94d184b 100644 --- a/src/qt/transactiondesc.cpp +++ b/src/qt/transactiondesc.cpp @@ -1,4 +1,5 @@ // Copyright (c) 2011-2014 The Bitcoin developers +// Copyright (c) 2014 The Darkcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -226,7 +227,7 @@ QString TransactionDesc::toHTML(CWallet *wallet, CWalletTx &wtx, int vout, int u strHTML += "" + tr("Transaction ID") + ": " + TransactionRecord::formatSubTxId(wtx.GetHash(), vout) + "
"; - // Message from normal bitcoin:URI (bitcoin:123...?message=example) + // Message from normal darkcoin:URI (darkcoin:XyZ...?message=example) foreach (const PAIRTYPE(string, string)& r, wtx.vOrderForm) if (r.first == "Message") strHTML += "
" + tr("Message") + ":
" + GUIUtil::HtmlEscape(r.second, true) + "
"; diff --git a/src/qt/transactionrecord.cpp b/src/qt/transactionrecord.cpp index 5a3728f49..645928585 100644 --- a/src/qt/transactionrecord.cpp +++ b/src/qt/transactionrecord.cpp @@ -1,4 +1,5 @@ // Copyright (c) 2011-2014 The Bitcoin developers +// Copyright (c) 2014 The Darkcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -52,7 +53,7 @@ QList TransactionRecord::decomposeTransaction(const CWallet * sub.credit = txout.nValue; if (ExtractDestination(txout.scriptPubKey, address) && IsMine(*wallet, address)) { - // Received by Bitcoin Address + // Received by Darkcoin Address sub.type = TransactionRecord::RecvWithAddress; sub.address = CBitcoinAddress(address).ToString(); } @@ -113,7 +114,7 @@ QList TransactionRecord::decomposeTransaction(const CWallet * CTxDestination address; if (ExtractDestination(txout.scriptPubKey, address)) { - // Sent to Bitcoin Address + // Sent to Darkcoin Address sub.type = TransactionRecord::SendToAddress; sub.address = CBitcoinAddress(address).ToString(); } diff --git a/src/qt/utilitydialog.cpp b/src/qt/utilitydialog.cpp index 285f0407a..78bcf0301 100644 --- a/src/qt/utilitydialog.cpp +++ b/src/qt/utilitydialog.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2011-2014 The Bitcoin developers -// Copyright (c) 2014 vertoe & the Darkcoin developers +// Copyright (c) 2014 The Darkcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -27,7 +27,8 @@ AboutDialog::AboutDialog(QWidget *parent) : ui->setupUi(this); // Set current copyright year - ui->copyrightLabel->setText(tr("Copyright") + QString(" © 2009-%1 ").arg(COPYRIGHT_YEAR) + tr("The Bitcoin Core developers")); + ui->copyrightLabel->setText(tr("Copyright") + QString(" © 2009-2014 ") + tr("The Bitcoin Core developers") + QString("
") + + tr("Copyright") + QString(" © 2014-%1 ").arg(COPYRIGHT_YEAR) + tr("The Darkcoin Core developers")); } void AboutDialog::setModel(ClientModel *model) diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp index 37d82ec06..2fb2d0d42 100644 --- a/src/qt/walletmodel.cpp +++ b/src/qt/walletmodel.cpp @@ -1,4 +1,5 @@ // Copyright (c) 2011-2014 The Bitcoin developers +// Copyright (c) 2014 The Darkcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -200,7 +201,7 @@ WalletModel::SendCoinsReturn WalletModel::prepareTransaction(WalletModelTransact total += subtotal; } else - { // User-entered bitcoin address / amount: + { // User-entered darkcoin address / amount: if(!validateAddress(rcp.address)) { return InvalidAddress; @@ -282,7 +283,7 @@ WalletModel::SendCoinsReturn WalletModel::sendCoins(WalletModelTransaction &tran rcp.paymentRequest.SerializeToString(&value); newTx->vOrderForm.push_back(make_pair(key, value)); } - else if (!rcp.message.isEmpty()) // Message from normal bitcoin:URI (bitcoin:123...?message=example) + else if (!rcp.message.isEmpty()) // Message from normal darkcoin:URI (darkcoin:XyZ...?message=example) newTx->vOrderForm.push_back(make_pair("Message", rcp.message.toStdString())); } diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp index c2edbda67..c4e2b218b 100644 --- a/src/rpcblockchain.cpp +++ b/src/rpcblockchain.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers -// Copyright (c) 2014 vertoe & the Darkcoin developers +// Copyright (c) 2014 The Darkcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -146,7 +146,7 @@ Value getrawmempool(const Array& params, bool fHelp) "{ (json object)\n" " \"transactionid\" : { (json object)\n" " \"size\" : n, (numeric) transaction size in bytes\n" - " \"fee\" : n, (numeric) transaction fee in bitcoins\n" + " \"fee\" : n, (numeric) transaction fee in darkcoins\n" " \"time\" : n, (numeric) local time transaction entered pool in seconds since 1 Jan 1970 GMT\n" " \"height\" : n, (numeric) block height when transaction entered pool\n" " \"startingpriority\" : n, (numeric) priority when transaction entered pool\n" @@ -349,8 +349,8 @@ Value gettxout(const Array& params, bool fHelp) " \"hex\" : \"hex\", (string) \n" " \"reqSigs\" : n, (numeric) Number of required signatures\n" " \"type\" : \"pubkeyhash\", (string) The type, eg pubkeyhash\n" - " \"addresses\" : [ (array of string) array of bitcoin addresses\n" - " \"bitcoinaddress\" (string) bitcoin address\n" + " \"addresses\" : [ (array of string) array of darkcoin addresses\n" + " \"darkcoinaddress\" (string) darkcoin address\n" " ,...\n" " ]\n" " },\n" diff --git a/src/rpcclient.cpp b/src/rpcclient.cpp index 5f7980972..eebbc3c12 100644 --- a/src/rpcclient.cpp +++ b/src/rpcclient.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers -// Copyright (c) 2014 vertoe & the Darkcoin developers +// Copyright (c) 2014 The Darkcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/rpcdump.cpp b/src/rpcdump.cpp index 593e0d2b6..c14724fc2 100644 --- a/src/rpcdump.cpp +++ b/src/rpcdump.cpp @@ -1,4 +1,5 @@ // Copyright (c) 2009-2014 The Bitcoin developers +// Copyright (c) 2014 The Darkcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -55,7 +56,7 @@ std::string DecodeDumpString(const std::string &str) { for (unsigned int pos = 0; pos < str.length(); pos++) { unsigned char c = str[pos]; if (c == '%' && pos+2 < str.length()) { - c = (((str[pos+1]>>6)*9+((str[pos+1]-'0')&15)) << 4) | + c = (((str[pos+1]>>6)*9+((str[pos+1]-'0')&15)) << 4) | ((str[pos+2]>>6)*9+((str[pos+2]-'0')&15)); pos += 2; } @@ -68,10 +69,10 @@ Value importprivkey(const Array& params, bool fHelp) { if (fHelp || params.size() < 1 || params.size() > 3) throw runtime_error( - "importprivkey \"bitcoinprivkey\" ( \"label\" rescan )\n" + "importprivkey \"darkcoinprivkey\" ( \"label\" rescan )\n" "\nAdds a private key (as returned by dumpprivkey) to your wallet.\n" "\nArguments:\n" - "1. \"bitcoinprivkey\" (string, required) The private key (see dumpprivkey)\n" + "1. \"darkcoinprivkey\" (string, required) The private key (see dumpprivkey)\n" "2. \"label\" (string, optional) an optional label\n" "3. rescan (boolean, optional, default=true) Rescan the wallet for transactions\n" "\nExamples:\n" @@ -235,11 +236,11 @@ Value dumpprivkey(const Array& params, bool fHelp) { if (fHelp || params.size() != 1) throw runtime_error( - "dumpprivkey \"bitcoinaddress\"\n" - "\nReveals the private key corresponding to 'bitcoinaddress'.\n" + "dumpprivkey \"darkcoinaddress\"\n" + "\nReveals the private key corresponding to 'darkcoinaddress'.\n" "Then the importprivkey can be used with this output\n" "\nArguments:\n" - "1. \"bitcoinaddress\" (string, required) The bitcoin address for the private key\n" + "1. \"darkcoinaddress\" (string, required) The darkcoin address for the private key\n" "\nResult:\n" "\"key\" (string) The private key\n" "\nExamples:\n" @@ -253,7 +254,7 @@ Value dumpprivkey(const Array& params, bool fHelp) string strAddress = params[0].get_str(); CBitcoinAddress address; if (!address.SetString(strAddress)) - throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Bitcoin address"); + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Darkcoin address"); CKeyID keyID; if (!address.GetKeyID(keyID)) throw JSONRPCError(RPC_TYPE_ERROR, "Address does not refer to a key"); @@ -298,7 +299,7 @@ Value dumpwallet(const Array& params, bool fHelp) std::sort(vKeyBirth.begin(), vKeyBirth.end()); // produce output - file << strprintf("# Wallet dump created by Bitcoin %s (%s)\n", CLIENT_BUILD, CLIENT_DATE); + file << strprintf("# Wallet dump created by Darkcoin %s (%s)\n", CLIENT_BUILD, CLIENT_DATE); file << strprintf("# * Created on %s\n", EncodeDumpTime(GetTime())); file << strprintf("# * Best block at time of backup was %i (%s),\n", chainActive.Height(), chainActive.Tip()->GetBlockHash().ToString()); file << strprintf("# mined on %s\n", EncodeDumpTime(chainActive.Tip()->nTime)); diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp index 3534253ad..cc588cbc7 100644 --- a/src/rpcmining.cpp +++ b/src/rpcmining.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers -// Copyright (c) 2014 vertoe & the Darkcoin developers +// Copyright (c) 2014 The Darkcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -300,10 +300,10 @@ Value getwork(const Array& params, bool fHelp) ); if (vNodes.empty()) - throw JSONRPCError(RPC_CLIENT_NOT_CONNECTED, "Bitcoin is not connected!"); + throw JSONRPCError(RPC_CLIENT_NOT_CONNECTED, "Darkcoin is not connected!"); if (IsInitialBlockDownload()) - throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, "Bitcoin is downloading blocks..."); + throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, "Darkcoin is downloading blocks..."); typedef map > mapNewBlock_t; static mapNewBlock_t mapNewBlock; // FIXME: thread safety @@ -482,10 +482,10 @@ Value getblocktemplate(const Array& params, bool fHelp) throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid mode"); if (vNodes.empty()) - throw JSONRPCError(RPC_CLIENT_NOT_CONNECTED, "Bitcoin is not connected!"); + throw JSONRPCError(RPC_CLIENT_NOT_CONNECTED, "Darkcoin is not connected!"); if (IsInitialBlockDownload()) - throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, "Bitcoin is downloading blocks..."); + throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, "Darkcoin is downloading blocks..."); // Update block static unsigned int nTransactionsUpdatedLast; diff --git a/src/rpcmisc.cpp b/src/rpcmisc.cpp index 27d6d61a3..afec75c97 100644 --- a/src/rpcmisc.cpp +++ b/src/rpcmisc.cpp @@ -1,5 +1,6 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers +// Copyright (c) 2014 The Darkcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -37,7 +38,7 @@ Value getinfo(const Array& params, bool fHelp) " \"version\": xxxxx, (numeric) the server version\n" " \"protocolversion\": xxxxx, (numeric) the protocol version\n" " \"walletversion\": xxxxx, (numeric) the wallet version\n" - " \"balance\": xxxxxxx, (numeric) the total bitcoin balance of the wallet\n" + " \"balance\": xxxxxxx, (numeric) the total darkcoin balance of the wallet\n" " \"blocks\": xxxxxx, (numeric) the current number of blocks processed in the server\n" " \"timeoffset\": xxxxx, (numeric) the time offset\n" " \"connections\": xxxxx, (numeric) the number of connections\n" @@ -130,14 +131,14 @@ Value validateaddress(const Array& params, bool fHelp) { if (fHelp || params.size() != 1) throw runtime_error( - "validateaddress \"bitcoinaddress\"\n" - "\nReturn information about the given bitcoin address.\n" + "validateaddress \"darkcoinaddress\"\n" + "\nReturn information about the given darkcoin address.\n" "\nArguments:\n" - "1. \"bitcoinaddress\" (string, required) The bitcoin address to validate\n" + "1. \"darkcoinaddress\" (string, required) The darkcoin address to validate\n" "\nResult:\n" "{\n" " \"isvalid\" : true|false, (boolean) If the address is valid or not. If not, this is the only property returned.\n" - " \"address\" : \"bitcoinaddress\", (string) The bitcoin address validated\n" + " \"address\" : \"darkcoinaddress\", (string) The darkcoin address validated\n" " \"ismine\" : true|false, (boolean) If the address is yours or not\n" " \"isscript\" : true|false, (boolean) If the key is a script\n" " \"pubkey\" : \"publickeyhex\", (string) The hex value of the raw public key\n" @@ -194,7 +195,7 @@ CScript _createmultisig_redeemScript(const Array& params) { const std::string& ks = keys[i].get_str(); #ifdef ENABLE_WALLET - // Case 1: Bitcoin address and we have full public key: + // Case 1: Darkcoin address and we have full public key: CBitcoinAddress address(ks); if (pwalletMain && address.IsValid()) { @@ -246,9 +247,9 @@ Value createmultisig(const Array& params, bool fHelp) "\nArguments:\n" "1. nrequired (numeric, required) The number of required signatures out of the n keys or addresses.\n" - "2. \"keys\" (string, required) A json array of keys which are bitcoin addresses or hex-encoded public keys\n" + "2. \"keys\" (string, required) A json array of keys which are darkcoin addresses or hex-encoded public keys\n" " [\n" - " \"key\" (string) bitcoin address or hex-encoded public key\n" + " \"key\" (string) darkcoin address or hex-encoded public key\n" " ,...\n" " ]\n" @@ -283,10 +284,10 @@ Value verifymessage(const Array& params, bool fHelp) { if (fHelp || params.size() != 3) throw runtime_error( - "verifymessage \"bitcoinaddress\" \"signature\" \"message\"\n" + "verifymessage \"darkcoinaddress\" \"signature\" \"message\"\n" "\nVerify a signed message\n" "\nArguments:\n" - "1. \"bitcoinaddress\" (string, required) The bitcoin address to use for the signature.\n" + "1. \"darkcoinaddress\" (string, required) The darkcoin address to use for the signature.\n" "2. \"signature\" (string, required) The signature provided by the signer in base 64 encoding (see signmessage).\n" "3. \"message\" (string, required) The message that was signed.\n" "\nResult:\n" diff --git a/src/rpcnet.cpp b/src/rpcnet.cpp index f92a94484..41b100d90 100644 --- a/src/rpcnet.cpp +++ b/src/rpcnet.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2014 The Bitcoin developers -// Copyright (c) 2014 vertoe & the Darkcoin developers +// Copyright (c) 2014 The Darkcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -212,7 +212,7 @@ Value getaddednodeinfo(const Array& params, bool fHelp) " \"connected\" : true|false, (boolean) If connected\n" " \"addresses\" : [\n" " {\n" - " \"address\" : \"192.168.0.201:9999\", (string) The bitcoin server host and port\n" + " \"address\" : \"192.168.0.201:9999\", (string) The darkcoin server host and port\n" " \"connected\" : \"outbound\" (string) connection, inbound or outbound\n" " }\n" " ,...\n" diff --git a/src/rpcprotocol.cpp b/src/rpcprotocol.cpp index 2718f8178..99e3febd0 100644 --- a/src/rpcprotocol.cpp +++ b/src/rpcprotocol.cpp @@ -1,5 +1,6 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers +// Copyright (c) 2014 The Darkcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -36,7 +37,7 @@ string HTTPPost(const string& strMsg, const map& mapRequestHeader { ostringstream s; s << "POST / HTTP/1.1\r\n" - << "User-Agent: bitcoin-json-rpc/" << FormatFullVersion() << "\r\n" + << "User-Agent: darkcoin-json-rpc/" << FormatFullVersion() << "\r\n" << "Host: 127.0.0.1\r\n" << "Content-Type: application/json\r\n" << "Content-Length: " << strMsg.size() << "\r\n" @@ -59,7 +60,7 @@ string HTTPReply(int nStatus, const string& strMsg, bool keepalive) if (nStatus == HTTP_UNAUTHORIZED) return strprintf("HTTP/1.0 401 Authorization Required\r\n" "Date: %s\r\n" - "Server: bitcoin-json-rpc/%s\r\n" + "Server: darkcoin-json-rpc/%s\r\n" "WWW-Authenticate: Basic realm=\"jsonrpc\"\r\n" "Content-Type: text/html\r\n" "Content-Length: 296\r\n" @@ -86,7 +87,7 @@ string HTTPReply(int nStatus, const string& strMsg, bool keepalive) "Connection: %s\r\n" "Content-Length: %u\r\n" "Content-Type: application/json\r\n" - "Server: bitcoin-json-rpc/%s\r\n" + "Server: darkcoin-json-rpc/%s\r\n" "\r\n" "%s", nStatus, @@ -208,7 +209,7 @@ int ReadHTTPMessage(std::basic_istream& stream, map >& vecSend, // The following if statement should be removed once enough miners // have upgraded to the 0.9 GetMinFee() rules. Until then, this avoids // creating free transactions that have change outputs less than - // CENT bitcoins. + // CENT darkcoins. if (nFeeRet < CTransaction::nMinTxFee && nChange > 0 && nChange < CENT) { int64_t nMoveToFee = min(nChange, CTransaction::nMinTxFee - nFeeRet); @@ -1304,7 +1304,7 @@ bool CWallet::CreateTransaction(const vector >& vecSend, { // Fill a vout to ourself // TODO: pass in scriptChange instead of reservekey so - // change transaction isn't always pay-to-bitcoin-address + // change transaction isn't always pay-to-darkcoin-address CScript scriptChange; // coin control: send change to custom address @@ -1484,7 +1484,7 @@ string CWallet::SendMoneyToDestination(const CTxDestination& address, int64_t nV if (nValue + nTransactionFee > GetBalance()) return _("Insufficient funds"); - // Parse Bitcoin address + // Parse Darkcoin address CScript scriptPubKey; scriptPubKey.SetDestination(address); diff --git a/src/wallet.h b/src/wallet.h index 1ec4b3c0b..9934e7b4e 100644 --- a/src/wallet.h +++ b/src/wallet.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers -// Copyright (c) 2014 vertoe & the Darkcoin developers +// Copyright (c) 2014 The Darkcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #ifndef BITCOIN_WALLET_H diff --git a/src/walletdb.cpp b/src/walletdb.cpp index 80e9dded5..146ba2c69 100644 --- a/src/walletdb.cpp +++ b/src/walletdb.cpp @@ -1,5 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers +// Copyright (c) 2014 The Darkcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -763,7 +764,7 @@ DBErrors CWalletDB::ZapWalletTx(CWallet* pwallet) void ThreadFlushWalletDB(const string& strFile) { // Make this thread recognisable as the wallet flushing thread - RenameThread("bitcoin-wallet"); + RenameThread("darkcoin-wallet"); static bool fOneThread; if (fOneThread)