neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into HEAD

Browse Source 
Resolved conflicts:
	configure.ac
	src/clientversion.h
	src/qt/locale/dash_bg.ts
	src/qt/locale/dash_cmn.ts
	src/qt/locale/dash_de.ts
	src/qt/locale/dash_es.ts
	src/qt/locale/dash_fi.ts
	src/qt/locale/dash_pt.ts
	src/qt/locale/dash_ru.ts
	src/qt/locale/dash_sv.ts
	src/qt/locale/dash_vi.ts
	src/qt/res/icons/toolbar.png
	src/qt/res/icons/toolbar_testnet.png
This commit is contained in:
UdjinM6 2015-04-04 19:45:02 +03:00
commit dd39898a6b
39 changed files with 983 additions and 986 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
share/pixmaps/bitcoin-bc.ico Normal file → Executable file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
share/pixmaps/bitcoin.ico Normal file → Executable file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
share/pixmaps/bitcoin128.png Normal file → Executable file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 67 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

263
share/pixmaps/bitcoin128.xpm Normal file → Executable file
View File

@ -1,136 +1,133 @@
/* XPM */
static char *bitcoin___[] = {
/* columns rows colors chars-per-pixel */
"128 128 2 1",
" c #2D98CE",
". c None",
/* pixels */
"................................................................................................................................",
"................................................................................................................................",
"................................................................................................................................",
"................................................................................................................................",
"................................................................................................................................",
"................................................................................................................................",
"................................................................................................................................",
"................................................................................................................................",
"................................................................................................................................",
"................................................................................................................................",
"................................................................................................................................",
"................................................................................................................................",
"................................................................................................................................",
"................................................................................................................................",
"................................................................................................................................",
"................................................................................................................................",
"................................................................................................................................",
"................................................................................................................................",
"................................................................................................................................",
"................................................................................................................................",
"................................................................................................................................",
"................................................................................................................................",
"................................................................................................................................",
"................................................................................................................................",
"................................................................................................................................",
"................................................................................................................................",
"................................................................................................................................",
"................................................................................................................................",
"................................................................................................................................",
".................... ......................",
".................... ................",
"..................... .............",
"...................... ..........",
"....................... .........",
"........................ .......",
"........................ ......",
"......................... .....",
".......................... ....",
"........................... ....",
"............................ ...",
"............................ ...",
"............................. ..",
".............................. ..",
"............................... ..",
"............................... .",
"................................ .",
"................................. .",
".................................. ............................................. .",
"................................... ............................................... .",
". ......... ................................................ .",
".. ......... ................................................. ",
".. .......... ................................................. ",
"... .......... .................................................. ",
".... ......... .................................................. ",
"..... ......... .................................................. ",
"...... .......... ................................................... ",
"...... .......... ................................................... ",
"....... .......... ................................................... ",
"........ ......... ................................................... ",
"......... ......... ................................................... ",
"......... .......... ................................................... ",
".......... .......... ................................................... ",
"........... ......... ................................................... ",
"............ ......... ................................................... ",
"............. .......... ................................................... ",
"............. .......... ................................................... ",
".............. .......... ................................................... ",
"............... ......... ................................................... ",
"................ ......... ................................................... ",
"................ .......... ................................................... ",
"................. .......... ................................................... ",
".................. ......... ................................................... ",
"................... ......... ................................................... ",
".................... .......... ................................................... ",
".................... ............................................................ ",
"..................... ........................................................... ",
"...................... .......................................................... ",
"....................... ........................................................ ",
"....................... ....................................................... ",
"........................ ..................................................... .",
"......................... .................................................. .",
".......................... ............................................ .",
"........................... .",
"........................... .",
"............................ .",
"............................. ..",
".............................. ..",
".............................. ..",
"............................... ...",
"................................ ...",
"................................. ....",
".................................. ....",
".................................. .....",
"................................... ......",
".................................... .......",
"..................................... .........",
"..................................... ...........",
"...................................... .............",
"....................................... ................",
"........................................ ......................",
"................................................................................................................................",
"................................................................................................................................",
"................................................................................................................................",
"................................................................................................................................",
"................................................................................................................................",
"................................................................................................................................",
"................................................................................................................................",
"................................................................................................................................",
"................................................................................................................................",
"................................................................................................................................",
"................................................................................................................................",
"................................................................................................................................",
"................................................................................................................................",
"................................................................................................................................",
"................................................................................................................................",
"................................................................................................................................",
"................................................................................................................................",
"................................................................................................................................",
"................................................................................................................................",
"................................................................................................................................",
"................................................................................................................................",
"................................................................................................................................",
"................................................................................................................................",
"................................................................................................................................",
"................................................................................................................................",
"................................................................................................................................",
"................................................................................................................................",
"................................................................................................................................"
};
" c None",
". c #1C75BC",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" .......................................................................................... ",
" .............................................................................................. ",
" ............................................................................................... ",
" ................................................................................................. ",
" ................................................................................................... ",
" ................................................................................................... ",
" .................................................................................................... ",
" ...................................................................................................... ",
" ...................................................................................................... ",
" ...................................................................................................... ",
" ........................................................................................................",
" ........................................................................................................",
" ........................................................................................................",
" .........................................................................................................",
" .........................................................................................................",
" .........................................................................................................",
" ..........................................................................................................",
" ..........................................................................................................",
" ......................................................................................................... ",
" ........................... ",
" ............................ ",
" ............................ ",
" ........................... ",
" ............................ ",
" ............................ ",
" ........................... ",
" ........................... ",
" ............................ ",
" ........................... ",
" ............................................... ........................... ",
" .............................................. ............................ ",
" ............................................... ........................... ",
" ............................................... ........................... ",
" .............................................. ........................... ",
" ............................................... ........................... ",
" ............................................... ........................... ",
" ............................................... ........................... ",
" ............................................... ........................... ",
" .............................................. ........................... ",
" ............................................... ............................ ",
" ............................................... ........................... ",
" .............................................. ........................... ",
" ............................................... ............................ ",
" ............................................... ........................... ",
" .............................................. ........................... ",
"............................................... ............................ ",
"............................................... ........................... ",
" ........................... ",
" ............................ ",
" ........................... ",
" ........................... ",
" ............................ ",
" ........................... ",
" ........................... ",
" ............................ ",
" ........................... ",
" ........................... ",
" .......................................................................................................... ",
" ......................................................................................................... ",
" .......................................................................................................... ",
" ......................................................................................................... ",
" ......................................................................................................... ",
" ......................................................................................................... ",
" ........................................................................................................ ",
" ....................................................................................................... ",
" ........................................................................................................ ",
" ....................................................................................................... ",
" ...................................................................................................... ",
" ...................................................................................................... ",
" .................................................................................................... ",
" ................................................................................................... ",
" ................................................................................................... ",
" ................................................................................................. ",
" ............................................................................................... ",
" ............................................................................................. ",
" .......................................................................................... ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "};

BIN
share/pixmaps/bitcoin16.png Normal file → Executable file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 379 B

41
share/pixmaps/bitcoin16.xpm Normal file → Executable file
View File

@ -1,24 +1,21 @@
/* XPM */
static char *bitcoin__[] = {
/* columns rows colors chars-per-pixel */
static char *bitcoin___[] = {
"16 16 2 1",
" c #2D98CE",
". c None",
/* pixels */
"................",
"................",
"................",
"... ..",
"... .",
".... ",
" .. ...... ",
". . ...... ",
".. ........ ",
"... ....... ",
"... ",
".... .",
"..... ..",
"................",
"................",
"................"
};
" c None",
". c #1C75BC",
" ",
" ",
" ",
" ............ ",
" .............",
" .............",
" ....",
" ..... ... ",
"...... ... ",
" .... ",
" ............. ",
" ............. ",
" ........... ",
" ",
" ",
" "};

BIN
share/pixmaps/bitcoin256.png Normal file → Executable file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 259 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

519
share/pixmaps/bitcoin256.xpm Normal file → Executable file
View File

