Merge remote-tracking branch 'remotes/hive/hive-android'

_templates/choose-your-wallet.html

@@ -267,44 +267,44 @@ wallets:
     level: 3
     platform:
       mobile:
-        text: "wallethive-android"
+        text: "wallethive-web"
-        link: "https://play.google.com/store/apps/details?id=com.hivewallet.androidclient.wallet"
+        link: "https://play.google.com/store/apps/details?id=com.hivewallet.hive.cordova"
-        source: "https://github.com/hivewallet/hive-android"
+        source: "https://github.com/hivewallet/hive-ios/tree/android"
-        screenshot: "hiveandroid.png"
+        screenshot: "hivemobile.png"
         os:
         - android
         check:
           control: "checkgoodcontrolfull"
-          decentralization: "checkpassvalidationspvp2p"
+          decentralization: "checkfailvalidationcentralized"
-          transparency: "checkpasstransparencyopensource"
+          transparency: "checkfailtransparencynew"
           environment: "checkpassenvironmentmobile"
-          privacy: "checkfailprivacyweak"
+          privacy: "checkpassprivacybasic"
         privacycheck:
-          privacyaddressreuse: "checkfailprivacyaddressrotation"
+          privacyaddressreuse: "checkpassprivacyaddressrotation"
-          privacydisclosure: "checkfailprivacydisclosurespv"
+          privacydisclosure: "checkfailprivacydisclosureaccount"
           privacynetwork: "checkfailprivacynetworknosupporttor"
       android:
-        text: "wallethive-android"
+        text: "wallethive-web"
-        link: "https://play.google.com/store/apps/details?id=com.hivewallet.androidclient.wallet"
+        link: "https://play.google.com/store/apps/details?id=com.hivewallet.hive.cordova"
-        source: "https://github.com/hivewallet/hive-android"
+        source: "https://github.com/hivewallet/hive-ios/tree/android"
-        screenshot: "hiveandroid.png"
+        screenshot: "hivemobile.png"
         os:
         - android
         check:
           control: "checkgoodcontrolfull"
-          decentralization: "checkpassvalidationspvp2p"
+          decentralization: "checkfailvalidationcentralized"
-          transparency: "checkpasstransparencyopensource"
+          transparency: "checkfailtransparencynew"
           environment: "checkpassenvironmentmobile"
-          privacy: "checkfailprivacyweak"
+          privacy: "checkpassprivacybasic"
         privacycheck:
-          privacyaddressreuse: "checkfailprivacyaddressrotation"
+          privacyaddressreuse: "checkpassprivacyaddressrotation"
-          privacydisclosure: "checkfailprivacydisclosurespv"
+          privacydisclosure: "checkfailprivacydisclosureaccount"
           privacynetwork: "checkfailprivacynetworknosupporttor"
       ios:
         text: "wallethive-web"
         link: "https://itunes.apple.com/us/app/hive-wallet/id906990301?mt=8"
         source: "https://github.com/hivewallet/hive-ios"
-        screenshot: "hiveios.png"
+        screenshot: "hivemobile.png"
         os:
         - ios
         check:

_translations/en.yml

@@ -108,7 +108,6 @@ en:
     walletbitcoinqt: "Bitcoin Core is a full Bitcoin client and builds the backbone of the network. It offers high levels of security, privacy, and stability. However, it has fewer features and it takes a lot of space and memory."
     walletmultibit: "MultiBit is a lightweight client that focuses on being fast and easy to use. It synchronizes with the network and is ready to use in minutes. MultiBit also supports many languages. It is a good choice for non-technical users."
     wallethive: "Hive is a fast, integrated, user-friendly Bitcoin wallet for Mac OS X. With a focus on usability, Hive is translated into many languages and has apps, making it easy to interact with your favorite Bitcoin services and merchants."
-    wallethive-android: "Hive is a standalone wallet for Android, which requires no external server or account. It focuses on usability, yet provides a range of advanced features, such as touch-to-pay via NFC or reliable payments via Bluetooth. Hive Android is extensible through plugins."
     wallethive-web: "Hive is a human-friendly Bitcoin and Litecoin wallet, which features a beautiful, elegant and simple interface. It offers Waggle, a simple way to send & receive tokens with other Hive users near you. Your passphrase generates your wallet, making it portable and backups easy."
     walletarmory: "Armory is an advanced Bitcoin client that expands its features for Bitcoin power users. It offers many backup and encryption features, and it allows secure cold-storage on offline computers."
     walletelectrum: "Electrum's focus is speed and simplicity, with low resource usage. It uses remote servers that handle the most complicated parts of the Bitcoin system, and it allows you to recover your wallet from a secret phrase."