Updated the template files contact and wallet.html

Signed-off-by: Stefan Kügel <skuegel@web.de>

1 files changed, 26 insertions, 48 deletions

diff --git a/template/wallet.html.j2 b/template/wallet.html.j2
index 34777624..3a254c47 100644
--- a/template/wallet.html.j2
+++ b/template/wallet.html.j2
@@ -95,7 +95,7 @@ document.addEventListener('DOMContentLoaded', onLoad);
     <!-- Jumbotron -->
     <div class="jumbotron">
       <div class="text-center">
-      <h1 lang="en">Taler Wallet</h1>
+      <h1 lang="en">{% trans %}Taler Wallet{% endtrans %}</h1>
       </div>
     </div>
 
@@ -104,7 +104,7 @@ document.addEventListener('DOMContentLoaded', onLoad);
     <div class="row">
       <div class="col-lg-12">
         <p class="greenbox" id="box-present" style="display:none">
-          {% trans %}Congratulations, you have installed the Taler wallet. Check out the{% endtrans %} <a href="https://demo.taler.net/">{% trans %}demonstration{% endtrans %}</a>.
+          {% trans %}Congratulations, the Taler wallet is installed on your device. Check out the <a href="https://demo.taler.net/">demonstration</a>.{% endtrans %}
         </p>
         <p class="bluebox" id="box-not-present" style="display:none">
           {% trans %}You don&#39;t have a wallet installed yet.{% endtrans %}
@@ -114,23 +114,21 @@ document.addEventListener('DOMContentLoaded', onLoad);
 
     <div class="row wallet-teaser-text">
       <div class="col-lg-12">
-        {% trans %}Install the wallet for your browser below, then check out the{% endtrans %} <a href="https://demo.taler.net">{% trans %}demonstration{% endtrans %}</a>.
-        {% trans %}For source, see this{% endtrans %} <a href="https://taler.net/files/wallet/">{% trans %}directory{% endtrans %}</a>.
+        {% trans %}Install the wallet for your browser below, then check out the <a href="https://demo.taler.net">demonstration</a>. The source code is provided <a href="https://taler.net/files/wallet/">here</a>.{% endtrans %}
       </div>
     </div> <!-- /row -->
 
     <div class="row extension">
       <div class="col-lg-6">
-        <h2><a href="https://chrome.google.com/webstore/detail/gnu-taler-wallet/millncjiddlpgdmkklmhfadpacifaonc">Google Chrome / Chromium 51+</a></h2>
+        <h2><a href="https://chrome.google.com/webstore/detail/gnu-taler-wallet/millncjiddlpgdmkklmhfadpacifaonc">{% trans %}Google Chrome / Chromium 51+{% endtrans %}</a></h2>
 
         <p id="error-chrome" class="error">
-          <a href="https://www.google.com/chrome">Google Chrome</a>
-          {% trans %}or{% endtrans %} <a href="https://www.chromium.org/">Chromium</a> {% trans %}is required, but it appears you don&#39;t have it installed.{% endtrans %}
+          {% trans %}<a href="https://www.google.com/chrome">Google Chrome</a> or <a href="https://www.chromium.org/">Chromium</a> 
+          is required, but it appears you don&#39;t have it installed.{% endtrans %}
         </p>
         <p id="error-chrome-version" class="error">
-          <a href="https://www.google.com/chrome">Google Chrome</a>
-          {% trans %}or{% endtrans %} <a href="https://www.chromium.org/">Chromium</a> {% trans %}version{% endtrans %}
-          <span id="chrome-min-version"></span> {% trans %}or newer is required, but it appears you have an older version.{% endtrans %}
+          {% trans %}<a href="https://www.google.com/chrome">Google Chrome</a> or <a href="https://www.chromium.org/">Chromium</a> 
+          version <span id="chrome-min-version"></span> or newer is required, but it appears you have an older version.{% endtrans %}
         </p>
         <div id="inline-install-chrome">
           <form target="_blank" action="https://chrome.google.com/webstore/detail/gnu-taler-wallet/millncjiddlpgdmkklmhfadpacifaonc">
@@ -140,9 +138,7 @@ document.addEventListener('DOMContentLoaded', onLoad);
           </form>
           <noscript>
             <em style="color:darkred;">
-              {% trans %}
-                JavaScript is disabled, installation won&#39;t work.
-              {% endtrans %}
+              {% trans %}JavaScript is disabled, the installation won&#39;t work.{% endtrans %}
             </em>
           </noscript>
           <div id="install-result"></div>
