[GNUnet-SVN] [taler-www] branch master updated (7950fef -> 8b60d9f)

[gnunet]

This is an automated email from the git hooks/post-receive script.

dold pushed a change to branch master
in repository www.

    from 7950fef  use absolute URL for worker
     new 200ff5d  formatting
     new cbc3f73  add missing alt tag
     new 8b60d9f  grammar

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 common/navigation.j2.inc |  2 +-
 faq.html.j2              | 17 ++++++++++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc
index 3be7f17..9567fb9 100644
--- a/common/navigation.j2.inc
+++ b/common/navigation.j2.inc
@@ -18,7 +18,7 @@
     <ul class="nav navbar-right navbar-form">
       <li>
         <button class="btn btn-dark dropdown-toggle" type="button" 
id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" 
aria-expanded="true">
-          <img src="{{ url('images/'+lang+'.png') }}" />
+          <img src="{{ url('images/'+lang+'.png') }}" alt="{{lang}}" />
           <span class="caret"></span>
         </button>
         <ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
diff --git a/faq.html.j2 b/faq.html.j2
index fc76f95..28f37a1 100644
--- a/faq.html.j2
+++ b/faq.html.j2
@@ -7,7 +7,7 @@ Taler does not use any Blockchain technology or Bitcoin 
directly.  Taler is not
 based on proof-of-work or any other distributed consensus mechanism.  Instead
 Taler is based on blind signatures.</p>
 
-<p>It would be possible, however, withdraw Bitcoins into a Taler wallet (with 
an approproate exchange),
+<p>It would be possible, however, to withdraw Bitcoins into a Taler wallet 
(with an approproate exchange),
 which would give some benefits ofer plain Bitcoin, such as instant 
confirmation times.</p>
 
 <h2>Where is the balance in my wallet stored?</h2>
@@ -25,14 +25,21 @@ like with a physical wallet for cash, you are responsible 
for keeping it safe.</
 make it possible for you to know that you've been compromised, which can be an 
advantage.</p>
 
 <h2>Can I send money to my friend with Taler?</h2>
-You can <emph>share</emh> coins in your wallet with people you trust, like
+<p>You can <em>share</em> coins in your wallet with people you trust, like
 family or friends.  Whenever these shared coins are spent, the other copies
 become invalid.  Sharing coins this does not constitute a transaction, is not 
taxable
-and requires trust between the sharing parties.
+and requires trust between the sharing parties.</p>
 
-If your friend provides goods or services for you in exchange for a payment,
-they can easily set up a Taler merchant and receive the payment on their bank 
account.
+<p>If your friend provides goods or services for you in exchange for a payment,
+they can easily set up a Taler merchant and receive the payment on their bank 
account.</p>
 
+<h2>How does Taler handle payments in different currencies?</h2>
+<p>Taler wallets can store digital coins corresponding to multiple diffent
+currencies such as the Euro, US Dollars or even Bitcoins.</p>
+
+<p>Automatic currency converstion is currently not our focus, but could be made
+available in the future, either with exchanges that handle multiple
+currencies, or other means of multi-currency payment routing.</p>
 
 </div>
 {% endblock body_content %}

-- 
To stop receiving notification emails like this one, please contact
address@hidden