Merge pull request #360 from greenaddress/master

Added GreenAddress wallet

_templates/choose-your-wallet.html

@@ -152,6 +152,21 @@ id: choose-your-wallet
   <a href="#" onclick="return false;"><img src="/img/clients/lo-bitgo.png" alt="coinkite" /></a>
 </div>
 {% endcase %}
+{% case page.lang %}
+{% when 'ar' or 'bg' or 'de' or 'es' or 'fa' or 'fr' or 'hu' or 'id' or 'it' or 'nl' or 'pl' or 'ru' or 'tr' or 'zh_CN' or 'zh_TW' %}
+{% else %}
+<div data-id="greenaddressweb">
+  <div class="walletinfo">
+    <div>
+      <h2>{% translate wallettrustinfo %}</h2>
+      <span></span>
+      <p>{% translate wallettrustinfotxt %}</p>
+      <p><a href="#" onclick="walletShow(event);">{% translate walletwebwarningok %}</a></p>
+    </div>
+  </div>
+  <a href="#" onclick="return false;"><img src="/img/clients/lo-greenaddress.png" alt="greenaddress" /></a>
+</div>
+{% endcase %}
 <div data-id="coinbase">
   <div class="walletwarning">
     <div>
@@ -355,6 +370,23 @@ id: choose-your-wallet
   <a href="#" onclick="return false;"><img src="/img/clients/lo-bitgo.png" alt="bitgo" /></a>
 </div>
 {% endcase %}
+{% case page.lang %}
+{% when 'ar' or 'bg' or 'de' or 'es' or 'fa' or 'fr' or 'hu' or 'id' or 'it' or 'nl' or 'pl' or 'ru' or 'tr' or 'zh_CN' or 'zh_TW' %}
+{% else %}
+<div data-id="greenaddressweb">
+  <div class="walletinfo">
+    <div class="b1"></div>
+    <div class="b2">
+      <h2>{% translate wallettrustinfo %}</h2>
+      <span></span>
+      <p class="hyphenate">{% translate wallettrustinfotxt %}</p>
+      <p><a href="#" onclick="walletShow(event);">{% translate walletwebwarningok %}</a></p>
+    </div>
+    <div class="b3"></div>
+  </div>
+  <a href="#" onclick="return false;"><img src="/img/clients/lo-greenaddress.png" alt="greenaddress" /></a>
+</div>
+{% endcase %}
 <div data-id="coinbase">
   <div class="walletwarning">
     <div class="b1"></div>
@@ -460,6 +492,19 @@ id: choose-your-wallet
   </div>
   <a href="#" onclick="return false;"><img src="/img/clients/lo-bitgo.png" alt="bitgo" />BitGo</a>
 </div>
+<div id="greenaddressweb">
+  <div>
+    <div class="b1"></div>
+    <div class="b2">
+      <h2>GreenAddress</h2>
+      <span></span>
+      <p class="hyphenate">{% translate walletgreenaddress %}</p>
+      <p><a href="https://greenaddress.it/">{% translate walletvisit %}</a></p>
+    </div>
+    <div class="b3"></div>
+  </div>
+  <a href="#" onclick="return false;"><img src="/img/clients/lo-greenaddress.png" alt="greenaddress" />Green<br>Address</a>
+</div>
 </div>
 
 </div>

_translations/en.yml

@@ -121,6 +121,7 @@ en:
     walletcoinbase: "Coinbase is a web wallet service that aims to be easy to use. It also provides an Android web wallet app, merchant tools and integration with US bank accounts to buy and sell bitcoins."
     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 the highest levels 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."
     walletdownload: "<a href=\"#download#\">Download</a>"
     walletvisit: "Visit website"
     walletwebwarning: "Be careful"