@ -1,264 +1,261 @@
/* XPM */
static char *bitcoin___[] = {
/* columns rows colors chars-per-pixel */
"256 256 2 1",
" c #2D98CE",
". c None",
/* pixels */
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"....................................... .............................................",
"........................................ .......................................",
"......................................... ..................................",
"......................................... ..............................",
".......................................... ...........................",
"........................................... ........................",
"............................................ ......................",
"............................................. ....................",
"............................................. ..................",
".............................................. .................",
"............................................... ...............",
"................................................ ..............",
"................................................ .............",
"................................................. ............",
".................................................. ...........",
"................................................... ..........",
".................................................... .........",
".................................................... .........",
"..................................................... ........",
"...................................................... .......",
"....................................................... .......",
"....................................................... ......",
"........................................................ ......",
"......................................................... .....",
".......................................................... .....",
"........................................................... ....",
"........................................................... ....",
"............................................................ ....",
"............................................................. ...",
".............................................................. ...",
".............................................................. ...",
"............................................................... ...",
"................................................................ ..",
"................................................................. ..",
".................................................................. ..",
".................................................................. ..",
"................................................................... ....................................................................................... ..",
".................................................................... .......................................................................................... .",
"..................................................................... ............................................................................................. .",
". ................... .............................................................................................. .",
". ................... ................................................................................................ .",
".. ................... ................................................................................................. .",
"... ................... ................................................................................................. .",
".... ................... .................................................................................................. .",
"..... ................... ................................................................................................... .",
"..... ................... ................................................................................................... .",
"...... ................... .................................................................................................... .",
"....... ................... .................................................................................................... .",
"........ ................... .................................................................................................... .",
"........ ................... ..................................................................................................... .",
"......... ................... ..................................................................................................... .",
".......... ................... ..................................................................................................... .",
"........... ................... ..................................................................................................... .",
"............ ................... ..................................................................................................... .",
"............ ................... ...................................................................................................... .",
"............. ................... ...................................................................................................... .",
".............. ................... ...................................................................................................... .",
"............... ................... ...................................................................................................... .",
"............... ................... ...................................................................................................... .",
"................ ................... ...................................................................................................... .",
"................. ................... ...................................................................................................... .",
".................. ................... ...................................................................................................... .",
"................... ................... ...................................................................................................... .",
"................... ................... ...................................................................................................... .",
".................... ................... ...................................................................................................... .",
"..................... ................... ...................................................................................................... .",
"...................... ................... ...................................................................................................... .",
"...................... ................... ...................................................................................................... .",
"....................... ................... ...................................................................................................... .",
"........................ ................... ...................................................................................................... .",
"......................... ................... ...................................................................................................... .",
"......................... ................... ...................................................................................................... .",
".......................... ................... ...................................................................................................... .",
"........................... ................... ...................................................................................................... .",
"............................ ................... ...................................................................................................... .",
"............................. ................... ...................................................................................................... .",
"............................. ................... ...................................................................................................... .",
".............................. ................... ...................................................................................................... .",
"............................... ................... ...................................................................................................... .",
"................................ ................... ...................................................................................................... .",
"................................. ................... ...................................................................................................... .",
"................................. ................... ...................................................................................................... .",
".................................. ................... ...................................................................................................... .",
"................................... ................... ...................................................................................................... .",
".................................... ................... ...................................................................................................... .",
".................................... ................... ...................................................................................................... .",
"..................................... ................... ..................................................................................................... .",
"...................................... ................... ..................................................................................................... .",
"....................................... .................. ..................................................................................................... .",
"....................................... ................... ..................................................................................................... .",
"........................................ ......................................................................................................................... .",
"......................................... ........................................................................................................................ .",
".......................................... ...................................................................................................................... .",
"........................................... ...................................................................................................................... .",
"........................................... ..................................................................................................................... .",
"............................................ ................................................................................................................... .",
"............................................. .................................................................................................................. .",
".............................................. ................................................................................................................ .",
".............................................. ............................................................................................................... .",
"............................................... ............................................................................................................. .",
"................................................ ........................................................................................................... .",
"................................................. ......................................................................................................... .",
".................................................. ....................................................................................................... .",
".................................................. .................................................................................................... .",
"................................................... ............................................................................................... .",
".................................................... ..",
"..................................................... ..",
"..................................................... ..",
"...................................................... ..",
"....................................................... ..",
"........................................................ ...",
"......................................................... ...",
"......................................................... ...",
".......................................................... ...",
"........................................................... ....",
"............................................................ ....",
"............................................................ ....",
"............................................................. .....",
".............................................................. .....",
"............................................................... ......",
"................................................................ ......",
"................................................................ .......",
"................................................................. .......",
".................................................................. ........",
"................................................................... .........",
"................................................................... .........",
".................................................................... ..........",
"..................................................................... ...........",
"...................................................................... ............",
"....................................................................... .............",
"....................................................................... ..............",
"........................................................................ ...............",
"......................................................................... .................",
".......................................................................... ..................",
".......................................................................... ....................",
"........................................................................... ......................",
"............................................................................ .........................",
"............................................................................. ...........................",
".............................................................................. ..............................",
".............................................................................. ..................................",
"............................................................................... ........................................",
"................................................................................ .....................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................",
"................................................................................................................................................................................................................................................................"
};
" c None",
". c #1C75BC",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ...................................................................................................................................................................................... ",
" ......................................................................................................................................................................................... ",
" ............................................................................................................................................................................................ ",
" .............................................................................................................................................................................................. ",
" ............................................................................................................................................................................................... ",
" ................................................................................................................................................................................................. ",
" ................................................................................................................................................................................................... ",
" .................................................................................................................................................................................................... ",
" ..................................................................................................................................................................................................... ",
" ....................................................................................................................................................................................................... ",
" ....................................................................................................................................................................................................... ",
" ........................................................................................................................................................................................................ ",
" ......................................................................................................................................................................................................... ",
" .......................................................................................................................................................................................................... ",
" .......................................................................................................................................................................................................... ",
" ............................................................................................................................................................................................................ ",
" ............................................................................................................................................................................................................ ",
" ............................................................................................................................................................................................................. ",
" .............................................................................................................................................................................................................. ",
" .............................................................................................................................................................................................................. ",
" .............................................................................................................................................................................................................. ",
" ................................................................................................................................................................................................................",
" ................................................................................................................................................................................................................",
" ................................................................................................................................................................................................................",
" .................................................................................................................................................................................................................",
" .................................................................................................................................................................................................................",
" .................................................................................................................................................................................................................",
" ..................................................................................................................................................................................................................",
" ..................................................................................................................................................................................................................",
" ..................................................................................................................................................................................................................",
" ...................................................................................................................................................................................................................",
" ...................................................................................................................................................................................................................",
" ...................................................................................................................................................................................................................",
" ................................................................................................................................................................................................................... ",
" ................................................................................................................................................................................................................... ",
" ................................................................................................................................................................................................................... ",
" .................................................................................................................................................................................................................... ",
" ...................................................... ",
" ...................................................... ",
" ....................................................... ",
" ...................................................... ",
" ...................................................... ",
" ....................................................... ",
" ...................................................... ",
" ...................................................... ",
" ....................................................... ",
" ...................................................... ",
" ...................................................... ",
" ....................................................... ",
" ...................................................... ",
" ...................................................... ",
" ....................................................... ",
" ...................................................... ",
" ...................................................... ",
" ....................................................... ",
" ....................................................... ",
" ...................................................... ",
" ............................................................................................. ....................................................... ",
" ............................................................................................. ....................................................... ",
" .............................................................................................. ...................................................... ",
" ............................................................................................. ....................................................... ",
" ............................................................................................. ....................................................... ",
" ............................................................................................. ...................................................... ",
" ............................................................................................. ....................................................... ",
" ............................................................................................. ....................................................... ",
" ............................................................................................. ...................................................... ",
" ............................................................................................. ....................................................... ",
" ............................................................................................. ....................................................... ",
" ............................................................................................. ...................................................... ",
" ............................................................................................. ....................................................... ",
" ............................................................................................. ....................................................... ",
" ............................................................................................. ...................................................... ",
" ............................................................................................. ....................................................... ",
" ............................................................................................. ....................................................... ",
" ............................................................................................. ...................................................... ",
" ............................................................................................. ....................................................... ",
" ............................................................................................. ....................................................... ",
" ............................................................................................. ...................................................... ",
" ............................................................................................. ....................................................... ",
" ............................................................................................. ....................................................... ",
" ............................................................................................. ...................................................... ",
" ............................................................................................. ....................................................... ",
" ............................................................................................. ....................................................... ",
" ............................................................................................. ...................................................... ",
" ............................................................................................. ....................................................... ",
" .............................................................................................. ....................................................... ",
" ............................................................................................. ...................................................... ",
" ............................................................................................. ....................................................... ",
" .............................................................................................. ....................................................... ",
" ............................................................................................. ...................................................... ",
" ............................................................................................. ....................................................... ",
".............................................................................................. ....................................................... ",
"............................................................................................. ...................................................... ",
" ....................................................... ",
" ....................................................... ",
" ...................................................... ",
" ....................................................... ",
" ....................................................... ",
" ...................................................... ",
" ...................................................... ",
" ....................................................... ",
" ...................................................... ",
" ...................................................... ",
" ....................................................... ",
" ...................................................... ",
" ...................................................... ",
" ....................................................... ",
" ...................................................... ",
" ...................................................... ",
" ....................................................... ",
" ...................................................... ",
" ...................................................... ",
" ....................................................... ",
" ................................................................................................................................................................................................................... ",
" ................................................................................................................................................................................................................... ",
" .................................................................................................................................................................................................................... ",
" ................................................................................................................................................................................................................... ",
" ................................................................................................................................................................................................................... ",
" ................................................................................................................................................................................................................... ",
" ................................................................................................................................................................................................................... ",
" .................................................................................................................................................................................................................. ",
" .................................................................................................................................................................................................................. ",
" .................................................................................................................................................................................................................. ",
" ................................................................................................................................................................................................................. ",
" ................................................................................................................................................................................................................. ",
" ................................................................................................................................................................................................................. ",
" ................................................................................................................................................................................................................ ",
" ............................................................................................................................................................................................................... ",
" ............................................................................................................................................................................................................... ",
" ............................................................................................................................................................................................................... ",
" .............................................................................................................................................................................................................. ",
" .............................................................................................................................................................................................................. ",
" ............................................................................................................................................................................................................. ",
" ............................................................................................................................................................................................................ ",
" ............................................................................................................................................................................................................ ",
" ........................................................................................................................................................................................................... ",
" .......................................................................................................................................................................................................... ",
" ......................................................................................................................................................................................................... ",
" ........................................................................................................................................................................................................ ",
" ....................................................................................................................................................................................................... ",
" ...................................................................................................................................................................................................... ",
" ..................................................................................................................................................................................................... ",
" ................................................................................................................................................................................................... ",
" ................................................................................................................................................................................................... ",
" ................................................................................................................................................................................................. ",
" ............................................................................................................................................................................................... ",
" .............................................................................................................................................................................................. ",
" ........................................................................................................................................................................................... ",
" ......................................................................................................................................................................................... ",
" ...................................................................................................................................................................................... ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "};

BIN
share/pixmaps/bitcoin32.png Normal file → Executable file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.8 KiB

After

Width:  |  Height:  |  Size: 627 B

73
share/pixmaps/bitcoin32.xpm Normal file → Executable file
View File

@ -1,40 +1,37 @@
/* XPM */
static char *bitcoin__[] = {
/* columns rows colors chars-per-pixel */
static char *bitcoin___[] = {
"32 32 2 1",
" c #2D98CE",
". c None",
/* pixels */
"................................",
"................................",
"................................",
"................................",
"................................",
"................................",
"................................",
"..... .....",
"...... ..",
"....... .",
"....... ",
"........ ",
". .. ............ ",
". ... ............ ",
".. .. ............. ",
"... .. ............. ",
"... .. ............. ",
".... ... ............. ",
"..... ............... ",
"...... .............. ",
"....... ",
"....... ",
"........ .",
"......... ..",
".......... ...",
"................................",
"................................",
"................................",
"................................",
"................................",
"................................",
"................................"
};
" c None",
". c #1C75BC",
" ",
" ",
" ",
" ",
" ",
" ",
" . ",
" ........................ ",
" ..........................",
" ..........................",
" ..........................",
" .......",
" ...... ",
" ....... ",
" ............ ....... ",
" ............ ...... ",
" ........... ....... ",
"............ ....... ",
" ...... ",
" ....... ",
" ....... ",
" .......................... ",
" .......................... ",
" .......................... ",
" ........................ ",
" ",
" ",
" ",
" ",
" ",
" ",
" "};

BIN
share/pixmaps/bitcoin64.png Normal file → Executable file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

137
share/pixmaps/bitcoin64.xpm Normal file → Executable file
View File

@ -1,72 +1,69 @@
/* XPM */
static char *bitcoin__[] = {
/* columns rows colors chars-per-pixel */
static char *bitcoin___[] = {
"64 64 2 1",
" c #2D98CE",
". c None",
/* pixels */
"................................................................",
"................................................................",
"................................................................",
"................................................................",
"................................................................",
"................................................................",
"................................................................",
"................................................................",
"................................................................",
"................................................................",
"................................................................",
"................................................................",
"................................................................",
"................................................................",
".......... ...........",
".......... .......",
"........... .....",
"............ ...",
"............. ..",
".............. ..",
".............. .",
"............... .",
"................ ",
"................. ",
". .... ........................ ",
". ..... ......................... ",
".. ..... .......................... ",
"... ..... .......................... ",
"... ..... .......................... ",
".... .... .......................... ",
"..... ..... .......................... ",
"...... ..... .......................... ",
"...... ..... .......................... ",
"....... .... .......................... ",
"........ ..... .......................... ",
"......... ..... ......................... ",
".......... ..... ......................... ",
".......... .............................. ",
"........... ............................ ",
"............ ............................ ",
"............. ......................... ",
"............. ",
".............. .",
"............... .",
"................ .",
"................. ..",
"................. ...",
".................. ....",
"................... ......",
".................... ........",
"................................................................",
"................................................................",
"................................................................",
"................................................................",
"................................................................",
"................................................................",
"................................................................",
"................................................................",
"................................................................",
"................................................................",
"................................................................",
"................................................................",
"................................................................",
"................................................................"
};
" c None",
". c #1C75BC",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" .............................................. ",
" ................................................. ",
" .................................................. ",
" .................................................. ",
" ....................................................",
" ....................................................",
" ....................................................",
" .....................................................",
" .....................................................",
" ...................................... ..............",
" ............. ",
" .............. ",
" .............. ",
" ............. ",
" . .............. ",
" ....................... .............. ",
" ........................ ............. ",
" ....................... .............. ",
" ....................... .............. ",
" ........................ ............. ",
" ....................... .............. ",
" ....................... .............. ",
"........................ ............. ",
" .............. ",
" .............. ",
" ............. ",
" .............. ",
" .............. ",
" ................................................... ",
" ..................................................... ",
" .................................................... ",
" .................................................... ",
" .................................................... ",
" ................................................... ",
" .................................................. ",
" .................................................. ",
" ................................................ ",
" .............................................. ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "};

BIN
share/pixmaps/dash128.png Normal file → Executable file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 67 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

