Browse Source

update txlist bug (icons), locale update, qrcode address fix

pull/26/head
R4SAS 7 years ago
parent
commit
1b6dbf1302
  1. 6
      android/gostcoin-qt-android.pro
  2. 6
      gostcoin-qt.pro
  3. 0
      src/i2psam/i2psam.cpp
  4. 0
      src/i2psam/i2psam.h
  5. 0
      src/i2psam/makefile.linux-mingw
  6. 0
      src/i2psam/makefile.mingw
  7. 0
      src/i2psam/makefile.unix
  8. 146
      src/makefile.linux-mingw
  9. 38
      src/makefile.mingw
  10. 38
      src/makefile.osx
  11. 197
      src/makefile.unix
  12. 3
      src/qt/gostcoin.cpp
  13. 198
      src/qt/locale/bitcoin_en.ts
  14. 4
      src/qt/locale/bitcoin_ru.ts
  15. 2
      src/qt/qrcodedialog.cpp
  16. 2
      src/qt/transactiontablemodel.cpp

6
android/gostcoin-qt-android.pro

@ -1,7 +1,7 @@
TEMPLATE = app TEMPLATE = app
TARGET = gostcoin-qt TARGET = gostcoin-qt
VERSION = 0.8.5.10 VERSION = 0.8.5.10
INCLUDEPATH += ../src ../src/json ../src/qt ../i2psam INCLUDEPATH += ../src ../src/json ../src/qt ../src/i2psam
QT += core gui network androidextras QT += core gui network androidextras
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE BOOST_NO_CXX11_SCOPED_ENUMS DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE BOOST_NO_CXX11_SCOPED_ENUMS
@ -242,7 +242,7 @@ HEADERS += ../src/qt/bitcoingui.h \
../src/json/json_spirit_reader.h \ ../src/json/json_spirit_reader.h \
../src/json/json_spirit_error_position.h \ ../src/json/json_spirit_error_position.h \
../src/json/json_spirit.h \ ../src/json/json_spirit.h \
../i2psam/i2psam.h \ ../src/i2psam/i2psam.h \
../src/qt/clientmodel.h \ ../src/qt/clientmodel.h \
../src/qt/guiutil.h \ ../src/qt/guiutil.h \
../src/qt/transactionrecord.h \ ../src/qt/transactionrecord.h \
@ -361,7 +361,7 @@ SOURCES += ../src/qt/gostcoin.cpp \
../src/txdb.cpp \ ../src/txdb.cpp \
../src/qt/splashscreen.cpp \ ../src/qt/splashscreen.cpp \
../src/qt/showi2paddresses.cpp \ ../src/qt/showi2paddresses.cpp \
../i2psam/i2psam.cpp \ ../src/i2psam/i2psam.cpp \
../src/qt/setupdarknet.cpp ../src/qt/setupdarknet.cpp
RESOURCES += ../src/qt/gostcoin.qrc RESOURCES += ../src/qt/gostcoin.qrc

6
gostcoin-qt.pro

@ -2,7 +2,7 @@ TEMPLATE = app
TARGET = gostcoin-qt TARGET = gostcoin-qt
macx:TARGET = "GOSTcoin-Qt" macx:TARGET = "GOSTcoin-Qt"
VERSION = 0.8.5.10 VERSION = 0.8.5.10
INCLUDEPATH += src src/json src/qt i2psam INCLUDEPATH += src src/json src/qt src/i2psam
QT += core gui network QT += core gui network
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE BOOST_NO_CXX11_SCOPED_ENUMS DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE BOOST_NO_CXX11_SCOPED_ENUMS
@ -166,7 +166,7 @@ HEADERS += src/qt/bitcoingui.h \
src/json/json_spirit_reader.h \ src/json/json_spirit_reader.h \
src/json/json_spirit_error_position.h \ src/json/json_spirit_error_position.h \
src/json/json_spirit.h \ src/json/json_spirit.h \
i2psam/i2psam.h \ src/i2psam/i2psam.h \
src/qt/clientmodel.h \ src/qt/clientmodel.h \
src/qt/guiutil.h \ src/qt/guiutil.h \
src/qt/transactionrecord.h \ src/qt/transactionrecord.h \
@ -286,7 +286,7 @@ SOURCES += src/qt/gostcoin.cpp \
src/qt/splashscreen.cpp \ src/qt/splashscreen.cpp \
src/qt/showi2paddresses.cpp \ src/qt/showi2paddresses.cpp \
src/qt/setupdarknet.cpp \ src/qt/setupdarknet.cpp \
i2psam/i2psam.cpp src/i2psam/i2psam.cpp
RESOURCES += src/qt/gostcoin.qrc RESOURCES += src/qt/gostcoin.qrc

0
i2psam/i2psam.cpp → src/i2psam/i2psam.cpp

0
i2psam/i2psam.h → src/i2psam/i2psam.h

0
i2psam/makefile.linux-mingw → src/i2psam/makefile.linux-mingw

0
i2psam/makefile.mingw → src/i2psam/makefile.mingw

0
i2psam/makefile.unix → src/i2psam/makefile.unix

146
src/makefile.linux-mingw

