Merge pull request #223 from bitcoin/tempenv

Replace "temporary environment" by "hardware wallets" in offline wallets

_templates/secure-your-wallet.html

@@ -54,28 +54,19 @@ id: secure-your-wallet
 <p>{% translate offlinetxtxt5 %}</p>
 </div>
 
-<br>
-<div class="box boxexpand">
-<h3><a href="#" onclick="boxshow(event);">{% translate offlinetmp %}</a></h3>
-<p>{% translate offlinetmptxt %}</p>
-<p><b>{% translate offlinetmplose %}</b></p>
-<p>{% translate offlinetmplosetxt %}</p>
-<p><b>{% translate offlinetmpmiss %}</b></p>
-<p>{% translate offlinetmpmisstxt %}</p>
-<p><b>{% translate offlinetmptrace %}</b></p>
-<p>{% translate offlinetmptracetxt %}</p>
-</div>
-
 {% case page.lang %}
 {% when 'ar' or 'es' or 'fa' or 'it' or 'nl' or 'ru' %}
 {% else %}
-<h2>{% translate hardwarewallet %}</h2>
+<br>
+<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://bitcointrezor.com/">Trezor</a><br>
 ButterflyLabs BitSafe
 </p>
+</div>
 {% endcase %}
 
 <h2>{% translate offlinemulti %}</h2>

_translations/en.yml

@@ -290,22 +290,14 @@ en:
     encryptstrong: "Use a strong password"
     encryptstrongtxt: "Any password that contains only letters or recognizable words can be considered very weak and easy to break. A strong password must contain letters, numbers, punctuation marks and must be at least 16 characters long. Still, this should not prevent you to remember your password."
     offline: "Offline wallet for savings"
-    offlinetxt: "An offline wallet, also known as cold storage, provides the highest level of security for savings. It involves storing a wallet in a secured place that is not connected to the network. When done properly, it can offer a very good protection against computer vulnerabilities. It is however very important to test this type of setup before you start to use it with serious transactions. Using an offline wallet in conjunction with backups and encryption is also a good practice. Here is an overview of some approaches."
+    offlinetxt: "An offline wallet, also known as cold storage, provides the highest level of security for savings. It involves storing a wallet in a secured place that is not connected to the network. When done properly, it can offer a very good protection against computer vulnerabilities. Using an offline wallet in conjunction with backups and encryption is also a good practice. Here is an overview of some approaches."
     offlinetx: "Offline transaction signing"
     offlinetxtxt1: "This approach involves having two computers sharing some parts of the same wallet. The first one must be disconnected from any network. It is the only one that holds the entire wallet and is able to sign transactions. The second computer is connected to the network and only have a watching wallet that can only create unsigned transactions. This way, you can securely issue new transactions with the following steps."
     offlinetxtxt2: "Create a new transaction on the online computer and save it on an USB key."
     offlinetxtxt3: "Sign the transaction with the offline computer."
     offlinetxtxt4: "Send the signed transaction with the online computer."
     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/using-offline-wallets-in-armory/\">Armory</a> can be used to do offline transaction signature."
-    offlinetmp: "Temporary environment"
+    hardwarewallet: "Hardware wallets"
-    offlinetmptxt: "This approach involves loading a wallet inside a temporary environment. For example, it is possible to boot on a Linux live CD, load a light SPV wallet software with its configuration from an USB key and issue a transaction. When a computer is booted from a trusted read-only environment that is only loaded in memory, malicious code is kept away and no trace of your wallet is left on the hard drive. You should however be very careful with the following points."
-    offlinetmplose: "Losing funds"
-    offlinetmplosetxt: "A temporary environment is the perfect place to lose funds forever. If your wallet is not correctly loaded from an external permanent storage like an USB key, any changes made in your wallet will be lost permanently. Including the new Bitcoin adresses that might have been created during the temporary session to receive the change of your last transactions."
-    offlinetmpmiss: "Password mismatch"
-    offlinetmpmisstxt: "Booting in a temporary environment might possibly assign a different layout to your keyboard which will later produce different characters then expected. When using encryption, this can cause password mismatches. You might want to type your password on the screen to prevent problems."
-    offlinetmptrace: "Leaving no trace"
-    offlinetmptracetxt: "As long as a storage media like a hard drive is connected to the computer, there is a small risk that some traces of your private keys can remain. You might want to disconnect any hard drive or disable all swap partitions before loading your wallet."
-    hardwarewallet: "Hardware wallets are the future"
     hardwarewallettxt: "Hardware wallets are the best balance between very high security and ease of use. They 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:"
     offlinemulti: "Multi-signature to protect against theft"