41
share/pixmaps/dash16.xpm Normal file → Executable file
View File

@ -1,24 +1,21 @@
/* XPM */
static char *bitcoin__[] = {
/* columns rows colors chars-per-pixel */
static char *bitcoin___[] = {
"16 16 2 1",
" c #2D98CE",
". c None",
/* pixels */
"................",
"................",
"................",
"... ..",
"... .",
".... ",
" .. ...... ",
". . ...... ",
".. ........ ",
"... ....... ",
"... ",
".... .",
"..... ..",
"................",
"................",
"................"
};
" c None",
". c #1C75BC",
" ",
" ",
" ",
" ........... ",
" .............",
" .............",
" ....",
" ..... ... ",
"...... ... ",
" .... ",
" ............. ",
" ............. ",
" ........... ",
" ",
" ",
" "};

73
share/pixmaps/dash32.xpm Normal file → Executable file
View File

@ -1,40 +1,37 @@
/* XPM */
static char *bitcoin__[] = {
/* columns rows colors chars-per-pixel */
static char *bitcoin___[] = {
"32 32 2 1",
" c #2D98CE",
". c None",
/* pixels */
"................................",
"................................",
"................................",
"................................",
"................................",
"................................",
"................................",
"..... .....",
"...... ..",
"....... .",
"....... ",
"........ ",
". .. ............ ",
". ... ............ ",
".. .. ............. ",
"... .. ............. ",
"... .. ............. ",
".... ... ............. ",
"..... ............... ",
"...... .............. ",
"....... ",
"....... ",
"........ .",
"......... ..",
".......... ...",
"................................",
"................................",
"................................",
"................................",
"................................",
"................................",
"................................"
};
" c None",
". c #1C75BC",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ........................ ",
" ..........................",
" ..........................",
" ..........................",
" .......",
" ...... ",
" ....... ",
" ............ ....... ",
" ............ ...... ",
" ........... ....... ",
"............ ....... ",
" ...... ",
" ....... ",
" ....... ",
" .......................... ",
" .......................... ",
" .......................... ",
" ........................ ",
" ",
" ",
" ",
" ",
" ",
" ",
" "};

BIN
share/pixmaps/favicon.ico Normal file → Executable file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
share/pixmaps/nsis-header.bmp Normal file → Executable file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 25 KiB

BIN
share/pixmaps/nsis-wizard.bmp Normal file → Executable file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 151 KiB

After

Width:  |  Height:  |  Size: 151 KiB

2
src/masternode.cpp
View File

@ -434,7 +434,7 @@ bool CMasternodePayments::ProcessBlock(int nBlockHeight)
}
// pay to the oldest MN that still had no payment but its input is old enough and it was active long enough
CMasternode *pmn = mnodeman.FindOldestNotInVec(vecLastPayments, nMinimumAge, nMinimumAge * 2.5 * 60);
CMasternode *pmn = mnodeman.FindOldestNotInVec(vecLastPayments, nMinimumAge, 0);
if(pmn != NULL)
{
newWinner.score = 0;

12
src/masternode.h
View File

@ -226,6 +226,18 @@ public:
}
}
std::string Status() {
std::string strStatus = "ACTIVE";
if(activeState == CMasternode::MASTERNODE_ENABLED) strStatus = "ENABLED";
if(activeState == CMasternode::MASTERNODE_EXPIRED) strStatus = "EXPIRED";
if(activeState == CMasternode::MASTERNODE_VIN_SPENT) strStatus = "VIN_SPENT";
if(activeState == CMasternode::MASTERNODE_REMOVE) strStatus = "REMOVE";
if(activeState == CMasternode::MASTERNODE_POS_ERROR) strStatus = "POS_ERROR";
return strStatus;
}
};
// for storing the winning payments

6
src/masternodeman.cpp
View File

@ -11,6 +11,7 @@
#include <boost/lexical_cast.hpp>
#include <boost/filesystem.hpp>
CCriticalSection cs_process_message;
/** Masternode manager */
CMasternodeMan mnodeman;
@ -545,7 +546,7 @@ void CMasternodeMan::ProcessMessage(CNode* pfrom, std::string& strCommand, CData
if(fLiteMode) return; //disable all Darksend/Masternode related functionality
if(IsInitialBlockDownload()) return;
LOCK(cs);
LOCK(cs_process_message);
if (strCommand == "dsee") { //DarkSend Election Entry
@ -621,7 +622,8 @@ void CMasternodeMan::ProcessMessage(CNode* pfrom, std::string& strCommand, CData
//search existing Masternode list, this is where we update existing Masternodes with new dsee broadcasts
CMasternode* pmn = this->Find(vin);
if(pmn != NULL)
// if we are masternode but with undefined vin and this dsee is ours (matches our Masternode privkey) then just skip this part
if(pmn != NULL && !(fMasterNode && activeMasternode.vin == CTxIn() && pubkey2 == activeMasternode.pubKeyMasternode))
{
// count == -1 when it's a new entry
// e.g. We don't want the entry relayed/time updated when we're syncing the list

425
src/qt/locale/dash_bg.ts
View File

File diff suppressed because it is too large Load Diff

58
src/qt/locale/dash_cmn.ts
View File

@ -6,19 +6,19 @@
<message>
<location filename="../forms/ui_aboutdialog.h" line="129"/>
<source>About Dash Core</source>
<translation>关于暗黑币核心</translation>
<translation>关于达世币核心</translation>
</message>
<message>
<location filename="../forms/ui_aboutdialog.h" line="130"/>
<source>&lt;b&gt;Dash Core&lt;/b&gt; version</source>
<translation>&lt;b&gt;暗黑币核心&lt;/b&gt; 版本</translation>
<translation>&lt;b&gt;达世币核心&lt;/b&gt; 版本</translation>
</message>
<message>
<location filename="../forms/ui_aboutdialog.h" line="131"/>
<source>Copyright &amp;copy; 2009-2014 The Bitcoin Core developers.
Copyright &amp;copy; 2014-YYYY The Dash Core developers.</source>
<translation>版权 &amp;copy; 2009-2014 比特币核心的开发者。
版权 &amp;copy; 暗黑币核心的开发者。</translation>
版权 &amp;copy; 达世币核心的开发者。</translation>
</message>
<message>
<location filename="../forms/ui_aboutdialog.h" line="133"/>
@ -136,12 +136,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location filename="../addressbookpage.cpp" line="65"/>
<source>These are your Dash addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
<translation>这些是你要付款过去的暗黑币位址。在付款之前，务必要检查金额和收款位址是否正确。</translation>
<translation>这些是你要付款过去的达世币地址。在付款之前，务必要检查金额和收款地址是否正确。</translation>
</message>
<message>
<location filename="../addressbookpage.cpp" line="69"/>
<source>These are your Dash addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
<translation>这些是你用来收款的暗黑币位址。建议在每次交易时，都使用一个新的收款位址。</translation>
<translation>这些是你用来收款的达世币地址。建议在每次交易时，都使用一个新的收款地址。</translation>
</message>
<message>
<location filename="../addressbookpage.cpp" line="75"/>
@ -285,7 +285,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location filename="../askpassphrasedialog.cpp" line="116"/>
<source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR DASH&lt;/b&gt;!</source>
<translation>警告:如果把钱包加​​密后又忘记密码，你就会从此&lt;b&gt;失去所有的暗黑币了&lt;/b&gt;!</translation>
<translation>警告:如果把钱包加​​密后又忘记密码，你就会从此&lt;b&gt;失去所有的达世币了&lt;/b&gt;!</translation>
</message>
<message>
<location filename="../askpassphrasedialog.cpp" line="116"/>
@ -301,7 +301,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location filename="../askpassphrasedialog.cpp" line="127"/>
<source>Dash will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your dashs from being stolen by malware infecting your computer.</source>
<translation>暗黑币软体现在要关闭，以完成加密过程。请注意，加密钱包不能完全防止恶意软件入侵你的电脑盗取你的暗黑币。</translation>
<translation>达世币软体现在要关闭，以完成加密过程。请注意，加密钱包不能完全防止恶意软件入侵你的电脑盗取你的达世币。</translation>
</message>
<message>
<location filename="../askpassphrasedialog.cpp" line="131"/>
@ -361,7 +361,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location filename="../bitcoingui.cpp" line="107"/>
<source>Dash Core</source>
<translation>暗黑币核心</translation>
<translation>达世币核心</translation>
</message>
<message>
<location filename="../bitcoingui.cpp" line="116"/>
@ -1188,12 +1188,12 @@ Address: %4
<message>
<location filename="../forms/darksendconfig.ui" line="78"/>
<source>Use 2 separate masternodes to mix funds up to 1000 DASH</source>
<translation>使用2个独立的主节点混合资金最多1000DRK</translation>
<translation>使用2个独立的主节点混合资金最多1000达世币</translation>
</message>
<message>
<location filename="../forms/darksendconfig.ui" line="91"/>
<source>Use 8 separate masternodes to mix funds up to 1000 DASH</source>
<translation>使用8个独立的主节点混合资金最多1000DRK</translation>
<translation>使用8个独立的主节点混合资金最多1000达世币</translation>
</message>
<message>
<location filename="../forms/darksendconfig.ui" line="104"/>
@ -1203,17 +1203,17 @@ Address: %4
<message>
<location filename="../forms/darksendconfig.ui" line="117"/>
<source>This option is the quickest and will cost about ~0.025 DASH to anonymize 1000 DASH</source>
<translation>此选项为最快速度，需要支付0.025DRK/1000DRK的匿名处理费用。</translation>
<translation>此选项为最快速度，需要支付0.025达世币/1000达世币的匿名处理费用。</translation>
</message>
<message>
<location filename="../forms/darksendconfig.ui" line="130"/>
<source>This option is moderately fast and will cost about 0.05 DASH to anonymize 1000 DASH</source>
<translation>此选项为一般速度，需要支付0.05DRK/1000DRK的匿名处理费用。</translation>
<translation>此选项为一般速度，需要支付0.05达世币/1000达世币的匿名处理费用。</translation>
</message>
<message>
<location filename="../forms/darksendconfig.ui" line="156"/>
<source>0.1 DASH per 1000 DASH you anonymize.</source>
<translation>0.1DRK/1000DRK的匿名处理费用。</translation>
<translation>0.1达世币/1000达世币的匿名处理费用。</translation>
</message>
<message>
<location filename="../forms/darksendconfig.ui" line="143"/>
@ -1948,7 +1948,7 @@ https://www.transifex.com/projects/p/dash/</source>
<message>
<location filename="../forms/overviewpage.ui" line="484"/>
<source>0 DASH</source>
<translation>0 暗黑币</translation>
<translation>0 达世币</translation>
</message>
<message>
<location filename="../forms/overviewpage.ui" line="491"/>
@ -1958,7 +1958,7 @@ https://www.transifex.com/projects/p/dash/</source>
<message>
<location filename="../forms/overviewpage.ui" line="498"/>
<source>0 DASH / 0 Rounds</source>
<translation>0 暗黑币 / 0 循环数</translation>
<translation>0 达世币 / 0 循环数</translation>
</message>
<message>
<location filename="../forms/overviewpage.ui" line="505"/>
@ -3245,7 +3245,7 @@ XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwg)</translation>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="1358"/>
<source>InstantX</source>
<translation>立即支付</translation>
<translation>即时支付</translation>
</message>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="1365"/>
@ -3322,7 +3322,7 @@ XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwg)</translation>
<message>
<location filename="../sendcoinsdialog.cpp" line="242"/>
<source>and InstantX</source>
<translation type="unfinished"></translation>
<translation>和 即时支付</translation>
</message>
<message>
<location filename="../sendcoinsdialog.cpp" line="266"/>
@ -3796,17 +3796,17 @@ XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwg)</translation>
<message>
<location filename="../transactiondesc.cpp" line="48"/>
<source>%1/offline (verified via instantx)</source>
<translation>%1/下线(经过立即支付系统认证)</translation>
<translation>%1/下线(经过即时支付系统认证)</translation>
</message>
<message>
<location filename="../transactiondesc.cpp" line="50"/>
<source>%1/confirmed (verified via instantx)</source>
<translation>%1/已确认(经过立即支付系统认证)</translation>
<translation>%1/已确认(经过即时支付系统认证)</translation>
</message>
<message>
<location filename="../transactiondesc.cpp" line="52"/>
<source>%1 confirmations (verified via instantx)</source>
<translation>%1/确认完成(经过立即支付系统认证)</translation>
<translation>%1/确认完成(经过即时支付付系统认证)</translation>
</message>
<message>
<location filename="../transactiondesc.cpp" line="81"/>
@ -3827,27 +3827,27 @@ XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwg)</translation>
<message>
<location filename="../transactiondesc.cpp" line="59"/>
<source>%1/offline (InstantX verification in progress - %2 of %3 signatures)</source>
<translation>%1/下线 (立即支付系统正在认证中 - %2 of %3签名数)</translation>
<translation>%1/下线 (即时支付系统正在认证中 - %2 of %3签名数)</translation>
</message>
<message>
<location filename="../transactiondesc.cpp" line="61"/>
<source>%1/confirmed (InstantX verification in progress - %2 of %3 signatures )</source>
<translation>%1/已确认 (立即支付系统正在认证中 - %2 of %3签名数)</translation>
<translation>%1/已确认 (即时支付系统正在认证中 - %2 of %3签名数)</translation>
</message>
<message>
<location filename="../transactiondesc.cpp" line="63"/>
<source>%1 confirmations (InstantX verification in progress - %2 of %3 signatures)</source>
<translation>%1/确认完成 (立即支付系统正在认证中 - %2 of %3签名数)</translation>
<translation>%1/确认完成 (即时支付系统正在认证中 - %2 of %3签名数)</translation>
</message>
<message>
<location filename="../transactiondesc.cpp" line="69"/>
<source>%1/offline (InstantX verification failed)</source>
<translation>%1/下线 (立即支付系统认证失败)</translation>
<translation>%1/下线 (即时支付系统认证失败)</translation>
</message>
<message>
<location filename="../transactiondesc.cpp" line="71"/>
<source>%1/confirmed (InstantX verification failed)</source>
<translation>%1/已确认 (立即支付系统认证失败)</translation>
<translation>%1/已确认 (即时支付系统认证失败)</translation>
</message>
<message>
<location filename="../transactiondesc.cpp" line="103"/>
@ -4548,7 +4548,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Dash Alert&quot; admin@foo.com
<message>
<location filename="../dashstrings.cpp" line="51"/>
<source>Enable instantx, show confirmations for locked transactions (bool, default: true)</source>
<translation>激活立即支付,显示锁定交易的确认数(bool, 默认：true)</translation>
<translation>激活即时支付,显示锁定交易的确认数(bool, 默认：true)</translation>
</message>
<message>
<location filename="../dashstrings.cpp" line="54"/>
@ -5170,7 +5170,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<message>
<location filename="../dashstrings.cpp" line="255"/>
<source>InstantX options:</source>
<translation>立即支付 选项：</translation>
<translation>即时支付 选项：</translation>
</message>
<message>
<location filename="../dashstrings.cpp" line="256"/>
@ -5625,7 +5625,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<message>
<location filename="../dashstrings.cpp" line="346"/>
<source>Start Dash Core Daemon</source>
<translation>启动暗黑币核心后台程序</translation>
<translation>启动达世币核心后台程序</translation>
</message>
<message>
<location filename="../dashstrings.cpp" line="347"/>
@ -5843,4 +5843,4 @@ If the file does not exist, create it with owner-readable-only file permissions.
<translation>钱包数据损坏，恢复失败</translation>
</message>
</context>
</TS>
</TS>

