Merge branch 'master' of https://github.com/gridcoin/Gridcoin-Research

# Conflicts:
#	src/qt/locale/bitcoin_zh_CN.ts

Author: gridcoin

CHANGELOG.md

@@ -4,6 +4,17 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [3.5.9.1] - 2017-07-03
+### Changed
+ - Neural Network improvements:
+    - Don't download stats data that hasn't changed.
+    - Use gridcoin.us as a stat mirror to reduce BOINC server loads.
+    - Use UTC instead of local time when filtering idle CPIDs.
+    - Only include beacons younger than 6 months when calculating mags.
+
+### Security
+ - Prevent untauthorized poll and vote deletions.
+
 ## [3.5.9.0] - 2017-06-05
 ### Added
  - Added execute unspentreport (shows proof of unspent coins in wallet).
@@ -18,54 +29,64 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
    #175 (@fooforever).
 
 ### Changed
- - Upgraded security on voting system - voting proof of balance and proof of
-   magnitude.
- - Security enhancement (@tomasbrod)
  - Wallet overview cleanup, #233 (@skcin)
-   - The main overview page is now cleaner, more structured and holds more of
+    - The main overview page is now cleaner, more structured and holds more of
      the recent transactions.
-   - Displayed DPOR weight should now be accurate, #233 (@skcin).
+    - Displayed DPOR weight should now be accurate, #233 (@skcin).
  - Show as many of the recent transactions as we can fit on the overview page.
  - Translation updates
-   - Portuguese (Miguel Veiga)
-   - Slovak (@tomasbrod)
-   - Swedish (@denravonska)
-   - Afrikaan and Spanish (@philipswift)
-   - French (@PsiPhiTheta)
-   - Russian (@rambinho)
+    - Portuguese (Miguel Veiga)
+    - Slovak (@tomasbrod)
+    - Swedish (@denravonska)
+    - Afrikaan and Spanish (@philipswift)
+    - French (@PsiPhiTheta)
+    - Russian (@rambinho)
  - Gridcoinstats is now used as block explorer, #308.
  - Slight RAM usage reduction.
- - Fix a bug where beacons were stored even though none were generated due
-   to the wallet being locked, #264.
  - Improve beacon advertise error message, #133 (@comprehendreality).
- - Remove empty "wcgtest" RPC command.
- - Fix incorrect WCG URL, #323 (@3ullShark).
- - Fix alt key shortcut order, #326 (@TheCharlatan).
  - Code cleanup (@Foggyx420, @TheCharlatan).
+
+### Fixed
  - Fix numerous beacon issues, #344, #321 and #334 (@Foggyx420).
+ - Fix incorrect WCG URL, #323 (@3ullShark).
+ - Fix alt key shortcut order, #326 (@TheCharlatan).
+ - Fix a bug where beacons were stored even though none were generated due
+   to the wallet being locked, #264 (@denravonska).
+
+### Removed
+ - Remove empty "wcgtest" RPC command.
+
+### Security
+ - Security enhancement (@tomasbrod)
+ - Upgraded security on voting system - voting proof of balance and proof of
+   magnitude.
 
 ## [3.5.8.9] - 2017-05-15
 ### Added
 - Implement voting functionality for Linux and OSX (@skcin).
+- Add man pages to doc folder, #135 (@caraka).
 
 ### Changed
-- Windows are now resizable 
-- Replace Windows voting dialog with the new dialog.
-- Update Gridcoin icon on Windows.
-- Enable C++11.
-- Removed unused link dependencies: librt, boost_chrono, boost_date_time, libz
-  and libdl.
-- Update Hungarian translations (@matthew11).
-- Update Portuguese translations (Miguel Veiga).
-- Update icon set by @Peppernrino.
-- Update icon on OSX, #193 (@coagmano).
-- Lossless compression of resources, #227 (@Peppernrino).
-- Reduced memory usage by around 100MB+.
-- Improve UI when used with dark themes on Linux, #222 (@skcin).
-- Fix occasional crashes when starting on Linux, #139.
-- Fix freeze when clicking on the "Amount" field under Send Coins when using
-  KDE, #210.
-- Fix OSX build issues, #174 (@coagmano).
-- Add man pages to doc folder, #135 (@caraka).
-- Remove lots of dead, obsolete code.
-- Possible fix for invalid time check in diagnostic.
+ - Windows are now resizable 
+ - Replace Windows voting dialog with the new dialog.
+ - Update Gridcoin icon on Windows.
+ - Enable C++11.
+ - Update Hungarian translations (@matthew11).
+ - Update Portuguese translations (Miguel Veiga).
+ - Update icon set by @Peppernrino.
+ - Update icon on OSX, #193 (@coagmano).
+ - Lossless compression of resources, #227 (@Peppernrino).
+ - Reduced memory usage by around 100MB+.
+ - Improve UI when used with dark themes on Linux, #222 (@skcin).
+
+### Fixed
+ - Fix OSX build issues, #174 (@coagmano).
+ - Fix occasional crashes when starting on Linux, #139.
+ - Fix freeze when clicking on the "Amount" field under Send Coins when using
+   KDE, #210.
+ - Possible fix for invalid time check in diagnostic.
+
+### Removed
+ - Remove lots of dead, obsolete code.
+ - Removed unused link dependencies: librt, boost_chrono, boost_date_time, libz
+   and libdl.

gridcoinresearch.pro

@@ -10,7 +10,7 @@ win32 {
     DEFINES += _WIN32_WINNT=0x0501 WINVER=0x0501
     lessThan(QT_VERSION, 5.0.0) {
         CONFIG += qaxcontainer
-    } 
+    }
     else {
         QT += axcontainer
     }
@@ -68,15 +68,15 @@ contains(RELEASE, 1) {
 
 !win32 {
     # for extra security against potential buffer overflows: enable GCCs Stack Smashing Protection
-    QMAKE_CXXFLAGS *= -fstack-protector-all --param ssp-buffer-size=1
-    QMAKE_LFLAGS *= -fstack-protector-all --param ssp-buffer-size=1
+    QMAKE_CXXFLAGS += -fstack-protector-all --param ssp-buffer-size=1
+    QMAKE_LFLAGS += -fstack-protector-all --param ssp-buffer-size=1
     # We need to exclude this for Windows cross compile with MinGW 4.2.x, as it will result in a non-working executable!
     # This can be enabled for Windows, when we switch to MinGW >= 4.4.x.
 } else {
     # for extra security on Windows: enable ASLR and DEP via GCC linker flags
-    QMAKE_LFLAGS *= -Wl,--dynamicbase -Wl,--nxcompat
+    QMAKE_LFLAGS += -Wl,--dynamicbase -Wl,--nxcompat
     # on Windows: enable GCC large address aware linker flag
-    QMAKE_LFLAGS *= -Wl,--large-address-aware
+    QMAKE_LFLAGS += -Wl,--large-address-aware
 }
 
 # use: qmake "USE_QRCODE=1"

src/qt/locale/bitcoin_zh_CN.ts

@@ -2212,7 +2212,7 @@ This label turns red, if the priority is smaller than "medium".
     </message>
     <message>
         <location line="+15"/>
-        <source>Copy quantity</source>
+        <source>Copy quantity</source> 
         <translation>复制数额 </translation>
     </message>
     <message>