Skip to content

Commit 8eaae32

Browse files
darkcoinprojectdarkcoinproject
committed
Merge pull request #70 from vertoe/devel-0.9
Update strings
2 parents 7a0df8c + 3f0ad3f commit 8eaae32

35 files changed

Lines changed: 360 additions & 421 deletions

‎README.md‎

Lines changed: 28 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,86 +1,51 @@
1-
Bitcoin Core integration/staging tree
2-
=====================================
1+
Darkcoin Core staging tree 0.11
2+
===============================
33

4-
http://www.bitcoin.org
4+
http://www.darkcoin.io
55

66
Copyright (c) 2009-2014 Bitcoin Core Developers
77

8-
What is Bitcoin?
8+
Copyright (c) 2014 Darkcoin Core Developers
9+
10+
11+
What is Darkcoin?
912
----------------
1013

11-
Bitcoin is an experimental new digital currency that enables instant payments to
12-
anyone, anywhere in the world. Bitcoin uses peer-to-peer technology to operate
13-
with no central authority: managing transactions and issuing money are carried
14-
out collectively by the network. Bitcoin Core is the name of open source
15-
software which enables the use of this currency.
14+
Darkcoin is an experimental new digital currency that enables anonymous, instant
15+
payments to anyone, anywhere in the world. Darkcoin uses peer-to-peer technology
16+
to operate with no central authority: managing transactions and issuing money
17+
are carried out collectively by the network. Darkcoin Core is the name of open
18+
source software which enables the use of this currency.
1619

1720
For more information, as well as an immediately useable, binary version of
18-
the Bitcoin Core software, see http://www.bitcoin.org/en/download.
21+
the Darkcoin Core software, see http://www.darkcoin.io/downloads.
22+
1923

2024
License
2125
-------
2226

23-
Bitcoin Core is released under the terms of the MIT license. See [COPYING](COPYING) for more
27+
Darkcoin Core is released under the terms of the MIT license. See [COPYING](COPYING) for more
2428
information or see http://opensource.org/licenses/MIT.
2529