18
src/qt/locale/dash_de.ts
View File

@ -574,7 +574,7 @@ Dieses Produkt enthält zudem folgende Dritt-Software:
<message>
<location filename="../bitcoingui.cpp" line="347"/>
<source>Open &amp;Configuration File</source>
<translation type="unfinished"></translation>
<translation>&amp;Konfigurationsdatei öffnen</translation>
</message>
<message>
<location filename="../bitcoingui.cpp" line="348"/>
@ -2116,7 +2116,7 @@ https://www.transifex.com/projects/p/dash/</translation>
<message>
<location filename="../overviewpage.cpp" line="423"/>
<source>Mixing in progress...</source>
<translation type="unfinished"></translation>
<translation>Am Mixen...</translation>
</message>
<message>
<location filename="../overviewpage.cpp" line="429"/>
@ -2176,15 +2176,15 @@ https://www.transifex.com/projects/p/dash/</translation>
</message>
<message>
<source>Submitted to masternode, waiting in queue .</source>
<translation type="vanished">An Masternode übermittelt, wartet in Warteschange .</translation>
<translation>An Masternode übermittelt, wartet in Warteschlange .</translation>
</message>
<message>
<source>Submitted to masternode, waiting in queue ..</source>
<translation type="vanished">An Masternode übermittelt, wartet in Warteschange ..</translation>
<translation>An Masternode übermittelt, wartet in Warteschlange ..</translation>
</message>
<message>
<source>Submitted to masternode, waiting in queue ...</source>
<translation type="vanished">An Masternode übermittelt, wartet in Warteschange ...</translation>
<translation>An Masternode übermittelt, wartet in Warteschlange ...</translation>
</message>
<message>
<location filename="../overviewpage.cpp" line="460"/>
@ -4989,7 +4989,7 @@ Falls die Konfigurationsdatei nicht existiert, erzeugen Sie diese bitte mit Lese
<message>
<location filename="../dashstrings.cpp" line="210"/>
<source>Downgrading and trying again.</source>
<translation type="unfinished"></translation>
<translation>Gehe auf ältere Version zurück und versuche es erneut.</translation>
</message>
<message>
<location filename="../dashstrings.cpp" line="211"/>
@ -5334,8 +5334,8 @@ Dash Core wird heruntergefahren.</translation>
</message>
<message>
<location filename="../dashstrings.cpp" line="279"/>
<source>Loading masternode cache...</source>
<translation type="unfinished"></translation>
<source>Loading masternode list...</source>
<translation>Lade Masternode-Liste...</translation>
</message>
<message>
<location filename="../dashstrings.cpp" line="280"/>
@ -5888,4 +5888,4 @@ Dash Core wird heruntergefahren.</translation>
<translation>wallet.dat beschädigt, Datenrettung fehlgeschlagen</translation>
</message>
</context>
</TS>
</TS>

4
src/qt/locale/dash_es.ts
View File

@ -2114,7 +2114,7 @@ https://www.transifex.com/projects/p/dash/</translation>
<message>
<location filename="../overviewpage.cpp" line="423"/>
<source>Mixing in progress...</source>
<translation type="unfinished"></translation>
<translation>Mezclado en curso...</translation>
</message>
<message>
<location filename="../overviewpage.cpp" line="429"/>
@ -5890,4 +5890,4 @@ Si el archivo no existe, créelo con permiso de lectura solamente del propietari
<translation>wallet.dat dañado, falló el rescate</translation>
</message>
</context>
</TS>
</TS>

147
src/qt/locale/dash_fi.ts
View File

