Merge branch 'wbnns-new-resources'

_templates/resources.html

@@ -10,11 +10,15 @@ id: resources
 
 <div class="resources">
 <div>
-  <div>
+ <div>
-    <h2 id="useful"><img src="/img/icons/ico_simple.svg" class="titleicon" alt="Icon">{% translate useful %}</h2>
+    <h2 id="learn"><img src="/img/icons/ico_solve.svg" class="titleicon" alt="Icon">{% translate learn %}</h2>
     <p>{% translate linkwiki %}</p>
+    <p><a href="https://www.khanacademy.org/economics-finance-domain/core-finance/money-and-banking/bitcoin/v/bitcoin-what-is-it">Khan Academy</a></p>
+    <p><a href="http://letstalkbitcoin.com/">Let's Talk Bitcoin</a></p>
+    <p><a href="http://www.bitcoin.kn/">Bitcoin Knowledge Podcast</a></p>
     <p><a href="https://www.weusecoins.com/">WeUseCoins.com</a></p>
     <p><a href="http://www.bitcoinmining.com/">BitcoinMining.com</a></p>
+    <p><a href="http://www.iamsatoshi.com/category/video-archive/">IamSatoshi</a></p>
   </div><div>
     <h2 id="directories"><img src="/img/icons/ico_invoice.svg" class="titleicon" alt="Icon">{% translate directories %}</h2>
     <p><a href="/{{ page.lang }}/{% translate choose-your-wallet url %}">{% translate linkwallets %}</a> - bitcoin.org</p>
@@ -54,11 +58,10 @@ id: resources
     <p><a href="http://iamsatoshi.com/">Ulterior States</a></p>
     <p><a href="https://www.youtube.com/watch?v=6pWblf8COH4">The Bitcoin Phenomenon</a></p>
   </div><div>
-    <h2 id="learn"><img src="/img/icons/ico_solve.svg" class="titleicon" alt="Icon">{% translate learn %}</h2>
+    <h2 id="vouchers"><img src="/img/icons/ico_voucher.svg" class="titleicon" alt="Icon">{% translate vouchers %}</h2>
-    <p><a href="http://letstalkbitcoin.com/">Let's Talk Bitcoin</a></p>
+    <p><a href="https://foldapp.com/">Fold</a></p>
-    <p><a href="http://www.bitcoin.kn/">Bitcoin Knowledge Podcast</a></p>
+    <p><a href="https://gyft.com/bitcoin/">Gyft</a></p>
-    <p><a href="https://www.khanacademy.org/economics-finance-domain/core-finance/money-and-banking/bitcoin/v/bitcoin-what-is-it">Khan Academy</a></p>
+    <p><a href="https://opendime.com/">Opendime</a></p>
-    <p><a href="http://www.iamsatoshi.com/category/video-archive/">IamSatoshi</a></p>
   </div>
 </div>
 </div>

_translations/en.yml

@@ -690,7 +690,6 @@ en:
     title: "Resources - Bitcoin"
     pagetitle: "Bitcoin resources"
     pagedesc: "Find useful websites and resources about Bitcoin."
-    useful: "Useful places"
     linkwiki: "<a href=\"https://en.bitcoin.it/\">Bitcoin Wiki</a>"
     linkcointelegraph: "<a href=\"http://cointelegraph.com/\">CoinTelegraph</a>"
     directories: "Directories"
@@ -703,6 +702,7 @@ en:
     news: "News"
     documentaries: "Documentaries"
     learn: "Learning resources"
+    vouchers: "Vouchers"
   secure-your-wallet:
     title: "Securing your wallet - Bitcoin"
     pagetitle: "Securing your wallet"

img/icons/ico_voucher.svg

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32">
+  <g>
+    <path d="M18.888 7.486l-7.189 3.617-9.064 11.967 10.225 7.457 8.886-12.413.893-8.261z" stroke="#000" stroke-linecap="round" stroke-linejoin="round"/>
+    <path d="M20.529 11.243a1.457 1.457 0 1 1-2.914 0 1.457 1.457 0 1 1 2.914 0z" transform="matrix(1.315 0 0 1.315 -5.659 -4.179)" opacity=".99" fill="#fff"/>
+    <path d="M19.812 9.938s1.694-3.01 2.925-4.185c1.344-1.281 2.709.216 5.262-1.786" stroke="#000" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round" fill="none"/>
+  </g>
+</svg>