diff --git a/contrib/debian/examples/darkcoin.conf b/contrib/debian/examples/darkcoin.conf index 6e3f9399c8f5..8e644119884f 100644 --- a/contrib/debian/examples/darkcoin.conf +++ b/contrib/debian/examples/darkcoin.conf @@ -3,7 +3,7 @@ # Network-related settings: -# Run on the test network instead of the real bitcoin network. +# Run on the test network instead of the real darkcoin network. #testnet=1 # Connect via a socks4 proxy @@ -22,9 +22,9 @@ #maxconnections= -# JSON-RPC options (for controlling a running Bitcoin/bitcoind process) +# JSON-RPC options (for controlling a running Darkcoin/darkcoind process) -# server=1 tells Bitcoin to accept JSON-RPC commands. +# server=1 tells Darkcoin to accept JSON-RPC commands. #server=1 # You must set rpcuser and rpcpassword to secure the JSON-RPC api @@ -40,12 +40,12 @@ # Listen for RPC connections on this TCP port: rpcport=9998 -# You can use Bitcoin or bitcoind to send commands to Bitcoin/bitcoind +# You can use Darkcoin or darkcoind to send commands to Darkcoin/darkcoind # running on another host using this option: rpcconnect=127.0.0.1 # Use Secure Sockets Layer (also known as TLS or HTTPS) to communicate -# with Bitcoin -server or bitcoind +# with Darkcoin -server or darkcoind #rpcssl=1 # OpenSSL settings used when rpcssl=1 @@ -56,17 +56,17 @@ rpcsslprivatekeyfile=server.pem # Miscellaneous options -# Set gen=1 to attempt to generate bitcoins +# Set gen=1 to attempt to generate darkcoins gen=0 -# Use SSE instructions to try to generate bitcoins faster. +# Use SSE instructions to try to generate darkcoins faster. #4way=1 # Pre-generate this many public/private key pairs, so wallet backups will be valid for # both prior transactions and several dozen future transactions. keypool=100 -# Pay an optional transaction fee every time you send bitcoins. Transactions with fees +# Pay an optional transaction fee every time you send darkcoins. Transactions with fees # are more likely than free transactions to be included in generated blocks, so may # be validated sooner. paytxfee=0.00 @@ -77,7 +77,7 @@ paytxfee=0.00 # User interface options -# Start Bitcoin minimized +# Start Darkcoin minimized #min=1 # Minimize to the system tray diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 41779910a2a8..2212b312e1f3 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -180,7 +180,7 @@ BitcoinGUI::BitcoinGUI(bool fIsTestnet, QWidget *parent) : QString curStyle = QApplication::style()->metaObject()->className(); if(curStyle == "QWindowsStyle" || curStyle == "QWindowsXPStyle") { - progressBar->setStyleSheet("QProgressBar { background-color: #e8e8e8; border: 1px solid grey; border-radius: 7px; padding: 1px; text-align: center; } QProgressBar::chunk { background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 0, stop: 0 #FF8000, stop: 1 orange); border-radius: 7px; margin: 0px; }"); + progressBar->setStyleSheet("QProgressBar { background-color: #F8F8F8; border: 1px solid grey; border-radius: 7px; padding: 1px; text-align: center; } QProgressBar::chunk { background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 0, stop: 0 #00CCFF, stop: 1 #33CCFF); border-radius: 7px; margin: 0px; }"); } statusBar()->addWidget(progressBarLabel); diff --git a/src/qt/forms/aboutdialog.ui b/src/qt/forms/aboutdialog.ui index f3f48844daa0..a71998f43cfe 100644 --- a/src/qt/forms/aboutdialog.ui +++ b/src/qt/forms/aboutdialog.ui @@ -91,7 +91,7 @@ IBeamCursor - Copyright © 2009-YYYY The Bitcoin Core developers + Copyright © 2009-2014 The Bitcoin Core developers Copyright © 2014-YYYY The Darkcoin Core developers diff --git a/src/qt/forms/helpmessagedialog.ui b/src/qt/forms/helpmessagedialog.ui index f68fea7e6410..085a0388b24c 100644 --- a/src/qt/forms/helpmessagedialog.ui +++ b/src/qt/forms/helpmessagedialog.ui @@ -16,7 +16,7 @@ - Bitcoin Core - Command-line options + Darkcoin Core - Command-line options diff --git a/src/qt/forms/intro.ui b/src/qt/forms/intro.ui index 09e7bdb02454..b424a2bbeecd 100644 --- a/src/qt/forms/intro.ui +++ b/src/qt/forms/intro.ui @@ -20,7 +20,7 @@ QLabel { font-style:italic; } - Welcome to Bitcoin Core. + Welcome to Darkcoin Core. true @@ -46,7 +46,7 @@ - As this is the first time the program is launched, you can choose where Bitcoin Core will store its data. + As this is the first time the program is launched, you can choose where Darkcoin Core will store its data. true @@ -56,7 +56,7 @@ - Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory. + Darkcoin Core will download and store a copy of the Darkcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory. true diff --git a/src/qt/forms/optionsdialog.ui b/src/qt/forms/optionsdialog.ui index 7477bed0e1f2..d20e6109a034 100644 --- a/src/qt/forms/optionsdialog.ui +++ b/src/qt/forms/optionsdialog.ui @@ -30,10 +30,10 @@ - Automatically start Bitcoin after logging in to the system. + Automatically start Darkcoin after logging in to the system. - &Start Bitcoin on system login + &Start Darkcoin on system login @@ -308,7 +308,7 @@ - Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled. + Automatically open the Darkcoin client port on the router. This only works when your router supports UPnP and it is enabled. Map port using &UPnP @@ -318,7 +318,7 @@ - Connect to the Bitcoin network through a SOCKS proxy. + Connect to the Darkcoin network through a SOCKS proxy. &Connect through SOCKS proxy (default proxy): @@ -504,7 +504,7 @@ - The user interface language can be set here. This setting will take effect after restarting Bitcoin. + The user interface language can be set here. This setting will take effect after restarting Darkcoin. @@ -537,7 +537,7 @@ - Whether to show Bitcoin addresses in the transaction list or not. + Whether to show Darkcoin addresses in the transaction list or not. &Display addresses in transaction list diff --git a/src/qt/forms/overviewpage.ui b/src/qt/forms/overviewpage.ui index f959aa63245c..b779a90d57f6 100644 --- a/src/qt/forms/overviewpage.ui +++ b/src/qt/forms/overviewpage.ui @@ -61,7 +61,7 @@ - The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet. + The displayed information may be out of date. Your wallet automatically synchronizes with the Darkcoin network after a connection is established, but this process has not completed yet. QLabel { color: red; } @@ -907,7 +907,7 @@ - The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet. + The displayed information may be out of date. Your wallet automatically synchronizes with the Darkcoin network after a connection is established, but this process has not completed yet. QLabel { color: red; } diff --git a/src/qt/forms/receivecoinsdialog.ui b/src/qt/forms/receivecoinsdialog.ui index e1a0a28f81bf..56e1e62ca8fc 100644 --- a/src/qt/forms/receivecoinsdialog.ui +++ b/src/qt/forms/receivecoinsdialog.ui @@ -48,7 +48,7 @@ - An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network. + An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Darkcoin network. &Message: @@ -71,7 +71,7 @@ - An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network. + An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Darkcoin network. diff --git a/src/qt/forms/rpcconsole.ui b/src/qt/forms/rpcconsole.ui index fcb6bb60bb34..4b3d136b50ed 100644 --- a/src/qt/forms/rpcconsole.ui +++ b/src/qt/forms/rpcconsole.ui @@ -305,7 +305,7 @@ - Open the Bitcoin debug log file from the current data directory. This can take a few seconds for large log files. + Open the Darkcoin debug log file from the current data directory. This can take a few seconds for large log files. &Open diff --git a/src/version.cpp b/src/version.cpp index 371df3614e34..0ef62d754411 100644 --- a/src/version.cpp +++ b/src/version.cpp @@ -10,7 +10,7 @@ // Name of client reported in the 'version' message. Report the same name // for both darkcoind and darkcoin-qt, to make it harder for attackers to // target servers or GUI users specifically. -const std::string CLIENT_NAME("Darkcoin Core"); +const std::string CLIENT_NAME("Core"); // Client version number #define CLIENT_VERSION_SUFFIX "-beta"