diff --git a/share/pixmaps/bitcoin-bc.ico b/share/pixmaps/bitcoin-bc.ico old mode 100644 new mode 100755 index 9ae192779b..a8c0c09137 Binary files a/share/pixmaps/bitcoin-bc.ico and b/share/pixmaps/bitcoin-bc.ico differ diff --git a/share/pixmaps/bitcoin.ico b/share/pixmaps/bitcoin.ico old mode 100644 new mode 100755 index 9ae192779b..a8c0c09137 Binary files a/share/pixmaps/bitcoin.ico and b/share/pixmaps/bitcoin.ico differ diff --git a/share/pixmaps/bitcoin128.png b/share/pixmaps/bitcoin128.png old mode 100644 new mode 100755 index 7ed74a0855..17b04d026e Binary files a/share/pixmaps/bitcoin128.png and b/share/pixmaps/bitcoin128.png differ diff --git a/share/pixmaps/bitcoin128.xpm b/share/pixmaps/bitcoin128.xpm old mode 100644 new mode 100755 index 3e6833e636..0e59e5334e --- a/share/pixmaps/bitcoin128.xpm +++ b/share/pixmaps/bitcoin128.xpm @@ -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", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" .......................................................................................... ", +" .............................................................................................. ", +" ............................................................................................... ", +" ................................................................................................. ", +" ................................................................................................... ", +" ................................................................................................... ", +" .................................................................................................... ", +" ...................................................................................................... ", +" ...................................................................................................... ", +" ...................................................................................................... ", +" ........................................................................................................", +" ........................................................................................................", +" ........................................................................................................", +" .........................................................................................................", +" .........................................................................................................", +" .........................................................................................................", +" ..........................................................................................................", +" ..........................................................................................................", +" ......................................................................................................... ", +" ........................... ", +" ............................ ", +" ............................ ", +" ........................... ", +" ............................ ", +" ............................ ", +" ........................... ", +" ........................... ", +" ............................ ", +" ........................... ", +" ............................................... ........................... ", +" .............................................. ............................ ", +" ............................................... ........................... ", +" ............................................... ........................... ", +" .............................................. ........................... ", +" ............................................... ........................... ", +" ............................................... ........................... ", +" ............................................... ........................... ", +" ............................................... ........................... ", +" .............................................. ........................... ", +" ............................................... ............................ ", +" ............................................... ........................... ", +" .............................................. ........................... ", +" ............................................... ............................ ", +" ............................................... ........................... ", +" .............................................. ........................... ", +"............................................... ............................ ", +"............................................... ........................... ", +" ........................... ", +" ............................ ", +" ........................... ", +" ........................... ", +" ............................ ", +" ........................... ", +" ........................... ", +" ............................ ", +" ........................... ", +" ........................... ", +" .......................................................................................................... ", +" ......................................................................................................... ", +" .......................................................................................................... ", +" ......................................................................................................... ", +" ......................................................................................................... ", +" ......................................................................................................... ", +" ........................................................................................................ ", +" ....................................................................................................... ", +" ........................................................................................................ ", +" ....................................................................................................... ", +" ...................................................................................................... ", +" ...................................................................................................... ", +" .................................................................................................... ", +" ................................................................................................... ", +" ................................................................................................... ", +" ................................................................................................. ", +" ............................................................................................... ", +" ............................................................................................. ", +" .......................................................................................... ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" "}; diff --git a/share/pixmaps/bitcoin16.png b/share/pixmaps/bitcoin16.png old mode 100644 new mode 100755 index 91828586d4..62476ae4b3 Binary files a/share/pixmaps/bitcoin16.png and b/share/pixmaps/bitcoin16.png differ diff --git a/share/pixmaps/bitcoin16.xpm b/share/pixmaps/bitcoin16.xpm old mode 100644 new mode 100755 index 4fbf138f97..deef7c9048 --- a/share/pixmaps/bitcoin16.xpm +++ b/share/pixmaps/bitcoin16.xpm @@ -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", +" ", +" ", +" ", +" ............ ", +" .............", +" .............", +" ....", +" ..... ... ", +"...... ... ", +" .... ", +" ............. ", +" ............. ", +" ........... ", +" ", +" ", +" "}; diff --git a/share/pixmaps/bitcoin256.png b/share/pixmaps/bitcoin256.png old mode 100644 new mode 100755 index 2cb311910e..061eb8ca8e Binary files a/share/pixmaps/bitcoin256.png and b/share/pixmaps/bitcoin256.png differ diff --git a/share/pixmaps/bitcoin256.xpm b/share/pixmaps/bitcoin256.xpm old mode 100644 new mode 100755 index 9f82a02e1e..4f16723b3e --- a/share/pixmaps/bitcoin256.xpm +++ b/share/pixmaps/bitcoin256.xpm @@ -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", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ...................................................................................................................................................................................... ", +" ......................................................................................................................................................................................... ", +" ............................................................................................................................................................................................ ", +" .............................................................................................................................................................................................. ", +" ............................................................................................................................................................................................... ", +" ................................................................................................................................................................................................. ", +" ................................................................................................................................................................................................... ", +" .................................................................................................................................................................................................... ", +" ..................................................................................................................................................................................................... ", +" ....................................................................................................................................................................................................... ", +" ....................................................................................................................................................................................................... ", +" ........................................................................................................................................................................................................ ", +" ......................................................................................................................................................................................................... ", +" .......................................................................................................................................................................................................... ", +" .......................................................................................................................................................................................................... ", +" ............................................................................................................................................................................................................ ", +" ............................................................................................................................................................................................................ ", +" ............................................................................................................................................................................................................. ", +" .............................................................................................................................................................................................................. ", +" .............................................................................................................................................................................................................. ", +" .............................................................................................................................................................................................................. ", +" ................................................................................................................................................................................................................", +" ................................................................................................................................................................................................................", +" ................................................................................................................................................................................................................", +" .................................................................................................................................................................................................................", +" .................................................................................................................................................................................................................", +" .................................................................................................................................................................................................................", +" ..................................................................................................................................................................................................................", +" ..................................................................................................................................................................................................................", +" ..................................................................................................................................................................................................................", +" ...................................................................................................................................................................................................................", +" ...................................................................................................................................................................................................................", +" ...................................................................................................................................................................................................................", +" ................................................................................................................................................................................................................... ", +" ................................................................................................................................................................................................................... ", +" ................................................................................................................................................................................................................... ", +" .................................................................................................................................................................................................................... ", +" ...................................................... ", +" ...................................................... ", +" ....................................................... ", +" ...................................................... ", +" ...................................................... ", +" ....................................................... ", +" ...................................................... ", +" ...................................................... ", +" ....................................................... ", +" ...................................................... ", +" ...................................................... ", +" ....................................................... ", +" ...................................................... ", +" ...................................................... ", +" ....................................................... ", +" ...................................................... ", +" ...................................................... ", +" ....................................................... ", +" ....................................................... ", +" ...................................................... ", +" ............................................................................................. ....................................................... ", +" ............................................................................................. ....................................................... ", +" .............................................................................................. ...................................................... ", +" ............................................................................................. ....................................................... ", +" ............................................................................................. ....................................................... ", +" ............................................................................................. ...................................................... ", +" ............................................................................................. ....................................................... ", +" ............................................................................................. ....................................................... ", +" ............................................................................................. ...................................................... ", +" ............................................................................................. ....................................................... ", +" ............................................................................................. ....................................................... ", +" ............................................................................................. ...................................................... ", +" ............................................................................................. ....................................................... ", +" ............................................................................................. ....................................................... ", +" ............................................................................................. ...................................................... ", +" ............................................................................................. ....................................................... ", +" ............................................................................................. ....................................................... ", +" ............................................................................................. ...................................................... ", +" ............................................................................................. ....................................................... ", +" ............................................................................................. ....................................................... ", +" ............................................................................................. ...................................................... ", +" ............................................................................................. ....................................................... ", +" ............................................................................................. ....................................................... ", +" ............................................................................................. ...................................................... ", +" ............................................................................................. ....................................................... ", +" ............................................................................................. ....................................................... ", +" ............................................................................................. ...................................................... ", +" ............................................................................................. ....................................................... ", +" .............................................................................................. ....................................................... ", +" ............................................................................................. ...................................................... ", +" ............................................................................................. ....................................................... ", +" .............................................................................................. ....................................................... ", +" ............................................................................................. ...................................................... ", +" ............................................................................................. ....................................................... ", +".............................................................................................. ....................................................... ", +"............................................................................................. ...................................................... ", +" ....................................................... ", +" ....................................................... ", +" ...................................................... ", +" ....................................................... ", +" ....................................................... ", +" ...................................................... ", +" ...................................................... ", +" ....................................................... ", +" ...................................................... ", +" ...................................................... ", +" ....................................................... ", +" ...................................................... ", +" ...................................................... ", +" ....................................................... ", +" ...................................................... ", +" ...................................................... ", +" ....................................................... ", +" ...................................................... ", +" ...................................................... ", +" ....................................................... ", +" ................................................................................................................................................................................................................... ", +" ................................................................................................................................................................................................................... ", +" .................................................................................................................................................................................................................... ", +" ................................................................................................................................................................................................................... ", +" ................................................................................................................................................................................................................... ", +" ................................................................................................................................................................................................................... ", +" ................................................................................................................................................................................................................... ", +" .................................................................................................................................................................................................................. ", +" .................................................................................................................................................................................................................. ", +" .................................................................................................................................................................................................................. ", +" ................................................................................................................................................................................................................. ", +" ................................................................................................................................................................................................................. ", +" ................................................................................................................................................................................................................. ", +" ................................................................................................................................................................................................................ ", +" ............................................................................................................................................................................................................... ", +" ............................................................................................................................................................................................................... ", +" ............................................................................................................................................................................................................... ", +" .............................................................................................................................................................................................................. ", +" .............................................................................................................................................................................................................. ", +" ............................................................................................................................................................................................................. ", +" ............................................................................................................................................................................................................ ", +" ............................................................................................................................................................................................................ ", +" ........................................................................................................................................................................................................... ", +" .......................................................................................................................................................................................................... ", +" ......................................................................................................................................................................................................... ", +" ........................................................................................................................................................................................................ ", +" ....................................................................................................................................................................................................... ", +" ...................................................................................................................................................................................................... ", +" ..................................................................................................................................................................................................... ", +" ................................................................................................................................................................................................... ", +" ................................................................................................................................................................................................... ", +" ................................................................................................................................................................................................. ", +" ............................................................................................................................................................................................... ", +" .............................................................................................................................................................................................. ", +" ........................................................................................................................................................................................... ", +" ......................................................................................................................................................................................... ", +" ...................................................................................................................................................................................... ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" "}; diff --git a/share/pixmaps/bitcoin32.png b/share/pixmaps/bitcoin32.png old mode 100644 new mode 100755 index dc210b4817..91cd8d5e47 Binary files a/share/pixmaps/bitcoin32.png and b/share/pixmaps/bitcoin32.png differ diff --git a/share/pixmaps/bitcoin32.xpm b/share/pixmaps/bitcoin32.xpm old mode 100644 new mode 100755 index b31cdfb856..2b04567083 --- a/share/pixmaps/bitcoin32.xpm +++ b/share/pixmaps/bitcoin32.xpm @@ -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", +" ", +" ", +" ", +" ", +" ", +" ", +" . ", +" ........................ ", +" ..........................", +" ..........................", +" ..........................", +" .......", +" ...... ", +" ....... ", +" ............ ....... ", +" ............ ...... ", +" ........... ....... ", +"............ ....... ", +" ...... ", +" ....... ", +" ....... ", +" .......................... ", +" .......................... ", +" .......................... ", +" ........................ ", +" ", +" ", +" ", +" ", +" ", +" ", +" "}; diff --git a/share/pixmaps/bitcoin64.png b/share/pixmaps/bitcoin64.png old mode 100644 new mode 100755 index a884d72a79..c9688088c0 Binary files a/share/pixmaps/bitcoin64.png and b/share/pixmaps/bitcoin64.png differ diff --git a/share/pixmaps/bitcoin64.xpm b/share/pixmaps/bitcoin64.xpm old mode 100644 new mode 100755 index 8295f49dc7..0aea6adfc3 --- a/share/pixmaps/bitcoin64.xpm +++ b/share/pixmaps/bitcoin64.xpm @@ -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", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" .............................................. ", +" ................................................. ", +" .................................................. ", +" .................................................. ", +" ....................................................", +" ....................................................", +" ....................................................", +" .....................................................", +" .....................................................", +" ...................................... ..............", +" ............. ", +" .............. ", +" .............. ", +" ............. ", +" . .............. ", +" ....................... .............. ", +" ........................ ............. ", +" ....................... .............. ", +" ....................... .............. ", +" ........................ ............. ", +" ....................... .............. ", +" ....................... .............. ", +"........................ ............. ", +" .............. ", +" .............. ", +" ............. ", +" .............. ", +" .............. ", +" ................................................... ", +" ..................................................... ", +" .................................................... ", +" .................................................... ", +" .................................................... ", +" ................................................... ", +" .................................................. ", +" .................................................. ", +" ................................................ ", +" .............................................. ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" "}; diff --git a/share/pixmaps/dash128.png b/share/pixmaps/dash128.png old mode 100644 new mode 100755 index 7ed74a0855..7889ea9709 Binary files a/share/pixmaps/dash128.png and b/share/pixmaps/dash128.png differ diff --git a/share/pixmaps/dash16.xpm b/share/pixmaps/dash16.xpm old mode 100644 new mode 100755 index 4fbf138f97..582aad85ba --- a/share/pixmaps/dash16.xpm +++ b/share/pixmaps/dash16.xpm @@ -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", +" ", +" ", +" ", +" ........... ", +" .............", +" .............", +" ....", +" ..... ... ", +"...... ... ", +" .... ", +" ............. ", +" ............. ", +" ........... ", +" ", +" ", +" "}; diff --git a/share/pixmaps/dash32.xpm b/share/pixmaps/dash32.xpm old mode 100644 new mode 100755 index b31cdfb856..da0ac0e62a --- a/share/pixmaps/dash32.xpm +++ b/share/pixmaps/dash32.xpm @@ -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", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ........................ ", +" ..........................", +" ..........................", +" ..........................", +" .......", +" ...... ", +" ....... ", +" ............ ....... ", +" ............ ...... ", +" ........... ....... ", +"............ ....... ", +" ...... ", +" ....... ", +" ....... ", +" .......................... ", +" .......................... ", +" .......................... ", +" ........................ ", +" ", +" ", +" ", +" ", +" ", +" ", +" "}; diff --git a/share/pixmaps/favicon.ico b/share/pixmaps/favicon.ico old mode 100644 new mode 100755 index 9ae192779b..a8c0c09137 Binary files a/share/pixmaps/favicon.ico and b/share/pixmaps/favicon.ico differ diff --git a/share/pixmaps/nsis-header.bmp b/share/pixmaps/nsis-header.bmp old mode 100644 new mode 100755 index c221b18f95..a835a31a45 Binary files a/share/pixmaps/nsis-header.bmp and b/share/pixmaps/nsis-header.bmp differ diff --git a/share/pixmaps/nsis-wizard.bmp b/share/pixmaps/nsis-wizard.bmp old mode 100644 new mode 100755 index af0520f1a9..b58277fe38 Binary files a/share/pixmaps/nsis-wizard.bmp and b/share/pixmaps/nsis-wizard.bmp differ diff --git a/src/masternode.cpp b/src/masternode.cpp index 3254ffda3b..39520105d8 100644 --- a/src/masternode.cpp +++ b/src/masternode.cpp @@ -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; diff --git a/src/masternode.h b/src/masternode.h index eb4fc823a8..3c83ac3586 100644 --- a/src/masternode.h +++ b/src/masternode.h @@ -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 diff --git a/src/masternodeman.cpp b/src/masternodeman.cpp index 6b18469c06..9956d7ec71 100644 --- a/src/masternodeman.cpp +++ b/src/masternodeman.cpp @@ -11,6 +11,7 @@ #include #include +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 diff --git a/src/qt/locale/dash_bg.ts b/src/qt/locale/dash_bg.ts index 0c9fc11b3a..62f411941f 100644 --- a/src/qt/locale/dash_bg.ts +++ b/src/qt/locale/dash_bg.ts @@ -30,7 +30,7 @@ This product includes software developed by the OpenSSL Project for use in the O Това е експериментален софтуер. -Разпространява се под MIT/X11 софтуерен лиценз, виж COPYING или http://www.opensource.org/licenses/mit-license.php. +Разпространява се под MIT/X11 софтуерен лиценз, виж придружаващия файл КОПИРАНЕ или на адрес: http://www.opensource.org/licenses/mit-license.php. Използван е софтуер, разработен от OpenSSL Project за употреба в OpenSSL Toolkit (http://www.openssl.org/), шифрографски софтуер, разработен от Eric Young (eay@cryptsoft.com) и UPnP софтуер, разработен от Thomas Bernard. @@ -59,8 +59,8 @@ This product includes software developed by the OpenSSL Project for use in the O - Right-click to edit address or label - + Double-click to edit address or label + Двоен клик за да редактирате адрес или наименование @@ -70,22 +70,22 @@ This product includes software developed by the OpenSSL Project for use in the O &New - Нов + &Нов Copy the currently selected address to the system clipboard - Копиране на избрания адрес + Копиране на избрания адрес в системния клипборд &Copy - Копирай + &Копирай Delete the currently selected address from the list - Изтрий избрания адрес от списъка + Изтрийте избрания адрес от списъка @@ -100,7 +100,7 @@ This product includes software developed by the OpenSSL Project for use in the O &Export - Изнеси + &Експортиране @@ -150,7 +150,7 @@ This product includes software developed by the OpenSSL Project for use in the O Copy &Label - Копирай &име + Копирай &наименование @@ -160,7 +160,7 @@ This product includes software developed by the OpenSSL Project for use in the O Export Address List - Изнасяне на списъка с адреси + Експортиране на списъка с адреси @@ -170,7 +170,7 @@ This product includes software developed by the OpenSSL Project for use in the O Exporting Failed - Грешка при изнасянето + Грешка при експортирането @@ -187,7 +187,7 @@ This product includes software developed by the OpenSSL Project for use in the O Label - Име + Наименование @@ -197,7 +197,7 @@ This product includes software developed by the OpenSSL Project for use in the O (no label) - (без име) + (без наименование) @@ -205,7 +205,7 @@ This product includes software developed by the OpenSSL Project for use in the O Passphrase Dialog - + Поле за парола @@ -225,7 +225,7 @@ This product includes software developed by the OpenSSL Project for use in the O Serves to disable the trivial sendmoney when OS account compromised. Provides no real security. - + Служи да изключи изпращането на средства, когато акаунта на Операционната система е компрометиран. Не предоставя реална сигурност. @@ -299,8 +299,8 @@ This product includes software developed by the OpenSSL Project for use in the O - 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. - Дарккойн ще се затвори, за да завърши процеса по шифриране. Запомнете, че шифрирането на вашия портфейл не може напълно да ви предпази от кражба на монетите от зловреден софтуер инфектирал компютъра ви. + Dash will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your darkcoins from being stolen by malware infecting your computer. + Dash ще се затвори сега, за да завърши процеса по шифриране. Запомнете, че шифрирането на вашия портфейл не може напълно да ви предпази от кражба на монетите от зловреден софтуер инфектирал компютъра ви. @@ -554,7 +554,7 @@ This product includes software developed by the OpenSSL Project for use in the O Open debugging console - + Отваряне конзола за отстраняване на грешки @@ -564,17 +564,17 @@ This product includes software developed by the OpenSSL Project for use in the O Show network monitor - Покажи диаграмата на мрежата + Покажи наблюдение на мрежата Open &Configuration File - + Отвори &Конфигурационен файл Open configuration file - + Отвори конфигурационния файл @@ -584,7 +584,7 @@ This product includes software developed by the OpenSSL Project for use in the O Show the list of used sending addresses and labels - Покажи списъкът от използвани изходящи адреси и етикети + Покажи списъкът от използваните адреси за изпращане и наименования @@ -594,7 +594,7 @@ This product includes software developed by the OpenSSL Project for use in the O Show the list of used receiving addresses and labels - Покажи списъкът от използвани входящи адреси и етикети + Покажи списъкът от използвани адреси за получаване и наименования @@ -604,7 +604,7 @@ This product includes software developed by the OpenSSL Project for use in the O Open a dash: URI or payment request - Отвори Дарккойн: URI или заявка за плащане + Отвори Dash: URI или заявка за плащане @@ -631,7 +631,7 @@ This product includes software developed by the OpenSSL Project for use in the O Show the Dash Core help message to get a list with possible Dash command-line options - Покажи помощ за Дарккойн ядрото със списък на възможните опции за командрия ред + Покажи съобщението за помощ на Dash ядрото за да получиш списък на възможните опции за командния ред @@ -1042,7 +1042,7 @@ Address: %4 n/a - Нама + няма такъв @@ -1098,7 +1098,7 @@ Address: %4 This label turns red, if the transaction size is greater than 1000 bytes. - Етикетът става червен, ако размерът на транзакцията е по-голям от 1000 байта. + Това наименование се оцветява в червено, ако размерът на транзакцията е по-голям от 1000 байта. @@ -1119,12 +1119,12 @@ Address: %4 This label turns red, if the priority is smaller than "medium". - Този етикет се оцветява в червено, ако приоритетът е по-малък от "среден". + Това наименование става червено, ако приоритетът е по-малък от "среден". This label turns red, if any recipient receives an amount smaller than %1. - Това етикет се оцветява в червено, ако произволен получател получи сума по-малка от %1. + Това наименование става червено, ако произволен получател получи сума по-малка от %1. This means a fee of at least %1 is required. @@ -1136,13 +1136,13 @@ Address: %4 This label turns red, if the change is smaller than %1. - Този етикет се оцветява в червено, ако рестото е по-малко от %1. + Това наименование става червено, ако рестото е по-малко от %1. (no label) - (без име) + (без наименование) @@ -1250,12 +1250,12 @@ Address: %4 &Label - &Име + &Наименование The label associated with this address list entry - Етикет, свързан с този запис на списъка с адреси + Наименованието се свързва с този запис от списъка с адреси @@ -1265,7 +1265,7 @@ Address: %4 The address associated with this address list entry. This can only be modified for sending addresses. - Адрес, свързан с този запис със списък от адреси. Може да бъде променен само за адреси за изпращане. + Адресът свързан с този запис от списък с адреси. Може да бъде променен само за адреси за изпращане. @@ -1401,12 +1401,12 @@ Address: %4 Set SSL root certificates for payment request (default: -system-) - + Задай SSL основен сертификат при искане за плащане (по подразбиране: -system-) Show splash screen on startup (default: 1) - + Покажи начален екран при стартиране(по подразбиране: 1) @@ -1932,7 +1932,7 @@ https://www.transifex.com/projects/p/dash/ Enabled/Disabled - Активно/Неактивно + Включено/Изключено @@ -1962,7 +1962,7 @@ https://www.transifex.com/projects/p/dash/ Submitted Denom: - + Изпратени за Denom: @@ -1972,7 +1972,7 @@ https://www.transifex.com/projects/p/dash/ n/a - Нама + Няма @@ -2055,7 +2055,7 @@ https://www.transifex.com/projects/p/dash/ Found unconfirmed denominated outputs, will wait till they confirm to recalculate. - + Открити са непотвърдени деноминирани средства, трябва да се изчака потвърждение за преизчисление . @@ -2104,7 +2104,7 @@ https://www.transifex.com/projects/p/dash/ Mixing in progress... - + В процес на смесване... @@ -2295,7 +2295,7 @@ https://www.transifex.com/projects/p/dash/ Requested payment amount of %1 is too small (considered dust). - Заявената сума за плащане: %1 е твърде малка (счита се за отпадък) + Заявената сума за плащане: %1 е твърде малка (се приема за незначителен остатък) @@ -2906,7 +2906,7 @@ https://www.transifex.com/projects/p/dash/ Copy label - Копирай име + Копирай наименование @@ -2969,7 +2969,7 @@ https://www.transifex.com/projects/p/dash/ Label - Име + Наименование @@ -2997,7 +2997,7 @@ https://www.transifex.com/projects/p/dash/ Label - Име + Наименование @@ -3012,7 +3012,7 @@ https://www.transifex.com/projects/p/dash/ (no label) - (без име) + (без наименование) @@ -3281,9 +3281,9 @@ https://www.transifex.com/projects/p/dash/ Копирай приоритета - - Copy dust - + + Copy low output + Копирай недостатъчна наличност @@ -3349,7 +3349,7 @@ https://www.transifex.com/projects/p/dash/ Confirm send coins - Потвърждаване + Потвърди изпращането на монетите Payment request expired @@ -3427,7 +3427,7 @@ https://www.transifex.com/projects/p/dash/ (no label) - (без име) + (без наименование) @@ -3481,12 +3481,12 @@ https://www.transifex.com/projects/p/dash/ &Label: - &Име: + &Наименование: Enter a label for this address to add it to the list of used addresses - Въведете име за този адрес, за да го добавите в списъка с адреси + Въведете наименование за този адрес, за да го добавите в списъка с адреси @@ -3502,13 +3502,13 @@ https://www.transifex.com/projects/p/dash/ - A message that was attached to the dash: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network. - + A message that was attached to the darkcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network. + Съобщението което беше прикрепено към darkcoin: URI ще бъде запазено с транзакцията за ваше сведение. Забележка: Това съобщение няма да бъде изпратено през Dash мрежата. This is an unverified payment request. - + Това е непроверена заявка за плащане. @@ -3520,17 +3520,17 @@ https://www.transifex.com/projects/p/dash/ Memo: - + Бележка: This is a verified payment request. - + Това е валидно искане за плащане. Enter a label for this address to add it to your address book - Въведете име за този адрес, за да го добавите в списъка с адреси + Въведете наименование за този адрес, за да го добавите в списъка с адреси @@ -3551,7 +3551,7 @@ https://www.transifex.com/projects/p/dash/ Signatures - Sign / Verify a Message - Подпиши / Провери съобщение + Подписи - Подпиши / Провери съобщение @@ -3583,7 +3583,7 @@ https://www.transifex.com/projects/p/dash/ Paste address from clipboard - Вмъкни от клипборда + Вмъкни адрес от клипборда @@ -3618,7 +3618,7 @@ https://www.transifex.com/projects/p/dash/ Reset all sign message fields - + Изчисти полето с подписаните съобщения. @@ -3629,12 +3629,12 @@ https://www.transifex.com/projects/p/dash/ &Verify Message - &Провери + &Провери съобщението Enter the signing address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. - + Въведете подписания адрес, съобщението (уверете се, че сте копирали редовете, спациите, табовете и другите точно) и подпишете отдолу, за да удостоверите съобщението. Внимавайте да не вмъкнете излишни символи в подписа от това, което е в самото съобщение, за избегнете риска от злонамерна външа намеса. @@ -3649,12 +3649,12 @@ https://www.transifex.com/projects/p/dash/ Verify &Message - + Провери &Съобщение Reset all verify message fields - + Изчисти всички проверени съобщения в полето @@ -3742,7 +3742,7 @@ https://www.transifex.com/projects/p/dash/ Version %1 - + Версия %1 @@ -3765,7 +3765,7 @@ https://www.transifex.com/projects/p/dash/ KB/s - + КБ/с @@ -3789,22 +3789,22 @@ https://www.transifex.com/projects/p/dash/ conflicted - + конфликтно %1/offline (verified via instantx) - + %1/офлайн(проверено през instantx) %1/confirmed (verified via instantx) - + %1/потвърдени (проверено от instantx) %1 confirmations (verified via instantx) - + %1 потвърждения (проверено от instantx) @@ -3825,27 +3825,27 @@ https://www.transifex.com/projects/p/dash/ %1/offline (InstantX verification in progress - %2 of %3 signatures) - + %1/офлайн (InstantX проверка в процес - %2 of %3 подписани) %1/confirmed (InstantX verification in progress - %2 of %3 signatures ) - + %1/потвърдени (InstantX проверка в процес - %2 of %3 подписани ) %1 confirmations (InstantX verification in progress - %2 of %3 signatures) - + %1 потвърждения (InstantX проверка в процес - %2 of %3 подписвания) %1/offline (InstantX verification failed) - + %1/офлайн (InstantX проверката е неуспешна) %1/confirmed (InstantX verification failed) - + %1/потвърдени (InstantX проверката е неуспешна) @@ -3913,7 +3913,7 @@ https://www.transifex.com/projects/p/dash/ label - име + наименование @@ -3978,7 +3978,7 @@ https://www.transifex.com/projects/p/dash/ Transaction ID - ID + на транзакцията @@ -3993,7 +3993,7 @@ https://www.transifex.com/projects/p/dash/ Debug information - + Информация за грешки @@ -4003,7 +4003,7 @@ https://www.transifex.com/projects/p/dash/ Inputs - + Входящи @@ -4073,7 +4073,7 @@ https://www.transifex.com/projects/p/dash/ Offline - + Офлайн @@ -4123,7 +4123,7 @@ https://www.transifex.com/projects/p/dash/ Received via Darksend - + Получени с Darksend @@ -4143,32 +4143,27 @@ https://www.transifex.com/projects/p/dash/ Darksend Denominate - + Darksend деноминация Darksend Collateral Payment - + Darksend обезпечава плащането Darksend Make Collateral Inputs - + Darksend направи обезпечение на постъпленията Darksend Create Denominations - + Darksend направени деноминации Darksent - - - - - watch-only - + Darksent @@ -4178,7 +4173,7 @@ https://www.transifex.com/projects/p/dash/ Transaction status. Hover over this field to show number of confirmations. - Състояние на транзакцията. Задръжте върху това поле за брой потвърждения. + Състояние на транзакцията. Задръжте върху това поле за да видите броя потвърждения. @@ -4257,27 +4252,27 @@ https://www.transifex.com/projects/p/dash/ Darksent - + Darksent Darksend Make Collateral Inputs - + Darksend направи обезпечение на постъпленията Darksend Create Denominations - + Darksend създава деноминации Darksend Denominate - + Darksend деноминация Darksend Collateral Payment - + Darksend обезпечава плащането @@ -4297,7 +4292,7 @@ https://www.transifex.com/projects/p/dash/ Enter address or label to search - Търсене по адрес или име + Търсене по адрес или наименование @@ -4312,7 +4307,7 @@ https://www.transifex.com/projects/p/dash/ Copy label - Копирай име + Копирай наименование @@ -4327,7 +4322,7 @@ https://www.transifex.com/projects/p/dash/ Edit label - Редактирай име + Редактирай наименование @@ -4367,7 +4362,7 @@ https://www.transifex.com/projects/p/dash/ Label - Име + Наименование @@ -4396,12 +4391,12 @@ https://www.transifex.com/projects/p/dash/ Exporting Successful - Изнасянето е успешна + Изнасянето е успешно The transaction history was successfully saved to %1. - + Направените транзакции са запазени до %1. @@ -4441,10 +4436,7 @@ https://www.transifex.com/projects/p/dash/ InstantX doesn't support sending values that high yet. Transactions are currently limited to %n DASH. - - - - + InstantX не поддържа изпращане на толкова големи суми. Транзакциите са ограничени до %n DASH.InstantX не поддържа изпращане на толкова големи суми. Транзакциите са ограничени до %n DASH. @@ -4452,7 +4444,7 @@ https://www.transifex.com/projects/p/dash/ &Export - Изнеси + &Изнеси @@ -4467,7 +4459,7 @@ https://www.transifex.com/projects/p/dash/ Wallet Data (*.dat) - + Данните за портфейла(*.dat) @@ -4487,7 +4479,7 @@ https://www.transifex.com/projects/p/dash/ The wallet data was successfully saved to %1. - + Базата на портфейла беше запазена успешно в %1. @@ -4505,12 +4497,22 @@ If the file does not exist, create it with owner-readable-only file permissions. It is also recommended to set alertnotify so you are notified of problems; for example: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com - + %s, трябва да зададете rpcpassword в конфигурационния файл: +%s +Препоръчително е да използвате следната произволна парола: +rpcuser=darkcoinrpc +rpcpassword=%s +(не е нужно да запомняте тази парола) +Потребителя и паролата НЕ ТРЯБВА да са еднакви. +Ако файла не съществува , създайте го с права за само за четене. +Препоръчително е да създадете сигнал за уведомяване за да бъдете осведомени при проблем; +Пример: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com + Acceptable ciphers (default: TLSv1.2+HIGH:TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!3DES:@STRENGTH) - + Разрешени шифри (default: TLSv1.2+HIGH:TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!3DES:@STRENGTH) @@ -4525,22 +4527,22 @@ for example: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com Bind to given address and always listen on it. Use [host]:port notation for IPv6 - + Свързва се с посочения адрес и винаги слуша за него. Използвайте [хост]:порт за изписване при IPv6 Cannot obtain a lock on data directory %s. Dash Core is probably already running. - + Не може да се заключи дата директорията %s. Dash ядрото вече работи. Continuously rate-limit free transactions to <n>*1000 bytes per minute (default:15) - + Непрекъснат лимит на безплатните транзакции до <n>*1000 байта в минута (default:15) Darksend uses exact denominated amounts to send funds, you might simply need to anonymize some more coins. - + Darksend използва всички деноминирани наличности за да изпрати сумата, може би ще е необходимо да бъдат анонимизирани още монети. @@ -4550,22 +4552,22 @@ for example: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com Enable instantx, show confirmations for locked transactions (bool, default: true) - + Включен instantx,покажи потвърждения за заключени транзакции (bool, default: true) Enable use of automated darksend for funds stored in this wallet (0-1, default: 0) - + Включено автоматично използване на darksend за средствата в този портфейл (0-1, default: 0) Enter regression test mode, which uses a special chain in which blocks can be solved instantly. This is intended for regression testing tools and app development. - + Влиза в регресивен тестов режим, който използва специална верига в която блоковете могат да бъдат намерени мигновено.Това е предназначено за тестване на предишни инструменти и разработване на приложението. Enter regression test mode, which uses a special chain in which blocks can be solved instantly. - + Влиза в регресивен тестов режим, който използва специална верига в която блоковете могат да бъдат намерени мигновено. @@ -4575,7 +4577,7 @@ for example: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com 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. - + Грешка: Транзакцията е отхвърлена! Това може да се случи, ако някои от монетите в портфейла са вече изразходвани, например ако се използва копие на wallet.dat където монетите са изразходвани, но не са изразходвани в настоящия портфейл. @@ -4585,52 +4587,52 @@ for example: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com Error: Wallet unlocked for anonymization only, unable to create transaction. - + Грешка: Портфейлът е отключен само за анонимизация,не може да бъде извършена транзакция. Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message) - + Изпълни командата когато се получи съответното предупреждение или се появи друг проблем с мрежата (%s в cmd е подменено от съобщение) Execute command when a wallet transaction changes (%s in cmd is replaced by TxID) - + Изпълнете командата когато транзакцията в портфейла се променя (%s в cmd е подменено с TxID) Execute command when the best block changes (%s in cmd is replaced by block hash) - + Изпълнете командата когато има промяна в най-добрият блок (%s в cmd е подменена от block hash) Fees smaller than this are considered zero fee (for transaction creation) (default: - + Такси по-малки от тази се считат за нулеви (за извършване на трнзакция) (по подразбиране: Flush database activity from memory pool to disk log every <n> megabytes (default: 100) - + Изчиствай активността по базата от паметта към лог на диска на всеки <n> мегабайта (по подразбиране: 100) Found unconfirmed denominated outputs, will wait till they confirm to continue. - + Намерени са непотвърдени деноминирани средства, трябва да изчакате потвърждаването им за да продължите How thorough the block verification of -checkblocks is (0-4, default: 3) - + How thorough the block verification of -checkblocks is (0-4, default: 3) In this mode -genproclimit controls how many blocks are generated immediately. - + В този режим -genproclimit се контролира колко блока са генерирани моментално. InstantX requires inputs with at least 6 confirmations, you might need to wait a few minutes and try again. - + InstantX изисква средства с поне 6 потвърждения, може да се наложи да почакате няколко минути и да опитате отново. @@ -4640,7 +4642,7 @@ for example: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com Name to construct url for KeePass entry that stores the wallet passphrase - + Име за създаване на URL за KeePass входа , който съхранява паролата за портфейла @@ -4650,22 +4652,23 @@ for example: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com Output debugging information (default: 0, supplying <category> is optional) - + Изходяща информация за грешки (по подразбиране: 0, задаването на <category> е опция) 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) - + 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) +Осигуряване на ликвидност Darksend от рядко смесване монети непрекъснато в съответствие (0-100, по подразбиране: 0, 1 = много чести, високи такси, 100 = твърде редки, ниски такси) Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect) - + Заявка за адреси на пиъри чрез DNS справка, ако адресите са недостатъчно (по-подразбиране: 1 освен ако -свързан) Set external address:port to get to this masternode (example: address:port) - + Задаване на външен адрес:порт на този masternode (пример: адрес:порт) @@ -4675,7 +4678,7 @@ for example: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d) - Задаване броя на нишките потвърждаващи скрипта (%u до %d, 0 = автоматично, <0 = leave that many cores free, по подразбиране: %d) + Задаване броя на нишките потвърждаващи скрипта (%u до %d, 0 = автоматично, <0 = да се оставят толкова ядра свободни, по подразбиране: %d) @@ -4685,7 +4688,7 @@ for example: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com Show N confirmations for a successfully locked transaction (0-9999, default: 1) - Покажи N потвърждения при успешно заключване на транзакция (0-9999, по подразбиране: 1) + Покажи N потвърждения при успешно заключена транзакция (0-9999, по подразбиране: 1) @@ -4695,7 +4698,7 @@ for example: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com Unable to bind to %s on this computer. Dash Core is probably already running. - + Не може да се свърже с %s на този компютър. Dash ядрото най-вероятно вече работи. @@ -4715,12 +4718,12 @@ for example: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy) - Изполва отделен SOCKS5 прокси, за достигне на пиъри чрез Тор скрита услуга (по подразбиране: -proxy) + Използва отделен SOCKS5 прокси, за достигне на пиъри чрез Tor скрити услуги (по подразбиране: -proxy) Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction. - Внимание: -paytxfee е с мното голяма зададена стойност! Това е транзакционната такса, която ще платите ако направите транзакция. + Внимание: -paytxfee е с много голяма зададена стойност! Това е транзакционната такса, която ще платите ако направите транзакция. @@ -4735,17 +4738,17 @@ for example: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade. - + Внимание: Не е намерена пълна съвместимост с останалите в мрежата ! Може би се нуждаете от обновяване , или някой от другите нодове се нуждае от обновяване . Warning: error reading wallet.dat! All keys read correctly, but transaction data or address book entries might be missing or incorrect. - + Внимание: грешка при четене на wallet.dat! Всички ключове са прочетени коректно, но записи в данните за транзакциите или в адресната книга може би липсват или са грешни. Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup. - + Внимание: wallet.dat е развален, данните са спасени! Оригиналния wallet.dat е запазен като wallet.{timestamp}.bak в %s; ако твоят баланс или транзакции са неверни трябва да възстановите от резервното копие. @@ -4824,7 +4827,7 @@ If the file does not exist, create it with owner-readable-only file permissions. Can't denominate: no compatible inputs left. - + Не може да бъде деноминирано: няма останали съвместими входящи средства. @@ -4854,12 +4857,12 @@ If the file does not exist, create it with owner-readable-only file permissions. Collateral is not valid. - + Обезпечението е невалидно. Collateral not valid. - + Обезпечението невалидно. @@ -4879,7 +4882,7 @@ If the file does not exist, create it with owner-readable-only file permissions. Connect to KeePassHttp on port <port> (default: 19455) - + Свързване към KeePassHttp през порт <port> (по подразбиране: 19455) @@ -4899,17 +4902,17 @@ If the file does not exist, create it with owner-readable-only file permissions. Dash Core Daemon - + Dash ядро демон Dash Core RPC client version - + Dash ядро RPC клиент версия Darksend is disabled. - Дарксенд е изключен. + Darksend е изключен. @@ -4949,7 +4952,7 @@ If the file does not exist, create it with owner-readable-only file permissions. Downgrading and trying again. - + Понижете и опитайте отново. @@ -5019,7 +5022,7 @@ If the file does not exist, create it with owner-readable-only file permissions. Error: Disk space is low! - Грешка: мястото на диска е малко! + Грешка: Мястото на харддиска е малко! @@ -5029,7 +5032,7 @@ If the file does not exist, create it with owner-readable-only file permissions. Error: You already have pending entries in the Darksend pool - + Грешка: Вече имате чакащи вписвания в Darksend басейна @@ -5039,57 +5042,57 @@ If the file does not exist, create it with owner-readable-only file permissions. Failed to listen on any port. Use -listen=0 if you want this. - Провалено "слушане" на всеки порт. Използвайте -listen=0 ако искате това. + Неуспешно "слушане" на всеки порт. Използвайте -listen=0 ако искате това. Failed to read block info - Грешка при четене данни на блок + Неуспешно четене на блок данни Failed to read block - Грешка при четене на блок + Неуспешно четене на блок Failed to sync block index - Неуспех при синхронизиране на блок индекса + Неуспешно синхронизиране на блок индекса Failed to write block index - Неуспех при запис в блок индекса + Неуспешен запис в блок индекса Failed to write block info - Грешка при запис данни на блок + Неуспешен запис на блок данни Failed to write block - Грешка при запис на блок + Неуспешен запис на блок Failed to write file info - Неуспех при запис на информационния файл + Неуспешен запис на информационния файл Failed to write to coin database - Неуспех при запис в базата данни на монетата + Неуспешен запис в базата данни на монетата Failed to write transaction index - + Неуспешен запис в индекса на транзакцията Failed to write undo data - + Неуспешен запис при връщане на данни @@ -5104,7 +5107,7 @@ If the file does not exist, create it with owner-readable-only file permissions. Force safe mode (default: 0) - Принуди безопасен режим (по подразбиране: 0) + Принудителен безопасен режим (по подразбиране: 0) @@ -5129,7 +5132,7 @@ If the file does not exist, create it with owner-readable-only file permissions. Ignore masternodes less than version (example: 70050; default : 0) - Игнориране на мастернодове с по-ниска версия от (пример: 70050; по подразбиране: 0) + Игнориране на masternodes с по-ниска версия от (пример: 70050; по подразбиране: 0) @@ -5154,22 +5157,22 @@ If the file does not exist, create it with owner-readable-only file permissions. Incorrect or no genesis block found. Wrong datadir for network? - + Намерен е неправилен или не създаден блок. Грешна data директория за мрежата? Information - Данни + Информация Initialization sanity check failed. Dash Core is shutting down. - + Инициализационната проверка не успешна. Dash ядрото се изключва. Input is not valid. - + Въвеждането е невалидно. @@ -5234,12 +5237,12 @@ If the file does not exist, create it with owner-readable-only file permissions. KeePassHttp id for the established association - + KeePassHttp id за осъществяване на връзка KeePassHttp key for AES encrypted communication with KeePass - + KeePassHttp ключ за AES криптирана връзка с KeePass @@ -5249,7 +5252,7 @@ If the file does not exist, create it with owner-readable-only file permissions. Keep at most <n> unconnectable blocks in memory (default: %u) - + Запази поне <n> неосъществени транзакции в паметта (по подразбиране: %u) @@ -5279,7 +5282,7 @@ If the file does not exist, create it with owner-readable-only file permissions. Listen for connections on <port> (default: 9999 or testnet: 19999) - Очаквай входящи връзки на <port> (по подразбиране: 9999 или за тестовата мрежа: 19999) + Слушане за входящи връзки на <port> (по подразбиране: 9999 или за тестовата мрежа: 19999) @@ -5339,12 +5342,12 @@ If the file does not exist, create it with owner-readable-only file permissions. Maximum per-connection receive buffer, <n>*1000 bytes (default: 5000) - Максимален буфер на връзка за получаване, <n>*1000 байта (по подразбиране: 5000) + Максимален размер на буфера при получаване, <n>*1000 байта (по подразбиране: 5000) Maximum per-connection send buffer, <n>*1000 bytes (default: 1000) - Максимален буфер на връзка за изпращане, <n>*1000 байта (по подразбиране: 1000) + Максимален размер на буфера при изпращане, <n>*1000 байта (по подразбиране: 1000) @@ -5384,7 +5387,7 @@ If the file does not exist, create it with owner-readable-only file permissions. Not enough file descriptors available. - + Няма достатъчно налични файлови описания. @@ -5394,7 +5397,7 @@ If the file does not exist, create it with owner-readable-only file permissions. Only accept block chain matching built-in checkpoints (default: 1) - Приемане само на регистър на блокове съвпадащ с вградените контролни точки (по подразбиране: 1) + Приема само блок регистъра съвпадащ с вградените контролни точки (по подразбиране: 1) @@ -5414,17 +5417,17 @@ If the file does not exist, create it with owner-readable-only file permissions. Prepend debug output with timestamp (default: 1) - + Прикрепва справката за грешки към времевия запис(по подразбиране: 1) Print block on startup, if found in block index - + Показвай блока при стартиране, ако е намерен в блок индекса Print block tree on startup (default: 0) - + Разпечатай блоковото дърво при стартиране (по подразбиране: 0) @@ -5444,17 +5447,17 @@ If the file does not exist, create it with owner-readable-only file permissions. Randomly drop 1 of every <n> network messages - + Произволно спира 1 от всеки <n> мрежови съобщения Randomly fuzz 1 of every <n> network messages - + Произволно проверява 1 на всеки <n> мрежови съобщения Rebuild block chain index from current blk000??.dat files - + Възстановяване индекса на блок регистъра от настоящия blk000??.dat файл @@ -5464,7 +5467,7 @@ If the file does not exist, create it with owner-readable-only file permissions. Rescanning... - Преразглеждане на последовтелността от блокове... + Повторно сканиране... @@ -5474,7 +5477,7 @@ If the file does not exist, create it with owner-readable-only file permissions. Run in the background as a daemon and accept commands - Стартирай във фонов режим като демон и приемай команди + Стартира във фонов режим като демон и приема команди @@ -5499,7 +5502,7 @@ If the file does not exist, create it with owner-readable-only file permissions. Send trace/debug info to console instead of debug.log file - Изпрати локализиращата или дебъг информацията към конзолата, вместо файлът debug.log + Изпрати информацията за грешки към конзолата, вместо файла debug.log @@ -5509,7 +5512,7 @@ If the file does not exist, create it with owner-readable-only file permissions. Server private key (default: server.pem) - Поверителен ключ за сървъра (default: server.pem) + Частен ключ за сървъра (default: server.pem) @@ -5529,7 +5532,7 @@ If the file does not exist, create it with owner-readable-only file permissions. Set key pool size to <n> (default: 100) - + Задайте максимален брой на генерираните ключове до <n> (по подразбиране: 100) @@ -5549,12 +5552,12 @@ If the file does not exist, create it with owner-readable-only file permissions. Set the number of threads to service RPC calls (default: 4) - + Задай брой заявки обслужващи процеса RPC повикванията (по подразбиране: 4) Sets the DB_PRIVATE flag in the wallet db environment (default: 1) - + Определете флага DB_PRIVATE в средата база от данни на портфейла (по подразбиране: 1) @@ -5564,7 +5567,7 @@ If the file does not exist, create it with owner-readable-only file permissions. Show benchmark information (default: 0) - + Покажи бенчмарк информация (по подразбиране: 0) @@ -5579,7 +5582,7 @@ If the file does not exist, create it with owner-readable-only file permissions. Signing timed out, please resubmit. - Времето за подпис изтече, моля изпратете отново. + Времето за подпис изтече, моля подпишете отново. @@ -5629,7 +5632,7 @@ If the file does not exist, create it with owner-readable-only file permissions. Start Dash Core Daemon - + Стартиране на Dash Core демона @@ -5644,7 +5647,7 @@ If the file does not exist, create it with owner-readable-only file permissions. This is intended for regression testing tools and app development. - + Това е предназначено за инструментите за регресивно тестване и разработка на приложението. @@ -5694,22 +5697,22 @@ If the file does not exist, create it with owner-readable-only file permissions. Unable to bind to %s on this computer (bind returned error %s) - + Не може да се свърже с %s на този компютър (връща грешка %s) Unable to sign masternode payment winner, wrong key? - + Неуспешно подписване на плащането към masternode победителя. Грешен ключ? Unable to sign spork message, wrong key? - + Неуспешно подписване на spork-съобщение. Грешен ключ? Unknown -socks proxy version requested: %i - + Заявка за неизвестна версия на -socks прокси: %i @@ -5734,7 +5737,7 @@ If the file does not exist, create it with owner-readable-only file permissions. Use KeePass 2 integration using KeePassHttp plugin (default: 0) - + Използвай KeePass 2 интеграция чрез плъгина KeePassHttp (по подразбиране: 0) @@ -5749,12 +5752,12 @@ If the file does not exist, create it with owner-readable-only file permissions. Use UPnP to map the listening port (default: 0) - + Използвай UPnP за определяне на порта за слушане (по подразбиране: 0) Use UPnP to map the listening port (default: 1 when listening) - + Използвай UPnP за определяне на порта за слушане (по подразбиране: 1 когато слуша) @@ -5769,7 +5772,7 @@ If the file does not exist, create it with owner-readable-only file permissions. Value more than Darksend pool maximum allows. - + Стойност повече от максимално позволената в Darksend басейна. @@ -5789,7 +5792,7 @@ If the file does not exist, create it with owner-readable-only file permissions. Wallet %s resides outside data directory %s - + Портфейла %s е разположен извън папката с данни %s @@ -5814,7 +5817,7 @@ If the file does not exist, create it with owner-readable-only file permissions. Warning: Deprecated argument -debugnet ignored, use -debug=net - + Внимание: Аргументът -debugnet е невалиден, използвайте -debug=net @@ -5824,12 +5827,12 @@ If the file does not exist, create it with owner-readable-only file permissions. You need to rebuild the database using -reindex to change -txindex - Необходимо е наново изграждане на базата от данни използвайки -reindex, за да промените -txindex + Необходимо е повторно изграждане на базата данни използвайки -reindex, за да промените -txindex Zapping all transactions from wallet... - + Премахване на всички транзакции от портфейла ... @@ -5847,4 +5850,4 @@ If the file does not exist, create it with owner-readable-only file permissions. wallet.dat е повреден, възстановяването неуспешно - + \ No newline at end of file diff --git a/src/qt/locale/dash_cmn.ts b/src/qt/locale/dash_cmn.ts index a420401150..772bff9305 100644 --- a/src/qt/locale/dash_cmn.ts +++ b/src/qt/locale/dash_cmn.ts @@ -6,19 +6,19 @@ About Dash Core - 关于暗黑币核心 + 关于达世币核心 <b>Dash Core</b> version - <b>暗黑币核心</b> 版本 + <b>达世币核心</b> 版本 Copyright &copy; 2009-2014 The Bitcoin Core developers. Copyright &copy; 2014-YYYY The Dash Core developers. 版权 &copy; 2009-2014 比特币核心的开发者。 -版权 &copy; 暗黑币核心的开发者。 +版权 &copy; 达世币核心的开发者。 @@ -136,12 +136,12 @@ This product includes software developed by the OpenSSL Project for use in the O These are your Dash addresses for sending payments. Always check the amount and the receiving address before sending coins. - 这些是你要付款过去的暗黑币位址。在付款之前,务必要检查金额和收款位址是否正确。 + 这些是你要付款过去的达世币地址。在付款之前,务必要检查金额和收款地址是否正确。 These are your Dash addresses for receiving payments. It is recommended to use a new receiving address for each transaction. - 这些是你用来收款的暗黑币位址。建议在每次交易时,都使用一个新的收款位址。 + 这些是你用来收款的达世币地址。建议在每次交易时,都使用一个新的收款地址。 @@ -285,7 +285,7 @@ This product includes software developed by the OpenSSL Project for use in the O Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DASH</b>! - 警告:如果把钱包加​​密后又忘记密码,你就会从此<b>失去所有的暗黑币了</b>! + 警告:如果把钱包加​​密后又忘记密码,你就会从此<b>失去所有的达世币了</b>! @@ -301,7 +301,7 @@ This product includes software developed by the OpenSSL Project for use in the O 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. - 暗黑币软体现在要关闭,以完成加密过程。请注意,加密钱包不能完全防止恶意软件入侵你的电脑盗取你的暗黑币。 + 达世币软体现在要关闭,以完成加密过程。请注意,加密钱包不能完全防止恶意软件入侵你的电脑盗取你的达世币。 @@ -361,7 +361,7 @@ This product includes software developed by the OpenSSL Project for use in the O Dash Core - 暗黑币核心 + 达世币核心 @@ -1188,12 +1188,12 @@ Address: %4 Use 2 separate masternodes to mix funds up to 1000 DASH - 使用2个独立的主节点混合资金最多1000DRK + 使用2个独立的主节点混合资金最多1000达世币 Use 8 separate masternodes to mix funds up to 1000 DASH - 使用8个独立的主节点混合资金最多1000DRK + 使用8个独立的主节点混合资金最多1000达世币 @@ -1203,17 +1203,17 @@ Address: %4 This option is the quickest and will cost about ~0.025 DASH to anonymize 1000 DASH - 此选项为最快速度,需要支付0.025DRK/1000DRK的匿名处理费用。 + 此选项为最快速度,需要支付0.025达世币/1000达世币的匿名处理费用。 This option is moderately fast and will cost about 0.05 DASH to anonymize 1000 DASH - 此选项为一般速度,需要支付0.05DRK/1000DRK的匿名处理费用。 + 此选项为一般速度,需要支付0.05达世币/1000达世币的匿名处理费用。 0.1 DASH per 1000 DASH you anonymize. - 0.1DRK/1000DRK的匿名处理费用。 + 0.1达世币/1000达世币的匿名处理费用。 @@ -1948,7 +1948,7 @@ https://www.transifex.com/projects/p/dash/ 0 DASH - 0 暗黑币 + 0 达世币 @@ -1958,7 +1958,7 @@ https://www.transifex.com/projects/p/dash/ 0 DASH / 0 Rounds - 0 暗黑币 / 0 循环数 + 0 达世币 / 0 循环数 @@ -3245,7 +3245,7 @@ XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwg) InstantX - 立即支付 + 即时支付 @@ -3322,7 +3322,7 @@ XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwg) and InstantX - + 和 即时支付 @@ -3796,17 +3796,17 @@ XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwg) %1/offline (verified via instantx) - %1/下线(经过立即支付系统认证) + %1/下线(经过即时支付系统认证) %1/confirmed (verified via instantx) - %1/已确认(经过立即支付系统认证) + %1/已确认(经过即时支付系统认证) %1 confirmations (verified via instantx) - %1/确认完成(经过立即支付系统认证) + %1/确认完成(经过即时支付付系统认证) @@ -3827,27 +3827,27 @@ XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwg) %1/offline (InstantX verification in progress - %2 of %3 signatures) - %1/下线 (立即支付系统正在认证中 - %2 of %3签名数) + %1/下线 (即时支付系统正在认证中 - %2 of %3签名数) %1/confirmed (InstantX verification in progress - %2 of %3 signatures ) - %1/已确认 (立即支付系统正在认证中 - %2 of %3签名数) + %1/已确认 (即时支付系统正在认证中 - %2 of %3签名数) %1 confirmations (InstantX verification in progress - %2 of %3 signatures) - %1/确认完成 (立即支付系统正在认证中 - %2 of %3签名数) + %1/确认完成 (即时支付系统正在认证中 - %2 of %3签名数) %1/offline (InstantX verification failed) - %1/下线 (立即支付系统认证失败) + %1/下线 (即时支付系统认证失败) %1/confirmed (InstantX verification failed) - %1/已确认 (立即支付系统认证失败) + %1/已确认 (即时支付系统认证失败) @@ -4548,7 +4548,7 @@ for example: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com Enable instantx, show confirmations for locked transactions (bool, default: true) - 激活立即支付,显示锁定交易的确认数(bool, 默认:true) + 激活即时支付,显示锁定交易的确认数(bool, 默认:true) @@ -5170,7 +5170,7 @@ If the file does not exist, create it with owner-readable-only file permissions. InstantX options: - 立即支付 选项: + 即时支付 选项: @@ -5625,7 +5625,7 @@ If the file does not exist, create it with owner-readable-only file permissions. Start Dash Core Daemon - 启动暗黑币核心后台程序 + 启动达世币核心后台程序 @@ -5843,4 +5843,4 @@ If the file does not exist, create it with owner-readable-only file permissions. 钱包数据损坏,恢复失败 - + \ No newline at end of file diff --git a/src/qt/locale/dash_de.ts b/src/qt/locale/dash_de.ts index fcab94249f..bc3e834fd0 100644 --- a/src/qt/locale/dash_de.ts +++ b/src/qt/locale/dash_de.ts @@ -574,7 +574,7 @@ Dieses Produkt enthält zudem folgende Dritt-Software: Open &Configuration File - + &Konfigurationsdatei öffnen @@ -2116,7 +2116,7 @@ https://www.transifex.com/projects/p/dash/ Mixing in progress... - + Am Mixen... @@ -2176,15 +2176,15 @@ https://www.transifex.com/projects/p/dash/ Submitted to masternode, waiting in queue . - An Masternode übermittelt, wartet in Warteschange . + An Masternode übermittelt, wartet in Warteschlange . Submitted to masternode, waiting in queue .. - An Masternode übermittelt, wartet in Warteschange .. + An Masternode übermittelt, wartet in Warteschlange .. Submitted to masternode, waiting in queue ... - An Masternode übermittelt, wartet in Warteschange ... + An Masternode übermittelt, wartet in Warteschlange ... @@ -4989,7 +4989,7 @@ Falls die Konfigurationsdatei nicht existiert, erzeugen Sie diese bitte mit Lese Downgrading and trying again. - + Gehe auf ältere Version zurück und versuche es erneut. @@ -5334,8 +5334,8 @@ Dash Core wird heruntergefahren. - Loading masternode cache... - + Loading masternode list... + Lade Masternode-Liste... @@ -5888,4 +5888,4 @@ Dash Core wird heruntergefahren. wallet.dat beschädigt, Datenrettung fehlgeschlagen - + \ No newline at end of file diff --git a/src/qt/locale/dash_es.ts b/src/qt/locale/dash_es.ts index 4d25bc4134..5bc262d345 100644 --- a/src/qt/locale/dash_es.ts +++ b/src/qt/locale/dash_es.ts @@ -2114,7 +2114,7 @@ https://www.transifex.com/projects/p/dash/ Mixing in progress... - + Mezclado en curso... @@ -5890,4 +5890,4 @@ Si el archivo no existe, créelo con permiso de lectura solamente del propietari wallet.dat dañado, falló el rescate - + \ No newline at end of file diff --git a/src/qt/locale/dash_fi.ts b/src/qt/locale/dash_fi.ts index 8e9b8d4247..9d55f263cc 100644 --- a/src/qt/locale/dash_fi.ts +++ b/src/qt/locale/dash_fi.ts @@ -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. - + +Käännös päivitetty: 29.3.2015 by AjM. Copyright @@ -112,7 +113,7 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o Choose the address to send coins to - Valitse osoite johon lähetetään + Valitse osoite johon varat lähetetään @@ -137,7 +138,7 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o These are your Dash addresses for sending payments. Always check the amount and the receiving address before sending coins. - 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. + 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. @@ -303,7 +304,7 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o 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. - Dash sulkeutuu nyt salauksen viimeistelyä varten. Muista että salaus pelkästään ei voi estää Darkcoiniesi varastamista jos koneesi saastuu haittaohjelmilla tai viruksilla. + Dash sulkeutuu nyt salauksen viimeistelyä varten. Muista että salaus pelkästään ei voi estää dashiesi varastamista jos koneesi saastuu haittaohjelmilla tai viruksilla. @@ -397,7 +398,7 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o Send coins to a Dash address - Lähetä kolikoita Dash osoitteeseen + Lähetä varoja Dash osoitteeseen @@ -482,7 +483,7 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o Encrypt the private keys that belong to your wallet - Suojaa yksityiset avaimet jotka kuuluvat lompakkoosi + Salaa yksityiset avaimet jotka kuuluvat lompakkoosi @@ -532,12 +533,12 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o &Verify message... - Varmista &Viesti... + Tarkista &Viesti... Verify messages to ensure they were signed with specified Dash addresses - Varmista viestit varmistaaksesi että ne ovat allekirjoitettu määritetyillä Dash osoitteilla + Tarkista viestit ollaksesi varma että ne on allekirjoitettu määritetyillä Dash osoitteilla @@ -1564,7 +1565,7 @@ Varoitus: Jos käytät käyttöjärjestelmää (Live os) suoraan usb, dvd tai cd Number of script &verification threads - Script &varmistuksen säikeiden määrä + Script &vahvistuksien säikeiden määrä @@ -1579,7 +1580,7 @@ Varoitus: Jos käytät käyttöjärjestelmää (Live os) suoraan usb, dvd tai cd Darksend rounds to use - Kuinka monta Darksend kierrosta käytetään + Kuinka montaa Darksend kierrosta käytetään @@ -1642,12 +1643,12 @@ Varoitus: Jos käytät käyttöjärjestelmää (Live os) suoraan usb, dvd tai cd 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. - 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. + 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. &Spend unconfirmed change - &Käytä varmistamattomia vaihtorahoja + &Käytä vahvistamattomia vaihtorahoja @@ -1755,12 +1756,12 @@ https://www.transifex.com/projects/p/dash/ &Unit to show amounts in: - Yksikkö jona määrät näytetään + Yksikkö joina määrät näytetään Choose the default subdivision unit to show in the interface and when sending coins. - Valitse mitä yksikköä käytetään ensisijaisesti kolikkomäärien näyttämiseen. + Valitse mitä yksikköä käytetään ensisijaisesti varojen määrien näyttämiseen. Whether to show Dash addresses in the transaction list or not. @@ -1825,7 +1826,7 @@ https://www.transifex.com/projects/p/dash/ Client restart required to activate changes. - Ohjelman uudelleenkäynnistys aktivoi muutokset käyttöön. + Ohjelman uudelleen käynnistys aktivoi muutokset käyttöön. @@ -1835,7 +1836,7 @@ https://www.transifex.com/projects/p/dash/ This change would require a client restart. - Tämä muutos vaatii ohjelman uudelleenkäynnistyksen. + Tämä muutos vaatii ohjelman uudelleen käynnistyksen. @@ -1874,12 +1875,12 @@ https://www.transifex.com/projects/p/dash/ Pending: - Odotetaan: + Vahvistamatta: Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance - Varmistamattomien siirtotapahtumien summa, jota ei vielä lasketa käytettävissä olevaan saldoon + Vahvistamattomien siirtotapahtumien summa, jota ei vielä lasketa käytettävissä olevaan saldoon @@ -1909,7 +1910,7 @@ https://www.transifex.com/projects/p/dash/ Total: - Yhteensä: + Saldo Yhteensä: @@ -1939,7 +1940,7 @@ https://www.transifex.com/projects/p/dash/ Status: - Tilanne: + Tila: @@ -2022,7 +2023,7 @@ https://www.transifex.com/projects/p/dash/ Reset the current status of Darksend (can interrupt Darksend if it's in the process of Mixing, which can cost you money!) - Nollaa nykyinen Darksend tilanne (voi keskeyttää Darksend sekoituksen, joka voi maksaa ylimääräisiä kuluja) + Nollaa nykyinen Darksend tila (voi keskeyttää Darksend sekoituksen, joka voi maksaa ylimääräisiä kuluja) @@ -2072,7 +2073,7 @@ https://www.transifex.com/projects/p/dash/ Rounds - Kierrokset + Kierrosta @@ -2116,7 +2117,7 @@ https://www.transifex.com/projects/p/dash/ Mixing in progress... - + Sekoitus käynnissä... @@ -2227,7 +2228,7 @@ https://www.transifex.com/projects/p/dash/ Cannot start dash: click-to-pay handler - Ei voi käynnistää Darkcoinia: click-to-pay handler + Ei voi käynnistää dashia: click-to-pay handler Net manager warning @@ -2302,7 +2303,7 @@ https://www.transifex.com/projects/p/dash/ Unverified payment requests to custom payment scripts are unsupported. - Varmistamattomia maksupyyntöjä kustomoituun maksupalvelun scripteihin ei tueta. + Vahvistamattomia maksupyyntöjä kustomoituun maksupalvelun scripteihin ei tueta. @@ -3044,7 +3045,7 @@ https://www.transifex.com/projects/p/dash/ Send Coins - Lähetä Darkcoineja + Lähetä Dasheja @@ -3336,7 +3337,7 @@ https://www.transifex.com/projects/p/dash/ and InstantX - ja instantx + ja InstantX @@ -3369,7 +3370,7 @@ https://www.transifex.com/projects/p/dash/ Confirm send coins - Hyväksy Darkcoinien lähettäminen + Hyväksy lähettäminen Payment request expired @@ -3412,7 +3413,7 @@ https://www.transifex.com/projects/p/dash/ 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. - 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ä. + 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ä. @@ -3528,7 +3529,7 @@ https://www.transifex.com/projects/p/dash/ This is an unverified payment request. - Tämä on varmistamaton maksupyyntö + Tämä on vahvistamaton maksupyyntö @@ -3545,7 +3546,7 @@ https://www.transifex.com/projects/p/dash/ This is a verified payment request. - Tämä on varmistettu maksupyyntö. + Tämä on vahvistettu maksupyyntö. @@ -3571,7 +3572,7 @@ https://www.transifex.com/projects/p/dash/ Signatures - Sign / Verify a Message - Allekirjoitukset - Allekirjoita / Varmista viesti + Allekirjoitukset - Allekirjoita / Tarkista viesti @@ -3642,7 +3643,7 @@ https://www.transifex.com/projects/p/dash/ Reset all sign message fields - Tyhjennä kaikki allekirjoituskentät + Tyhjennä kaikki kentät @@ -3653,7 +3654,7 @@ https://www.transifex.com/projects/p/dash/ &Verify Message - &Varmista viesti + &Tarkista viesti @@ -3672,17 +3673,17 @@ https://www.transifex.com/projects/p/dash/ Verify the message to ensure it was signed with the specified Dash address - Varmista että viesti on allekirjoitettu määritetyllä Dash osoitteella + Tarkista että viesti on allekirjoitettu määritetyllä Dash osoitteella Verify &Message - Varmista &Viesti... + Tarkista &Viesti... Reset all verify message fields - Tyhjennä kaikki varmistakentät + Tyhjennä kaikki kentät @@ -3752,12 +3753,12 @@ https://www.transifex.com/projects/p/dash/ Message verification failed. - Viestin varmistus epäonnistui. + Viestin tarkistus epäonnistui. Message verified. - Viesti varmistettu. + Viesti tarkistettu. @@ -3822,17 +3823,17 @@ https://www.transifex.com/projects/p/dash/ %1/offline (verified via instantx) - %1/ei yhteyttä (varmistettu instantx:lla) + %1/ei yhteyttä (vahvistettu instantx:lla) %1/confirmed (verified via instantx) - %1/vahvistettu (varmistettu instantx:lla) + %1/vahvistettu (vahvistettu instantx:lla) %1 confirmations (verified via instantx) - %1 vahvistusta (varmistettu instantx:lla) + %1 vahvistusta (vahvistettu instantx:lla) @@ -3853,27 +3854,27 @@ https://www.transifex.com/projects/p/dash/ %1/offline (InstantX verification in progress - %2 of %3 signatures) - %1/ei yhteyttä (varmistus instantx:lla käynnissä - %2 / %3 allekirjoitusta) + %1/ei yhteyttä (vahvistus instantx:lla käynnissä - %2 / %3 allekirjoitusta) %1/confirmed (InstantX verification in progress - %2 of %3 signatures ) - %1/vahvistettu (varmistus instantx:lla käynnissä - %2 / %3 allekirjoitusta) + %1/vahvistettu (vahvistus instantx:lla käynnissä - %2 / %3 allekirjoitusta) %1 confirmations (InstantX verification in progress - %2 of %3 signatures) - %1 vahvistusta (varmistus instantx:lla käynnissä - %2 / %3 allekirjoitusta) + %1 vahvistusta (vahvistus instantx:lla käynnissä - %2 / %3 allekirjoitusta) %1/offline (InstantX verification failed) - %1/ei yhteyttä (instantx varmistus epäonnistui) + %1/ei yhteyttä (instantx vahvistus epäonnistui) %1/confirmed (InstantX verification failed) - %1/vahvistettu (instantx varmistus epäonnistui) + %1/vahvistettu (instantx vahvistus epäonnistui) @@ -4016,7 +4017,7 @@ https://www.transifex.com/projects/p/dash/ 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 "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours. - 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 "ei hyväksytty" ja sitä ei voida käyttää. Näin voi ajoittain tapahtua kun toisen solmun lohko luodaan samanaikaisesti omasi kanssa. + 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 "ei hyväksytty" ja sitä ei voida käyttää. Näin voi ajoittain tapahtua kun toisen solmun lohko luodaan samanaikaisesti omasi kanssa. @@ -4106,7 +4107,7 @@ https://www.transifex.com/projects/p/dash/ Unconfirmed - Varmistamaton + Vahvistamaton @@ -4181,7 +4182,7 @@ https://www.transifex.com/projects/p/dash/ Darksend Make Collateral Inputs - Darksend luo vakuus syöte + Darksend luo vakuus syötteet @@ -4290,7 +4291,7 @@ https://www.transifex.com/projects/p/dash/ Darksend Make Collateral Inputs - Darksend vakuus syöte + Darksend luo vakuus syötteet @@ -4464,7 +4465,7 @@ https://www.transifex.com/projects/p/dash/ Send Coins - Lähetä Darkcoineja + Lähetä Dasheja @@ -4578,7 +4579,7 @@ esimerkiksi: alertnotify=echo %%s | mail -s "Dash Hälytys" admin@foo. Darksend uses exact denominated amounts to send funds, you might simply need to anonymize some more coins. - Darksend käyttää tarkalleen denominoituja syötteitä lähettäessään varoja, saatat tarvita anonymisoida lisää kolikoita. + Darksend käyttää tarkalleen denominoituja syötteitä lähettäessään varoja, saatat tarvita anonymisoida lisää varoja. @@ -4613,7 +4614,7 @@ esimerkiksi: alertnotify=echo %%s | mail -s "Dash Hälytys" admin@foo. 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. - 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ä. + 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ä. @@ -4658,7 +4659,7 @@ esimerkiksi: alertnotify=echo %%s | mail -s "Dash Hälytys" admin@foo. How thorough the block verification of -checkblocks is (0-4, default: 3) - Kuinka vaativa lohkonvarmistus -checkblocks on (0-4, oletus: 3) + Kuinka vaativa lohkon vahvistus -checkblocks on (0-4, oletus: 3) @@ -4668,7 +4669,7 @@ esimerkiksi: alertnotify=echo %%s | mail -s "Dash Hälytys" admin@foo. InstantX requires inputs with at least 6 confirmations, you might need to wait a few minutes and try again. - Instantx vaatii vähintään 6 varmistusta, odota muutama minuutti ja yritä uudelleen. + InstantX vaatii vähintään 6 vahvistusta, odota muutama minuutti ja yritä uudelleen. @@ -4693,7 +4694,7 @@ esimerkiksi: alertnotify=echo %%s | mail -s "Dash Hälytys" admin@foo. 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) - Tarjoa Darksend:ille likviditeettiä jatkuvaa kolikoiden sekoitusta varten (0-100, oletus: 0, 1=usein, isot maksukulut, 100=harvoin, pienet maksukulut) + Tarjoa Darksend:ille likviditeettiä jatkuvaa varojen sekoitusta varten (0-100, oletus: 0, 1=usein, isot maksukulut, 100=harvoin, pienet maksukulut) @@ -4713,7 +4714,7 @@ esimerkiksi: alertnotify=echo %%s | mail -s "Dash Hälytys" admin@foo. Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d) - Aseta script varmistuksen säikeiden määrä (%u - %d, 0= auto, <0 = jätä näin monta prosessorin ydintä vapaaksi, oletus: %d) + Aseta script vahvistuksen säikeiden määrä (%u - %d, 0= auto, <0 = jätä näin monta prosessorin ydintä vapaaksi, oletus: %d) @@ -4827,7 +4828,7 @@ Jos tiedostoa ei ole, niin luo se ainoastaan omistajan kirjoitusoikeuksin. Add a node to connect to and attempt to keep the connection open - Linää solmu mihin liittyä pitääksesi yhteyden auki + Lisää solmu mihin liittyä pitääksesi yhteyden auki @@ -4862,7 +4863,7 @@ Jos tiedostoa ei ole, niin luo se ainoastaan omistajan kirjoitusoikeuksin. Can't denominate: no compatible inputs left. - Ei voida denomnoida: yhteensopivia syötteitä ei ole jäljellä. + Ei voida denominoida: yhteensopivia syötteitä ei ole jäljellä. @@ -4987,7 +4988,7 @@ Jos tiedostoa ei ole, niin luo se ainoastaan omistajan kirjoitusoikeuksin. Downgrading and trying again. - + Alennetaan ja yritetään uudestaan. @@ -5032,7 +5033,7 @@ Jos tiedostoa ei ole, niin luo se ainoastaan omistajan kirjoitusoikeuksin. Error loading wallet.dat: Wallet requires newer version of Dash - Virhe ladattaessa wallet.dat lompakkotiedostoa: Tarvitset uudemman version Darkcoinista + Virhe ladattaessa wallet.dat lompakkotiedostoa: Tarvitset uudemman version dashista @@ -5117,7 +5118,7 @@ Jos tiedostoa ei ole, niin luo se ainoastaan omistajan kirjoitusoikeuksin. Failed to write to coin database - Kolikkotietokannan kirjoitus epäonnistui + Tietokannan kirjoitus epäonnistui @@ -5147,7 +5148,7 @@ Jos tiedostoa ei ole, niin luo se ainoastaan omistajan kirjoitusoikeuksin. Generate coins (default: 0) - Luo kolikoita (oletus: 0) + Luo varoja (oletus: 0) @@ -5212,7 +5213,7 @@ Jos tiedostoa ei ole, niin luo se ainoastaan omistajan kirjoitusoikeuksin. InstantX options: - Instantx valinnat: + InstantX valinnat: @@ -5436,7 +5437,7 @@ Jos tiedostoa ei ole, niin luo se ainoastaan omistajan kirjoitusoikeuksin. Only accept block chain matching built-in checkpoints (default: 1) - Hyväksy vain lohkoketjua vastaavat sisäänrakennetut varmistuspisteet (Oletus: 1) + Hyväksy vain lohkoketjua vastaavat sisäänrakennetut vahvistuspisteet (Oletus: 1) @@ -5561,7 +5562,7 @@ Jos tiedostoa ei ole, niin luo se ainoastaan omistajan kirjoitusoikeuksin. Session timed out (30 seconds), please resubmit. - Istunnon aikaraja (30 sekuntia), esitä uudestaan. + Istunto vanheni (30 sekuntia), esitä uudestaan. @@ -5666,7 +5667,7 @@ Jos tiedostoa ei ole, niin luo se ainoastaan omistajan kirjoitusoikeuksin. Spend unconfirmed change when sending transactions (default: 1) - Käytä varmistamattomia vaihtorahoja lähetettäessä siirtotapahtumia (oletus: 1) + Käytä vahvistamattomia vaihtorahoja lähetettäessä siirtotapahtumia (oletus: 1) @@ -5746,7 +5747,7 @@ Jos tiedostoa ei ole, niin luo se ainoastaan omistajan kirjoitusoikeuksin. Unable to sign spork message, wrong key? - En voida osoittaa spork viestiä, väärä avain? + En voida allekirjoittaa spork viestiä, väärä avain? @@ -5816,12 +5817,12 @@ Jos tiedostoa ei ole, niin luo se ainoastaan omistajan kirjoitusoikeuksin. Verifying blocks... - Varmistetaan lohkoja... + Tarkistetaan lohkoja... Verifying wallet... - Varmistetaan lompakko... + Tarkistetaan lompakko... @@ -5886,7 +5887,7 @@ Jos tiedostoa ei ole, niin luo se ainoastaan omistajan kirjoitusoikeuksin. wallet.dat corrupt, salvage failed - wallet.dat lompakkotiedosto vioittunut, palastaminen epäonnistui + wallet.dat lompakkotiedosto vioittunut, pelastaminen epäonnistui - + \ No newline at end of file diff --git a/src/qt/locale/dash_pt.ts b/src/qt/locale/dash_pt.ts index 433b7d8d2e..0c999c4e26 100644 --- a/src/qt/locale/dash_pt.ts +++ b/src/qt/locale/dash_pt.ts @@ -2113,7 +2113,7 @@ https://www.transifex.com/projects/p/dash/ Mixing in progress... - + Mistura em progresso... @@ -4983,7 +4983,7 @@ Se o ficheiro não existir, deve criá-lo só com permissões de leitura para o Downgrading and trying again. - + A diminuir o nível e tentar de novo. @@ -5885,4 +5885,4 @@ Se o ficheiro não existir, deve criá-lo só com permissões de leitura para o wallet.dat corrompido, recuperação falhou - + \ No newline at end of file diff --git a/src/qt/locale/dash_ru.ts b/src/qt/locale/dash_ru.ts index 4a617a7a3d..502ede6058 100644 --- a/src/qt/locale/dash_ru.ts +++ b/src/qt/locale/dash_ru.ts @@ -2121,7 +2121,7 @@ https://www.transifex.com/projects/p/dash/ Mixing in progress... - + Выполняется перемешивание... @@ -4997,7 +4997,7 @@ If the file does not exist, create it with owner-readable-only file permissions. Downgrading and trying again. - + Откат к обычному перемешиванию и повторная попытка. diff --git a/src/qt/locale/dash_sv.ts b/src/qt/locale/dash_sv.ts index 20bf2f121b..122a1628f6 100644 --- a/src/qt/locale/dash_sv.ts +++ b/src/qt/locale/dash_sv.ts @@ -2118,7 +2118,7 @@ https://www.transifex.com/projects/p/dash/ Mixing in progress... - + Mixning pågår... @@ -4990,7 +4990,7 @@ Om filen inte existerar, skapa den och ge inga andra än ägaren läsarrättighe Downgrading and trying again. - + Nedgraderar och försöker igen. @@ -5004,7 +5004,7 @@ Om filen inte existerar, skapa den och ge inga andra än ägaren läsarrättighe - Error connecting to masternode. + Error connecting to Masternode. Fel vid anslutning till masternode. @@ -5888,4 +5888,4 @@ Om filen inte existerar, skapa den och ge inga andra än ägaren läsarrättighe wallet.dat är korrumperad, återställning misslyckades - + \ No newline at end of file diff --git a/src/qt/locale/dash_vi.ts b/src/qt/locale/dash_vi.ts index eb6c1d4d6b..cd5da22e8e 100644 --- a/src/qt/locale/dash_vi.ts +++ b/src/qt/locale/dash_vi.ts @@ -2105,7 +2105,7 @@ https://www.transifex.com/projects/p/dash/ Mixing in progress... - + Đang trong quá trình trộn... @@ -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 Downgrading and trying again. - + Hạ cấp và thử lại xem. @@ -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 wallet.dat bị lỗi, cứu chữa không thành công. - + \ No newline at end of file diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp index af0ba9ae5b..c3adff6970 100755 --- a/src/qt/overviewpage.cpp +++ b/src/qt/overviewpage.cpp @@ -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; } diff --git a/src/qt/res/icons/bitcoin.ico b/src/qt/res/icons/bitcoin.ico index 8cb92782a0..037611c8aa 100755 Binary files a/src/qt/res/icons/bitcoin.ico and b/src/qt/res/icons/bitcoin.ico differ diff --git a/src/qt/res/icons/bitcoin.png b/src/qt/res/icons/bitcoin.png index 2cb311910e..b5181822f4 100755 Binary files a/src/qt/res/icons/bitcoin.png and b/src/qt/res/icons/bitcoin.png differ diff --git a/src/qt/res/icons/bitcoin_testnet.ico b/src/qt/res/icons/bitcoin_testnet.ico index f19334b98a..f9f7a91b74 100755 Binary files a/src/qt/res/icons/bitcoin_testnet.ico and b/src/qt/res/icons/bitcoin_testnet.ico differ diff --git a/src/qt/res/icons/bitcoin_testnet.png b/src/qt/res/icons/bitcoin_testnet.png index a72e5498b5..1247f23f62 100755 Binary files a/src/qt/res/icons/bitcoin_testnet.png and b/src/qt/res/icons/bitcoin_testnet.png differ diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp index 71f09c6997..9e1059c53a 100644 --- a/src/qt/sendcoinsdialog.cpp +++ b/src/qt/sendcoinsdialog.cpp @@ -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())); diff --git a/src/rpcdarksend.cpp b/src/rpcdarksend.cpp index 8faf475ce7..9327b0dd07 100644 --- a/src/rpcdarksend.cpp +++ b/src/rpcdarksend.cpp @@ -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 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(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(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(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())); } } } diff --git a/src/util.cpp b/src/util.cpp old mode 100644 new mode 100755 index b083342c18..5a192d2151 --- a/src/util.cpp +++ b/src/util.cpp @@ -485,8 +485,13 @@ void ReadConfigFile(map& mapSettingsRet, map >& 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 setOptions; setOptions.insert("*"); diff --git a/src/wallet.cpp b/src/wallet.cpp index b7cabaacb2..73397f591c 100644 --- a/src/wallet.cpp +++ b/src/wallet.cpp @@ -1622,7 +1622,7 @@ bool CWallet::SelectCoins(const CAmount& nTargetValue, set 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){