Merge pull request #387 from Laser9un/master

Update README and Copyright Year

diff --git a/COPYING b/COPYING
index d0ccb3e..90f9003 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -2,7 +2,7 @@
 Copyright © 2011-2012 The PPCoin Developers
 Copyright © 2014 The Peerunity Developers
 Copyright © 2014 The EmerCoin Developers
-Copyright © 2012-2019 The NovaCoin developers
+Copyright © 2012-2020 The NovaCoin developers
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
index cc27b34..ed040ff 100644 (file)
--- a/README.md
+++ b/README.md
@@ -6,11 +6,11 @@ NovaCoin - a hybrid scrypt PoW + PoS based cryptocurrency.
 * 10 minutes stake spacing
 * 30 minutes PoW spacing
 * Balanced PoW blocks and stakes weighting
-* The PoW subsidy halves every x64 multiply of PoW difficulty
-* The PoS interest halves every x64 multiply of PoS difficulty
+* The PoW subsidy halves every x8 multiply of PoW difficulty
+* The PoS interest halves every x8 multiply of PoS difficulty
 * Maximum PoW reward is 100 coins
 * Maximum PoS reward is 10 coins
-* No deterministic limit of the supply, currently ~ 1411259 coins mined
+* No deterministic limit of the supply, currently ~ 2712526 coins mined
 
 Development process
 ===========================

diff --git a/contrib/debian/copyright b/contrib/debian/copyright
index 0b139f4..963c96f 100644 (file)
--- a/contrib/debian/copyright
+++ b/contrib/debian/copyright
@@ -5,11 +5,11 @@ Source: http://sourceforge.net/projects/novacoin/files/
  https://github.com/novacoin-project/novacoin
 
 Files: *
-Copyright: 2012-2019, Novacoin Developers
+Copyright: 2012-2020, Novacoin Developers
 License: Expat
 
 Files: *
-Copyright: 2009-2015, Bitcoin Developers
+Copyright: 2009-2019, Bitcoin Developers
 License: Expat
 Comment: The Bitcoin Developers encompasses the current developers listed on bitcoin.org,
          as well as the numerous contributors to the project.

diff --git a/doc/README b/doc/README
index 1076386..98291ad 100644 (file)
--- a/doc/README
+++ b/doc/README
@@ -1,6 +1,4 @@
-NovaCoin 0.5.0 BETA
-
-Copyright (c) 2013-2019 NovaCoin Developers
+Copyright (c) 2013-2020 NovaCoin Developers
 Copyright (c) 2011-2012 PPCoin Developers
 Distributed under the MIT/X11 software license, see the accompanying
 file license.txt or http://www.opensource.org/licenses/mit-license.php.

diff --git a/doc/README_windows.txt b/doc/README_windows.txt
index b6a8762..5aabf07 100644 (file)
--- a/doc/README_windows.txt
+++ b/doc/README_windows.txt
@@ -1,6 +1,4 @@
-NovaCoin 0.4.4 BETA\r
-\r
-Copyright (c) 2013-2019 NovaCoin Developers\r
+Copyright (c) 2013-2020 NovaCoin Developers\r
 Copyright (c) 2011-2013 PPCoin Developers\r
 Distributed under the MIT/X11 software license, see the accompanying\r
 file license.txt or http://www.opensource.org/licenses/mit-license.php.\r

diff --git a/src/qt/forms/aboutdialog.ui b/src/qt/forms/aboutdialog.ui
index 9658227..9005c3b 100644 (file)
--- a/src/qt/forms/aboutdialog.ui
+++ b/src/qt/forms/aboutdialog.ui
@@ -94,11 +94,11 @@
         <cursorShape>IBeamCursor</cursorShape>
        </property>
        <property name="text">
-        <string>Copyright © 2009-2016 The Bitcoin developers
+        <string>Copyright © 2009-2019 The Bitcoin developers
 Copyright © 2011-2012 The PPCoin Developers
 Copyright © 2014 The Peerunity Developers
 Copyright © 2014 The EmerCoin Developers
-Copyright © 2012-2019 The NovaCoin developers</string>
+Copyright © 2012-2020 The NovaCoin developers</string>
        </property>
        <property name="textInteractionFlags">
         <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>

diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts
index c91f616..9fcb6aa 100644 (file)
--- a/src/qt/locale/bitcoin_en.ts
+++ b/src/qt/locale/bitcoin_en.ts
@@ -16,16 +16,16 @@
     </message>
     <message>
         <location filename="../forms/aboutdialog.ui" line="97"/>
