sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 03:52:49 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #191 from darkcoin/revert-187-devel-0.9-strings

Browse Source 
Revert "Rebrand to darkcoin"
This commit is contained in:
evan82 2015-02-19 11:28:58 -07:00
commit 93efb82ab1
65 changed files with 9881 additions and 10161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -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

14
configure.ac
View File

@ -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

8
contrib/darkcoin-qt.pro
View File

@ -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

2
contrib/debian/rules
View File

@ -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:

6
doc/translation_process.md
View File

@ -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 \\/'`

4
share/qt/extract_strings_qt.py
View File

@ -8,7 +8,7 @@ import glob
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 @@ f.write("""
#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:

6
src/Makefile.am
View File

@ -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

12
src/darkcoind-res.rc → src/bitcoin-cli-res.rc
View File

@ -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

12
src/darkcoin-cli-res.rc → src/bitcoind-res.rc
View File

@ -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

2
src/clientversion.h
View File

@ -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

2
src/compat/glibc_compat.cpp
View File

@ -1,4 +1,4 @@
#include "darkcoin-config.h"
#include "bitcoin-config.h"
#include <cstddef>
#include <sys/select.h>

2
src/darksend.cpp
View File

@ -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"

2
src/init.cpp
View File

@ -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"

2
src/main.h
View File

@ -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"

2
src/net.cpp
View File

@ -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"

2
src/netbase.h
View File

@ -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"

14
src/qt/Makefile.am
View File

@ -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

2
src/qt/addressbookpage.cpp
View File

@ -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"

0
src/qt/darkcoin.qrc → src/qt/bitcoin.qrc
View File

2
src/qt/bitcoingui.h
View File

@ -6,7 +6,7 @@
#define BITCOINGUI_H
#if defined(HAVE_CONFIG_H)
#include "darkcoin-config.h"
#include "bitcoin-config.h"
#endif
#include <QMainWindow>

2
src/qt/darkcoinstrings.cpp → src/qt/bitcoinstrings.cpp
View File

@ -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"

6
src/qt/darkcoin.cpp
View File

@ -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);
}

4
src/qt/forms/aboutdialog.ui
View File

@ -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>

10
src/qt/forms/addressbookpage.ui
View File

@ -60,7 +60,7 @@
<string>&amp;New</string>
</property>
<property name="icon">
<iconset resource="../darkcoin.qrc">
<iconset resource="../bitcoin.qrc">
<normaloff>:/icons/add</normaloff>:/icons/add</iconset>
</property>
</widget>
@ -74,7 +74,7 @@
<string>&amp;Copy</string>
</property>
<property name="icon">
<iconset resource="../darkcoin.qrc">
<iconset resource="../bitcoin.qrc">
<normaloff>:/icons/editcopy</normaloff>:/icons/editcopy</iconset>
</property>
</widget>
@ -88,7 +88,7 @@
<string>&amp;Delete</string>
</property>
<property name="icon">
<iconset resource="../darkcoin.qrc">
<iconset resource="../bitcoin.qrc">
<normaloff>:/icons/remove</normaloff>:/icons/remove</iconset>
</property>
</widget>
@ -115,7 +115,7 @@
<string>&amp;Export</string>
</property>
<property name="icon">
<iconset resource="../darkcoin.qrc">
<iconset resource="../bitcoin.qrc">
<normaloff>:/icons/export</normaloff>:/icons/export</iconset>
</property>
</widget>
@ -138,7 +138,7 @@
</layout>
</widget>
<resources>
<include location="../darkcoin.qrc"/>
<include location="../bitcoin.qrc"/>
</resources>
<connections/>
</ui>

4
src/qt/forms/helpmessagedialog.ui
View File

@ -28,7 +28,7 @@
</sizepolicy>
</property>
<property name="pixmap">
<pixmap resource="../darkcoin.qrc">:/images/about</pixmap>
<pixmap resource="../bitcoin.qrc">:/images/about</pixmap>
</property>
</widget>
</item>
@ -89,7 +89,7 @@
</layout>
</widget>
<resources>
<include location="../darkcoin.qrc"/>
<include location="../bitcoin.qrc"/>
</resources>
<connections>
<connection>

10
src/qt/forms/receivecoinsdialog.ui
View File

@ -141,7 +141,7 @@
<string>&amp;Request payment</string>
</property>
<property name="icon">
<iconset resource="../darkcoin.qrc">
<iconset resource="../bitcoin.qrc">
<normaloff>:/icons/receiving_addresses</normaloff>:/icons/receiving_addresses</iconset>
</property>
</widget>
@ -161,7 +161,7 @@
<string>Clear</string>
</property>
<property name="icon">
<iconset resource="../darkcoin.qrc">
<iconset resource="../bitcoin.qrc">
<normaloff>:/icons/remove</normaloff>:/icons/remove</iconset>
</property>
<property name="autoRepeatDelay">
@ -267,7 +267,7 @@
<bool>false</bool>
</property>
<property name="icon">
<iconset resource="../darkcoin.qrc">
<iconset resource="../bitcoin.qrc">
<normaloff>:/icons/edit</normaloff>:/icons/edit</iconset>
</property>
</widget>
@ -284,7 +284,7 @@
<bool>false</bool>
</property>
<property name="icon">
<iconset resource="../darkcoin.qrc">
<iconset resource="../bitcoin.qrc">
<normaloff>:/icons/remove</normaloff>:/icons/remove</iconset>
</property>
</widget>
@ -328,7 +328,7 @@
<tabstop>removeRequestButton</tabstop>
</tabstops>
<resources>
<include location="../darkcoin.qrc"/>
<include location="../bitcoin.qrc"/>
</resources>
<connections/>
</ui>

4
src/qt/forms/rpcconsole.ui
View File

@ -401,7 +401,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../darkcoin.qrc">
<iconset resource="../bitcoin.qrc">
<normaloff>:/icons/remove</normaloff>:/icons/remove</iconset>
</property>
<property name="shortcut">
@ -682,7 +682,7 @@
</customwidget>
</customwidgets>
<resources>
<include location="../darkcoin.qrc"/>
<include location="../bitcoin.qrc"/>
</resources>
<connections/>
</ui>

8
src/qt/forms/sendcoinsdialog.ui
View File

@ -671,7 +671,7 @@
<string>S&amp;end</string>
</property>
<property name="icon">
<iconset resource="../darkcoin.qrc">
<iconset resource="../bitcoin.qrc">
<normaloff>:/icons/send</normaloff>:/icons/send</iconset>
</property>
<property name="default">
@ -694,7 +694,7 @@
<string>Clear &amp;All</string>
</property>
<property name="icon">
<iconset resource="../darkcoin.qrc">
<iconset resource="../bitcoin.qrc">
<normaloff>:/icons/remove</normaloff>:/icons/remove</iconset>
</property>
<property name="autoRepeatDelay">
@ -714,7 +714,7 @@
<string>Add &amp;Recipient</string>
</property>
<property name="icon">
<iconset resource="../darkcoin.qrc">
<iconset resource="../bitcoin.qrc">
<normaloff>:/icons/add</normaloff>:/icons/add</iconset>
</property>
<property name="autoDefault">
@ -812,7 +812,7 @@
</customwidget>
</customwidgets>
<resources>
<include location="../darkcoin.qrc"/>
<include location="../bitcoin.qrc"/>
</resources>
<connections/>
</ui>

12
src/qt/forms/sendcoinsentry.ui
View File

@ -64,7 +64,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../darkcoin.qrc">
<iconset resource="../bitcoin.qrc">
<normaloff>:/icons/address-book</normaloff>:/icons/address-book</iconset>
</property>
<property name="shortcut">
@ -81,7 +81,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../darkcoin.qrc">
<iconset resource="../bitcoin.qrc">
<normaloff>:/icons/editpaste</normaloff>:/icons/editpaste</iconset>
</property>
<property name="shortcut">
@ -98,7 +98,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../darkcoin.qrc">
<iconset resource="../bitcoin.qrc">
<normaloff>:/icons/remove</normaloff>:/icons/remove</iconset>
</property>
</widget>
@ -622,7 +622,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../darkcoin.qrc">
<iconset resource="../bitcoin.qrc">
<normaloff>:/icons/remove</normaloff>:/icons/remove</iconset>
</property>
</widget>
@ -1158,7 +1158,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../darkcoin.qrc">
<iconset resource="../bitcoin.qrc">
<normaloff>:/icons/remove</normaloff>:/icons/remove</iconset>
</property>
</widget>
@ -1230,7 +1230,7 @@
<tabstop>deleteButton_s</tabstop>
</tabstops>
<resources>
<include location="../darkcoin.qrc"/>
<include location="../bitcoin.qrc"/>
</resources>
<connections/>
</ui>

18
src/qt/forms/signverifymessagedialog.ui
View File

@ -58,7 +58,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../darkcoin.qrc">
<iconset resource="../bitcoin.qrc">
<normaloff>:/icons/address-book</normaloff>:/icons/address-book</iconset>
</property>
<property name="shortcut">
@ -78,7 +78,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../darkcoin.qrc">
<iconset resource="../bitcoin.qrc">
<normaloff>:/icons/editpaste</normaloff>:/icons/editpaste</iconset>
</property>
<property name="shortcut">
@ -134,7 +134,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../darkcoin.qrc">
<iconset resource="../bitcoin.qrc">
<normaloff>:/icons/editcopy</normaloff>:/icons/editcopy</iconset>
</property>
<property name="autoDefault">
@ -155,7 +155,7 @@
<string>Sign &amp;Message</string>
</property>
<property name="icon">
<iconset resource="../darkcoin.qrc">
<iconset resource="../bitcoin.qrc">
<normaloff>:/icons/edit</normaloff>:/icons/edit</iconset>
</property>
<property name="autoDefault">
@ -172,7 +172,7 @@
<string>Clear &amp;All</string>
</property>
<property name="icon">
<iconset resource="../darkcoin.qrc">
<iconset resource="../bitcoin.qrc">
<normaloff>:/icons/remove</normaloff>:/icons/remove</iconset>
</property>
<property name="autoDefault">
@ -268,7 +268,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../darkcoin.qrc">
<iconset resource="../bitcoin.qrc">
<normaloff>:/icons/address-book</normaloff>:/icons/address-book</iconset>
</property>
<property name="shortcut">
@ -298,7 +298,7 @@
<string>Verify &amp;Message</string>
</property>
<property name="icon">
<iconset resource="../darkcoin.qrc">
<iconset resource="../bitcoin.qrc">
<normaloff>:/icons/transaction_0</normaloff>:/icons/transaction_0</iconset>
</property>
<property name="autoDefault">
@ -315,7 +315,7 @@
<string>Clear &amp;All</string>
</property>
<property name="icon">
<iconset resource="../darkcoin.qrc">
<iconset resource="../bitcoin.qrc">
<normaloff>:/icons/remove</normaloff>:/icons/remove</iconset>
</property>
<property name="autoDefault">
@ -381,7 +381,7 @@
</customwidget>
</customwidgets>
<resources>
<include location="../darkcoin.qrc"/>
<include location="../bitcoin.qrc"/>
</resources>
<connections/>
</ui>

708
src/qt/locale/darkcoin_bar.ts
View File

File diff suppressed because it is too large Load Diff

708
src/qt/locale/darkcoin_bg.ts
View File

File diff suppressed because it is too large Load Diff

708
src/qt/locale/darkcoin_ca.ts
View File

File diff suppressed because it is too large Load Diff

708
src/qt/locale/darkcoin_cmn.ts
View File

File diff suppressed because it is too large Load Diff

708
src/qt/locale/darkcoin_cs.ts
View File

File diff suppressed because it is too large Load Diff

708
src/qt/locale/darkcoin_da.ts
View File

File diff suppressed because it is too large Load Diff

708
src/qt/locale/darkcoin_de.ts
View File

File diff suppressed because it is too large Load Diff

708
src/qt/locale/darkcoin_el.ts
View File

File diff suppressed because it is too large Load Diff

708
src/qt/locale/darkcoin_en.ts
View File

File diff suppressed because it is too large Load Diff

708
src/qt/locale/darkcoin_eo.ts
View File

File diff suppressed because it is too large Load Diff

708
src/qt/locale/darkcoin_es.ts
View File

File diff suppressed because it is too large Load Diff

708
src/qt/locale/darkcoin_fi.ts
View File

File diff suppressed because it is too large Load Diff

708
src/qt/locale/darkcoin_fr.ts
View File

File diff suppressed because it is too large Load Diff

708
src/qt/locale/darkcoin_hu_HU.ts
View File

File diff suppressed because it is too large Load Diff

708
src/qt/locale/darkcoin_it.ts
View File

File diff suppressed because it is too large Load Diff

708
src/qt/locale/darkcoin_lv_LV.ts
View File

File diff suppressed because it is too large Load Diff

708
src/qt/locale/darkcoin_nb.ts
View File

File diff suppressed because it is too large Load Diff

708
src/qt/locale/darkcoin_nl.ts
View File

File diff suppressed because it is too large Load Diff

708
src/qt/locale/darkcoin_pl.ts
View File

File diff suppressed because it is too large Load Diff

716
src/qt/locale/darkcoin_pt.ts
View File

File diff suppressed because it is too large Load Diff

708
src/qt/locale/darkcoin_pt_BR.ts
View File

File diff suppressed because it is too large Load Diff

716
src/qt/locale/darkcoin_ru.ts
View File

File diff suppressed because it is too large Load Diff

708
src/qt/locale/darkcoin_sk.ts
View File

File diff suppressed because it is too large Load Diff

708
src/qt/locale/darkcoin_sv.ts
View File

File diff suppressed because it is too large Load Diff

708
src/qt/locale/darkcoin_tr.ts
View File

File diff suppressed because it is too large Load Diff

716
src/qt/locale/darkcoin_vi.ts
View File

File diff suppressed because it is too large Load Diff

708
src/qt/locale/darkcoin_zh_CN.ts
View File

File diff suppressed because it is too large Load Diff

708
src/qt/locale/darkcoin_zh_HK.ts
View File

File diff suppressed because it is too large Load Diff

2
src/qt/notificator.h
View File

@ -6,7 +6,7 @@
#define NOTIFICATOR_H
#if defined(HAVE_CONFIG_H)
#include "darkcoin-config.h"
#include "bitcoin-config.h"
#endif
#include <QIcon>

2
src/qt/optionsdialog.cpp
View File

@ -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 "optionsdialog.h"

2
src/qt/optionsmodel.cpp
View File

@ -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 "optionsmodel.h"

2
src/qt/receiverequestdialog.cpp
View File

@ -22,7 +22,7 @@
#endif
#if defined(HAVE_CONFIG_H)
#include "darkcoin-config.h" /* for USE_QRCODE */
#include "bitcoin-config.h" /* for USE_QRCODE */
#endif
#ifdef USE_QRCODE

2
src/qt/res/darkcoin-qt-res.rc → src/qt/res/bitcoin-qt-res.rc
View File

@ -8,7 +8,7 @@ IDI_ICON2 ICON DISCARDABLE "icons/bitcoin_testnet.ico"
#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 developers"
VS_VERSION_INFO VERSIONINFO
FILEVERSION VER_FILEVERSION

4
src/qt/test/test_main.cpp
View File

@ -1,6 +1,6 @@
#include "darkcoin-config.h"
#include "bitcoin-config.h"
#if defined(HAVE_CONFIG_H)
#include "darkcoin-config.h"
#include "bitcoin-config.h"
#endif
#ifdef ENABLE_WALLET

2
src/util.h
View File

@ -8,7 +8,7 @@
#define BITCOIN_UTIL_H
#if defined(HAVE_CONFIG_H)
#include "darkcoin-config.h"
#include "bitcoin-config.h"
#endif
#include "compat.h"