Fix strings

2017-12-30 23:41:21 +01:00 · 2017-12-30 23:41:21 +01:00 · 728b62fccf
commit 728b62fccf
parent 24209342f4
3 changed files with 135 additions and 135 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -12,9 +12,9 @@ set(CRYPTONOTE_LIB cryptonote)

 include_directories(${CMAKE_BINARY_DIR}
    src
-    cryptonote/external
-    cryptonote/include
-    cryptonote/src)
+    danicoin/external
+    danicoin/include
+    danicoin/src)

 find_package(Qt5Gui REQUIRED)
 find_package(Qt5Widgets REQUIRED)
@ -35,7 +35,7 @@ include_directories(${Boost_INCLUDE_DIRS})
 link_directories(${Boost_LIBRARY_DIRS})

 set(VERSION "")
-configure_file("cryptonote/src/version.h.in" "version.h")
+configure_file("danicoin/src/version.h.in" "version.h")
 configure_file("src/CryptoNoteWalletConfig.h.in" "CryptoNoteWalletConfig.h")

 add_definitions(-DGIT_REVISION=\"${GIT_REVISION}\")
@ -43,130 +43,130 @@ add_definitions(-DGIT_REVISION=\"${GIT_REVISION}\")
 set(CMAKE_AUTOMOC ON)

 set(CRYPTONOTE_SOURCES
-  cryptonote/external/miniupnpc/connecthostport.c
-  cryptonote/external/miniupnpc/igd_desc_parse.c
-  cryptonote/external/miniupnpc/minisoap.c
-  cryptonote/external/miniupnpc/miniupnpc.c
-  cryptonote/external/miniupnpc/miniwget.c
-  cryptonote/external/miniupnpc/minixml.c
-  cryptonote/external/miniupnpc/portlistingparse.c
-  cryptonote/external/miniupnpc/receivedata.c
-  cryptonote/external/miniupnpc/upnpcommands.c
-  cryptonote/external/miniupnpc/upnpreplyparse.c
-  cryptonote/src/Common/Base58.cpp
-  cryptonote/src/Common/CommandLine.cpp
-  cryptonote/src/Common/Util.cpp
-  cryptonote/src/Common/StringTools.cpp
-  cryptonote/src/Common/JsonValue.cpp
-  cryptonote/src/Common/ConsoleTools.cpp
-  cryptonote/src/Common/MemoryInputStream.cpp
-  cryptonote/src/Common/PathTools.cpp
-  cryptonote/src/Common/StdInputStream.cpp
-  cryptonote/src/Common/StdOutputStream.cpp
-  cryptonote/src/Common/StreamTools.cpp
-  cryptonote/src/Common/StringOutputStream.cpp
-  cryptonote/src/Common/StringView.cpp
-  cryptonote/src/Common/VectorOutputStream.cpp
-  cryptonote/src/crypto/blake256.c
-  cryptonote/src/crypto/chacha8.c
-  cryptonote/src/crypto/crypto-ops-data.c
-  cryptonote/src/crypto/crypto-ops.c
-  cryptonote/src/crypto/crypto.cpp
-  cryptonote/src/crypto/groestl.c
-  cryptonote/src/crypto/hash-extra-blake.c
-  cryptonote/src/crypto/hash-extra-groestl.c
-  cryptonote/src/crypto/hash-extra-jh.c
-  cryptonote/src/crypto/hash-extra-skein.c
-  cryptonote/src/crypto/hash.c
-  cryptonote/src/crypto/jh.c
-  cryptonote/src/crypto/keccak.c
-  cryptonote/src/crypto/oaes_lib.c
-  cryptonote/src/crypto/random.c
-  cryptonote/src/crypto/skein.c
-  cryptonote/src/crypto/slow-hash.c
-  cryptonote/src/crypto/slow-hash.cpp
-  cryptonote/src/crypto/tree-hash.c
-  cryptonote/src/CryptoNoteCore/BlockchainIndices.cpp
-  cryptonote/src/CryptoNoteCore/BlockchainMessages.cpp
-  cryptonote/src/CryptoNoteCore/BlockIndex.cpp
-  cryptonote/src/CryptoNoteCore/CoreConfig.cpp
-  cryptonote/src/CryptoNoteCore/CryptoNoteBasic.cpp
-  cryptonote/src/CryptoNoteCore/CryptoNoteTools.cpp
-  cryptonote/src/CryptoNoteCore/Currency.cpp
-  cryptonote/src/CryptoNoteCore/MinerConfig.cpp
-  cryptonote/src/CryptoNoteCore/Transaction.cpp
-  cryptonote/src/CryptoNoteCore/Account.cpp
-  cryptonote/src/CryptoNoteCore/Blockchain.cpp
-  cryptonote/src/CryptoNoteCore/Checkpoints.cpp
-  cryptonote/src/CryptoNoteCore/CryptoNoteBasicImpl.cpp
-  cryptonote/src/CryptoNoteCore/Core.cpp
-  cryptonote/src/CryptoNoteCore/CryptoNoteFormatUtils.cpp
-  cryptonote/src/CryptoNoteCore/CryptoNoteSerialization.cpp
-  cryptonote/src/CryptoNoteCore/Difficulty.cpp
-  cryptonote/src/CryptoNoteCore/IBlock.cpp
-  cryptonote/src/CryptoNoteCore/Miner.cpp
-  cryptonote/src/CryptoNoteCore/TransactionExtra.cpp
-  cryptonote/src/CryptoNoteCore/TransactionPool.cpp
-  cryptonote/src/CryptoNoteCore/TransactionPrefixImpl.cpp
-  cryptonote/src/CryptoNoteCore/TransactionUtils.cpp
-  cryptonote/src/InProcessNode/InProcessNode.cpp
-  cryptonote/src/InProcessNode/InProcessNodeErrors.cpp
-  cryptonote/src/NodeRpcProxy/NodeErrors.cpp
-  cryptonote/src/NodeRpcProxy/NodeRpcProxy.cpp
-  cryptonote/src/P2p/NetNodeConfig.cpp
-  cryptonote/src/Serialization/BinaryInputStreamSerializer.cpp
-  cryptonote/src/Serialization/BinaryOutputStreamSerializer.cpp
-  cryptonote/src/Serialization/JsonInputValueSerializer.cpp
-  cryptonote/src/Serialization/JsonOutputStreamSerializer.cpp
-  cryptonote/src/Serialization/KVBinaryInputStreamSerializer.cpp
-  cryptonote/src/Serialization/KVBinaryOutputStreamSerializer.cpp
-  cryptonote/src/Serialization/SerializationOverloads.cpp
-  cryptonote/src/Transfers/BlockchainSynchronizer.cpp
-  cryptonote/src/Transfers/SynchronizationState.cpp
-  cryptonote/src/Transfers/TransfersConsumer.cpp
-  cryptonote/src/Transfers/TransfersContainer.cpp
-  cryptonote/src/Transfers/TransfersSubscription.cpp
-  cryptonote/src/Transfers/TransfersSynchronizer.cpp
-  cryptonote/src/Wallet/LegacyKeysImporter.cpp
-  cryptonote/src/Wallet/WalletAsyncContextCounter.cpp
-  cryptonote/src/Wallet/WalletErrors.cpp
-  cryptonote/src/WalletLegacy/KeysStorage.cpp
-  cryptonote/src/WalletLegacy/WalletLegacy.cpp
-  cryptonote/src/WalletLegacy/WalletHelper.cpp
-  cryptonote/src/WalletLegacy/WalletLegacySerializer.cpp
-  cryptonote/src/WalletLegacy/WalletLegacySerialization.cpp
-  cryptonote/src/WalletLegacy/WalletTransactionSender.cpp
-  cryptonote/src/WalletLegacy/WalletUnconfirmedTransactions.cpp
-  cryptonote/src/WalletLegacy/WalletUserTransactionsCache.cpp
-  cryptonote/src/System/ContextGroup.cpp
-  cryptonote/src/System/Event.cpp
-  cryptonote/src/System/EventLock.cpp
-  cryptonote/src/System/InterruptedException.cpp
-  cryptonote/src/System/Ipv4Address.cpp
-  cryptonote/src/System/TcpStream.cpp
-  cryptonote/src/HTTP/HttpRequest.cpp
-  cryptonote/src/HTTP/HttpParser.cpp
-  cryptonote/src/HTTP/HttpParserErrorCodes.cpp
-  cryptonote/src/HTTP/HttpResponse.cpp
-  cryptonote/src/Rpc/HttpClient.cpp
-  cryptonote/src/Rpc/JsonRpc.cpp
-  cryptonote/src/P2p/NetNode.cpp
-  cryptonote/src/P2p/LevinProtocol.cpp
-  cryptonote/src/P2p/NetNodeConfig.cpp
-  cryptonote/src/P2p/PeerListManager.cpp
-  cryptonote/src/CryptoNoteProtocol/CryptoNoteProtocolHandler.cpp
-  cryptonote/src/Logging/ILogger.cpp
-  cryptonote/src/Logging/LoggerGroup.cpp
-  cryptonote/src/Logging/CommonLogger.cpp
-  cryptonote/src/Logging/LoggerManager.cpp
-  cryptonote/src/Logging/FileLogger.cpp
-  cryptonote/src/Logging/StreamLogger.cpp
-  cryptonote/src/Logging/ConsoleLogger.cpp
-  cryptonote/src/Logging/LoggerMessage.cpp
-  cryptonote/src/Logging/LoggerRef.cpp
-  cryptonote/src/BlockchainExplorer/BlockchainExplorer.cpp
-  cryptonote/src/BlockchainExplorer/BlockchainExplorerDataBuilder.cpp
-  cryptonote/src/BlockchainExplorer/BlockchainExplorerErrors.cpp
+  danicoin/external/miniupnpc/connecthostport.c
+  danicoin/external/miniupnpc/igd_desc_parse.c
+  danicoin/external/miniupnpc/minisoap.c
+  danicoin/external/miniupnpc/miniupnpc.c
+  danicoin/external/miniupnpc/miniwget.c
+  danicoin/external/miniupnpc/minixml.c
+  danicoin/external/miniupnpc/portlistingparse.c
+  danicoin/external/miniupnpc/receivedata.c
+  danicoin/external/miniupnpc/upnpcommands.c
+  danicoin/external/miniupnpc/upnpreplyparse.c
+  danicoin/src/Common/Base58.cpp
+  danicoin/src/Common/CommandLine.cpp
+  danicoin/src/Common/Util.cpp
+  danicoin/src/Common/StringTools.cpp
+  danicoin/src/Common/JsonValue.cpp
+  danicoin/src/Common/ConsoleTools.cpp
+  danicoin/src/Common/MemoryInputStream.cpp
+  danicoin/src/Common/PathTools.cpp
+  danicoin/src/Common/StdInputStream.cpp
+  danicoin/src/Common/StdOutputStream.cpp
+  danicoin/src/Common/StreamTools.cpp
+  danicoin/src/Common/StringOutputStream.cpp
+  danicoin/src/Common/StringView.cpp
+  danicoin/src/Common/VectorOutputStream.cpp
+  danicoin/src/crypto/blake256.c
+  danicoin/src/crypto/chacha8.c
+  danicoin/src/crypto/crypto-ops-data.c
+  danicoin/src/crypto/crypto-ops.c
+  danicoin/src/crypto/crypto.cpp
+  danicoin/src/crypto/groestl.c
+  danicoin/src/crypto/hash-extra-blake.c
+  danicoin/src/crypto/hash-extra-groestl.c
+  danicoin/src/crypto/hash-extra-jh.c
+  danicoin/src/crypto/hash-extra-skein.c
+  danicoin/src/crypto/hash.c
+  danicoin/src/crypto/jh.c
+  danicoin/src/crypto/keccak.c
+  danicoin/src/crypto/oaes_lib.c
+  danicoin/src/crypto/random.c
+  danicoin/src/crypto/skein.c
+  danicoin/src/crypto/slow-hash.c
+  danicoin/src/crypto/slow-hash.cpp
+  danicoin/src/crypto/tree-hash.c
+  danicoin/src/CryptoNoteCore/BlockchainIndices.cpp
+  danicoin/src/CryptoNoteCore/BlockchainMessages.cpp
+  danicoin/src/CryptoNoteCore/BlockIndex.cpp
+  danicoin/src/CryptoNoteCore/CoreConfig.cpp
+  danicoin/src/CryptoNoteCore/CryptoNoteBasic.cpp
+  danicoin/src/CryptoNoteCore/CryptoNoteTools.cpp
+  danicoin/src/CryptoNoteCore/Currency.cpp
+  danicoin/src/CryptoNoteCore/MinerConfig.cpp
+  danicoin/src/CryptoNoteCore/Transaction.cpp
+  danicoin/src/CryptoNoteCore/Account.cpp
+  danicoin/src/CryptoNoteCore/Blockchain.cpp
+  danicoin/src/CryptoNoteCore/Checkpoints.cpp
+  danicoin/src/CryptoNoteCore/CryptoNoteBasicImpl.cpp
+  danicoin/src/CryptoNoteCore/Core.cpp
+  danicoin/src/CryptoNoteCore/CryptoNoteFormatUtils.cpp
+  danicoin/src/CryptoNoteCore/CryptoNoteSerialization.cpp
+  danicoin/src/CryptoNoteCore/Difficulty.cpp
+  danicoin/src/CryptoNoteCore/IBlock.cpp
+  danicoin/src/CryptoNoteCore/Miner.cpp
+  danicoin/src/CryptoNoteCore/TransactionExtra.cpp
+  danicoin/src/CryptoNoteCore/TransactionPool.cpp
+  danicoin/src/CryptoNoteCore/TransactionPrefixImpl.cpp
+  danicoin/src/CryptoNoteCore/TransactionUtils.cpp
+  danicoin/src/InProcessNode/InProcessNode.cpp
+  danicoin/src/InProcessNode/InProcessNodeErrors.cpp
+  danicoin/src/NodeRpcProxy/NodeErrors.cpp
+  danicoin/src/NodeRpcProxy/NodeRpcProxy.cpp
+  danicoin/src/P2p/NetNodeConfig.cpp
+  danicoin/src/Serialization/BinaryInputStreamSerializer.cpp
+  danicoin/src/Serialization/BinaryOutputStreamSerializer.cpp
+  danicoin/src/Serialization/JsonInputValueSerializer.cpp
+  danicoin/src/Serialization/JsonOutputStreamSerializer.cpp
+  danicoin/src/Serialization/KVBinaryInputStreamSerializer.cpp
+  danicoin/src/Serialization/KVBinaryOutputStreamSerializer.cpp
+  danicoin/src/Serialization/SerializationOverloads.cpp
+  danicoin/src/Transfers/BlockchainSynchronizer.cpp
+  danicoin/src/Transfers/SynchronizationState.cpp
+  danicoin/src/Transfers/TransfersConsumer.cpp
+  danicoin/src/Transfers/TransfersContainer.cpp
+  danicoin/src/Transfers/TransfersSubscription.cpp
+  danicoin/src/Transfers/TransfersSynchronizer.cpp
+  danicoin/src/Wallet/LegacyKeysImporter.cpp
+  danicoin/src/Wallet/WalletAsyncContextCounter.cpp
+  danicoin/src/Wallet/WalletErrors.cpp
+  danicoin/src/WalletLegacy/KeysStorage.cpp
+  danicoin/src/WalletLegacy/WalletLegacy.cpp
+  danicoin/src/WalletLegacy/WalletHelper.cpp
+  danicoin/src/WalletLegacy/WalletLegacySerializer.cpp
+  danicoin/src/WalletLegacy/WalletLegacySerialization.cpp
+  danicoin/src/WalletLegacy/WalletTransactionSender.cpp
+  danicoin/src/WalletLegacy/WalletUnconfirmedTransactions.cpp
+  danicoin/src/WalletLegacy/WalletUserTransactionsCache.cpp
+  danicoin/src/System/ContextGroup.cpp
+  danicoin/src/System/Event.cpp
+  danicoin/src/System/EventLock.cpp
+  danicoin/src/System/InterruptedException.cpp
+  danicoin/src/System/Ipv4Address.cpp
+  danicoin/src/System/TcpStream.cpp
+  danicoin/src/HTTP/HttpRequest.cpp
+  danicoin/src/HTTP/HttpParser.cpp
+  danicoin/src/HTTP/HttpParserErrorCodes.cpp
+  danicoin/src/HTTP/HttpResponse.cpp
+  danicoin/src/Rpc/HttpClient.cpp
+  danicoin/src/Rpc/JsonRpc.cpp
+  danicoin/src/P2p/NetNode.cpp
+  danicoin/src/P2p/LevinProtocol.cpp
+  danicoin/src/P2p/NetNodeConfig.cpp
+  danicoin/src/P2p/PeerListManager.cpp
+  danicoin/src/CryptoNoteProtocol/CryptoNoteProtocolHandler.cpp
+  danicoin/src/Logging/ILogger.cpp
+  danicoin/src/Logging/LoggerGroup.cpp
+  danicoin/src/Logging/CommonLogger.cpp
+  danicoin/src/Logging/LoggerManager.cpp
+  danicoin/src/Logging/FileLogger.cpp
+  danicoin/src/Logging/StreamLogger.cpp
+  danicoin/src/Logging/ConsoleLogger.cpp
+  danicoin/src/Logging/LoggerMessage.cpp
+  danicoin/src/Logging/LoggerRef.cpp
+  danicoin/src/BlockchainExplorer/BlockchainExplorer.cpp
+  danicoin/src/BlockchainExplorer/BlockchainExplorerDataBuilder.cpp
+  danicoin/src/BlockchainExplorer/BlockchainExplorerErrors.cpp
 )

 file(GLOB_RECURSE SOURCES src/*.cpp)
@ -184,7 +184,7 @@ if (WIN32)
 	message(FATAL_ERROR "Only MSVC is supported on this platform")
  endif ()
  add_definitions(/D_CRT_SECURE_NO_WARNINGS /D_WIN32_WINNT=0x0600 /DSTATICLIB)
-  include_directories(cryptonote/src/platform/msc)
+  include_directories(danicoin/src/platform/msc)

  set(PLATFORM_DIR Windows)
  set(BUILD_PLATFORM WIN32)
@ -192,13 +192,13 @@ if (WIN32)
  set(QTMAIN Qt5::WinMain)

 elseif (UNIX)
-  set(CRYPTONOTE_SOURCES ${CRYPTONOTE_SOURCES} cryptonote/external/miniupnpc/minissdpc.c)
+  set(CRYPTONOTE_SOURCES ${CRYPTONOTE_SOURCES} danicoin/external/miniupnpc/minissdpc.c)
  if (APPLE)
    enable_language(ASM)
    file(GLOB_RECURSE OBJC_SOURCES src/*.mm)
    set(SOURCES ${SOURCES} ${OBJC_SOURCES})
    set(PLATFORM_DIR OSX)
-    set(MACOSX_BUNDLE_INFO_STRING "Cryptonote GUI wallet")
+    set(MACOSX_BUNDLE_INFO_STRING "Danicoin GUI wallet")
    set(MACOSX_BUNDLE_LONG_VERSION_STRING "${VERSION_VERSION}.${VERSION_MINOR}.${VERSION_PATCH}")
    set(MACOSX_BUNDLE_BUNDLE_NAME CryptonoteWallet)
    set(MACOSX_BUNDLE_SHORT_VERSION_STRING "${VERSION_VERSION}.${VERSION_MINOR}.${VERSION_PATCH}")
@ -228,8 +228,8 @@ elseif (UNIX)
  endif (APPLE)
 endif ()

-include_directories(cryptonote/src/Platform/${PLATFORM_DIR})
-file(GLOB PLATFORM_SOURCES cryptonote/src/Platform/${PLATFORM_DIR}/System/*)
+include_directories(danicoin/src/Platform/${PLATFORM_DIR})
+file(GLOB PLATFORM_SOURCES danicoin/src/Platform/${PLATFORM_DIR}/System/*)
 set(CRYPTONOTE_SOURCES ${CRYPTONOTE_SOURCES} ${PLATFORM_SOURCES})

 add_library(${CRYPTONOTE_LIB} STATIC ${CRYPTONOTE_SOURCES})
--- a/src/gui/ui/aboutdialog.ui
+++ b/src/gui/ui/aboutdialog.ui
@ -41,7 +41,7 @@
      </sizepolicy>
     </property>
     <property name="text">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;CryptoNote coin version %1&lt;/p&gt;&lt;p&gt;CryptoNote coin is the next generation anonymous cryptocurrency based on CryptoNote.&lt;/p&gt;&lt;p&gt;Copyright (c) 2012-2015. CryptoNote Developers&lt;/p&gt;&lt;p&gt;&lt;a href=&quot;http://opensource.org/licenses/MIT&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://opensource.org/licenses/MIT&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;a href=&quot;https://cryptonote.org/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;https://cryptonote.org/&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+	     <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Danicoin Wallet version %1&lt;/p&gt;&lt;p&gt;Danicoin is the next generation anonymous cryptocurrency.&lt;/p&gt;&lt;p&gt;Copyright (c) 2012-2015. CryptoNote Developers&lt;/p&gt;&lt;p&gt;Copyright (c) 2017. Klaus-Uwe Mitterer&lt;/p&gt;&lt;p&gt;&lt;a href=&quot;http://opensource.org/licenses/MIT&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://opensource.org/licenses/MIT&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;a href=&quot;https://danico.in/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;https://danico.in/&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
     </property>
     <property name="textFormat">
      <enum>Qt::RichText</enum>
--- a/src/gui/ui/sendframe.ui
+++ b/src/gui/ui/sendframe.ui
@ -100,7 +100,7 @@
     <item row="1" column="0">
      <widget class="QLabel" name="label_2">
       <property name="text">
-        <string>Anonimity level:</string>
+        <string>Anonymity level:</string>
       </property>
      </widget>
     </item>