eduffield222 · Feb 19, 2015 · Feb 19, 2015
diff --git a/.gitignore b/.gitignore
@@ -13,8 +13,8 @@ autom4te.cache/
 config.log
 config.status
 configure
-src/darkcoin-config.h
-src/darkcoin-config.h.in
+src/bitcoin-config.h
+src/bitcoin-config.h.in
 src/build-aux/
 src/stamp-h1
 share/setup.nsi

diff --git a/configure.ac b/configure.ac
@@ -2,17 +2,17 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 0)
 define(_CLIENT_VERSION_MINOR, 11)
-define(_CLIENT_VERSION_REVISION, 2)
-define(_CLIENT_VERSION_BUILD, 0)
+define(_CLIENT_VERSION_REVISION, 1)
+define(_CLIENT_VERSION_BUILD, 25)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2015)
 AC_INIT([Darkcoin Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[info@darkcoin.io],[darkcoin])
 AC_CONFIG_AUX_DIR([src/build-aux])
 AC_CONFIG_MACRO_DIR([src/m4])
 AC_CANONICAL_HOST
-AH_TOP([#ifndef DARKCOIN_CONFIG_H])
-AH_TOP([#define DARKCOIN_CONFIG_H])
-AH_BOTTOM([#endif //DARKCOIN_CONFIG_H])
+AH_TOP([#ifndef BITCOIN_CONFIG_H])
+AH_TOP([#define BITCOIN_CONFIG_H])
+AH_BOTTOM([#endif //BITCOIN_CONFIG_H])
 
 # This m4 will only be used if a system copy cannot be found. This is helpful
 # on systems where autotools are installed but the pkg-config macros are not in
@@ -111,7 +111,7 @@ AC_ARG_WITH([protoc-bindir],[AS_HELP_STRING([--with-protoc-bindir=BIN_DIR],[spec
 
 
 AC_CONFIG_SRCDIR([src])
-AC_CONFIG_HEADERS([src/darkcoin-config.h])
+AC_CONFIG_HEADERS([src/bitcoin-config.h])
 
 dnl Checks for programs.
 AC_PROG_CXX
@@ -312,7 +312,7 @@ dnl Check for pthread compile/link requirements
 AX_PTHREAD
 INCLUDES="$INCLUDES $PTHREAD_CFLAGS"
 
-# The following macro will add the necessary defines to darkcoin-config.h, but
+# The following macro will add the necessary defines to bitcoin-config.h, but
 # they also need to be passed down to any subprojects. Pull the results out of
 # the cache and add them to CPPFLAGS.
 AC_SYS_LARGEFILE

diff --git a/contrib/darkcoin-qt.pro b/contrib/darkcoin-qt.pro
@@ -7,7 +7,7 @@ HEADERS += \
     ../src/allocators.h \
     ../src/base58.h \
     ../src/bignum.h \
-    ../src/darkcoin-config.h \
+    ../src/bitcoin-config.h \
     ../src/bloom.h \
     ../src/chainparams.h \
     ../src/checkpoints.h \
@@ -224,7 +224,7 @@ SOURCES += \
     ../src/qt/bitcoinaddressvalidator.cpp \
     ../src/qt/bitcoinamountfield.cpp \
     ../src/qt/bitcoingui.cpp \
-    ../src/qt/darkcoinstrings.cpp \
+    ../src/qt/bitcoinstrings.cpp \
     ../src/qt/bitcoinunits.cpp \
     ../src/qt/clientmodel.cpp \
     ../src/qt/coincontroldialog.cpp \
@@ -288,7 +288,7 @@ SOURCES += \
     ../src/qt/paymentrequest.pb.cc \
     ../src/qt/paymentrequestplus.cpp \
     ../src/qt/paymentserver.cpp \
-    ../src/qt/qrc_darkcoin.cpp \
+    ../src/qt/qrc_bitcoin.cpp \
     ../src/qt/qvalidatedlineedit.cpp \
     ../src/qt/qvaluecombobox.cpp \
     ../src/qt/receivecoinsdialog.cpp \
@@ -339,4 +339,4 @@ FORMS += \
     ../src/qt/forms/transactiondescdialog.ui
 
 RESOURCES += \
-    ../src/qt/darkcoin.qrc
+    ../src/qt/bitcoin.qrc
diff --git a/contrib/debian/rules b/contrib/debian/rules
@@ -13,7 +13,7 @@ DEB_INSTALL_MANPAGES_bitcoind += debian/manpages/*
 
 override_dh_auto_clean:
 	if [ -f Makefile ]; then $(MAKE) distclean; fi
-	rm -rf Makefile.in aclocal.m4 configure src/Makefile.in src/darkcoin-config.h.in src/build-aux src/qt/Makefile.in src/qt/test/Makefile.in src/test/Makefile.in
+	rm -rf Makefile.in aclocal.m4 configure src/Makefile.in src/bitcoin-config.h.in src/build-aux src/qt/Makefile.in src/qt/test/Makefile.in src/test/Makefile.in
 
 # Yea, autogen should be run on the source archive, but I like doing git archive
 override_dh_auto_configure:

diff --git a/doc/translation_process.md b/doc/translation_process.md
@@ -12,7 +12,7 @@ Files and Folders
 This file takes care of generating `.qm` files from `.ts` files. It is mostly
 automated.
 
-### src/qt/darkcoin.qrc
+### src/qt/bitcoin.qrc
 
 This file must be updated whenever a new translation is added. Please note that
 files must end with `.qm`, not `.ts`.
@@ -60,7 +60,7 @@ in Transifex and can be translated.
 
 To create the pull-request you have to do:
 
-    git add src/qt/darkcoinstrings.cpp src/qt/locale/darkcoin_en.ts
+    git add src/qt/bitcoinstrings.cpp src/qt/locale/darkcoin_en.ts
     git commit
 
 Syncing with Transifex
@@ -80,7 +80,7 @@ postprocessing steps before committing the translations.
 ### Fetching new translations
 
 1. `python contrib/devtools/update-translations.py`
-2. update `src/qt/darkcoin.qrc` manually or via
+2. update `src/qt/bitcoin.qrc` manually or via
    `ls src/qt/locale/*ts|xargs -n1 basename|sed 's/\(darkcoin_\(.*\)\).ts/        <file alias="\2">locale\/\1.qm<\/file>/'`
 3. update `src/qt/Makefile.am` manually or via
    `ls src/qt/locale/*ts|xargs -n1 basename|sed 's/\(darkcoin_\(.*\)\).ts/  locale\/\1.ts \\/'`

diff --git a/share/qt/extract_strings_qt.py b/share/qt/extract_strings_qt.py
@@ -8,7 +8,7 @@
 import operator
 import os
 
-OUT_CPP="src/qt/darkcoinstrings.cpp"
+OUT_CPP="src/qt/bitcoinstrings.cpp"
 EMPTY=['""']
 
 def parse_po(text):
@@ -72,7 +72,7 @@ def parse_po(text):
 #define UNUSED
 #endif
 """)
-f.write('static const char UNUSED *darkcoin_strings[] = {\n')
+f.write('static const char UNUSED *bitcoin_strings[] = {\n')
 messages.sort(key=operator.itemgetter(0))
 for (msgid, msgstr) in messages:
     if msgid != EMPTY:

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -203,7 +203,7 @@ darkcoind_SOURCES = darkcoind.cpp
 #
 
 if TARGET_WINDOWS
-darkcoind_SOURCES += darkcoind-res.rc
+darkcoind_SOURCES += bitcoind-res.rc
 endif
 
 AM_CPPFLAGS += $(BDB_CPPFLAGS)
@@ -218,7 +218,7 @@ darkcoin_cli_SOURCES = darkcoin-cli.cpp
 #
 
 if TARGET_WINDOWS
-darkcoin_cli_SOURCES += darkcoin-cli-res.rc
+darkcoin_cli_SOURCES += bitcoin-cli-res.rc
 endif
 
 # NOTE: This dependency is not strictly necessary, but without it make may try to build both in parallel, which breaks the LevelDB build system in a race
@@ -229,7 +229,7 @@ leveldb/%.a:
 	  CC="$(CC)" PLATFORM=$(TARGET_OS) AR="$(AR)" $(LEVELDB_TARGET_FLAGS) \
 	  OPT="$(CXXFLAGS) $(CPPFLAGS)"
 
-qt/darkcoinstrings.cpp: $(libdarkcoin_server_a_SOURCES) $(libdarkcoin_common_a_SOURCES) $(libdarkcoin_cli_a_SOURCES)
+qt/bitcoinstrings.cpp: $(libdarkcoin_server_a_SOURCES) $(libdarkcoin_common_a_SOURCES) $(libdarkcoin_cli_a_SOURCES)
 	@test -n $(XGETTEXT) || echo "xgettext is required for updating translations"
 	@cd $(top_srcdir); XGETTEXT=$(XGETTEXT) share/qt/extract_strings_qt.py
 

diff --git a/src/darkcoind-res.rc → src/bitcoin-cli-res.rc b/src/darkcoind-res.rc → src/bitcoin-cli-res.rc
@@ -5,7 +5,7 @@
 #define VER_PRODUCTVERSION_STR STRINGIZE(CLIENT_VERSION_MAJOR) "." STRINGIZE(CLIENT_VERSION_MINOR) "." STRINGIZE(CLIENT_VERSION_REVISION) "." STRINGIZE(CLIENT_VERSION_BUILD)
 #define VER_FILEVERSION        VER_PRODUCTVERSION
 #define VER_FILEVERSION_STR    VER_PRODUCTVERSION_STR
-#define COPYRIGHT_STR          "2009-" STRINGIZE(COPYRIGHT_YEAR) " The Bitcoin and Darkcoin developers"
+#define COPYRIGHT_STR          "2009-" STRINGIZE(COPYRIGHT_YEAR) " The Bitcoin Core developers"
 
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION     VER_FILEVERSION
@@ -17,14 +17,14 @@ BEGIN
     BEGIN
         BLOCK "040904E4" // U.S. English - multilingual (hex)
         BEGIN
-            VALUE "CompanyName",        "Darkcoin"
-            VALUE "FileDescription",    "Darkcoind (OSS daemon/client for Darkcoin)"
+            VALUE "CompanyName",        "Bitcoin"
+            VALUE "FileDescription",    "Bitcoin-cli (OSS RPC client for Bitcoin)"
             VALUE "FileVersion",        VER_FILEVERSION_STR
-            VALUE "InternalName",       "darkcoind"
+            VALUE "InternalName",       "bitcoin-cli"
             VALUE "LegalCopyright",     COPYRIGHT_STR
             VALUE "LegalTrademarks1",   "Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php."
-            VALUE "OriginalFilename",   "darkcoind.exe"
-            VALUE "ProductName",        "Darkcoind"
+            VALUE "OriginalFilename",   "bitcoin-cli.exe"
+            VALUE "ProductName",        "Bitcoin-cli"
             VALUE "ProductVersion",     VER_PRODUCTVERSION_STR
         END
     END

diff --git a/src/darkcoin-cli-res.rc → src/bitcoind-res.rc b/src/darkcoin-cli-res.rc → src/bitcoind-res.rc
@@ -5,7 +5,7 @@
 #define VER_PRODUCTVERSION_STR STRINGIZE(CLIENT_VERSION_MAJOR) "." STRINGIZE(CLIENT_VERSION_MINOR) "." STRINGIZE(CLIENT_VERSION_REVISION) "." STRINGIZE(CLIENT_VERSION_BUILD)
 #define VER_FILEVERSION        VER_PRODUCTVERSION
 #define VER_FILEVERSION_STR    VER_PRODUCTVERSION_STR
-#define COPYRIGHT_STR          "2009-" STRINGIZE(COPYRIGHT_YEAR) " The Bitcoin and Darkcoin developers"
+#define COPYRIGHT_STR          "2009-" STRINGIZE(COPYRIGHT_YEAR) " The Bitcoin Core developers"
 
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION     VER_FILEVERSION
@@ -17,14 +17,14 @@ BEGIN
     BEGIN
         BLOCK "040904E4" // U.S. English - multilingual (hex)
         BEGIN
-            VALUE "CompanyName",        "Darkcoin"
-            VALUE "FileDescription",    "Darkcoin-cli (OSS RPC client for Darkcoin)"
+            VALUE "CompanyName",        "Bitcoin"
+            VALUE "FileDescription",    "Bitcoind (OSS daemon/client for Bitcoin)"
             VALUE "FileVersion",        VER_FILEVERSION_STR
-            VALUE "InternalName",       "darkcoin-cli"
+            VALUE "InternalName",       "bitcoind"
             VALUE "LegalCopyright",     COPYRIGHT_STR
             VALUE "LegalTrademarks1",   "Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php."
-            VALUE "OriginalFilename",   "darkcoin-cli.exe"
-            VALUE "ProductName",        "Darkcoin-cli"
+            VALUE "OriginalFilename",   "bitcoind.exe"
+            VALUE "ProductName",        "Bitcoind"
             VALUE "ProductVersion",     VER_PRODUCTVERSION_STR
         END
     END

diff --git a/src/clientversion.h b/src/clientversion.h
@@ -2,7 +2,7 @@
 #define CLIENTVERSION_H
 
 #if defined(HAVE_CONFIG_H)
-#include "darkcoin-config.h"
+#include "bitcoin-config.h"
 #else
 //
 // client versioning and copyright year

diff --git a/src/compat/glibc_compat.cpp b/src/compat/glibc_compat.cpp
@@ -1,4 +1,4 @@
-#include "darkcoin-config.h"
+#include "bitcoin-config.h"
 #include <cstddef>
 #include <sys/select.h>
 

diff --git a/src/darksend.cpp b/src/darksend.cpp
@@ -3,7 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #if defined(HAVE_CONFIG_H)
-#include "darkcoin-config.h"
+#include "bitcoin-config.h"
 #endif
 
 #include "darksend.h"

diff --git a/src/init.cpp b/src/init.cpp
@@ -5,7 +5,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #if defined(HAVE_CONFIG_H)
-#include "darkcoin-config.h"
+#include "bitcoin-config.h"
 #endif
 
 #include "init.h"

diff --git a/src/main.h b/src/main.h
@@ -8,7 +8,7 @@
 #define BITCOIN_MAIN_H
 
 #if defined(HAVE_CONFIG_H)
-#include "darkcoin-config.h"
+#include "bitcoin-config.h"
 #endif
 
 #include "bignum.h"

diff --git a/src/net.cpp b/src/net.cpp
@@ -5,7 +5,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #if defined(HAVE_CONFIG_H)
-#include "darkcoin-config.h"
+#include "bitcoin-config.h"
 #endif
 
 #include "net.h"

diff --git a/src/netbase.h b/src/netbase.h
@@ -6,7 +6,7 @@
 #define BITCOIN_NETBASE_H
 
 #if defined(HAVE_CONFIG_H)
-#include "darkcoin-config.h"
+#include "bitcoin-config.h"
 #endif
 
 #include "compat.h"

diff --git a/src/qt/Makefile.am b/src/qt/Makefile.am
@@ -117,8 +117,8 @@ QT_MOC = \
   overviewpage.moc \
   rpcconsole.moc
 
-QT_QRC_CPP = qrc_darkcoin.cpp
-QT_QRC = darkcoin.qrc
+QT_QRC_CPP = qrc_bitcoin.cpp
+QT_QRC = bitcoin.qrc
 
 PROTOBUF_CC = paymentrequest.pb.cc
 PROTOBUF_H = paymentrequest.pb.h
@@ -281,7 +281,7 @@ RES_IMAGES = \
 
 RES_MOVIES = $(wildcard res/movies/spinner-*.png)
 
-DARKCOIN_RC = res/darkcoin-qt-res.rc
+BITCOIN_RC = res/bitcoin-qt-res.rc
 
 libdarkcoinqt_a_CPPFLAGS = $(AM_CPPFLAGS) $(QT_INCLUDES) \
   -I$(top_srcdir)/src/qt/forms $(QT_DBUS_INCLUDES)
@@ -306,7 +306,7 @@ if TARGET_DARWIN
   darkcoin_qt_SOURCES += $(BITCOIN_MM)
 endif
 if TARGET_WINDOWS
-  darkcoin_qt_SOURCES += $(DARKCOIN_RC)
+  darkcoin_qt_SOURCES += $(BITCOIN_RC)
 endif
 darkcoin_qt_LDADD = libdarkcoinqt.a $(LIBBITCOIN_SERVER)
 if ENABLE_WALLET
@@ -325,10 +325,10 @@ QT_QM=$(QT_TS:.ts=.qm)
 .PHONY: FORCE
 .SECONDARY: $(QT_QM)
 
-darkcoinstrings.cpp: FORCE
-	$(MAKE) -C $(top_srcdir)/src qt/darkcoinstrings.cpp
+bitcoinstrings.cpp: FORCE
+	$(MAKE) -C $(top_srcdir)/src qt/bitcoinstrings.cpp
 
-translate: darkcoinstrings.cpp $(QT_FORMS_UI) $(QT_FORMS_UI) $(BITCOIN_QT_CPP) $(BITCOIN_QT_H) $(BITCOIN_MM)
+translate: bitcoinstrings.cpp $(QT_FORMS_UI) $(QT_FORMS_UI) $(BITCOIN_QT_CPP) $(BITCOIN_QT_H) $(BITCOIN_MM)
 	@test -n $(LUPDATE) || echo "lupdate is required for updating translations"
 	@QT_SELECT=$(QT_SELECT) $(LUPDATE) $^ -locations relative -no-obsolete -ts locale/darkcoin_en.ts
 

diff --git a/src/qt/addressbookpage.cpp b/src/qt/addressbookpage.cpp
@@ -4,7 +4,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #if defined(HAVE_CONFIG_H)
-#include "darkcoin-config.h"
+#include "bitcoin-config.h"
 #endif
 
 #include "addressbookpage.h"

diff --git a/src/qt/darkcoin.qrc → src/qt/bitcoin.qrc b/src/qt/darkcoin.qrc → src/qt/bitcoin.qrc
diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h
@@ -6,7 +6,7 @@
 #define BITCOINGUI_H
 
 #if defined(HAVE_CONFIG_H)
-#include "darkcoin-config.h"
+#include "bitcoin-config.h"
 #endif
 
 #include <QMainWindow>

diff --git a/src/qt/darkcoinstrings.cpp → src/qt/bitcoinstrings.cpp b/src/qt/darkcoinstrings.cpp → src/qt/bitcoinstrings.cpp
@@ -12,7 +12,7 @@
 #else
 #define UNUSED
 #endif
-static const char UNUSED *darkcoin_strings[] = {
+static const char UNUSED *bitcoin_strings[] = {
 QT_TRANSLATE_NOOP("darkcoin-core", ""
 "%s, you must set a rpcpassword in the configuration file:\n"
 "%s\n"

diff --git a/src/qt/darkcoin.cpp b/src/qt/darkcoin.cpp
@@ -4,7 +4,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #if defined(HAVE_CONFIG_H)
-#include "darkcoin-config.h"
+#include "bitcoin-config.h"
 #endif
 
 #include "bitcoingui.h"
@@ -115,11 +115,11 @@ static void initTranslations(QTranslator &qtTranslatorBase, QTranslator &qtTrans
     if (qtTranslator.load("qt_" + lang_territory, QLibraryInfo::location(QLibraryInfo::TranslationsPath)))
         QApplication::installTranslator(&qtTranslator);
 
-    // Load e.g. bitcoin_de.qm (shortcut "de" needs to be defined in darkcoin.qrc)
+    // Load e.g. bitcoin_de.qm (shortcut "de" needs to be defined in bitcoin.qrc)
     if (translatorBase.load(lang, ":/translations/"))
         QApplication::installTranslator(&translatorBase);
 
-    // Load e.g. bitcoin_de_DE.qm (shortcut "de_DE" needs to be defined in darkcoin.qrc)
+    // Load e.g. bitcoin_de_DE.qm (shortcut "de_DE" needs to be defined in bitcoin.qrc)
     if (translator.load(lang_territory, ":/translations/"))
         QApplication::installTranslator(&translator);
 }

diff --git a/src/qt/forms/aboutdialog.ui b/src/qt/forms/aboutdialog.ui
@@ -23,7 +23,7 @@
       </sizepolicy>
      </property>
      <property name="pixmap">
-      <pixmap resource="../darkcoin.qrc">:/images/about</pixmap>
+      <pixmap resource="../bitcoin.qrc">:/images/about</pixmap>
      </property>
     </widget>
    </item>
@@ -151,7 +151,7 @@ This product includes software developed by the OpenSSL Project for use in the O
   </layout>
  </widget>
  <resources>
-  <include location="../darkcoin.qrc"/>
+  <include location="../bitcoin.qrc"/>
  </resources>
  <connections>
   <connection>