-        <source>Copyright © 2009-2016 The Bitcoin developers
+        <source>Copyright © 2009-2019 The Bitcoin developers
 Copyright © 2011-2012 The PPCoin Developers
 Copyright © 2014 The Peerunity Developers
 Copyright © 2014 The EmerCoin Developers
-Copyright © 2012-2019 The NovaCoin developers</source>
-        <translation>Copyright © 2009-2016 The Bitcoin developers
+Copyright © 2012-2020 The NovaCoin developers</source>
+        <translation>Copyright © 2009-2019 The Bitcoin developers
 Copyright © 2011-2012 The PPCoin Developers
 Copyright © 2014 The Peerunity Developers
 Copyright © 2014 The EmerCoin Developers
-Copyright © 2012-2019 The NovaCoin developers</translation>
+Copyright © 2012-2020 The NovaCoin developers</translation>
     </message>
     <message>
         <location filename="../forms/aboutdialog.ui" line="114"/>

diff --git a/src/qt/locale/bitcoin_ru.ts b/src/qt/locale/bitcoin_ru.ts
index 8e27720..216b260 100644 (file)
--- a/src/qt/locale/bitcoin_ru.ts
+++ b/src/qt/locale/bitcoin_ru.ts
@@ -16,16 +16,16 @@
     </message>
     <message>
         <location filename="../forms/aboutdialog.ui" line="97"/>
-        <source>Copyright © 2009-2016 The Bitcoin developers
+        <source>Copyright © 2009-2019 The Bitcoin developers
 Copyright © 2011-2012 The PPCoin Developers
 Copyright © 2014 The Peerunity Developers
 Copyright © 2014 The EmerCoin Developers
-Copyright © 2012-2019 The NovaCoin developers</source>
-        <translation>Все права защищены © 2009-2016 Разработчики Bitcoin
+Copyright © 2012-2020 The NovaCoin developers</source>
+        <translation>Все права защищены © 2009-2019 Разработчики Bitcoin
 Все права защищены © 2011-2012 Разработчики PPCoin
 Все права защищены © 2014 Разработчики Peerunity
 Все права защищены © 2014 Разработчики EmerCoin
-Все права защищены © 2012-2019 Разработчики NovaCoin</translation>
+Все права защищены © 2012-2020 Разработчики NovaCoin</translation>
     </message>
     <message>
         <location filename="../forms/aboutdialog.ui" line="114"/>

diff --git a/src/qt/locale/bitcoin_uk.ts b/src/qt/locale/bitcoin_uk.ts
index 0d1bed1..01948af 100644 (file)
--- a/src/qt/locale/bitcoin_uk.ts
+++ b/src/qt/locale/bitcoin_uk.ts
@@ -16,16 +16,16 @@
     </message>
     <message>
         <location filename="../forms/aboutdialog.ui" line="97"/>
-        <source>Copyright © 2009-2016 The Bitcoin developers
+        <source>Copyright © 2009-2019 The Bitcoin developers
 Copyright © 2011-2012 The PPCoin Developers
 Copyright © 2014 The Peerunity Developers
 Copyright © 2014 The EmerCoin Developers
-Copyright © 2012-2019 The NovaCoin developers</source>
-        <translation>© 2009-2016 Розробники Bitcoin
+Copyright © 2012-2020 The NovaCoin developers</source>
+        <translation>© 2009-2019 Розробники Bitcoin
 © 2011-2012 Розробники PPCoin
 © 2014 Розробники Peerunity
 © 2014 Розробники EmerCoin
-© 2012-2019 Розробники NovaCoin</translation>
+© 2012-2020 Розробники NovaCoin</translation>
     </message>
     <message>
         <location filename="../forms/aboutdialog.ui" line="114"/>

diff --git a/src/qt/res/bitcoin-qt.rc b/src/qt/res/bitcoin-qt.rc
index a727710..96702fc 100644 (file)
--- a/src/qt/res/bitcoin-qt.rc
+++ b/src/qt/res/bitcoin-qt.rc
@@ -22,7 +22,7 @@ BEGIN
             VALUE "FileDescription",    "NovaCoin-Qt (OSS GUI client for NovaCoin)"
             VALUE "FileVersion",        VER_FILEVERSION_STR
             VALUE "InternalName",       "novacoin-qt"
-            VALUE "LegalCopyright",     "2009-2012 The Bitcoin developers, 2012-2014 The NovaCoin & PPCoin developers"
+            VALUE "LegalCopyright",     "2009-2019 The Bitcoin developers, 2012-2020 The NovaCoin & PPCoin developers"
             VALUE "LegalTrademarks1",   "Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php."
             VALUE "OriginalFilename",   "novacoin-qt.exe"
             VALUE "ProductName",        "NovaCoin-Qt"