@ -34,7 +34,8 @@ Tämä on kokeellinen ohjelmisto.
Levitetään MIT/X11 ohjelmistolisenssin alaisuudessa. Tarkemmat tiedot löytyvät tiedostosta COPYING tai osoitteesta http://www.opensource.org/licenses/mit-license.php.
Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.openssl.org/), Eric Youngin (eay@cryptsoft.com) kehittämän salausohjelmiston sekä Thomas Bernardin UPnP ohjelmiston.
</translation>
Käännös päivitetty: 29.3.2015 by AjM.</translation>
</message>
<message>
<source>Copyright</source>
@ -112,7 +113,7 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o
<message>
<location filename="../addressbookpage.cpp" line="45"/>
<source>Choose the address to send coins to</source>
<translation>Valitse osoite johon lähetetään</translation>
<translation>Valitse osoite johon varat lähetetään</translation>
</message>
<message>
<location filename="../addressbookpage.cpp" line="46"/>
@ -137,7 +138,7 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o
<message>
<location filename="../addressbookpage.cpp" line="65"/>
<source>These are your Dash addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
<translation>Nämä ovat sinun Dash osoitteesi maksujen lähetykseen. Tarkista aina lähetettävä määrä ja vastaanottajan osoite ennen kuin lähetät kolikkoja.</translation>
<translation>Nämä ovat sinun Dash osoitteesi maksujen lähetykseen. Tarkista aina lähetettävä määrä ja vastaanottajan osoite ennen kuin lähetät varoja.</translation>
</message>
<message>
<location filename="../addressbookpage.cpp" line="69"/>
@ -303,7 +304,7 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o
<message>
<location filename="../askpassphrasedialog.cpp" line="127"/>
<source>Dash will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your dashs from being stolen by malware infecting your computer.</source>
<translation>Dash sulkeutuu nyt salauksen viimeistelyä varten. Muista että salaus pelkästään ei voi estää Darkcoiniesi varastamista jos koneesi saastuu haittaohjelmilla tai viruksilla.</translation>
<translation>Dash sulkeutuu nyt salauksen viimeistelyä varten. Muista että salaus pelkästään ei voi estää dashiesi varastamista jos koneesi saastuu haittaohjelmilla tai viruksilla.</translation>
</message>
<message>
<location filename="../askpassphrasedialog.cpp" line="131"/>
@ -397,7 +398,7 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o
<message>
<location filename="../bitcoingui.cpp" line="261"/>
<source>Send coins to a Dash address</source>
<translation>Lähetä kolikoita Dash osoitteeseen</translation>
<translation>Lähetä varoja Dash osoitteeseen</translation>
</message>
<message>
<location filename="../bitcoingui.cpp" line="271"/>
@ -482,7 +483,7 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o
<message>
<location filename="../bitcoingui.cpp" line="327"/>
<source>Encrypt the private keys that belong to your wallet</source>
<translation>Suojaa yksityiset avaimet jotka kuuluvat lompakkoosi</translation>
<translation>Salaa yksityiset avaimet jotka kuuluvat lompakkoosi</translation>
</message>
<message>
<location filename="../bitcoingui.cpp" line="329"/>
@ -532,12 +533,12 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o
<message>
<location filename="../bitcoingui.cpp" line="338"/>
<source>&amp;Verify message...</source>
<translation>Varmista &amp;Viesti...</translation>
<translation>Tarkista &amp;Viesti...</translation>
</message>
<message>
<location filename="../bitcoingui.cpp" line="339"/>
<source>Verify messages to ensure they were signed with specified Dash addresses</source>
<translation>Varmista viestit varmistaaksesi että ne ovat allekirjoitettu määritetyillä Dash osoitteilla</translation>
<translation>Tarkista viestit ollaksesi varma että ne on allekirjoitettu määritetyillä Dash osoitteilla</translation>
</message>
<message>
<location filename="../bitcoingui.cpp" line="341"/>
@ -1564,7 +1565,7 @@ Varoitus: Jos käytät käyttöjärjestelmää (Live os) suoraan usb, dvd tai cd
<message>
<location filename="../forms/optionsdialog.ui" line="88"/>
<source>Number of script &amp;verification threads</source>
<translation>Script &amp;varmistuksen säikeiden määrä</translation>
<translation>Script &amp;vahvistuksien säikeiden määrä</translation>
</message>
<message>
<location filename="../forms/optionsdialog.ui" line="101"/>
@ -1579,7 +1580,7 @@ Varoitus: Jos käytät käyttöjärjestelmää (Live os) suoraan usb, dvd tai cd
<message>
<location filename="../forms/optionsdialog.ui" line="141"/>
<source>Darksend rounds to use</source>
<translation>Kuinka monta Darksend kierrosta käytetään</translation>
<translation>Kuinka montaa Darksend kierrosta käytetään</translation>
</message>
<message>
<location filename="../forms/optionsdialog.ui" line="165"/>
@ -1642,12 +1643,12 @@ Varoitus: Jos käytät käyttöjärjestelmää (Live os) suoraan usb, dvd tai cd
<message>
<location filename="../forms/optionsdialog.ui" line="228"/>
<source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
<translation>Jos poistat varmistamattomien vaihtorahojen käytön, siirtotapahtuman vaihtorahaa ei voida käyttää ennen vähintään yhtä varmistusta. Tämä vaikuttaa myös kuinka saldosi lasketaan.</translation>
<translation>Jos poistat vahvistamattomien vaihtorahojen käytön, siirtotapahtuman vaihtorahaa ei voida käyttää ennen vähintään yhtä vahvistusta. Tämä vaikuttaa myös kuinka saldosi lasketaan.</translation>
</message>
<message>
<location filename="../forms/optionsdialog.ui" line="231"/>
<source>&amp;Spend unconfirmed change</source>
<translation>&amp;Käytä varmistamattomia vaihtorahoja</translation>
<translation>&amp;Käytä vahvistamattomia vaihtorahoja</translation>
</message>
<message>
<location filename="../forms/optionsdialog.ui" line="255"/>
@ -1755,12 +1756,12 @@ https://www.transifex.com/projects/p/dash/</translation>
<message>
<location filename="../forms/optionsdialog.ui" line="508"/>
<source>&amp;Unit to show amounts in:</source>
<translation>Yksikkö jona määrät näytetään</translation>
<translation>Yksikkö joina määrät näytetään</translation>
</message>
<message>
<location filename="../forms/optionsdialog.ui" line="521"/>
<source>Choose the default subdivision unit to show in the interface and when sending coins.</source>
<translation>Valitse mitä yksikköä käytetään ensisijaisesti kolikkomäärien näyttämiseen.</translation>
<translation>Valitse mitä yksikköä käytetään ensisijaisesti varojen määrien näyttämiseen.</translation>
</message>
<message>
<source>Whether to show Dash addresses in the transaction list or not.</source>
@ -1825,7 +1826,7 @@ https://www.transifex.com/projects/p/dash/</translation>
<location filename="../optionsdialog.cpp" line="229"/>
<location filename="../optionsdialog.cpp" line="259"/>
<source>Client restart required to activate changes.</source>
<translation>Ohjelman uudelleenkäynnistys aktivoi muutokset käyttöön.</translation>
<translation>Ohjelman uudelleen käynnistys aktivoi muutokset käyttöön.</translation>
</message>
<message>
<location filename="../optionsdialog.cpp" line="229"/>
@ -1835,7 +1836,7 @@ https://www.transifex.com/projects/p/dash/</translation>
<message>
<location filename="../optionsdialog.cpp" line="263"/>
<source>This change would require a client restart.</source>
<translation>Tämä muutos vaatii ohjelman uudelleenkäynnistyksen.</translation>
<translation>Tämä muutos vaatii ohjelman uudelleen käynnistyksen.</translation>
</message>
<message>
<location filename="../optionsdialog.cpp" line="288"/>
@ -1874,12 +1875,12 @@ https://www.transifex.com/projects/p/dash/</translation>
<message>
<location filename="../forms/overviewpage.ui" line="379"/>
<source>Pending:</source>
<translation>Odotetaan:</translation>
<translation>Vahvistamatta:</translation>
</message>
<message>
<location filename="../forms/overviewpage.ui" line="143"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation>Varmistamattomien siirtotapahtumien summa, jota ei vielä lasketa käytettävissä olevaan saldoon</translation>
<translation>Vahvistamattomien siirtotapahtumien summa, jota ei vielä lasketa käytettävissä olevaan saldoon</translation>
</message>
<message>
<location filename="../forms/overviewpage.ui" line="255"/>
@ -1909,7 +1910,7 @@ https://www.transifex.com/projects/p/dash/</translation>
<message>
<location filename="../forms/overviewpage.ui" line="210"/>
<source>Total:</source>
<translation>Yhteensä:</translation>
<translation>Saldo Yhteensä:</translation>
</message>
<message>
<location filename="../forms/overviewpage.ui" line="271"/>
@ -1939,7 +1940,7 @@ https://www.transifex.com/projects/p/dash/</translation>
<message>
<location filename="../forms/overviewpage.ui" line="437"/>
<source>Status:</source>
<translation>Tilanne:</translation>
<translation>Tila:</translation>
</message>
<message>
<location filename="../forms/overviewpage.ui" line="444"/>
@ -2022,7 +2023,7 @@ https://www.transifex.com/projects/p/dash/</translation>
<message>
<location filename="../forms/overviewpage.ui" line="1053"/>
<source>Reset the current status of Darksend (can interrupt Darksend if it&apos;s in the process of Mixing, which can cost you money!)</source>
<translation>Nollaa nykyinen Darksend tilanne (voi keskeyttää Darksend sekoituksen, joka voi maksaa ylimääräisiä kuluja)</translation>
<translation>Nollaa nykyinen Darksend tila (voi keskeyttää Darksend sekoituksen, joka voi maksaa ylimääräisiä kuluja)</translation>
</message>
<message>
<location filename="../forms/overviewpage.ui" line="1059"/>
@ -2072,7 +2073,7 @@ https://www.transifex.com/projects/p/dash/</translation>
<message>
<location filename="../overviewpage.cpp" line="377"/>
<source>Rounds</source>
<translation>Kierrokset</translation>
<translation>Kierrosta</translation>
</message>
<message>
<location filename="../overviewpage.cpp" line="408"/>
@ -2116,7 +2117,7 @@ https://www.transifex.com/projects/p/dash/</translation>
<message>
<location filename="../overviewpage.cpp" line="423"/>
<source>Mixing in progress...</source>
<translation type="unfinished"></translation>
<translation>Sekoitus käynnissä...</translation>
</message>
<message>
<location filename="../overviewpage.cpp" line="429"/>
@ -2227,7 +2228,7 @@ https://www.transifex.com/projects/p/dash/</translation>
<message>
<location filename="../paymentserver.cpp" line="319"/>
<source>Cannot start dash: click-to-pay handler</source>
<translation>Ei voi käynnistää Darkcoinia: click-to-pay handler</translation>
<translation>Ei voi käynnistää dashia: click-to-pay handler</translation>
</message>
<message>
<source>Net manager warning</source>
@ -2302,7 +2303,7 @@ https://www.transifex.com/projects/p/dash/</translation>
<message>
<location filename="../paymentserver.cpp" line="570"/>
<source>Unverified payment requests to custom payment scripts are unsupported.</source>
<translation>Varmistamattomia maksupyyntöjä kustomoituun maksupalvelun scripteihin ei tueta.</translation>
<translation>Vahvistamattomia maksupyyntöjä kustomoituun maksupalvelun scripteihin ei tueta.</translation>
</message>
<message>
<location filename="../paymentserver.cpp" line="578"/>
@ -3044,7 +3045,7 @@ https://www.transifex.com/projects/p/dash/</translation>
<location filename="../sendcoinsdialog.cpp" line="590"/>
<location filename="../sendcoinsdialog.cpp" line="602"/>
<source>Send Coins</source>
<translation>Lähetä Darkcoineja</translation>
<translation>Lähetä Dasheja</translation>
</message>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="90"/>
@ -3336,7 +3337,7 @@ https://www.transifex.com/projects/p/dash/</translation>
<message>
<location filename="../sendcoinsdialog.cpp" line="242"/>
<source>and InstantX</source>
<translation>ja instantx</translation>
<translation>ja InstantX</translation>
</message>
<message>
<location filename="../sendcoinsdialog.cpp" line="266"/>
@ -3369,7 +3370,7 @@ https://www.transifex.com/projects/p/dash/</translation>
<message>
<location filename="../sendcoinsdialog.cpp" line="359"/>
<source>Confirm send coins</source>
<translation>Hyväksy Darkcoinien lähettäminen</translation>
<translation>Hyväksy lähettäminen</translation>
</message>
<message>
<source>Payment request expired</source>
@ -3412,7 +3413,7 @@ https://www.transifex.com/projects/p/dash/</translation>
<message>
<location filename="../sendcoinsdialog.cpp" line="586"/>
<source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
<translation>Siirtotapahtuma hylättiin! Tämä saattaa tapahtua jos lompakossa olevat kolikot on jo kulutettu, kuten jos käytät kopiota wallet.dat tiedostosta ja kolikot oli jo käytetty mutta ei merkattu täällä.</translation>
<translation>Siirtotapahtuma hylättiin! Tämä saattaa tapahtua jos lompakossa olevat varat on jo kulutettu, kuten jos käytät kopiota wallet.dat tiedostosta ja varat oli jo käytetty mutta ei merkattu täällä.</translation>
</message>
<message>
<location filename="../sendcoinsdialog.cpp" line="591"/>
@ -3528,7 +3529,7 @@ https://www.transifex.com/projects/p/dash/</translation>
<message>
<location filename="../forms/sendcoinsentry.ui" line="583"/>
<source>This is an unverified payment request.</source>
<translation>Tämä on varmistamaton maksupyyntö</translation>
<translation>Tämä on vahvistamaton maksupyyntö</translation>
</message>
<message>
<location filename="../forms/sendcoinsentry.ui" line="601"/>
@ -3545,7 +3546,7 @@ https://www.transifex.com/projects/p/dash/</translation>
<message>
<location filename="../forms/sendcoinsentry.ui" line="1115"/>
<source>This is a verified payment request.</source>
<translation>Tämä on varmistettu maksupyyntö.</translation>
<translation>Tämä on vahvistettu maksupyyntö.</translation>
</message>
<message>
<location filename="../sendcoinsentry.cpp" line="31"/>
@ -3571,7 +3572,7 @@ https://www.transifex.com/projects/p/dash/</translation>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="14"/>
<source>Signatures - Sign / Verify a Message</source>
<translation>Allekirjoitukset - Allekirjoita / Varmista viesti</translation>
<translation>Allekirjoitukset - Allekirjoita / Tarkista viesti</translation>
</message>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="27"/>
@ -3642,7 +3643,7 @@ https://www.transifex.com/projects/p/dash/</translation>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="172"/>
<source>Reset all sign message fields</source>
<translation>Tyhjennä kaikki allekirjoituskentät</translation>
<translation>Tyhjennä kaikki kentät</translation>
</message>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="175"/>
@ -3653,7 +3654,7 @@ https://www.transifex.com/projects/p/dash/</translation>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="234"/>
<source>&amp;Verify Message</source>
<translation>&amp;Varmista viesti</translation>
<translation>&amp;Tarkista viesti</translation>
</message>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="240"/>
@ -3672,17 +3673,17 @@ https://www.transifex.com/projects/p/dash/</translation>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="298"/>
<source>Verify the message to ensure it was signed with the specified Dash address</source>
<translation>Varmista että viesti on allekirjoitettu määritetyllä Dash osoitteella</translation>
<translation>Tarkista että viesti on allekirjoitettu määritetyllä Dash osoitteella</translation>
</message>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="301"/>
<source>Verify &amp;Message</source>
<translation>Varmista &amp;Viesti...</translation>
<translation>Tarkista &amp;Viesti...</translation>
</message>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="315"/>
<source>Reset all verify message fields</source>
<translation>Tyhjennä kaikki varmistakentät</translation>
<translation>Tyhjennä kaikki kentät</translation>
</message>
<message>
<location filename="../signverifymessagedialog.cpp" line="30"/>
@ -3752,12 +3753,12 @@ https://www.transifex.com/projects/p/dash/</translation>
<message>
<location filename="../signverifymessagedialog.cpp" line="232"/>
<source>Message verification failed.</source>
<translation>Viestin varmistus epäonnistui.</translation>
<translation>Viestin tarkistus epäonnistui.</translation>
</message>
<message>
<location filename="../signverifymessagedialog.cpp" line="237"/>
<source>Message verified.</source>
<translation>Viesti varmistettu.</translation>
<translation>Viesti tarkistettu.</translation>
</message>
</context>
<context>
@ -3822,17 +3823,17 @@ https://www.transifex.com/projects/p/dash/</translation>
<message>
<location filename="../transactiondesc.cpp" line="48"/>
<source>%1/offline (verified via instantx)</source>
<translation>%1/ei yhteyttä (varmistettu instantx:lla)</translation>
<translation>%1/ei yhteyttä (vahvistettu instantx:lla)</translation>
</message>
<message>
<location filename="../transactiondesc.cpp" line="50"/>
<source>%1/confirmed (verified via instantx)</source>
<translation>%1/vahvistettu (varmistettu instantx:lla)</translation>
<translation>%1/vahvistettu (vahvistettu instantx:lla)</translation>
</message>
<message>
<location filename="../transactiondesc.cpp" line="52"/>
<source>%1 confirmations (verified via instantx)</source>
<translation>%1 vahvistusta (varmistettu instantx:lla)</translation>
<translation>%1 vahvistusta (vahvistettu instantx:lla)</translation>
</message>
<message>
<location filename="../transactiondesc.cpp" line="81"/>
@ -3853,27 +3854,27 @@ https://www.transifex.com/projects/p/dash/</translation>
<message>
<location filename="../transactiondesc.cpp" line="59"/>
<source>%1/offline (InstantX verification in progress - %2 of %3 signatures)</source>
<translation>%1/ei yhteyttä (varmistus instantx:lla käynnissä - %2 / %3 allekirjoitusta)</translation>
<translation>%1/ei yhteyttä (vahvistus instantx:lla käynnissä - %2 / %3 allekirjoitusta)</translation>
</message>
<message>
<location filename="../transactiondesc.cpp" line="61"/>
<source>%1/confirmed (InstantX verification in progress - %2 of %3 signatures )</source>
<translation>%1/vahvistettu (varmistus instantx:lla käynnissä - %2 / %3 allekirjoitusta)</translation>
<translation>%1/vahvistettu (vahvistus instantx:lla käynnissä - %2 / %3 allekirjoitusta)</translation>
</message>
<message>
<location filename="../transactiondesc.cpp" line="63"/>
<source>%1 confirmations (InstantX verification in progress - %2 of %3 signatures)</source>
<translation>%1 vahvistusta (varmistus instantx:lla käynnissä - %2 / %3 allekirjoitusta)</translation>
<translation>%1 vahvistusta (vahvistus instantx:lla käynnissä - %2 / %3 allekirjoitusta)</translation>
</message>
<message>
<location filename="../transactiondesc.cpp" line="69"/>
<source>%1/offline (InstantX verification failed)</source>
<translation>%1/ei yhteyttä (instantx varmistus epäonnistui)</translation>
<translation>%1/ei yhteyttä (instantx vahvistus epäonnistui)</translation>
</message>
<message>
<location filename="../transactiondesc.cpp" line="71"/>
<source>%1/confirmed (InstantX verification failed)</source>
<translation>%1/vahvistettu (instantx varmistus epäonnistui)</translation>
<translation>%1/vahvistettu (instantx vahvistus epäonnistui)</translation>
</message>
<message>
<location filename="../transactiondesc.cpp" line="103"/>
@ -4016,7 +4017,7 @@ https://www.transifex.com/projects/p/dash/</translation>
<message>
<location filename="../transactiondesc.cpp" line="308"/>
<source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to &quot;not accepted&quot; and it won&apos;t be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
<translation>Luodut (louhitut) kolikot täytyy kypsyä %1 lohkon ajan kunnes ne voidaan käyttää. Kun generoit tämän lohkon, se lähetettiin verkkoon lohkoketjuun. Jos se epäonnistuu pääsemään lohkoketjuun sen tila tulee muuttumaan &quot;ei hyväksytty&quot; ja sitä ei voida käyttää. Näin voi ajoittain tapahtua kun toisen solmun lohko luodaan samanaikaisesti omasi kanssa.</translation>
<translation>Luodut (louhitut) varat täytyy kypsyä %1 lohkon ajan kunnes ne voidaan käyttää. Kun generoit tämän lohkon, se lähetettiin verkkoon lohkoketjuun. Jos se epäonnistuu pääsemään lohkoketjuun sen tila tulee muuttumaan &quot;ei hyväksytty&quot; ja sitä ei voida käyttää. Näin voi ajoittain tapahtua kun toisen solmun lohko luodaan samanaikaisesti omasi kanssa.</translation>
</message>
<message>
<location filename="../transactiondesc.cpp" line="316"/>
@ -4106,7 +4107,7 @@ https://www.transifex.com/projects/p/dash/</translation>
<message>
<location filename="../transactiontablemodel.cpp" line="296"/>
<source>Unconfirmed</source>
<translation>Varmistamaton</translation>
<translation>Vahvistamaton</translation>
</message>
<message>
<location filename="../transactiontablemodel.cpp" line="299"/>
@ -4181,7 +4182,7 @@ https://www.transifex.com/projects/p/dash/</translation>
<message>
<location filename="../transactiontablemodel.cpp" line="371"/>
<source>Darksend Make Collateral Inputs</source>
<translation>Darksend luo vakuus syöte</translation>
<translation>Darksend luo vakuus syötteet</translation>
</message>
<message>
<location filename="../transactiontablemodel.cpp" line="373"/>
@ -4290,7 +4291,7 @@ https://www.transifex.com/projects/p/dash/</translation>
<message>
<location filename="../transactionview.cpp" line="89"/>
<source>Darksend Make Collateral Inputs</source>
<translation>Darksend vakuus syöte</translation>
<translation>Darksend luo vakuus syötteet</translation>
</message>
<message>
<location filename="../transactionview.cpp" line="90"/>
@ -4464,7 +4465,7 @@ https://www.transifex.com/projects/p/dash/</translation>
<location filename="../walletmodel.cpp" line="289"/>
<location filename="../walletmodel.cpp" line="303"/>
<source>Send Coins</source>
<translation>Lähetä Darkcoineja</translation>
<translation>Lähetä Dasheja</translation>
</message>
<message numerus="yes">
<location filename="../walletmodel.cpp" line="289"/>
@ -4578,7 +4579,7 @@ esimerkiksi: alertnotify=echo %%s | mail -s &quot;Dash Hälytys&quot; admin@foo.
<message>
<location filename="../dashstrings.cpp" line="46"/>
<source>Darksend uses exact denominated amounts to send funds, you might simply need to anonymize some more coins.</source>
<translation>Darksend käyttää tarkalleen denominoituja syötteitä lähettäessään varoja, saatat tarvita anonymisoida lisää kolikoita.</translation>
<translation>Darksend käyttää tarkalleen denominoituja syötteitä lähettäessään varoja, saatat tarvita anonymisoida lisää varoja.</translation>
</message>
<message>
<location filename="../dashstrings.cpp" line="49"/>
@ -4613,7 +4614,7 @@ esimerkiksi: alertnotify=echo %%s | mail -s &quot;Dash Hälytys&quot; admin@foo.
<message>
<location filename="../dashstrings.cpp" line="66"/>
<source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
<translation>Virhe: Siirtotapahtuma hylättiin! Tämä saattaa tapahtua jos jotkut kolikot lompakossa on jo käytetty. Esimerkiksi jos käytit kopioitua lompakkoa ja kolikot on käytetty jo siellä, mutta ei ole merkattu käytetyksi täällä.</translation>
<translation>Virhe: Siirtotapahtuma hylättiin! Tämä saattaa tapahtua jos jotkut varat lompakossa on jo käytetty. Esimerkiksi jos käytit kopioitua lompakkoa ja varat on käytetty jo siellä, mutta ei ole merkattu käytetyksi täällä.</translation>
</message>
<message>
<location filename="../dashstrings.cpp" line="70"/>
@ -4658,7 +4659,7 @@ esimerkiksi: alertnotify=echo %%s | mail -s &quot;Dash Hälytys&quot; admin@foo.
<message>
<location filename="../dashstrings.cpp" line="93"/>
<source>How thorough the block verification of -checkblocks is (0-4, default: 3)</source>
<translation>Kuinka vaativa lohkonvarmistus -checkblocks on (0-4, oletus: 3)</translation>
<translation>Kuinka vaativa lohkon vahvistus -checkblocks on (0-4, oletus: 3)</translation>
</message>
<message>
<location filename="../dashstrings.cpp" line="95"/>
@ -4668,7 +4669,7 @@ esimerkiksi: alertnotify=echo %%s | mail -s &quot;Dash Hälytys&quot; admin@foo.
<message>
<location filename="../dashstrings.cpp" line="98"/>
<source>InstantX requires inputs with at least 6 confirmations, you might need to wait a few minutes and try again.</source>
<translation>Instantx vaatii vähintään 6 varmistusta, odota muutama minuutti ja yritä uudelleen.</translation>
<translation>InstantX vaatii vähintään 6 vahvistusta, odota muutama minuutti ja yritä uudelleen.</translation>
</message>
<message>
<location filename="../dashstrings.cpp" line="101"/>
@ -4693,7 +4694,7 @@ esimerkiksi: alertnotify=echo %%s | mail -s &quot;Dash Hälytys&quot; admin@foo.
<message>
<location filename="../dashstrings.cpp" line="110"/>
<source>Provide liquidity to Darksend by infrequently mixing coins on a continual basis (0-100, default: 0, 1=very frequent, high fees, 100=very infrequent, low fees)</source>
<translation>Tarjoa Darksend:ille likviditeettiä jatkuvaa kolikoiden sekoitusta varten (0-100, oletus: 0, 1=usein, isot maksukulut, 100=harvoin, pienet maksukulut)</translation>
<translation>Tarjoa Darksend:ille likviditeettiä jatkuvaa varojen sekoitusta varten (0-100, oletus: 0, 1=usein, isot maksukulut, 100=harvoin, pienet maksukulut)</translation>
</message>
<message>
<location filename="../dashstrings.cpp" line="114"/>
@ -4713,7 +4714,7 @@ esimerkiksi: alertnotify=echo %%s | mail -s &quot;Dash Hälytys&quot; admin@foo.
<message>
<location filename="../dashstrings.cpp" line="121"/>
<source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
<translation>Aseta script varmistuksen säikeiden määrä (%u - %d, 0= auto, &lt;0 = jätä näin monta prosessorin ydintä vapaaksi, oletus: %d)</translation>
<translation>Aseta script vahvistuksen säikeiden määrä (%u - %d, 0= auto, &lt;0 = jätä näin monta prosessorin ydintä vapaaksi, oletus: %d)</translation>
</message>
<message>
<location filename="../dashstrings.cpp" line="124"/>
@ -4827,7 +4828,7 @@ Jos tiedostoa ei ole, niin luo se ainoastaan omistajan kirjoitusoikeuksin.</tran
<message>
<location filename="../dashstrings.cpp" line="178"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>Linää solmu mihin liittyä pitääksesi yhteyden auki</translation>
<translation>Lisää solmu mihin liittyä pitääksesi yhteyden auki</translation>
</message>
<message>
<location filename="../dashstrings.cpp" line="179"/>
@ -4862,7 +4863,7 @@ Jos tiedostoa ei ole, niin luo se ainoastaan omistajan kirjoitusoikeuksin.</tran
<message>
<location filename="../dashstrings.cpp" line="185"/>
<source>Can&apos;t denominate: no compatible inputs left.</source>
<translation>Ei voida denomnoida: yhteensopivia syötteitä ei ole jäljellä.</translation>
<translation>Ei voida denominoida: yhteensopivia syötteitä ei ole jäljellä.</translation>
</message>
<message>
<location filename="../dashstrings.cpp" line="186"/>
@ -4987,7 +4988,7 @@ Jos tiedostoa ei ole, niin luo se ainoastaan omistajan kirjoitusoikeuksin.</tran
<message>
<location filename="../dashstrings.cpp" line="210"/>
<source>Downgrading and trying again.</source>
<translation type="unfinished"></translation>
<translation>Alennetaan ja yritetään uudestaan.</translation>
</message>
<message>
<location filename="../dashstrings.cpp" line="211"/>
@ -5032,7 +5033,7 @@ Jos tiedostoa ei ole, niin luo se ainoastaan omistajan kirjoitusoikeuksin.</tran
<message>
<location filename="../dashstrings.cpp" line="219"/>
<source>Error loading wallet.dat: Wallet requires newer version of Dash</source>
<translation>Virhe ladattaessa wallet.dat lompakkotiedostoa: Tarvitset uudemman version Darkcoinista</translation>
<translation>Virhe ladattaessa wallet.dat lompakkotiedostoa: Tarvitset uudemman version dashista</translation>
</message>
<message>
<location filename="../dashstrings.cpp" line="220"/>
@ -5117,7 +5118,7 @@ Jos tiedostoa ei ole, niin luo se ainoastaan omistajan kirjoitusoikeuksin.</tran
<message>
<location filename="../dashstrings.cpp" line="236"/>
<source>Failed to write to coin database</source>
<translation>Kolikkotietokannan kirjoitus epäonnistui</translation>
<translation>Tietokannan kirjoitus epäonnistui</translation>
</message>
<message>
<location filename="../dashstrings.cpp" line="237"/>
@ -5147,7 +5148,7 @@ Jos tiedostoa ei ole, niin luo se ainoastaan omistajan kirjoitusoikeuksin.</tran
<message>
<location filename="../dashstrings.cpp" line="242"/>
<source>Generate coins (default: 0)</source>
<translation>Luo kolikoita (oletus: 0)</translation>
<translation>Luo varoja (oletus: 0)</translation>
</message>
<message>
<location filename="../dashstrings.cpp" line="243"/>
@ -5212,7 +5213,7 @@ Jos tiedostoa ei ole, niin luo se ainoastaan omistajan kirjoitusoikeuksin.</tran
<message>
<location filename="../dashstrings.cpp" line="255"/>
<source>InstantX options:</source>
<translation>Instantx valinnat:</translation>
<translation>InstantX valinnat:</translation>
</message>
<message>
<location filename="../dashstrings.cpp" line="256"/>
@ -5436,7 +5437,7 @@ Jos tiedostoa ei ole, niin luo se ainoastaan omistajan kirjoitusoikeuksin.</tran
<message>
<location filename="../dashstrings.cpp" line="299"/>
<source>Only accept block chain matching built-in checkpoints (default: 1)</source>
<translation>Hyväksy vain lohkoketjua vastaavat sisäänrakennetut varmistuspisteet (Oletus: 1)</translation>
<translation>Hyväksy vain lohkoketjua vastaavat sisäänrakennetut vahvistuspisteet (Oletus: 1)</translation>
</message>
<message>
<location filename="../dashstrings.cpp" line="300"/>
@ -5561,7 +5562,7 @@ Jos tiedostoa ei ole, niin luo se ainoastaan omistajan kirjoitusoikeuksin.</tran
<message>
<location filename="../dashstrings.cpp" line="324"/>
<source>Session timed out (30 seconds), please resubmit.</source>
<translation>Istunnon aikaraja (30 sekuntia), esitä uudestaan.</translation>
<translation>Istunto vanheni (30 sekuntia), esitä uudestaan.</translation>
</message>
<message>
<location filename="../dashstrings.cpp" line="325"/>
@ -5666,7 +5667,7 @@ Jos tiedostoa ei ole, niin luo se ainoastaan omistajan kirjoitusoikeuksin.</tran
<message>
<location filename="../dashstrings.cpp" line="345"/>
<source>Spend unconfirmed change when sending transactions (default: 1)</source>
<translation>Käytä varmistamattomia vaihtorahoja lähetettäessä siirtotapahtumia (oletus: 1)</translation>
<translation>Käytä vahvistamattomia vaihtorahoja lähetettäessä siirtotapahtumia (oletus: 1)</translation>
</message>
<message>
<location filename="../dashstrings.cpp" line="346"/>
@ -5746,7 +5747,7 @@ Jos tiedostoa ei ole, niin luo se ainoastaan omistajan kirjoitusoikeuksin.</tran
<message>
<location filename="../dashstrings.cpp" line="361"/>
<source>Unable to sign spork message, wrong key?</source>
<translation>En voida osoittaa spork viestiä, väärä avain?</translation>
<translation>En voida allekirjoittaa spork viestiä, väärä avain?</translation>
</message>
<message>
<location filename="../dashstrings.cpp" line="362"/>
@ -5816,12 +5817,12 @@ Jos tiedostoa ei ole, niin luo se ainoastaan omistajan kirjoitusoikeuksin.</tran
<message>
<location filename="../dashstrings.cpp" line="375"/>
<source>Verifying blocks...</source>
<translation>Varmistetaan lohkoja...</translation>
<translation>Tarkistetaan lohkoja...</translation>
</message>
<message>
<location filename="../dashstrings.cpp" line="376"/>
<source>Verifying wallet...</source>
<translation>Varmistetaan lompakko...</translation>
<translation>Tarkistetaan lompakko...</translation>
</message>
<message>
<location filename="../dashstrings.cpp" line="377"/>
@ -5886,7 +5887,7 @@ Jos tiedostoa ei ole, niin luo se ainoastaan omistajan kirjoitusoikeuksin.</tran
<message>
<location filename="../dashstrings.cpp" line="389"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation>wallet.dat lompakkotiedosto vioittunut, palastaminen epäonnistui</translation>
<translation>wallet.dat lompakkotiedosto vioittunut, pelastaminen epäonnistui</translation>
</message>
</context>
</TS>
</TS>

