Merge pull request #213 from bitcoin/instanttxt

Improve text about reversible instant transactions and move it on "You need to know"

_templates/bitcoin-for-developers.html

@@ -20,8 +20,5 @@ id: bitcoin-for-developers
 <h2><img class="titleicon" src="/img/ico_lock.svg" alt="Icon" />{% translate security %}</h2>
 <p>{% translate securitytext %}</p>
 
-<h2><img class="titleicon" src="/img/ico_fast.svg" alt="Icon" />{% translate instant %}</h2>
-<p>{% translate instanttext %}</p>
-
 <h2><img class="titleicon" src="/img/ico_micro.svg" alt="Icon" />{% translate micro %}</h2>
 <p>{% translate microtext %}</p>

_templates/you-need-to-know.html

@@ -67,6 +67,11 @@ id: you-need-to-know
 <h2><img src="/img/ico_anon.svg" alt="Icon" />{% translate anonymous %}</h2>
 <p>{% translate anonymoustxt %}</p>
 
+{% case page.lang %}{% when 'ar' or 'de' or 'es' or 'fa' or 'fr' or 'it' or 'nl' or 'pl' or 'ru' %}{% else %}
+<h2><img src="/img/ico_fast.svg" alt="Icon" />{% translate instant %}</h2>
+<p>{% translate instanttxt %}</p>
+{% endcase %}
+
 <h2><img src="/img/ico_lab.svg" alt="Icon" />{% translate experimental %}</h2>
 <p>{% translate experimentaltxt %}</p>
 

_translations/en.yml

@@ -79,8 +79,6 @@ en:
     invoicetext: "Bitcoin can create as many Bitcoin addresses as you want. So if you were to build a payment system associated with an invoice, you simply need to generate and monitor a Bitcoin address for each payment. You can also use the same addresses once the payment is done."
     security: "Most of the security is on client side"
     securitytext: "Most parts of the security are handled by the protocol on the client and Bitcoin network side. Authenticity is verified through private keys, and double-spends are prevented through the Bitcoin network. That means no need for PCI compliance nor fraud detection. We love things that just work, don't we?"
-    instant: "Instant transactions and confirmations"
-    instanttext: "A Bitcoin transaction is usually deployed within a few seconds and confirmed within 10 minutes. During that time, a transaction can be considered authentic but still reversible. If you need instant transactions, it is recommended to ask for a small transaction fee and use a double-spend detection system."
     micro: "Cheap micro payments"
     microtext: "Bitcoin offers the lowest payment processing fees for any type of transaction, including micro-payments. This means that it can also be used to design and implement new creative online services that could not exist before only because of financial limitations."
   bitcoin-for-individuals:
@@ -473,6 +471,8 @@ en:
     irreversibletxt: "Any transaction you issue with Bitcoin cannot be reversed, it can only be refunded by the person receiving the funds. That means you should take care to do business with people or organizations you know and trust. But don't worry, Bitcoin can detect typos and usually won't let you send money to an invalid address."
     anonymous: "Bitcoin is not anonymous"
     anonymoustxt: "Some effort is required in order to protect your privacy with Bitcoin. All Bitcoin transactions are stored publicly and permanently on the network, which means anyone can see the balance and transactions of any Bitcoin address. However, the identity of the owner cannot be associated with their Bitcoin address until personal information is revealed by the owner during an exchange. This is why it is recommended for Bitcoin owners to use many different Bitcoin addresses; in fact, you should create a new one each time you receive money. This is especially important for public uses such as websites. You might also want to consider hiding your computer's IP address with a tool like <a href=\"https://www.torproject.org/\">Tor</a> so that it cannot be logged."
+    instant: "Instant transactions are less secure"
+    instanttxt: "A Bitcoin transaction is usually deployed within a few seconds and confirmed within 10 minutes. During that time, a transaction can be considered authentic but still reversible. Dishonnest users could try to cheat. If you can't wait for a confirmation, asking for a small transaction fee or using a detection system for unsafe transactions can increase security. For larger amounts like 1000 $USD, it makes sense to wait for 6 confirmations or more. Each confirmation <i>exponentially</i> decreases the risk of a reversed transaction."
     experimental: "Bitcoin is still experimental"
     experimentaltxt: "Bitcoin is an experimental new currency that is in active development. Although it becomes less experimental as usage grows, you should keep in mind that Bitcoin is a new invention that is exploring ideas that have never been attempted before. As such, its future cannot be predicted by anyone."
     tax: "Don't forget government taxes"