26-
Development process
27-
-------------------
28-
29-
Developers work in their own trees, then submit pull requests when they think
30-
their feature or bug fix is ready.
31-
32-
If it is a simple/trivial/non-controversial change, then one of the Bitcoin
33-
development team members simply pulls it.
34-
35-
If it is a *more complicated or potentially controversial* change, then the patch
36-
submitter will be asked to start a discussion (if they haven't already) on the
37-
[mailing list](http://sourceforge.net/mailarchive/forum.php?forum_name=bitcoin-development).
38-
39-
The patch will be accepted if there is broad consensus that it is a good thing.
40-
Developers should expect to rework and resubmit patches if the code doesn't
41-
match the project's coding conventions (see [doc/coding.md](doc/coding.md)) or are
42-
controversial.
43-
44-
The `master` branch is regularly built and tested, but is not guaranteed to be
45-
completely stable. [Tags](https://github.com/bitcoin/bitcoin/tags) are created
46-
regularly to indicate new official, stable release versions of Bitcoin.
47-
48-
Testing
49-
-------
50-
51-
Testing and code review is the bottleneck for development; we get more pull
52-
requests than we can review and test. Please be patient and help out, and
53-
remember this is a security-critical project where any mistake might cost people
54-
lots of money.
55-
56-
### Automated Testing
5730

58-
Developers are strongly encouraged to write unit tests for new code, and to
59-
submit new unit tests for old code. Unit tests can be compiled and run (assuming they weren't disabled in configure) with: `make check`
31+
Building process
32+
-----------------
6033

61-
Every pull request is built for both Windows and Linux on a dedicated server,
62-
and unit and sanity tests are automatically run. The binaries produced may be
63-
used for manual QA testing — a link to them will appear in a comment on the
64-
pull request posted by [BitcoinPullTester](https://github.com/BitcoinPullTester). See https://github.com/TheBlueMatt/test-scripts
65-
for the build/test scripts.
34+
**compiling Darkcoin from git**
6635

67-
### Manual Quality Assurance (QA) Testing
36+
Use the autogen script to prepare the build environment.
6837

69-
Large changes should have a test plan, and should be tested by somebody other
70-
than the developer who wrote the code.
71-
See https://github.com/bitcoin/QA/ for how to create a test plan.
38+
./autogen.sh
39+
./configure
40+
make
7241

73-
Translations
74-
------------
42+
**precompiled binaries**
7543

76-
Changes to translations as well as new translations can be submitted to
77-
[Bitcoin Core's Transifex page](https://www.transifex.com/projects/p/bitcoin/).
44+
Precompiled binaries are available at github, see
45+
https://github.com/darkcoinproject/darkcoin-binaries
7846

79-
Periodically the translations are pulled from Transifex and merged into the git repository. See the
80-
[translation process](doc/translation_process.md) for details on how this works.
47+
Always verify the signatures and checksums.
8148

82-
**Important**: We do not accept translation changes as github pull request because the next
83-
pull from Transifex would automatically overwrite them again.
8449

8550
Development tips and tricks
8651
---------------------------
@@ -103,7 +68,7 @@ to see it.
10368

10469
**testnet and regtest modes**
10570

106-
Run with the -testnet option to run with "play bitcoins" on the test network, if you
71+
Run with the -testnet option to run with "play darkcoins" on the test network, if you
10772
are testing multi-machine code that needs to operate across the internet.
10873

10974
If you are testing something that can run on one machine, run with the -regtest option.
@@ -112,7 +77,7 @@ that run in -regest mode.
11277

11378
**DEBUG_LOCKORDER**
11479

115-
Bitcoin Core is a multithreaded application, and deadlocks or other multithreading bugs
80+
Darkcoin Core is a multithreaded application, and deadlocks or other multithreading bugs
11681
can be very difficult to track down. Compiling with -DDEBUG_LOCKORDER (configure
11782
CXXFLAGS="-DDEBUG_LOCKORDER -g") inserts run-time checks to keep track of what locks
11883
are held, and adds warning to the debug.log file if inconsistencies are detected.

‎TODO.md‎

Lines changed: 0 additions & 50 deletions
This file was deleted.

‎src/darkcoin-cli.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// Copyright (c) 2009-2010 Satoshi Nakamoto
22
// Copyright (c) 2009-2013 The Bitcoin developers
3+
// Copyright (c) 2009-2013 The Darkcoin developers
34
// Distributed under the MIT/X11 software license, see the accompanying
45
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
56

‎src/init.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ void Shutdown()
114114
TRY_LOCK(cs_Shutdown, lockShutdown);
115115
if (!lockShutdown) return;
116116

117-
RenameThread("bitcoin-shutoff");
117+
RenameThread("darkcoin-shutoff");
118118
mempool.AddTransactionsUpdated(1);
119119
StopRPCThreads();
120120
ShutdownRPCMining();
@@ -342,7 +342,7 @@ struct CImportingNow
342342

343343
void ThreadImport(std::vector<boost::filesystem::path> vImportFiles)
344344
{
345-
RenameThread("bitcoin-loadblk");
345+
RenameThread("darkcoin-loadblk");
346346

347347
// -reindex
348348
if (fReindex) {

‎src/main.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ using namespace std;
3131
using namespace boost;
3232

3333
#if defined(NDEBUG)
34-
# error "Bitcoin cannot be compiled without assertions."
34+
# error "Darkcoin cannot be compiled without assertions."
3535
#endif
3636

3737
//
@@ -2273,7 +2273,7 @@ bool FindUndoPos(CValidationState &state, int nFile, CDiskBlockPos &pos, unsigne
22732273
static CCheckQueue<CScriptCheck> scriptcheckqueue(128);
22742274

22752275
void ThreadScriptCheck() {
2276-
RenameThread("bitcoin-scriptch");
2276+
RenameThread("darkcoin-scriptch");
22772277
scriptcheckqueue.Thread();
22782278
}
22792279

‎src/miner.cpp‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@
1212
#ifdef ENABLE_WALLET
1313
#include "wallet.h"
1414
#endif
15+
1516
//////////////////////////////////////////////////////////////////////////////
1617
//
17-
// BitcoinMiner
18+
// DarkcoinMiner
1819
//
1920

2021
int static FormatHashBlocks(void* pbuffer, unsigned int len)
@@ -487,7 +488,7 @@ bool CheckWork(CBlock* pblock, CWallet& wallet, CReserveKey& reservekey)
487488
return false;
488489

489490
//// debug print
490-
LogPrintf("BitcoinMiner:\n");
491+
LogPrintf("DarkcoinMiner:\n");
491492
LogPrintf("proof-of-work found \n hash: %s \ntarget: %s\n", hash.GetHex(), hashTarget.GetHex());
492493
pblock->print();
493494
LogPrintf("generated %s\n", FormatMoney(pblock->vtx[0].vout[0].nValue));
@@ -496,7 +497,7 @@ bool CheckWork(CBlock* pblock, CWallet& wallet, CReserveKey& reservekey)
496497
{
497498
LOCK(cs_main);
498499
if (pblock->hashPrevBlock != chainActive.Tip()->GetBlockHash())
499-
return error("BitcoinMiner : generated block is stale");
500+
return error("DarkcoinMiner : generated block is stale");
500501

501502
// Remove key from key pool
502503
reservekey.KeepKey();
@@ -510,17 +511,17 @@ bool CheckWork(CBlock* pblock, CWallet& wallet, CReserveKey& reservekey)
510511
// Process this block the same as if we had received it from another node
511512
CValidationState state;
512513
if (!ProcessBlock(state, NULL, pblock))
513-
return error("BitcoinMiner : ProcessBlock, block not accepted");
514+
return error("DarkcoinMiner : ProcessBlock, block not accepted");
514515
}
515516

516517
return true;
517518
}
518519

519520
void static BitcoinMiner(CWallet *pwallet)
520521
{
521-
LogPrintf("BitcoinMiner started\n");
522+
LogPrintf("DarkcoinMiner started\n");
522523
SetThreadPriority(THREAD_PRIORITY_LOWEST);
523-
RenameThread("bitcoin-miner");
524+
RenameThread("darkcoin-miner");
524525

525526
// Each thread has its own key and counter
526527
CReserveKey reservekey(pwallet);
@@ -546,7 +547,7 @@ void static BitcoinMiner(CWallet *pwallet)
546547
CBlock *pblock = &pblocktemplate->block;
547548
IncrementExtraNonce(pblock, pindexPrev, nExtraNonce);
548549

549-
LogPrintf("Running BitcoinMiner with %u transactions in block (%u bytes)\n", pblock->vtx.size(),
550+
LogPrintf("Running DarkcoinMiner with %u transactions in block (%u bytes)\n", pblock->vtx.size(),
550551
::GetSerializeSize(*pblock, SER_NETWORK, PROTOCOL_VERSION));
551552

552553
//
@@ -647,7 +648,7 @@ void static BitcoinMiner(CWallet *pwallet)
647648
} }
648649
catch (boost::thread_interrupted)
649650
{
650-
LogPrintf("BitcoinMiner terminated\n");
651+
LogPrintf("DarkcoinMiner terminated\n");
651652
throw;
652653
}
653654
}

‎src/net.cpp‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// Copyright (c) 2009-2010 Satoshi Nakamoto
22
// Copyright (c) 2009-2014 The Bitcoin developers
3+
// Copyright (c) 2014 The Darkcoin developers
34
// Distributed under the MIT/X11 software license, see the accompanying
45
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
56

@@ -606,7 +607,7 @@ void CNode::copyStats(CNodeStats &stats)
606607
nPingUsecWait = GetTimeMicros() - nPingUsecStart;
607608
}
608609

609-
// 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 :)
610+
// 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 :)
610611
stats.dPingTime = (((double)nPingUsecTime) / 1e6);
611612
stats.dPingWait = (((double)nPingUsecWait) / 1e6);
612613

@@ -1096,7 +1097,7 @@ void ThreadMapPort()
10961097
}
10971098
}
10981099

1099-
string strDesc = "Bitcoin " + FormatFullVersion();
1100+
string strDesc = "Darkcoin " + FormatFullVersion();
11001101

11011102
try {
11021103
while (true) {
@@ -1633,7 +1634,7 @@ bool BindListenPort(const CService &addrBind, string& strError)
16331634
{
16341635
int nErr = WSAGetLastError();
16351636
if (nErr == WSAEADDRINUSE)
1636-
strError = strprintf(_("Unable to bind to %s on this computer. Bitcoin Core is probably already running."), addrBind.ToString());
1637+
strError = strprintf(_("Unable to bind to %s on this computer. Darkcoin Core is probably already running."), addrBind.ToString());
16371638
else
16381639
strError = strprintf(_("Unable to bind to %s on this computer (bind returned error %s)"), addrBind.ToString(), NetworkErrorString(nErr));
16391640
LogPrintf("%s\n", strError);

‎src/noui.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// Copyright (c) 2010 Satoshi Nakamoto
22
// Copyright (c) 2009-2014 The Bitcoin developers
3+
// Copyright (c) 2014 The Darkcoin developers
34
// Distributed under the MIT/X11 software license, see the accompanying
45
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
56

@@ -41,7 +42,7 @@ static void noui_InitMessage(const std::string &message)
4142

4243
void noui_connect()
4344
{
44-
// Connect bitcoind signal handlers
45+
// Connect darkcoind signal handlers
4546
uiInterface.ThreadSafeMessageBox.connect(noui_ThreadSafeMessageBox);
4647
uiInterface.InitMessage.connect(noui_InitMessage);
4748
}

‎src/qt/addressbookpage.cpp‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
// Copyright (c) 2011-2013 The Bitcoin developers
1+
// Copyright (c) 2011-2014 The Bitcoin developers
2+
// Copyright (c) 2014 The Darkcoin developers
23
// Distributed under the MIT/X11 software license, see the accompanying
34
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
45

@@ -61,11 +62,11 @@ AddressBookPage::AddressBookPage(Mode mode, Tabs tab, QWidget *parent) :
6162
switch(tab)
6263
{
6364
case SendingTab:
64-
ui->labelExplanation->setText(tr("These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins."));
65+
ui->labelExplanation->setText(tr("These are your Darkcoin addresses for sending payments. Always check the amount and the receiving address before sending coins."));
6566
ui->deleteAddress->setVisible(true);
6667
break;
6768
case ReceivingTab:
68-
ui->labelExplanation->setText(tr("These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction."));
69+
ui->labelExplanation->setText(tr("These are your Darkcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction."));
6970
ui->deleteAddress->setVisible(false);
7071
break;
7172
}

‎src/qt/addresstablemodel.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
// Copyright (c) 2011-2013 The Bitcoin developers
1+
// Copyright (c) 2011-2014 The Bitcoin developers
2+
// Copyright (c) 2014 The Darkcoin developers
23
// Distributed under the MIT/X11 software license, see the accompanying
34
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
45

@@ -336,7 +337,7 @@ QModelIndex AddressTableModel::index(int row, int column, const QModelIndex &par
336337
void AddressTableModel::updateEntry(const QString &address,
337338
const QString &label, bool isMine, const QString &purpose, int status)
338339
{
339-
// Update address book model from Bitcoin core
340+
// Update address book model from Darkcoin core
340341
priv->updateEntry(address, label, isMine, purpose, status);
341342
}
342343

0 commit comments

Comments
 (0)