6
src/qt/locale/dash_pt.ts
View File

@ -2113,7 +2113,7 @@ https://www.transifex.com/projects/p/dash/</translation>
<message>
<location filename="../overviewpage.cpp" line="423"/>
<source>Mixing in progress...</source>
<translation type="unfinished"></translation>
<translation>Mistura em progresso...</translation>
</message>
<message>
<location filename="../overviewpage.cpp" line="429"/>
@ -4983,7 +4983,7 @@ Se o ficheiro não existir, deve criá-lo só com permissões de leitura para o
<message>
<location filename="../dashstrings.cpp" line="210"/>
<source>Downgrading and trying again.</source>
<translation type="unfinished"></translation>
<translation>A diminuir o nível e tentar de novo.</translation>
</message>
<message>
<location filename="../dashstrings.cpp" line="211"/>
@ -5885,4 +5885,4 @@ Se o ficheiro não existir, deve criá-lo só com permissões de leitura para o
<translation>wallet.dat corrompido, recuperação falhou</translation>
</message>
</context>
</TS>
</TS>

4
src/qt/locale/dash_ru.ts
View File

@ -2121,7 +2121,7 @@ https://www.transifex.com/projects/p/dash/</translation>
<message>
<location filename="../overviewpage.cpp" line="423"/>
<source>Mixing in progress...</source>
<translation type="unfinished"></translation>
<translation>Выполняется перемешивание...</translation>
</message>
<message>
<location filename="../overviewpage.cpp" line="429"/>
@ -4997,7 +4997,7 @@ If the file does not exist, create it with owner-readable-only file permissions.
<message>
<location filename="../dashstrings.cpp" line="210"/>
<source>Downgrading and trying again.</source>
<translation type="unfinished"></translation>
<translation>Откат к обычному перемешиванию и повторная попытка.</translation>
</message>
<message>
<location filename="../dashstrings.cpp" line="211"/>

