Merge pull request #545 from bitcoin/trezor

Add Trezor to wallets

_templates/choose-your-wallet.html

@@ -243,6 +243,23 @@ wallets:
           privacyaddressreuse: "checkpassprivacyaddressrotation"
           privacydisclosure: "checkfailprivacydisclosurespv"
           privacynetwork: "checkfailprivacynetworknosupporttor"
+- trezor:
+    title: "TREZOR"
+    titleshort: "TREZOR"
+    compat: "hardware"
+    level: 2
+    platform:
+      hardware:
+        text: "wallettrezor"
+        link: "http://bitcointrezor.com/"
+        source: "https://github.com/trezor/"
+        screenshot: "trezor.png"
+        check:
+          control: "checkgoodcontrolfull"
+          decentralization: "checkneutraldecentralizevariable"
+          transparency: "checkfailtransparencynew"
+          environment: "checkgoodenvironmenthardware"
+          privacy: "checkneutralprivacyvariable"
 - hive:
     title: "Hive"
     titleshort: "Hive"
@@ -654,7 +671,7 @@ wallets:
       <li class="wallet-linux"><a data-walletcompat="linux">{% translate platformlinux %}</a></li>
     </ul>
     </li>
-    <li class="wallet-hardware" style="display:none;"><a data-walletcompat="hardware">{% translate walletcathardware %}</a></li>
+    <li class="wallet-hardware"><a data-walletcompat="hardware">{% translate walletcathardware %}</a></li>
     <li class="wallet-web"><a data-walletcompat="web">{% translate walletcatweb %}</a></li>
   </ul>
 </div>

_templates/secure-your-wallet.html

@@ -61,11 +61,6 @@ id: secure-your-wallet
 <div class="box boxexpand">
 <h3><a href="#" onclick="boxShow(event);">{% translate hardwarewallet %}</a></h3>
 <p>{% translate hardwarewallettxt %}</p>
-<p>{% translate hardwarewalletsoon %}</p>
-<p>
-<a href="http://www.bitcointrezor.com/">Trezor</a><br>
-<a href="http://www.butterflylabs.com/bitcoin-hardware-wallet/">ButterflyLabs BitSafe</a>
-</p>
 </div>
 
 <h2>{% translate update %}</h2>

_translations/en.yml

@@ -122,6 +122,7 @@ en:
     walletcoinkite: "Coinkite is a web wallet & debit card service that aims to be easy to use. It also works on mobile browsers, has merchant tools, point-of-sale payment terminals. It is a hybrid wallet and full reserve vault."
     walletbitgo: "BitGo is a multi-signature wallet offering a high level of security. Every transaction requires two signatures, protecting your bitcoins from malware and server attacks. Private keys are held by the user such that BitGo cannot access the bitcoins. It is a good choice for non technical users."
     walletgreenaddress: "GreenAddress is a user-friendly multi-signature wallet with improved security and privacy. At no time your keys are server side, not even encrypted. For security reasons, you should always use 2FA and the browser extension or Android App."
+    wallettrezor: "TREZOR is a hardware wallet providing a high level of security without sacrificing convenience. Unlike cold storage, TREZOR is able to sign transactions while connected to an online device. That means spending bitcoins is secure even when using a compromised computer."
     walletdownload: "Install"
     walletvisit: "Visit website"
     walletsourcecode: "Source code"
@@ -523,7 +524,6 @@ en:
     offlinetxtxt5: "Because the computer that is connected to the network cannot sign transactions, it cannot be used to withdraw any funds if it is compromised. <a href=\"https://bitcoinarmory.com/about/using-our-wallet/#offlinewallet\">Armory</a> can be used to do offline transaction signature."
     hardwarewallet: "Hardware wallets"
     hardwarewallettxt: "Hardware wallets are the best balance between very high security and ease of use. These are little devices that are designed from the root to be a wallet and nothing else. No software can be installed on them, making them very secure against computer vulnerabilities and online thieves. Because they can allow backup, you can recover your funds if you lose the device."
-    hardwarewalletsoon: "As of today, no hardware wallet has entered in production but they are coming soon:"
     update: "Keep your software up to date"
     updatetxt: "Using the latest version of your Bitcoin software allows you to receive important stability and security fixes. Updates can prevent problems of various severity, include new useful features and help keep your wallet safe. Installing updates for all other software on your computer or mobile is also important to keep your wallet environment safer."
     offlinemulti: "Multi-signature to protect against theft"