@@ -150,13 +146,11 @@ document.addEventListener('DOMContentLoaded', onLoad);
       </div> <!-- /col-lg-6 -->
 
       <div class="col-lg-6">
-        <h2><a href="https://addons.mozilla.org/en-US/firefox/addon/taler-wallet/">Mozilla Firefox 57+</a></h2>
+        <h2><a href="https://addons.mozilla.org/en-US/firefox/addon/taler-wallet/">{% trans %}Mozilla Firefox 57+{% endtrans %}</a></h2>
         <div id="inline-install-chrome">
           <form action="https://addons.mozilla.org/firefox/downloads/latest/taler-wallet/">
             <button action="submit" class="install-button">
-              {% trans %}
-              Install wallet
-              {% endtrans %}
+              {% trans %}Install wallet{% endtrans %}
             </button>
           </form>
         </div>
@@ -178,52 +172,38 @@ document.addEventListener('DOMContentLoaded', onLoad);
       </div> <!-- /col-lg-6 -->
 
       <div class="col-lg-6">
-        <h2>Opera 36+</h2>
+        <h2>{% trans %}Opera 36+{% endtrans %}</h2>
 
         <ol>
           <li>
             <a href="https://addons.opera.com/en/extensions/details/download-chrome-extension-9/">
-              {% trans %}
-                Install Download Chrome Extension
-              {% endtrans %}
+              {% trans %}Install Download of Chrome Extension{% endtrans %}
             </a>
           </li>
           <li>
-            <a href="https://chrome.google.com/webstore/detail/gnu-taler-wallet/millncjiddlpgdmkklmhfadpacifaonc">
-              {% trans %}
-                Install GNU Taler
-              {% endtrans %}
-            </a>
-            {% trans %}
-              from the Chrome Web Store
-            {% endtrans %}
+            {% trans %}<a href="https://chrome.google.com/webstore/detail/gnu-taler-wallet/millncjiddlpgdmkklmhfadpacifaonc">Install GNU Taler from the Chrome Web Store</a>.{% endtrans %}
           </li>
         </ol>
       </div> <!-- /col-lg-6 -->
 
 
       <div class="col-lg-6">
-        <h2>Android 4.4 (API 18) or later</h2>
+        <h2>{% trans %}Android 4.4 (API 18) or later{% endtrans %}</h2>
 
         <ul>
           <li>
-        <p>You can <a href="https://taler.net/files/wallet/wallet-nightly-debug-1667560285.apk">download
-the APK for Android</a> directly.</p>
-
+        <p>{% trans %}You can 
+        <a href="https://taler.net/files/wallet/wallet-nightly-debug-1667560285.apk">download the APK for Android</a> directly.{% endtrans %}</p>
           </li>
           <li>
-            <p style="color: red">The wallet uploaded on Google is currently outdated (as of 2022-11-04). Please use F-Droid or side-load the APK.</p>
-            <s><a href="https://play.google.com/store/apps/details?id=net.taler.wallet">
-               {% trans %}
-                 Install Android App from Google App Store, or
-               {% endtrans %}
-            </a></s>
-          </li>
+            <p style="color: red">{% trans %}The wallet uploaded on Google is currently outdated (as of 2022-11-04). Please use F-Droid or side-load the APK.{% endtrans %}</p>
+            <s>
+            <a href="https://play.google.com/store/apps/details?id=net.taler.wallet">
+               {% trans %}Install the Android App from Google App Store</a>
+            </s>
+          </li> or 
           <li>
-            <a href="https://f-droid.org/en/packages/net.taler.wallet.fdroid/">
-               {% trans %}
-                 Download Android App from F-Droid (bypassing Google registration).
-               {% endtrans %}
+            <a href="https://f-droid.org/en/packages/net.taler.wallet.fdroid/">download the Android App from F-Droid (bypassing Google registration).{% endtrans %}
             </a>
           </li>
         </ul>
@@ -234,11 +214,9 @@ the APK for Android</a> directly.</p>
     <div class="row extension">
 
       <div class="col-lg-6">
-        <h2>{{ _("Other browsers") }}</h2>
+        <h2>{% trans %}Other browsers{% endtrans %}</h2>
         <p>
-          {% trans %}
-            Wallets for other browsers will be provided in the near future.
-          {% endtrans %}
+          {% trans %}Wallets for other browsers will be provided in the near future.{% endtrans %}
         </p>
       </div> <!-- /col-lg-6 -->