8
src/qt/locale/dash_sv.ts
View File

@ -2118,7 +2118,7 @@ https://www.transifex.com/projects/p/dash/</translation>
<message>
<location filename="../overviewpage.cpp" line="423"/>
<source>Mixing in progress...</source>
<translation type="unfinished"></translation>
<translation>Mixning pågår...</translation>
</message>
<message>
<location filename="../overviewpage.cpp" line="429"/>
@ -4990,7 +4990,7 @@ Om filen inte existerar, skapa den och ge inga andra än ägaren läsarrättighe
<message>
<location filename="../dashstrings.cpp" line="210"/>
<source>Downgrading and trying again.</source>
<translation type="unfinished"></translation>
<translation>Nedgraderar och försöker igen.</translation>
</message>
<message>
<location filename="../dashstrings.cpp" line="211"/>
@ -5004,7 +5004,7 @@ Om filen inte existerar, skapa den och ge inga andra än ägaren läsarrättighe
</message>
<message>
<location filename="../dashstrings.cpp" line="213"/>
<source>Error connecting to masternode.</source>
<source>Error connecting to Masternode.</source>
<translation>Fel vid anslutning till masternode.</translation>
</message>
<message>
@ -5888,4 +5888,4 @@ Om filen inte existerar, skapa den och ge inga andra än ägaren läsarrättighe
<translation>wallet.dat är korrumperad, återställning misslyckades</translation>
</message>
</context>
</TS>
</TS>

6
src/qt/locale/dash_vi.ts
View File

@ -2105,7 +2105,7 @@ https://www.transifex.com/projects/p/dash/</translation>
<message>
<location filename="../overviewpage.cpp" line="423"/>
<source>Mixing in progress...</source>
<translation type="unfinished"></translation>
<translation>Đang trong quá trình trộn...</translation>
</message>
<message>
<location filename="../overviewpage.cpp" line="429"/>
@ -4971,7 +4971,7 @@ Nếu tệp không tồn tại, tạo nó với quyền tệp owner-readable-onl
<message>
<location filename="../dashstrings.cpp" line="210"/>
<source>Downgrading and trying again.</source>
<translation type="unfinished"></translation>
<translation>Hạ cấp và thử lại xem.</translation>
</message>
<message>
<location filename="../dashstrings.cpp" line="211"/>
@ -5873,4 +5873,4 @@ Nếu tệp không tồn tại, tạo nó với quyền tệp owner-readable-onl
<translation>wallet.dat bị lỗi, cứu chữa không thành công.</translation>
</message>
</context>
</TS>
</TS>

8
src/qt/overviewpage.cpp
View File