@ -1,146 +0,0 @@
# Copyright (c) 2009-2010 Satoshi Nakamoto
# Distributed under the MIT/X11 software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
DEPSDIR:=/usr/i686-w64-mingw32
CC := i686-w64-mingw32-gcc
CXX := i686-w64-mingw32-g++
USE_UPNP:=0
USE_IPV6:=1
INCLUDEPATHS= \
-I"$(CURDIR)" \
-I"$(CURDIR)"/obj \
-I"$(DEPSDIR)/include" \
-I"$(DEPSDIR)" \
-I"../i2psam"
LIBPATHS= \
-L"$(DEPSDIR)/lib" \
-L"../i2psam"
LIBS= \
$(CURDIR)/leveldb/libleveldb.a $(CURDIR)/leveldb/libmemenv.a \
-l boost_system-mt-s \
-l boost_filesystem-mt-s \
-l boost_program_options-mt-s \
-l boost_thread_win32-mt-s \
-l boost_chrono-mt-s \
-l db_cxx \
-l ssl \
-l crypto \
-l i2psam
DEFS=-D_MT -DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -DBOOST_SPIRIT_THREADSAFE
DEBUGFLAGS=-g
xCXXFLAGS=-O2 -w -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS) $(CXXFLAGS)
# enable: ASLR, DEP and large address aware
xLDFLAGS=-Wl,--dynamicbase -Wl,--nxcompat -Wl,--large-address-aware -static-libgcc -static-libstdc++ $(LDFLAGS)
TESTDEFS = -DTEST_DATA_DIR=$(abspath test/data)
ifndef USE_UPNP
override USE_UPNP = -
endif
ifneq (${USE_UPNP}, -)
LIBPATHS += -L"$(DEPSDIR)/miniupnpc"
LIBS += -l miniupnpc -l iphlpapi
DEFS += -DSTATICLIB -DUSE_UPNP=$(USE_UPNP)
endif
ifneq (${USE_IPV6}, -)
DEFS += -DUSE_IPV6=$(USE_IPV6)
endif
LIBS += -l mingwthrd -l kernel32 -l user32 -l gdi32 -l comdlg32 -l winspool -l winmm -l shell32 -l comctl32 -l ole32 -l oleaut32 -l uuid -l rpcrt4 -l advapi32 -l ws2_32 -l mswsock -l shlwapi
# I2P Support
DEFS += -DUSE_NATIVE_I2P -I"../i2psam"
LIBS += -L"../i2psam"
# TODO: make the mingw builds smarter about dependencies, like the linux/osx builds are
HEADERS = $(wildcard *.h)
OBJS= \
leveldb/libleveldb.a \
obj/alert.o \
obj/version.o \
obj/checkpoints.o \
obj/netbase.o \
obj/addrman.o \
obj/crypter.o \
obj/key.o \
obj/db.o \
obj/init.o \
obj/keystore.o \
obj/irc.o \
obj/i2p.o \
obj/main.o \
obj/net.o \
obj/protocol.o \
obj/bitcoinrpc.o \
obj/rpcdump.o \
obj/rpcnet.o \
obj/rpcmining.o \
obj/rpcwallet.o \
obj/rpcblockchain.o \
obj/rpcrawtransaction.o \
obj/script.o \
obj/scrypt.o \
obj/sync.o \
obj/util.o \
obj/wallet.o \
obj/walletdb.o \
obj/noui.o \
obj/hash.o \
obj/bloom.o \
obj/leveldb.o \
obj/txdb.o
ifdef USE_SSE2
DEFS += -DUSE_SSE2
OBJS_SSE2= obj/scrypt-sse2.o
OBJS += $(OBJS_SSE2)
endif
all: anoncoind.exe
DEFS += -I"$(CURDIR)/leveldb/include"
DEFS += -I"$(CURDIR)/leveldb/helpers"
leveldb/libleveldb.a:
@echo "Building LevelDB ..." && cd leveldb && TARGET_OS=OS_WINDOWS_CROSSCOMPILE $(MAKE) CC=$(CC) CXX=$(CXX) OPT="$(xCXXFLAGS)" libleveldb.a libmemenv.a && i686-w64-mingw32-ranlib libleveldb.a && i686-w64-mingw32-ranlib libmemenv.a && cd ..
obj/build.h: FORCE
/bin/sh ../share/genbuild.sh obj/build.h
version.cpp: obj/build.h
DEFS += -DHAVE_BUILD_INFO
obj/%-sse2.o: %-sse2.cpp
$(CXX) -c $(xCXXFLAGS) -msse2 -mstackrealign -o $@ $<
obj/%.o: %.cpp $(HEADERS)
$(CXX) -c $(xCXXFLAGS) -o $@ $<
anoncoind.exe: $(OBJS:obj/%=obj/%)
$(CXX) $(xCXXFLAGS) $(xLDFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS)
TESTOBJS := $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp))
obj-test/%.o: test/%.cpp $(HEADERS)
$(CXX) -c $(TESTDEFS) $(xCXXFLAGS) -o $@ $<
test_anoncoin.exe: $(TESTOBJS) $(filter-out obj/init.o,$(OBJS:obj/%=obj/%))
$(CXX) $(xCXXFLAGS) $(xLDFLAGS) -o $@ $(LIBPATHS) $^ -lboost_unit_test_framework-mt-s $(LIBS)
clean:
-rm -f obj/*.o
-rm -f anoncoind.exe
-rm -f obj-test/*.o
-rm -f test_anoncoin.exe
-rm -f obj/build.h
cd leveldb && TARGET_OS=OS_WINDOWS_CROSSCOMPILE $(MAKE) clean && cd ..
FORCE:

38
src/makefile.mingw

@ -17,7 +17,7 @@
CXX ?= g++ CXX ?= g++
USE_IPV6:=0 USE_IPV6:=1
USE_DEBUG:=0 USE_DEBUG:=0
DEPSDIR?=/usr/local DEPSDIR?=/usr/local
@ -27,25 +27,25 @@ BOOST_SUFFIX?=-mt
INCLUDEPATHS= \ INCLUDEPATHS= \
-I"$(CURDIR)" \ -I"$(CURDIR)" \
-I"$(DEPSDIR)/include" \ -I"$(DEPSDIR)/include" \
-I"../i2psam" -I"i2psam"
LIBPATHS= \ LIBPATHS= \
-L"$(CURDIR)/leveldb" \ -L"$(CURDIR)/leveldb" \
-L"$(DEPSDIR)/lib" \ -L"$(DEPSDIR)/lib" \
-L"../i2psam" -L"i2psam"
LIBS= \ LIBS= \
-l leveldb \ -lleveldb \
-l memenv \ -lmemenv \
-l boost_system$(BOOST_SUFFIX) \ -lboost_system$(BOOST_SUFFIX) \
-l boost_filesystem$(BOOST_SUFFIX) \ -lboost_filesystem$(BOOST_SUFFIX) \
-l boost_program_options$(BOOST_SUFFIX) \ -lboost_program_options$(BOOST_SUFFIX) \
-l boost_thread$(BOOST_SUFFIX) \ -lboost_thread$(BOOST_SUFFIX) \
-l boost_chrono$(BOOST_SUFFIX) \ -lboost_chrono$(BOOST_SUFFIX) \
-l db_cxx \ -ldb_cxx \
-l ssl \ -lssl \
-l crypto \ -lcrypto \
-l i2psam -li2psam
DEFS=-D_MT -DWIN32 -D_WINDOWS -DWIN32_LEAN_AND_MEAN -DBOOST_THREAD_USE_LIB -DBOOST_SPIRIT_THREADSAFE DEFS=-D_MT -DWIN32 -D_WINDOWS -DWIN32_LEAN_AND_MEAN -DBOOST_THREAD_USE_LIB -DBOOST_SPIRIT_THREADSAFE
@ -63,13 +63,13 @@ ifneq (${USE_IPV6}, -)
DEFS += -DUSE_IPV6=$(USE_IPV6) DEFS += -DUSE_IPV6=$(USE_IPV6)
endif endif
LIBS += -l stdc++ -l mingwthrd -l kernel32 -l user32 -l gdi32 -l comdlg32 -l winspool -l winmm -l shell32 -l comctl32 -l ole32 -l oleaut32 -l uuid -l rpcrt4 -l advapi32 -l ws2_32 -l mswsock -l shlwapi -l pthread LIBS += -lstdc++ -lmingwthrd -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lws2_32 -lmswsock -lshlwapi -lpthread
# TODO: make the mingw builds smarter about dependencies, like the linux/osx builds are # TODO: make the mingw builds smarter about dependencies, like the linux/osx builds are
HEADERS = $(wildcard *.h) HEADERS = $(wildcard *.h)
OBJS= \ OBJS= \
../i2psam/libi2psam.a \ i2psam/libi2psam.a \
leveldb/libleveldb.a \ leveldb/libleveldb.a \
obj/alert.o \ obj/alert.o \
obj/version.o \ obj/version.o \
@ -128,8 +128,8 @@ leveldb/libleveldb.a:
# I2P Support # I2P Support
DEFS += -DUSE_NATIVE_I2P DEFS += -DUSE_NATIVE_I2P
../i2psam/libi2psam.a: i2psam/libi2psam.a:
cd ../i2psam && $(MAKE) -f makefile.mingw && cd ../src cd i2psam && $(MAKE) -f makefile.mingw && cd ..
obj/build.h: FORCE obj/build.h: FORCE
/bin/sh ../share/genbuild.sh obj/build.h /bin/sh ../share/genbuild.sh obj/build.h
@ -162,6 +162,6 @@ clean:
rm -f obj/* rm -f obj/*
rm -f obj-test/* rm -f obj-test/*
cd leveldb && $(MAKE) TARGET_OS=NATIVE_WINDOWS clean && cd .. cd leveldb && $(MAKE) TARGET_OS=NATIVE_WINDOWS clean && cd ..
cd ../i2psam && $(MAKE) -f makefile.mingw clean && cd ../src cd i2psam && $(MAKE) -f makefile.mingw clean && cd ../src
FORCE: FORCE:

38
src/makefile.osx vendored

@ -14,12 +14,12 @@ INCLUDEPATHS= \
-I"$(CURDIR)"/obj \ -I"$(CURDIR)"/obj \
-I"$(DEPSDIR)/include" \ -I"$(DEPSDIR)/include" \
-I"$(DEPSDIR)/include/db48" \ -I"$(DEPSDIR)/include/db48" \
-I"../i2psam" -I"i2psam"
LIBPATHS= \ LIBPATHS= \
-L"$(DEPSDIR)/lib" \ -L"$(DEPSDIR)/lib" \
-L"$(DEPSDIR)/lib/db48" \ -L"$(DEPSDIR)/lib/db48" \
-L"../i2psam" -L"i2psam"
USE_UPNP:=1 USE_UPNP:=1
USE_IPV6:=1 USE_IPV6:=1
@ -55,7 +55,7 @@ LIBS += \
-lssl \ -lssl \
-lcrypto \ -lcrypto \
-lz \ -lz \
-l i2psam -li2psam
TESTDEFS += -DBOOST_TEST_DYN_LINK TESTDEFS += -DBOOST_TEST_DYN_LINK
endif endif
@ -70,16 +70,12 @@ else
DEBUGFLAGS = -g DEBUGFLAGS = -g
endif endif
# I2P Support
DEFS += -DUSE_NATIVE_I2P -I"../i2psam"
LIBS += -L"../i2psam"
# ppc doesn't work because we don't support big-endian # ppc doesn't work because we don't support big-endian
CFLAGS += -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter \ CFLAGS += -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter \
$(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS) $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS)
OBJS= \ OBJS= \
i2psam/libi2psam.a \
leveldb/libleveldb.a \ leveldb/libleveldb.a \
obj/alert.o \ obj/alert.o \
obj/version.o \ obj/version.o \
@ -115,12 +111,6 @@ OBJS= \
obj/leveldb.o \ obj/leveldb.o \
obj/txdb.o obj/txdb.o
ifdef USE_SSE2
DEFS += -DUSE_SSE2
OBJS_SSE2= obj/scrypt-sse2.o
OBJS += $(OBJS_SSE2)
endif
ifndef USE_UPNP ifndef USE_UPNP
override USE_UPNP = - override USE_UPNP = -
endif endif
@ -137,10 +127,10 @@ ifneq (${USE_IPV6}, -)
DEFS += -DUSE_IPV6=$(USE_IPV6) DEFS += -DUSE_IPV6=$(USE_IPV6)
endif endif
all: anoncoind all: gostcoind
test check: test_anoncoin FORCE test check: test_gostcoin FORCE
./test_anoncoin ./test_gostcoin
# #
# LevelDB support # LevelDB support
@ -151,6 +141,13 @@ DEFS += $(addprefix -I,$(CURDIR)/leveldb/helpers)
leveldb/libleveldb.a: leveldb/libleveldb.a:
@echo "Building LevelDB ..." && cd leveldb && $(MAKE) CC=$(CC) CXX=$(CXX) OPT="$(CFLAGS)" libleveldb.a libmemenv.a && cd .. @echo "Building LevelDB ..." && cd leveldb && $(MAKE) CC=$(CC) CXX=$(CXX) OPT="$(CFLAGS)" libleveldb.a libmemenv.a && cd ..
# I2P Support
LIBS += -L"i2psam"
DEFS += -DUSE_NATIVE_I2P -I"i2psam"
i2psam/libi2psam.a:
@echo "Building libi2psam ..." && cd i2psam && $(MAKE) -f makefile.unix && cd ..
# auto-generated dependencies: # auto-generated dependencies:
-include obj/*.P -include obj/*.P
-include obj-test/*.P -include obj-test/*.P
@ -174,7 +171,7 @@ obj/%.o: %.cpp
-e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \ -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
rm -f $(@:%.o=%.d) rm -f $(@:%.o=%.d)
anoncoind: $(OBJS:obj/%=obj/%) gostcoind: $(OBJS:obj/%=obj/%)
$(CXX) $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS) $(CXX) $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS)
TESTOBJS := $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp)) TESTOBJS := $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp))
@ -186,16 +183,17 @@ obj-test/%.o: test/%.cpp
-e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \ -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
rm -f $(@:%.o=%.d) rm -f $(@:%.o=%.d)
test_anoncoin: $(TESTOBJS) $(filter-out obj/init.o,$(OBJS:obj/%=obj/%)) test_gostcoin: $(TESTOBJS) $(filter-out obj/init.o,$(OBJS:obj/%=obj/%))
$(CXX) $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS) $(TESTLIBS) $(CXX) $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS) $(TESTLIBS)
clean: clean:
-rm -f anoncoind test_anoncoin -rm -f gostcoind test_gostcoin
-rm -f obj/*.o -rm -f obj/*.o
-rm -f obj-test/*.o -rm -f obj-test/*.o
-rm -f obj/*.P -rm -f obj/*.P
-rm -f obj-test/*.P -rm -f obj-test/*.P
-rm -f obj/build.h -rm -f obj/build.h
-cd i2psam && $(MAKE) -f makefile.unix clean || true
-cd leveldb && $(MAKE) clean || true -cd leveldb && $(MAKE) clean || true
FORCE: FORCE:

197
src/makefile.unix

@ -29,61 +29,61 @@ endif
# for boost 1.37, add -mt to the boost libraries # for boost 1.37, add -mt to the boost libraries
LIBS += \ LIBS += \
-Wl,-B$(LMODE) \ -Wl,-B$(LMODE) \
-l boost_system$(BOOST_LIB_SUFFIX) \ -lboost_system$(BOOST_LIB_SUFFIX) \
-l boost_filesystem$(BOOST_LIB_SUFFIX) \ -lboost_filesystem$(BOOST_LIB_SUFFIX) \
-l boost_program_options$(BOOST_LIB_SUFFIX) \ -lboost_program_options$(BOOST_LIB_SUFFIX) \
-l boost_thread$(BOOST_LIB_SUFFIX) \ -lboost_thread$(BOOST_LIB_SUFFIX) \
-l db_cxx$(BDB_LIB_SUFFIX) \ -ldb_cxx$(BDB_LIB_SUFFIX) \
-l ssl \ -lssl \
-l crypto -lcrypto
TESTLIBS += \ TESTLIBS += \
-Wl,-B$(LMODE) \ -Wl,-B$(LMODE) \
-l boost_unit_test_framework$(BOOST_LIB_SUFFIX) -lboost_unit_test_framework$(BOOST_LIB_SUFFIX)
ifneq (${USE_IPV6}, -) ifneq (${USE_IPV6}, -)
DEFS += -DUSE_IPV6=$(USE_IPV6) DEFS += -DUSE_IPV6=$(USE_IPV6)
endif endif
LIBS += \ LIBS += \
-Wl,-B$(LMODE2) \ -Wl,-B$(LMODE2) \
-l z \ -lz \
-l dl \ -ldl \
-l pthread \ -lpthread \
-l i2psam -li2psam
# Hardening # Hardening
# Make some classes of vulnerabilities unexploitable in case one is discovered. # Make some classes of vulnerabilities unexploitable in case one is discovered.
# #
# This is a workaround for Ubuntu bug #691722, the default -fstack-protector causes # This is a workaround for Ubuntu bug #691722, the default -fstack-protector causes
# -fstack-protector-all to be ignored unless -fno-stack-protector is used first. # -fstack-protector-all to be ignored unless -fno-stack-protector is used first.
# see: https://bugs.launchpad.net/ubuntu/+source/gcc-4.5/+bug/691722 # see: https://bugs.launchpad.net/ubuntu/+source/gcc-4.5/+bug/691722
HARDENING=-fno-stack-protector HARDENING=-fno-stack-protector
# Stack Canaries # Stack Canaries
# Put numbers at the beginning of each stack frame and check that they are the same. # Put numbers at the beginning of each stack frame and check that they are the same.
# If a stack buffer if overflowed, it writes over the canary number and then on return # If a stack buffer if overflowed, it writes over the canary number and then on return
# when that number is checked, it won't be the same and the program will exit with # when that number is checked, it won't be the same and the program will exit with
# a "Stack smashing detected" error instead of being exploited. # a "Stack smashing detected" error instead of being exploited.
HARDENING+=-fstack-protector-all -Wstack-protector HARDENING+=-fstack-protector-all -Wstack-protector
# Make some important things such as the global offset table read only as soon as # Make some important things such as the global offset table read only as soon as
# the dynamic linker is finished building it. This will prevent overwriting of addresses # the dynamic linker is finished building it. This will prevent overwriting of addresses
# which would later be jumped to. # which would later be jumped to.
LDHARDENING+=-Wl,-z,relro -Wl,-z,now LDHARDENING+=-Wl,-z,relro -Wl,-z,now
# Build position independent code to take advantage of Address Space Layout Randomization # Build position independent code to take advantage of Address Space Layout Randomization
# offered by some kernels. # offered by some kernels.
# see doc/build-unix.txt for more information. # see doc/build-unix.txt for more information.
ifdef PIE ifdef PIE
HARDENING+=-fPIE HARDENING+=-fPIE
LDHARDENING+=-pie LDHARDENING+=-pie
endif endif
# -D_FORTIFY_SOURCE=2 does some checking for potentially exploitable code patterns in # -D_FORTIFY_SOURCE=2 does some checking for potentially exploitable code patterns in
# the source such overflowing a statically defined buffer. # the source such overflowing a statically defined buffer.
HARDENING+=-D_FORTIFY_SOURCE=2 HARDENING+=-D_FORTIFY_SOURCE=2
# #
ifneq (${USE_DEBUG}, 0) ifneq (${USE_DEBUG}, 0)
@ -93,54 +93,47 @@ endif
# CXXFLAGS can be specified on the make command line, so we use xCXXFLAGS that only # CXXFLAGS can be specified on the make command line, so we use xCXXFLAGS that only
# adds some defaults in front. Unfortunately, CXXFLAGS=... $(CXXFLAGS) does not work. # adds some defaults in front. Unfortunately, CXXFLAGS=... $(CXXFLAGS) does not work.
xCXXFLAGS = -std=c++11 -O2 -pthread -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter \ xCXXFLAGS = -std=c++11 -O2 -pthread -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter \
$(DEBUGFLAGS) $(DEFS) $(HARDENING) $(CXXFLAGS) $(DEBUGFLAGS) $(DEFS) $(HARDENING) $(CXXFLAGS)
# LDFLAGS can be specified on the make command line, so we use xLDFLAGS that only # LDFLAGS can be specified on the make command line, so we use xLDFLAGS that only
# adds some defaults in front. Unfortunately, LDFLAGS=... $(LDFLAGS) does not work. # adds some defaults in front. Unfortunately, LDFLAGS=... $(LDFLAGS) does not work.
xLDFLAGS=$(LDHARDENING) $(LDFLAGS) xLDFLAGS=$(LDHARDENING) $(LDFLAGS)
OBJS = \ OBJS = \
../i2psam/libi2psam.a \ i2psam/libi2psam.a \
leveldb/libleveldb.a \ leveldb/libleveldb.a \
obj/alert.o \ obj/alert.o \
obj/version.o \ obj/version.o \
obj/checkpoints.o \ obj/checkpoints.o \
obj/netbase.o \ obj/netbase.o \
obj/addrman.o \ obj/addrman.o \
obj/crypter.o \ obj/crypter.o \
obj/key.o \ obj/key.o \
obj/db.o \ obj/db.o \
obj/init.o \ obj/init.o \
obj/keystore.o \ obj/keystore.o \
obj/i2p.o \ obj/i2p.o \
obj/Gost.o \ obj/Gost.o \
obj/main.o \ obj/main.o \
obj/net.o \ obj/net.o \
obj/protocol.o \ obj/protocol.o \
obj/bitcoinrpc.o \ obj/bitcoinrpc.o \
obj/rpcdump.o \ obj/rpcdump.o \
obj/rpcnet.o \ obj/rpcnet.o \
obj/rpcmining.o \ obj/rpcmining.o \
obj/rpcwallet.o \ obj/rpcwallet.o \
obj/rpcblockchain.o \ obj/rpcblockchain.o \
obj/rpcrawtransaction.o \ obj/rpcrawtransaction.o \
obj/script.o \ obj/script.o \
obj/sync.o \ obj/sync.o \
obj/util.o \ obj/util.o \
obj/wallet.o \ obj/wallet.o \
obj/walletdb.o \ obj/walletdb.o \
obj/hash.o \ obj/hash.o \
obj/bloom.o \ obj/bloom.o \
obj/noui.o \ obj/noui.o \
obj/leveldb.o \ obj/leveldb.o \
obj/txdb.o obj/txdb.o
ifdef USE_SSE2
DEFS += -DUSE_SSE2
OBJS_SSE2= obj/scrypt-sse2.o
OBJS += $(OBJS_SSE2)
endif
all: gostcoind all: gostcoind
@ -154,14 +147,16 @@ MAKEOVERRIDES =
LIBS += $(CURDIR)/leveldb/libleveldb.a $(CURDIR)/leveldb/libmemenv.a LIBS += $(CURDIR)/leveldb/libleveldb.a $(CURDIR)/leveldb/libmemenv.a
DEFS += $(addprefix -I,$(CURDIR)/leveldb/include) DEFS += $(addprefix -I,$(CURDIR)/leveldb/include)
DEFS += $(addprefix -I,$(CURDIR)/leveldb/helpers) DEFS += $(addprefix -I,$(CURDIR)/leveldb/helpers)
leveldb/libleveldb.a: leveldb/libleveldb.a:
@echo "Building LevelDB ..." && cd leveldb && $(MAKE) CC=$(CC) CXX=$(CXX) OPT="$(xCXXFLAGS)" libleveldb.a libmemenv.a && cd .. @echo "Building LevelDB ..." && cd leveldb && $(MAKE) CC=$(CC) CXX=$(CXX) OPT="$(xCXXFLAGS)" libleveldb.a libmemenv.a && cd ..
# I2P Support # I2P Support
LIBS += -L"../i2psam" LIBS += -L"i2psam"
DEFS += -DUSE_NATIVE_I2P -I"../i2psam" DEFS += -DUSE_NATIVE_I2P -I"i2psam"
../i2psam/libi2psam.a:
@echo "Building libi2psam ..." && cd ../i2psam && $(MAKE) -f makefile.unix && cd ../src i2psam/libi2psam.a:
@echo "Building libi2psam ..." && cd i2psam && $(MAKE) -f makefile.unix && cd ..
# auto-generated dependencies: # auto-generated dependencies:
-include obj/*.P -include obj/*.P
@ -169,22 +164,24 @@ DEFS += -DUSE_NATIVE_I2P -I"../i2psam"
obj/build.h: FORCE obj/build.h: FORCE
/bin/sh ../share/genbuild.sh obj/build.h /bin/sh ../share/genbuild.sh obj/build.h
version.cpp: obj/build.h version.cpp: obj/build.h
DEFS += -DHAVE_BUILD_INFO DEFS += -DHAVE_BUILD_INFO
obj/%-sse2.o: %-sse2.cpp obj/%-sse2.o: %-sse2.cpp
$(CXX) -c $(xCXXFLAGS) -msse2 -MMD -MF $(@:%.o=%.d) -o $@ $< $(CXX) -c $(xCXXFLAGS) -msse2 -MMD -MF $(@:%.o=%.d) -o $@ $<
@cp $(@:%.o=%.d) $(@:%.o=%.P); \ @cp $(@:%.o=%.d) $(@:%.o=%.P); \
sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
-e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \ -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
rm -f $(@:%.o=%.d) rm -f $(@:%.o=%.d)
obj/%.o: %.cpp obj/%.o: %.cpp
$(CXX) -c $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $< $(CXX) -c $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $<
@cp $(@:%.o=%.d) $(@:%.o=%.P); \ @cp $(@:%.o=%.d) $(@:%.o=%.P); \
sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
-e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \ -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
rm -f $(@:%.o=%.d) rm -f $(@:%.o=%.d)
gostcoind: $(OBJS:obj/%=obj/%) gostcoind: $(OBJS:obj/%=obj/%)
$(LINK) $(xCXXFLAGS) -o $@ $^ $(xLDFLAGS) $(LIBS) $(LINK) $(xCXXFLAGS) -o $@ $^ $(xLDFLAGS) $(LIBS)
@ -194,9 +191,9 @@ TESTOBJS := $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp))
obj-test/%.o: test/%.cpp obj-test/%.o: test/%.cpp
$(CXX) -c $(TESTDEFS) $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $< $(CXX) -c $(TESTDEFS) $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $<
@cp $(@:%.o=%.d) $(@:%.o=%.P); \ @cp $(@:%.o=%.d) $(@:%.o=%.P); \
sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
-e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \ -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
rm -f $(@:%.o=%.d) rm -f $(@:%.o=%.d)
test_gostcoin: $(TESTOBJS) $(filter-out obj/init.o,$(OBJS:obj/%=obj/%)) test_gostcoin: $(TESTOBJS) $(filter-out obj/init.o,$(OBJS:obj/%=obj/%))
$(LINK) $(xCXXFLAGS) -o $@ $(LIBPATHS) $^ $(TESTLIBS) $(xLDFLAGS) $(LIBS) $(LINK) $(xCXXFLAGS) -o $@ $(LIBPATHS) $^ $(TESTLIBS) $(xLDFLAGS) $(LIBS)
@ -208,7 +205,7 @@ clean:
-rm -f obj/*.P -rm -f obj/*.P
-rm -f obj-test/*.P -rm -f obj-test/*.P
-rm -f obj/build.h -rm -f obj/build.h
-cd ../i2psam && $(MAKE) -f makefile.unix clean || true -cd i2psam && $(MAKE) -f makefile.unix clean || true
-cd leveldb && $(MAKE) clean || true -cd leveldb && $(MAKE) clean || true
FORCE: FORCE:

3
src/qt/gostcoin.cpp

@ -2,6 +2,7 @@
* W.J. van der Laan 2011-2012 * W.J. van der Laan 2011-2012
*/ */
// Copyright 2013 The Anoncoin Developers // Copyright 2013 The Anoncoin Developers
// Copyright 2017 The Gostcoin Developers
// //
// I2P-patch // I2P-patch
// Copyright (c) 2012-2013 giv // Copyright (c) 2012-2013 giv
@ -160,7 +161,7 @@ static std::string Translate(const char* psz)
static void handleRunawayException(std::exception *e) static void handleRunawayException(std::exception *e)
{ {
PrintExceptionContinue(e, "Runaway exception"); PrintExceptionContinue(e, "Runaway exception");
QMessageBox::critical(0, "Runaway exception", BitcoinGUI::tr("A fatal error occurred. Anoncoin can no longer continue safely and will quit.") + QString("\n\n") + QString::fromStdString(strMiscWarning)); QMessageBox::critical(0, "Runaway exception", BitcoinGUI::tr("A fatal error occurred. Gostcoin can no longer continue safely and will quit.") + QString("\n\n") + QString::fromStdString(strMiscWarning));
exit(1); exit(1);
} }

