Merge remote-tracking branch 'dashpay/master'

_data/merchants-gifts.yml

@@ -3,9 +3,9 @@
   url: http://www.cryptodechange.com
   image: CryptodeChange.jpg
 
-- name: PremiumGiftCards
-  url: #
-  image: PremiumGiftCards.png
+# - name: PremiumGiftCards
+#   url: #
+#   image: PremiumGiftCards.png
 
 - name: Gift Off
   url: https://giftoff.com

_data/merchants-stores.yml

@@ -39,10 +39,10 @@
   url: http://healthiverse.net
   image: Healthiverse.jpg
 
-- name: Above All House Plans
-  title: House/ Garden
-  url: http://www.aboveallhouseplans.com
-  image: AboveAllHousePlants.jpg
+# - name: Above All House Plans
+#   title: House/ Garden
+#   url: http://www.aboveallhouseplans.com
+#   image: AboveAllHousePlants.jpg
 
 - name: The Reef Shop
   title: Aquarium Equipment
@@ -74,10 +74,10 @@
   url: http://www.fortgalt.com
   image: FortGalt.jpg
 
-- name: BitFon
-  title: Phone credits
-  url: #
-  image: Bitfon.jpg
+# - name: BitFon
+#   title: Phone credits
+#   url: #
+#   image: Bitfon.jpg
 
 - name: Ecigar
   title: Ecigarettes

_data/wallets-collection.yml

@@ -263,7 +263,7 @@
 - name: Jaxx
   description: |
    All keys are created on your local device and never sent to any servers. This means you have full control of your wallet and Jaxx neither holds nor has access to your funds.
-  logo_url: "https://jaxx.io/images/favicon.ico"
+  logo_url: "/assets/img/wallets/jaxx-logo.ico"
   os: linux
   type: desktop
   vendor_id: jaxx
@@ -282,7 +282,7 @@
 - name: Jaxx
   description: |
    All keys are created on your local device and never sent to any servers. This means you have full control of your wallet and Jaxx neither holds nor has access to your funds.
-  logo_url: "https://jaxx.io/images/favicon.ico"
+  logo_url: "/assets/img/wallets/jaxx-logo.ico"
   os: win32
   type: desktop
   vendor_id: jaxx
@@ -301,7 +301,7 @@
 - name: Jaxx
   description: |
     All keys are created on your local device and never sent to any servers. This means you have full control of your wallet and Jaxx neither holds nor has access to your funds.
-  logo_url: "https://jaxx.io/images/favicon.ico"
+  logo_url: "/assets/img/wallets/jaxx-logo.ico"
   os: win64
   type: desktop
   vendor_id: jaxx
@@ -368,7 +368,7 @@
 - name: Jaxx
   description: |
     All keys are created on your local device and never sent to any servers. This means you have full control of your wallet and Jaxx neither holds nor has access to your funds.
-  logo_url: "https://jaxx.io/images/favicon.ico"
+  logo_url: "/assets/img/wallets/jaxx-logo.ico"
   os: osx
   type: desktop
   vendor_id: jaxx
@@ -403,7 +403,7 @@
   type: mobile
   vendor_id: hash_engineering_solutions
   vendor_label: Hash Engineering Solutions
-  control_type: semi
+  control_type: full
   validation_type: hosted
   access_type: vendor
   product_id: dash_android_wallet
@@ -452,7 +452,7 @@
     Jaxx Blockchain Interface & Wallet
     </p>
     All keys are created on your local device and never sent to any servers. This means you have full control of your wallet and Jaxx neither holds nor has access to your funds.
-  logo_url: "https://jaxx.io/images/favicon.ico"
+  logo_url: "/assets/img/wallets/jaxx-logo.ico"
   os: android
   type: mobile
   vendor_id: jaxx

_i18n/en.yml

@@ -242,7 +242,7 @@ pages:
     wallets-security-header: Security
     modal-platform: Platform
 
-    wallets-security-subtitle: Please secure your wallets by protecting them with strong, difficult-to-guess passwords and by backing them up in a secure place. Always chose to encrypt your wallet and any backups, because if your funds are lost or stolen, there is no way to recover them. If using an HD wallet such as a hardware or paper wallet, please secure your "seeds" just as you would a regular wallet password. They are the only way to recover your wallet. For help on securing passowrds, visit
+    wallets-security-subtitle: Please secure your wallets by protecting them with strong, difficult-to-guess passwords and by backing them up in a secure place. Always choose to encrypt your wallet and any backups, because if your funds are lost or stolen, there is no way to recover them. If using a hardware (HD) wallet such as a paper wallet or keepass, please secure your "seeds" just as you would a regular wallet password. They are the only way to recover your wallet. For help on securing passwords, visit
     modal-header-vendor-label-descriptor: Wallet for Dash
     modal-download-action-button-label: Download
     modal-source-code-view: View