@ -146,15 +146,15 @@ OverviewPage::OverviewPage(QWidget *parent) :
if(fLiteMode){
ui->frameDarksend->setVisible(false);
} else {
} else if(!fMasterNode) {
timer = new QTimer(this);
connect(timer, SIGNAL(timeout()), this, SLOT(darkSendStatus()));
timer->start(333);
}
if(fMasterNode || fLiteMode){
if(fMasterNode){
ui->toggleDarksend->setText("(" + tr("Disabled") + ")");
ui->toggleDarksend->setEnabled(false);
ui->frameDarksend->setEnabled(false);
}else if(!fEnableDarksend){
ui->toggleDarksend->setText(tr("Start Darksend Mixing"));
} else {
@ -173,7 +173,7 @@ void OverviewPage::handleTransactionClicked(const QModelIndex &index)
OverviewPage::~OverviewPage()
{
if(!fLiteMode) disconnect(timer, SIGNAL(timeout()), this, SLOT(darkSendStatus()));
if(!fLiteMode && !fMasterNode) disconnect(timer, SIGNAL(timeout()), this, SLOT(darkSendStatus()));
delete ui;
}

BIN
src/qt/res/icons/bitcoin.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.2 KiB

After

Width:  |  Height:  |  Size: 9.4 KiB

BIN
src/qt/res/icons/bitcoin.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 259 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

BIN
src/qt/res/icons/bitcoin_testnet.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.2 KiB

After

Width:  |  Height:  |  Size: 9.4 KiB

BIN
src/qt/res/icons/bitcoin_testnet.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.3 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

7
src/qt/sendcoinsdialog.cpp
View File

@ -52,6 +52,13 @@ SendCoinsDialog::SendCoinsDialog(QWidget *parent) :
connect(ui->pushButtonCoinControl, SIGNAL(clicked()), this, SLOT(coinControlButtonClicked()));
connect(ui->checkBoxCoinControlChange, SIGNAL(stateChanged(int)), this, SLOT(coinControlChangeChecked(int)));
connect(ui->lineEditCoinControlChange, SIGNAL(textEdited(const QString &)), this, SLOT(coinControlChangeEdited(const QString &)));
// Dash specific
if(fLiteMode) {
ui->checkUseDarksend->setChecked(false);
ui->checkUseDarksend->setVisible(false);
ui->checkInstantX->setVisible(false);
}
connect(ui->checkUseDarksend, SIGNAL(stateChanged ( int )), this, SLOT(updateDisplayUnit()));
connect(ui->checkInstantX, SIGNAL(stateChanged ( int )), this, SLOT(updateInstantX()));

100
src/rpcdarksend.cpp
View File

@ -86,7 +86,7 @@ Value darksend(const Array& params, bool fHelp)
CBitcoinAddress address(params[0].get_str());
if (!address.IsValid())
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid DarkCoin address");
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Dash address");
// Amount
CAmount nAmount = AmountFromValue(params[1]);
@ -696,34 +696,34 @@ Value masternode(const Array& params, bool fHelp)
Value masternodelist(const Array& params, bool fHelp)
{
std::string strMode = "active";
std::string strMode = "status";
std::string strFilter = "";
if (params.size() >= 1) strMode = params[0].get_str();
if (params.size() == 2) strFilter = params[1].get_str();
if (fHelp ||
(strMode != "active" && strMode != "vin" && strMode != "pubkey" && strMode != "lastseen" && strMode != "activeseconds" && strMode != "rank"
(strMode != "status" && strMode != "vin" && strMode != "pubkey" && strMode != "lastseen" && strMode != "activeseconds" && strMode != "rank"
&& strMode != "protocol" && strMode != "full" && strMode != "votes" && strMode != "donation" && strMode != "pose"))
{
throw runtime_error(
"masternodelist ( \"mode\" \"filter\" )\n"
"Get a list of masternodes in different modes\n"
"\nArguments:\n"
"1. \"mode\" (string, optional/required to use filter, defaults = active) The mode to run list in\n"
"1. \"mode\" (string, optional/required to use filter, defaults = status) The mode to run list in\n"
"2. \"filter\" (string, optional) Filter results. Partial match by IP by default in all modes, additional matches in some modes\n"
"\nAvailable modes:\n"
" active - Print '1' if active and '0' otherwise (can be additionally filtered by 'true' (active only) / 'false' (non-active only))\n"
" activeseconds - Print number of seconds masternode recognized by the network as enabled\n"
" full - Print info in format 'active protocol pubkey vin lastseen activeseconds' (can be additionally filtered, partial match)\n"
" donation - Show donation settings\n"
" full - Print info in format 'status protocol pubkey vin lastseen activeseconds' (can be additionally filtered, partial match)\n"
" lastseen - Print timestamp of when a masternode was last seen on the network\n"
" pose - Print Proof-of-Service score\n"
" protocol - Print protocol of a masternode (can be additionally filtered, exact match))\n"
" pubkey - Print public key associated with a masternode (can be additionally filtered, partial match)\n"
" rank - Print rank of a masternode based on current block\n"
" status - Print masternode status: ENABLED / EXPIRED / VIN_SPENT / REMOVE / POS_ERROR (can be additionally filtered, partial match)\n"
" vin - Print vin associated with a masternode (can be additionally filtered, partial match)\n"
" votes - Print all masternode votes for a Dash initiative\n"
" donation - Show donation settings\n"
" pose - Show proof-of-service score\n"
" votes - Print all masternode votes for a Dash initiative (can be additionally filtered, partial match)\n"
);
}
@ -739,36 +739,25 @@ Value masternodelist(const Array& params, bool fHelp)
std::vector<CMasternode> vMasternodes = mnodeman.GetFullMasternodeVector();
BOOST_FOREACH(CMasternode& mn, vMasternodes) {
std::string strAddr = mn.addr.ToString();
if(strMode == "active"){
if(strFilter !="" && strFilter != (mn.IsEnabled() ? "true" : "false") &&
strAddr.find(strFilter) == string::npos) continue;
std::string strStatus = "ACTIVE";
if(mn.activeState == CMasternode::MASTERNODE_ENABLED) strStatus = "ENABLED";
if(mn.activeState == CMasternode::MASTERNODE_EXPIRED) strStatus = "EXPIRED";
if(mn.activeState == CMasternode::MASTERNODE_VIN_SPENT) strStatus = "VIN_SPENT";
if(mn.activeState == CMasternode::MASTERNODE_REMOVE) strStatus = "REMOVE";
if(mn.activeState == CMasternode::MASTERNODE_POS_ERROR) strStatus = "POS_ERROR";
obj.push_back(Pair(strAddr, strStatus.c_str()));
} else if(strMode == "votes"){
if(strFilter !="" && strFilter != (mn.IsEnabled() ? "true" : "false") &&
strAddr.find(strFilter) == string::npos) continue;
std::string strStatus = "ABSTAIN";
//voting lasts 7 days, ignore the last vote if it was older than that
if((GetAdjustedTime() - mn.lastVote) < (60*60*8))
{
if(mn.nVote == -1) strStatus = "NAY";
if(mn.nVote == 1) strStatus = "YEA";
}
obj.push_back(Pair(strAddr, strStatus.c_str()));
} else if (strMode == "activeseconds") {
if (strMode == "activeseconds") {
if(strFilter !="" && strAddr.find(strFilter) == string::npos) continue;
obj.push_back(Pair(strAddr, (int64_t)(mn.lastTimeSeen - mn.sigTime)));
} else if (strMode == "donation") {
CTxDestination address1;
ExtractDestination(mn.donationAddress, address1);
CBitcoinAddress address2(address1);
if(strFilter !="" && address2.ToString().find(strFilter) == string::npos &&
strAddr.find(strFilter) == string::npos) continue;
std::string strOut = "";
if(mn.donationPercentage != 0){
strOut = address2.ToString().c_str();
strOut += ":";
strOut += boost::lexical_cast<std::string>(mn.donationPercentage);
}
obj.push_back(Pair(strAddr, strOut.c_str()));
} else if (strMode == "full") {
CScript pubkey;
pubkey = GetScriptForDestination(mn.pubkey.GetID());
@ -780,7 +769,8 @@ Value masternodelist(const Array& params, bool fHelp)
addrStream << setw(21) << strAddr;
std::ostringstream stringStream;
stringStream << (mn.IsEnabled() ? "1" : "0") << " " <<
stringStream << setw(10) <<
mn.Status() << " " <<
mn.protocolVersion << " " <<
address2.ToString() << " " <<
mn.vin.prevout.hash.ToString() << " " <<
@ -808,32 +798,30 @@ Value masternodelist(const Array& params, bool fHelp)
if(strFilter !="" && address2.ToString().find(strFilter) == string::npos &&
strAddr.find(strFilter) == string::npos) continue;
obj.push_back(Pair(strAddr, address2.ToString().c_str()));
} else if (strMode == "donation") {
CTxDestination address1;
ExtractDestination(mn.donationAddress, address1);
CBitcoinAddress address2(address1);
if(strFilter !="" && address2.ToString().find(strFilter) == string::npos &&
strAddr.find(strFilter) == string::npos) continue;
std::string strOut = "";
if(mn.donationPercentage != 0){
strOut = address2.ToString().c_str();
strOut += ":";
strOut += boost::lexical_cast<std::string>(mn.donationPercentage);
}
obj.push_back(Pair(strAddr, strOut.c_str()));
} else if (strMode == "pose") {
if(strFilter !="" && strAddr.find(strFilter) == string::npos) continue;
std::string strOut = boost::lexical_cast<std::string>(mn.nScanningErrorCount);
obj.push_back(Pair(strAddr, strOut.c_str()));
} else if(strMode == "status") {
std::string strStatus = mn.Status();
if(strFilter !="" && strAddr.find(strFilter) == string::npos && strStatus.find(strFilter) == string::npos) continue;
obj.push_back(Pair(strAddr, strStatus.c_str()));
} else if (strMode == "vin") {
if(strFilter !="" && mn.vin.prevout.hash.ToString().find(strFilter) == string::npos &&
strAddr.find(strFilter) == string::npos) continue;
obj.push_back(Pair(strAddr, mn.vin.prevout.hash.ToString().c_str()));
} else if(strMode == "votes"){
std::string strStatus = "ABSTAIN";
//voting lasts 7 days, ignore the last vote if it was older than that
if((GetAdjustedTime() - mn.lastVote) < (60*60*8))
{
if(mn.nVote == -1) strStatus = "NAY";
if(mn.nVote == 1) strStatus = "YEA";
}
if(strFilter !="" && (strAddr.find(strFilter) == string::npos || strStatus.find(strFilter) == string::npos)) continue;
obj.push_back(Pair(strAddr, strStatus.c_str()));
}
}
}

9
src/util.cpp Normal file → Executable file
View File

@ -485,8 +485,13 @@ void ReadConfigFile(map<string, string>& mapSettingsRet,
map<string, vector<string> >& mapMultiSettingsRet)
{
boost::filesystem::ifstream streamConfig(GetConfigFile());
if (!streamConfig.good())
return; // No dash.conf file is OK
if (!streamConfig.good()){
// Create empty dash.conf if it does not excist
FILE* configFile = fopen(GetConfigFile().string().c_str(), "a");
if (configFile != NULL)
fclose(configFile);
return; // Nothing to read, so just return
}
set<string> setOptions;
setOptions.insert("*");

2
src/wallet.cpp
View File

@ -1622,7 +1622,7 @@ bool CWallet::SelectCoins(const CAmount& nTargetValue, set<pair<const CWalletTx*
// Note: this function should never be used for "always free" tx types like dstx
vector<COutput> vCoins;
AvailableCoins(vCoins, true, coinControl, ALL_COINS, useIX);
AvailableCoins(vCoins, true, coinControl, coin_type, useIX);
//if we're doing only denominated, we need to round up to the nearest .1DRK
if(coin_type == ONLY_DENOMINATED){