198
src/qt/locale/bitcoin_en.ts

@ -5,13 +5,13 @@
<name>AboutDialog</name> <name>AboutDialog</name>
<message> <message>
<location filename="../forms/aboutdialog.ui" line="+14"/> <location filename="../forms/aboutdialog.ui" line="+14"/>
<source>About Anoncoin</source> <source>About Gostcoin</source>
<translation>About Anoncoin</translation> <translation>About Gostcoin</translation>
</message> </message>
<message> <message>
<location line="+39"/> <location line="+39"/>
<source>&lt;b&gt;Anoncoin&lt;/b&gt; version</source> <source>&lt;b&gt;Gostcoin&lt;/b&gt; version</source>
<translation>&lt;b&gt;Anoncoin&lt;/b&gt; version</translation> <translation>&lt;b&gt;Gostcoin&lt;/b&gt; version</translation>
</message> </message>
<message> <message>
<location line="+57"/> <location line="+57"/>
@ -35,8 +35,8 @@ This product includes software developed by the OpenSSL Project for use in the O
</message> </message>
<message> <message>
<location line="+0"/> <location line="+0"/>
<source>The Anoncoin developers</source> <source>The Gostcoin developers</source>
<translation>The Anoncoin developers</translation> <translation>The Gostcoin developers</translation>
</message> </message>
</context> </context>
<context> <context>
@ -68,8 +68,8 @@ This product includes software developed by the OpenSSL Project for use in the O
</message> </message>
<message> <message>
<location filename="../addressbookpage.cpp" line="+63"/> <location filename="../addressbookpage.cpp" line="+63"/>
<source>These are your Anoncoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you.</source> <source>These are your Gostcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you.</source>
<translation>These are your Anoncoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you.</translation> <translation>These are your Gostcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you.</translation>
</message> </message>
<message> <message>
<location filename="../forms/addressbookpage.ui" line="+14"/> <location filename="../forms/addressbookpage.ui" line="+14"/>
@ -83,8 +83,8 @@ This product includes software developed by the OpenSSL Project for use in the O
</message> </message>
<message> <message>
<location line="+11"/> <location line="+11"/>
<source>Sign a message to prove you own a Anoncoin address</source> <source>Sign a message to prove you own a Gostcoin address</source>
<translation>Sign a message to prove you own a Anoncoin address</translation> <translation>Sign a message to prove you own a Gostcoin address</translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+3"/>
@ -108,8 +108,8 @@ This product includes software developed by the OpenSSL Project for use in the O
</message> </message>
<message> <message>
<location line="-44"/> <location line="-44"/>
<source>Verify a message to ensure it was signed with a specified Anoncoin address</source> <source>Verify a message to ensure it was signed with a specified Gostcoin address</source>
<translation>Verify a message to ensure it was signed with a specified Anoncoin address</translation> <translation>Verify a message to ensure it was signed with a specified Gostcoin address</translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+3"/>
@ -123,8 +123,8 @@ This product includes software developed by the OpenSSL Project for use in the O
</message> </message>
<message> <message>
<location filename="../addressbookpage.cpp" line="-5"/> <location filename="../addressbookpage.cpp" line="-5"/>
<source>These are your Anoncoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> <source>These are your Gostcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
<translation>These are your Anoncoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</translation> <translation>These are your Gostcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</translation>
</message> </message>
<message> <message>
<location line="+13"/> <location line="+13"/>
@ -276,8 +276,8 @@ This product includes software developed by the OpenSSL Project for use in the O
</message> </message>
<message> <message>
<location line="-56"/> <location line="-56"/>
<source>Anoncoin will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your anoncoins from being stolen by malware infecting your computer.</source> <source>Gostcoin will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your anoncoins from being stolen by malware infecting your computer.</source>
<translation>Anoncoin will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your anoncoins from being stolen by malware infecting your computer.</translation> <translation>Gostcoin will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your anoncoins from being stolen by malware infecting your computer.</translation>
</message> </message>
<message> <message>
<location line="+13"/> <location line="+13"/>
@ -375,8 +375,8 @@ This product includes software developed by the OpenSSL Project for use in the O
</message> </message>
<message> <message>
<location line="+4"/> <location line="+4"/>
<source>Show information about Anoncoin</source> <source>Show information about Gostcoin</source>
<translation>Show information about Anoncoin</translation> <translation>Show information about Gostcoin</translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+2"/>
@ -420,13 +420,13 @@ This product includes software developed by the OpenSSL Project for use in the O
</message> </message>
<message> <message>
<location line="-347"/> <location line="-347"/>
<source>Send coins to a Anoncoin address</source> <source>Send coins to a Gostcoin address</source>
<translation>Send coins to a Anoncoin address</translation> <translation>Send coins to a Gostcoin address</translation>
</message> </message>
<message> <message>
<location line="+49"/> <location line="+49"/>
<source>Modify configuration options for Anoncoin</source> <source>Modify configuration options for Gostcoin</source>
<translation>Modify configuration options for Anoncoin</translation> <translation>Modify configuration options for Gostcoin</translation>
</message> </message>
<message> <message>
<location line="+9"/> <location line="+9"/>
@ -456,8 +456,8 @@ This product includes software developed by the OpenSSL Project for use in the O
<message> <message>
<location line="-165"/> <location line="-165"/>
<location line="+530"/> <location line="+530"/>
<source>Anoncoin</source> <source>Gostcoin</source>
<translation>Anoncoin</translation> <translation>Gostcoin</translation>
</message> </message>
<message> <message>
<location line="-530"/> <location line="-530"/>
@ -481,8 +481,8 @@ This product includes software developed by the OpenSSL Project for use in the O
</message> </message>
<message> <message>
<location line="+22"/> <location line="+22"/>
<source>&amp;About Anoncoin</source> <source>&amp;About Gostcoin</source>
<translation>&amp;About Anoncoin</translation> <translation>&amp;About Gostcoin</translation>
</message> </message>
<message> <message>
<location line="+9"/> <location line="+9"/>
@ -501,13 +501,13 @@ This product includes software developed by the OpenSSL Project for use in the O
</message> </message>
<message> <message>
<location line="+7"/> <location line="+7"/>
<source>Sign messages with your Anoncoin addresses to prove you own them</source> <source>Sign messages with your Gostcoin addresses to prove you own them</source>
<translation>Sign messages with your Anoncoin addresses to prove you own them</translation> <translation>Sign messages with your Gostcoin addresses to prove you own them</translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+2"/>
<source>Verify messages to ensure they were signed with specified Anoncoin addresses</source> <source>Verify messages to ensure they were signed with specified Gostcoin addresses</source>
<translation>Verify messages to ensure they were signed with specified Anoncoin addresses</translation> <translation>Verify messages to ensure they were signed with specified Gostcoin addresses</translation>
</message> </message>
<message> <message>
<location line="+28"/> <location line="+28"/>
@ -537,15 +537,15 @@ This product includes software developed by the OpenSSL Project for use in the O
</message> </message>
<message> <message>
<location line="+47"/> <location line="+47"/>
<source>Anoncoin client</source> <source>Gostcoin client</source>
<translation>Anoncoin client</translation> <translation>Gostcoin client</translation>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<location line="+141"/> <location line="+141"/>
<source>%n active connection(s) to Anoncoin network</source> <source>%n active connection(s) to Gostcoin network</source>
<translation> <translation>
<numerusform>%n active connection to Anoncoin network</numerusform> <numerusform>%n active connection to Gostcoin network</numerusform>
<numerusform>%n active connections to Anoncoin network</numerusform> <numerusform>%n active connections to Gostcoin network</numerusform>
</translation> </translation>
</message> </message>
<message> <message>
@ -669,8 +669,8 @@ Address: %4
<message> <message>
<location line="-23"/> <location line="-23"/>
<location line="+23"/> <location line="+23"/>
<source>URI can not be parsed! This can be caused by an invalid Anoncoin address or malformed URI parameters.</source> <source>URI can not be parsed! This can be caused by an invalid Gostcoin address or malformed URI parameters.</source>
<translation>URI can not be parsed! This can be caused by an invalid Anoncoin address or malformed URI parameters.</translation> <translation>URI can not be parsed! This can be caused by an invalid Gostcoin address or malformed URI parameters.</translation>
</message> </message>
<message> <message>
<location line="+17"/> <location line="+17"/>
@ -684,8 +684,8 @@ Address: %4
</message> </message>
<message> <message>
<location filename="../bitcoin.cpp" line="+111"/> <location filename="../bitcoin.cpp" line="+111"/>
<source>A fatal error occurred. Anoncoin can no longer continue safely and will quit.</source> <source>A fatal error occurred. Gostcoin can no longer continue safely and will quit.</source>
<translation>A fatal error occurred. Anoncoin can no longer continue safely and will quit.</translation> <translation>A fatal error occurred. Gostcoin can no longer continue safely and will quit.</translation>
</message> </message>
</context> </context>
<context> <context>
@ -750,8 +750,8 @@ Address: %4
</message> </message>
<message> <message>
<location line="-5"/> <location line="-5"/>
<source>The entered address &quot;%1&quot; is not a valid Anoncoin address.</source> <source>The entered address &quot;%1&quot; is not a valid Gostcoin address.</source>
<translation>The entered address &quot;%1&quot; is not a valid Anoncoin address.</translation> <translation>The entered address &quot;%1&quot; is not a valid Gostcoin address.</translation>
</message> </message>
<message> <message>
<location line="+10"/> <location line="+10"/>
@ -769,8 +769,8 @@ Address: %4
<message> <message>
<location filename="../guiutil.cpp" line="+424"/> <location filename="../guiutil.cpp" line="+424"/>
<location line="+12"/> <location line="+12"/>
<source>Anoncoin-Qt</source> <source>Gostcoin-Qt</source>
<translation>Anoncoin-Qt</translation> <translation>Gostcoin-Qt</translation>
</message> </message>
<message> <message>
<location line="-12"/> <location line="-12"/>
@ -832,13 +832,13 @@ Address: %4
</message> </message>
<message> <message>
<location line="+31"/> <location line="+31"/>
<source>Automatically start Anoncoin after logging in to the system.</source> <source>Automatically start Gostcoin after logging in to the system.</source>
<translation>Automatically start Anoncoin after logging in to the system.</translation> <translation>Automatically start Gostcoin after logging in to the system.</translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+3"/>
<source>&amp;Start Anoncoin on system login</source> <source>&amp;Start Gostcoin on system login</source>
<translation>&amp;Start Anoncoin on system login</translation> <translation>&amp;Start Gostcoin on system login</translation>
</message> </message>
<message> <message>
<location line="+35"/> <location line="+35"/>
@ -857,8 +857,8 @@ Address: %4
</message> </message>
<message> <message>
<location line="+6"/> <location line="+6"/>
<source>Automatically open the Anoncoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <source>Automatically open the Gostcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
<translation>Automatically open the Anoncoin client port on the router. This only works when your router supports UPnP and it is enabled.</translation> <translation>Automatically open the Gostcoin client port on the router. This only works when your router supports UPnP and it is enabled.</translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+3"/>
@ -867,8 +867,8 @@ Address: %4
</message> </message>
<message> <message>
<location line="+7"/> <location line="+7"/>
<source>Connect to the Anoncoin network through a SOCKS proxy (e.g. when connecting through Tor).</source> <source>Connect to the Gostcoin network through a SOCKS proxy (e.g. when connecting through Tor).</source>
<translation>Connect to the Anoncoin network through a SOCKS proxy (e.g. when connecting through Tor).</translation> <translation>Connect to the Gostcoin network through a SOCKS proxy (e.g. when connecting through Tor).</translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+3"/>
@ -952,8 +952,8 @@ Address: %4
</message> </message>
<message> <message>
<location line="+13"/> <location line="+13"/>
<source>The user interface language can be set here. This setting will take effect after restarting Anoncoin.</source> <source>The user interface language can be set here. This setting will take effect after restarting Gostcoin.</source>
<translation>The user interface language can be set here. This setting will take effect after restarting Anoncoin.</translation> <translation>The user interface language can be set here. This setting will take effect after restarting Gostcoin.</translation>
</message> </message>
<message> <message>
<location line="+11"/> <location line="+11"/>
@ -967,8 +967,8 @@ Address: %4
</message> </message>
<message> <message>
<location line="+9"/> <location line="+9"/>
<source>Whether to show Anoncoin addresses in the transaction list or not.</source> <source>Whether to show Gostcoin addresses in the transaction list or not.</source>
<translation>Whether to show Anoncoin addresses in the transaction list or not.</translation> <translation>Whether to show Gostcoin addresses in the transaction list or not.</translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+3"/>
@ -1019,8 +1019,8 @@ Address: %4
<message> <message>
<location line="-9"/> <location line="-9"/>
<location line="+9"/> <location line="+9"/>
<source>This setting will take effect after restarting Anoncoin.</source> <source>This setting will take effect after restarting Gostcoin.</source>
<translation>This setting will take effect after restarting Anoncoin.</translation> <translation>This setting will take effect after restarting Gostcoin.</translation>
</message> </message>
<message> <message>
<location line="+29"/> <location line="+29"/>
@ -1038,8 +1038,8 @@ Address: %4
<message> <message>
<location line="+50"/> <location line="+50"/>
<location line="+166"/> <location line="+166"/>
<source>The displayed information may be out of date. Your wallet automatically synchronizes with the Anoncoin network after a connection is established, but this process has not completed yet.</source> <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Gostcoin network after a connection is established, but this process has not completed yet.</source>
<translation>The displayed information may be out of date. Your wallet automatically synchronizes with the Anoncoin network after a connection is established, but this process has not completed yet.</translation> <translation>The displayed information may be out of date. Your wallet automatically synchronizes with the Gostcoin network after a connection is established, but this process has not completed yet.</translation>
</message> </message>
<message> <message>
<location line="-124"/> <location line="-124"/>
@ -1242,8 +1242,8 @@ Address: %4
</message> </message>
<message> <message>
<location line="+7"/> <location line="+7"/>
<source>Show the Anoncoin-Qt help message to get a list with possible Anoncoin command-line options.</source> <source>Show the Gostcoin-Qt help message to get a list with possible Gostcoin command-line options.</source>
<translation>Show the Anoncoin-Qt help message to get a list with possible Anoncoin command-line options.</translation> <translation>Show the Gostcoin-Qt help message to get a list with possible Gostcoin command-line options.</translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+3"/>
@ -1262,13 +1262,13 @@ Address: %4
</message> </message>
<message> <message>
<location line="-104"/> <location line="-104"/>
<source>Anoncoin - Debug window</source> <source>Gostcoin - Debug window</source>
<translation>Anoncoin - Debug window</translation> <translation>Gostcoin - Debug window</translation>
</message> </message>
<message> <message>
<location line="+25"/> <location line="+25"/>
<source>Anoncoin Core</source> <source>Gostcoin Core</source>
<translation>Anoncoin Core</translation> <translation>Gostcoin Core</translation>
</message> </message>
<message> <message>
<location line="+279"/> <location line="+279"/>
@ -1277,8 +1277,8 @@ Address: %4
</message> </message>
<message> <message>
<location line="+7"/> <location line="+7"/>
<source>Open the Anoncoin debug log file from the current data directory. This can take a few seconds for large log files.</source> <source>Open the Gostcoin debug log file from the current data directory. This can take a few seconds for large log files.</source>
<translation>Open the Anoncoin debug log file from the current data directory. This can take a few seconds for large log files.</translation> <translation>Open the Gostcoin debug log file from the current data directory. This can take a few seconds for large log files.</translation>
</message> </message>
<message> <message>
<location line="+102"/> <location line="+102"/>
@ -1287,8 +1287,8 @@ Address: %4
</message> </message>
<message> <message>
<location filename="../rpcconsole.cpp" line="-30"/> <location filename="../rpcconsole.cpp" line="-30"/>
<source>Welcome to the Anoncoin RPC console.</source> <source>Welcome to the Gostcoin RPC console.</source>
<translation>Welcome to the Anoncoin RPC console.</translation> <translation>Welcome to the Gostcoin RPC console.</translation>
</message> </message>
<message> <message>
<location line="+1"/> <location line="+1"/>
@ -1471,8 +1471,8 @@ Address: %4
</message> </message>
<message> <message>
<location filename="../sendcoinsentry.cpp" line="+1"/> <location filename="../sendcoinsentry.cpp" line="+1"/>
<source>Enter a Anoncoin address (e.g. Ler4HNAEfwYhBmGXcFP2Po1NpRUEiK8km2)</source> <source>Enter a Gostcoin address (e.g. Ger4HNAEfwYhBmGXcFP2Po1NpRUEiK8km2)</source>
<translation>Enter a Anoncoin address (e.g. Ler4HNAEfwYhBmGXcFP2Po1NpRUEiK8km2)</translation> <translation>Enter a Gostcoin address (e.g. Ger4HNAEfwYhBmGXcFP2Po1NpRUEiK8km2)</translation>
</message> </message>
</context> </context>
<context> <context>
@ -1536,8 +1536,8 @@ Address: %4
</message> </message>
<message> <message>
<location line="+21"/> <location line="+21"/>
<source>Sign the message to prove you own this Anoncoin address</source> <source>Sign the message to prove you own this Gostcoin address</source>
<translation>Sign the message to prove you own this Anoncoin address</translation> <translation>Sign the message to prove you own this Gostcoin address</translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+3"/>
@ -1567,13 +1567,13 @@ Address: %4
</message> </message>
<message> <message>
<location line="+21"/> <location line="+21"/>
<source>The address the message was signed with (e.g. Ler4HNAEfwYhBmGXcFP2Po1NpRUEiK8km2)</source> <source>The address the message was signed with (e.g. Ger4HNAEfwYhBmGXcFP2Po1NpRUEiK8km2)</source>
<translation>The address the message was signed with (e.g. Ler4HNAEfwYhBmGXcFP2Po1NpRUEiK8km2)</translation> <translation>The address the message was signed with (e.g. Ger4HNAEfwYhBmGXcFP2Po1NpRUEiK8km2)</translation>
</message> </message>
<message> <message>
<location line="+40"/> <location line="+40"/>
<source>Verify the message to ensure it was signed with the specified Anoncoin address</source> <source>Verify the message to ensure it was signed with the specified Gostcoin address</source>
<translation>Verify the message to ensure it was signed with the specified Anoncoin address</translation> <translation>Verify the message to ensure it was signed with the specified Gostcoin address</translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+3"/>
@ -1588,8 +1588,8 @@ Address: %4
<message> <message>
<location filename="../signverifymessagedialog.cpp" line="+27"/> <location filename="../signverifymessagedialog.cpp" line="+27"/>
<location line="+3"/> <location line="+3"/>
<source>Enter a Anoncoin address (e.g. Ler4HNAEfwYhBmGXcFP2Po1NpRUEiK8km2)</source> <source>Enter a Gostcoin address (e.g. Ger4HNAEfwYhBmGXcFP2Po1NpRUEiK8km2)</source>
<translation>Enter a Anoncoin address (e.g. Ler4HNAEfwYhBmGXcFP2Po1NpRUEiK8km2)</translation> <translation>Enter a Gostcoin address (e.g. Ger4HNAEfwYhBmGXcFP2Po1NpRUEiK8km2)</translation>
</message> </message>
<message> <message>
<location line="-2"/> <location line="-2"/>
@ -1598,8 +1598,8 @@ Address: %4
</message> </message>
<message> <message>
<location line="+3"/> <location line="+3"/>
<source>Enter Anoncoin signature</source> <source>Enter Gostcoin signature</source>
<translation>Enter Anoncoin signature</translation> <translation>Enter Gostcoin signature</translation>
</message> </message>
<message> <message>
<location line="+82"/> <location line="+82"/>
@ -1672,8 +1672,8 @@ Address: %4
<name>SplashScreen</name> <name>SplashScreen</name>
<message> <message>
<location filename="../splashscreen.cpp" line="+22"/> <location filename="../splashscreen.cpp" line="+22"/>
<source>The Anoncoin developers</source> <source>The Gostcoin developers</source>
<translation>The Anoncoin developers</translation> <translation>The Gostcoin developers</translation>
</message> </message>
<message> <message>
<location line="+1"/> <location line="+1"/>
@ -2225,8 +2225,8 @@ Address: %4
<name>bitcoin-core</name> <name>bitcoin-core</name>
<message> <message>
<location filename="../bitcoinstrings.cpp" line="+94"/> <location filename="../bitcoinstrings.cpp" line="+94"/>
<source>Anoncoin version</source> <source>Gostcoin version</source>
<translation>Anoncoin version</translation> <translation>Gostcoin version</translation>
</message> </message>
<message> <message>
<location line="+102"/> <location line="+102"/>
@ -2344,7 +2344,7 @@ rpcpassword=%s
The username and password MUST NOT be the same. The username and password MUST NOT be the same.
If the file does not exist, create it with owner-readable-only file permissions. If the file does not exist, create it with owner-readable-only file permissions.
It is also recommended to set alertnotify so you are notified of problems; It is also recommended to set alertnotify so you are notified of problems;
for example: alertnotify=echo %%s | mail -s &quot;Anoncoin Alert&quot; admin@foo.com for example: alertnotify=echo %%s | mail -s &quot;Gostcoin Alert&quot; admin@foo.com
</source> </source>
<translation>%s, you must set a rpcpassword in the configuration file: <translation>%s, you must set a rpcpassword in the configuration file:
%s %s
@ -2355,7 +2355,7 @@ rpcpassword=%s
The username and password MUST NOT be the same. The username and password MUST NOT be the same.
If the file does not exist, create it with owner-readable-only file permissions. If the file does not exist, create it with owner-readable-only file permissions.
It is also recommended to set alertnotify so you are notified of problems; It is also recommended to set alertnotify so you are notified of problems;
for example: alertnotify=echo %%s | mail -s &quot;Anoncoin Alert&quot; admin@foo.com for example: alertnotify=echo %%s | mail -s &quot;Gostcoin Alert&quot; admin@foo.com
</translation> </translation>
</message> </message>
<message> <message>
@ -2370,8 +2370,8 @@ for example: alertnotify=echo %%s | mail -s &quot;Anoncoin Alert&quot; admin@foo
</message> </message>
<message> <message>
<location line="+3"/> <location line="+3"/>
<source>Cannot obtain a lock on data directory %s. Anoncoin is probably already running.</source> <source>Cannot obtain a lock on data directory %s. Gostcoin is probably already running.</source>
<translation>Cannot obtain a lock on data directory %s. Anoncoin is probably already running.</translation> <translation>Cannot obtain a lock on data directory %s. Gostcoin is probably already running.</translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+3"/>
@ -2415,8 +2415,8 @@ for example: alertnotify=echo %%s | mail -s &quot;Anoncoin Alert&quot; admin@foo
</message> </message>
<message> <message>
<location line="+3"/> <location line="+3"/>
<source>Warning: Please check that your computer&apos;s date and time are correct! If your clock is wrong Anoncoin will not work properly.</source> <source>Warning: Please check that your computer&apos;s date and time are correct! If your clock is wrong Gostcoin will not work properly.</source>
<translation>Warning: Please check that your computer&apos;s date and time are correct! If your clock is wrong Anoncoin will not work properly.</translation> <translation>Warning: Please check that your computer&apos;s date and time are correct! If your clock is wrong Gostcoin will not work properly.</translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+3"/>
@ -2665,8 +2665,8 @@ for example: alertnotify=echo %%s | mail -s &quot;Anoncoin Alert&quot; admin@foo
</message> </message>
<message> <message>
<location line="+5"/> <location line="+5"/>
<source>SSL options: (see the Anoncoin Wiki for SSL setup instructions)</source> <source>SSL options: (see the Gostcoin Wiki for SSL setup instructions)</source>
<translation>SSL options: (see the Anoncoin Wiki for SSL setup instructions)</translation> <translation>SSL options: (see the Gostcoin Wiki for SSL setup instructions)</translation>
</message> </message>
<message> <message>
<location line="+1"/> <location line="+1"/>
@ -2855,13 +2855,13 @@ for example: alertnotify=echo %%s | mail -s &quot;Anoncoin Alert&quot; admin@foo
</message> </message>
<message> <message>
<location line="+1"/> <location line="+1"/>
<source>Error loading wallet.dat: Wallet requires newer version of Anoncoin</source> <source>Error loading wallet.dat: Wallet requires newer version of Gostcoin</source>
<translation>Error loading wallet.dat: Wallet requires newer version of Anoncoin</translation> <translation>Error loading wallet.dat: Wallet requires newer version of Gostcoin</translation>
</message> </message>
<message> <message>
<location line="+93"/> <location line="+93"/>
<source>Wallet needed to be rewritten: restart Anoncoin to complete</source> <source>Wallet needed to be rewritten: restart Gostcoin to complete</source>
<translation>Wallet needed to be rewritten: restart Anoncoin to complete</translation> <translation>Wallet needed to be rewritten: restart Gostcoin to complete</translation>
</message> </message>
<message> <message>
<location line="-95"/> <location line="-95"/>
@ -2920,8 +2920,8 @@ for example: alertnotify=echo %%s | mail -s &quot;Anoncoin Alert&quot; admin@foo
</message> </message>
<message> <message>
<location line="-25"/> <location line="-25"/>
<source>Unable to bind to %s on this computer. Anoncoin is probably already running.</source> <source>Unable to bind to %s on this computer. Gostcoin is probably already running.</source>
<translation>Unable to bind to %s on this computer. Anoncoin is probably already running.</translation> <translation>Unable to bind to %s on this computer. Gostcoin is probably already running.</translation>
</message> </message>
<message> <message>
<location line="+64"/> <location line="+64"/>

4
src/qt/locale/bitcoin_ru.ts

@ -33,8 +33,8 @@ This product includes software developed by the OpenSSL Project for use in the O
</message> </message>
<message> <message>
<location line="+0"/> <location line="+0"/>
<source>The Anoncoin developers</source> <source>The Gostcoin developers</source>
<translation>Разработчики Anoncoin</translation> <translation>Разработчики Gostcoin</translation>
</message> </message>
</context> </context>
<context> <context>

2
src/qt/qrcodedialog.cpp

@ -85,7 +85,7 @@ void QRCodeDialog::genCode()
QString QRCodeDialog::getURI() QString QRCodeDialog::getURI()
{ {
QString ret = QString("anoncoin:%1").arg(address); QString ret = QString("gostcoin:%1").arg(address);
int paramCount = 0; int paramCount = 0;
ui->outUri->clear(); ui->outUri->clear();

2
src/qt/transactiontablemodel.cpp

@ -443,7 +443,7 @@ QVariant TransactionTableModel::txStatusDecoration(const TransactionRecord *wtx)
{ {
case TransactionStatus::Immature: { case TransactionStatus::Immature: {
int total = wtx->status.depth + wtx->status.matures_in; int total = wtx->status.depth + wtx->status.matures_in;
int part = (wtx->status.depth * 4 / total) + 1; int part = (wtx->status.depth * 5 / total) + 1;
return QIcon(QString(":/icons/transaction_%1").arg(part)); return QIcon(QString(":/icons/transaction_%1").arg(part));
} }
case TransactionStatus::Mature: case TransactionStatus::Mature:

Loading…
Cancel
Save