Merge branch 'master' of taler.net:/var/git/www

Former-commit-id: 9838fee1c3db2fd2e765b23880ef847bbae1ded3

5 files changed, 41 insertions, 4 deletions

diff --git a/about.html b/about.html
index e49bc55e..a74e180f 100644
--- a/about.html
+++ b/about.html
@@ -14,6 +14,7 @@
         <h1 lang="en">About us</h1>
         <h1 lang="de">&Uuml;ber uns</h1>
         <h1 lang="fr">À&nbsp;propos</h1>
+        <h1 lang="it">Chi siamo</h1>
       </div>
 
       <!-- Example row of columns -->
@@ -25,6 +26,7 @@
 	  wer w&uuml;rde schon versuchen, ein neues Zahlungssystem und ein neues
 	  Internet zu erschaffen?</p>
           <p lang="fr">Mégalomane local, C'est à dire, qui voudrait créer un nouveau système de paiement et un nouvel Internet ?</p>
+          <p lang="it">Megalomane locale. Intendo, chi creerebbe un nuovo sistema di pagamento e una nuova Internet?</p>
         </div>
         <div class="col-lg-4">
           <h2><a href="https://www.sec.in.tum.de/julian-kirsch/">Julian Kirsch</a></h2>
@@ -32,12 +34,14 @@
           <p lang="de">Hackt Linux, FreeBSD, Webseiten und den Staat im Staate
 	  in seiner Freizeit.</p>
           <p lang="fr">Pirate Linux, FreeBSD, sites Web et en état profond de détente.</p>
+          <p lang="it">Hackera Linux, FreeBSD, siti web e il deep state nel tempo libero.</p>
        </div>
         <div class="col-lg-4">
           <h2>Florian Dold</h2>
           <p lang="en">Is currently on probation at Microsoft</p>
           <p lang="de">Im Moment auf Bew&auml;hrung bei Microsoft</p>
           <p lang="fr">Actuellement en sursis chez Microsoft</p>
+          <p lang="it">Attualmente in libertà vigilata presso Microsoft</p>
         </div>
       </div>
       <div class="row">
@@ -46,18 +50,21 @@
           <p lang="en">Mostly harmless</p>
           <p lang="de">Gr&auml;&szlig;tenteils harmlos</p>
           <p lang="fr">Principalement inoffensif</p>
+          <p lang="it">Principalmente inoffensivo</p>
         </div>
         <div class="col-lg-4">
           <h2>Benedikt M&uuml;ller</h2>
           <p lang="en">Loves SEPA.</p>
           <p lang="de">Liebt SEPA.</p>
           <p lang="fr">Aime SEPA.</p>
+          <p lang="it">Ama SEPA.</p>
         </div>
         <div class="col-lg-4">
           <h2><a href="https://www.stallman.org/">Dr. Richard M. Stallman</a></h2>
           <p lang="en">Ethics enthusiast</p>
           <p lang="de">Chef GNUisance</p>
           <p lang="fr">Enthousiaste Ethique</p>
+          <p lang="it">Entusiasta di etica</p>
         </div>
       </div>
       <div class="row">
@@ -66,12 +73,21 @@
           <p lang="en">Theoretically deadly</p>
           <p lang="de">Theoretisch t&ouml;tlich</p>
           <p lang="fr">Fatale (en théorie)</p>
+          <p lang="it">Teoricamente mortale</p>
         </div>
         <div class="col-lg-4">
           <h2>Dr. Nana Karlstetter</h2>
           <p lang="en">Realizing deep thought</p>
           <p lang="de">Des Grundes wegen</p>
           <p lang="fr">Basse fréquence</p>
+          <p lang="it">Realizzando pensieri profondi</p>
+        </div>
+        <div class="col-lg-4">
+          <h2>Greta Breveglieri & Ylenia Baldanza</h2>
+          <p lang="en">Translators and best fan ever</p>
+          <p lang="it">Traduttrici e migliori fan mai avute</p>
+          <p lang="de">&Uuml;bersetzer</p>
+          <p lang="fr">Traductrice</p>
         </div>
       </div>
 
diff --git a/common/navigation.inc b/common/navigation.inc
index 19cd76c5..c0d54a82 100644
--- a/common/navigation.inc
+++ b/common/navigation.inc
@@ -12,24 +12,31 @@
             <li lang="en" class="m_index"><a href="/">Home</a></li>
             <li lang="de" class="m_index"><a href="/">Home</a></li>
             <li lang="fr" class="m_index"><a href="/">Accueil</a></li>
+            <li lang="it" class="m_index"><a href="/">Home</a></li>
 	    <li lang="en" class="m_citizens"><a href="/citizens">Citizens</a></li>
 	    <li lang="de" class="m_citizens"><a href="/citizens">B&uuml;rger</a></li>
 	    <li lang="fr" class="m_citizens"><a href="/citizens">Citoyens</a></li>
+	    <li lang="it" class="m_citizens"><a href="/citizens">Cittadini</a></li>
             <li lang="en" class="m_merchants"><a href="/merchants">Merchants</a></li>
             <li lang="de" class="m_merchants"><a href="/merchants">H&auml;ndler</a></li>
             <li lang="fr" class="m_merchants"><a href="/merchants">Commer&ccedil;ants</a></li>
+            <li lang="it" class="m_merchants"><a href="/merchants">Venditori</a></li>
             <li lang="en" class="m_governments"><a href="/governments">Governments</a></li>
             <li lang="de" class="m_governments"><a href="/governments">Regierungen</a></li>
             <li lang="fr" class="m_governments"><a href="/governments">Gouvernements</a></li>
+            <li lang="it" class="m_governments"><a href="/governments">Governi</a></li>
             <li lang="en" class="m_developers"><a href="/developers">Developers</a></li>
             <li lang="de" class="m_developers"><a href="/developers">Entwickler</a></li>
             <li lang="fr" class="m_developers"><a href="/developers">Développeurs</a></li>
+            <li lang="it" class="m_developers"><a href="/developers">Sviluppatori</a></li>
             <li lang="en" class="m_investors"><a href="/investors">Investors</a></li>
             <li lang="de" class="m_investors"><a href="/investors">Investoren</a></li>
             <li lang="fr" class="m_investors"><a href="/investors">Investisseurs</a></li>
+            <li lang="it" class="m_investors"><a href="/investors">Investitori</a></li>
             <li lang="en" class="m_about"><a href="/about">About&nbsp;us</a></li>
             <li lang="de" class="m_about"><a href="/about">&Uuml;ber uns</a></li>
             <li lang="fr" class="m_about"><a href="/about">À&nbsp;propos</a></li>
+            <li lang="it" class="m_about"><a href="/about">Chi siamo</a></li>
           </ul>
         </div>
       </div>
diff --git a/developers.html b/developers.html
index d3f6d0b0..840b5cda 100644
--- a/developers.html
+++ b/developers.html
@@ -153,18 +153,25 @@
 	     préparons un document exhaustif qui sera publié ici prochainement.</p>
 	  <p lang="it">Oltre a questo sito, il <a href="http://www.git.taler.net/">codice documentato</a>,
 	     e la <a href="http://api.taler.net/">documentazione API</a>, siamo preparando un
-	     documento integrale di progettazione che sarù presto pubblicato qui.</p>
+	     documento integrale di progettazione che sarà presto pubblicato qui.</p>
         </div>
          <div class="col-lg-4">
           <h2 lang="en">Discussion</h2>
 	  <h2 lang="de">Diskussion</h2>
 	  <h2 lang="fr">Discussion</h2>
+	  <h2 lang="it">Discurssione</h2>
           <p lang="en">We have a mailinglist for developer discussions.
             You can subscribe to it or read the list archive at
             <a href="http://lists.gnu.org/mailman/listinfo/taler">http://lists.gnu.org/mailman/listinfo/taler</a>.</p>
           <p lang="de">Wir haben eine Mailingliste f&uuml;r Diskussionen mit den Entwicklern.
             Die Webseite der Liste zum eintragen als auch das Listenarchiv sind hier:
             <a href="http://lists.gnu.org/mailman/listinfo/taler">http://lists.gnu.org/mailman/listinfo/taler</a>.</p>
+          <p lang="fr">Nous avons une liste pour le discours public des developers.
+            On peut s'inscrire ou lire les archives à
+            <a href="http://lists.gnu.org/mailman/listinfo/taler">http://lists.gnu.org/mailman/listinfo/taler</a>.</p>
+          <p lang="it">We have a mailinglist for developer discussions.
+            You can subscribe to it or read the list archive at
+            <a href="http://lists.gnu.org/mailman/listinfo/taler">http://lists.gnu.org/mailman/listinfo/taler</a>.</p>
         </div>
       </div>
 
diff --git a/index.html b/index.html
index 258c75a9..7309a0ed 100644
--- a/index.html
+++ b/index.html
@@ -72,6 +72,7 @@
           <p><a lang="en" class="btn btn-primary" href="/governments" role="button" lang="en">Learn more &raquo;</a></p>
           <p><a lang="de" class="btn btn-primary" href="/governments" role="button" lang="de">Mehr erfahren &raquo;</a></p>
           <p><a lang="fr" class="btn btn-primary" href="/governments" role="button" lang="fr">En savoir plus &raquo;</a></p>
+          <p><a lang="it" class="btn btn-primary" href="/governments" role="button" lang="it">Scopri di più &raquo;</a></p>
         </div>
         <div class="col-lg-4">
           <h2 lang="en">Anonymous</h2>
@@ -101,6 +102,7 @@
           <p><a lang="en" class="btn btn-primary" href="/citizens" role="button" lang="en">Learn more &raquo;</a></p>
           <p><a lang="de" class="btn btn-primary" href="/citizens" role="button" lang="de">Mehr erfahren &raquo;</a></p>
           <p><a lang="fr" class="btn btn-primary" href="/citizens" role="button" lang="fr">En savoir plus &raquo;</a></p>
+          <p><a lang="it" class="btn btn-primary" href="/citizens" role="button" lang="it">Scopri di più &raquo;</a></p>
         </div>
         <div class="col-lg-4">
           <h2 lang="en">Libre</h2>
@@ -123,6 +125,7 @@
           <p><a lang="en" class="btn btn-primary" href="/developers" role="button" lang="en">Learn more &raquo;</a></p>
           <p><a lang="de" class="btn btn-primary" href="/developers" role="button" lang="de">Mehr erfahren &raquo;</a></p>
           <p><a lang="fr" class="btn btn-primary" href="/developers" role="button" lang="fr">En savoir plus &raquo;</a></p>
+          <p><a lang="it" class="btn btn-primary" href="/developers" role="button" lang="it">Scopri di più &raquo;</a></p>
         </div>
       </div>
       <div class="row">
@@ -146,12 +149,13 @@
           <p><a lang="en" class="btn btn-primary" href="/merchants" role="button" lang="en">Learn more &raquo;</a></p>
           <p><a lang="de" class="btn btn-primary" href="/merchants" role="button" lang="de">Mehr erfahren &raquo;</a></p>
           <p><a lang="fr" class="btn btn-primary" href="/merchants" role="button" lang="fr">En savoir plus &raquo;</a></p>
+          <p><a lang="it" class="btn btn-primary" href="/merchants" role="button" lang="it">Scopri di più &raquo;</a></p>
         </div>
         <div class="col-lg-4">
           <h2 lang="en">Reserves</h2>
           <h2 lang="de">Reserven</h2>
           <h2 lang="fr">Réserve</h2>
-          <h2 lang="it">Riserve</h2>
+          <h2 lang="it">Riserva</h2>
 	  <p lang="en">Taler operates as a reserve. This means that Taler is not
 	     a new currency with the inherent currency fluctuation risks, but
 	     instead the digital coins correspond to existing currencies, such as
@@ -174,16 +178,18 @@
           <p><a lang="en" class="btn btn-primary" href="/investors" role="button" lang="en">Learn more &raquo;</a></p>
           <p><a lang="de" class="btn btn-primary" href="/investors" role="button" lang="de">Mehr erfahren &raquo;</a></p>
           <p><a lang="fr" class="btn btn-primary" href="/investors" role="button" lang="fr">En savoir plus &raquo;</a></p>
+          <p><a lang="it" class="btn btn-primary" href="/investors" role="button" lang="it">Scopri di più &raquo;</a></p>
         </div>
         <div class="col-lg-4">
           <h2>News</h2>
 	  <p lang="en">Taler becomes a GNU package.</p>
 	  <p lang="de">Taler wird ein GNU Paket.</p>
 	  <p lang="fr">Taler intégre le GNU project.</p>
-	  <p lang="it">Taler &amp; GNU project.</p>
+	  <p lang="it">Taler diventa parte del progetto GNU.</p>
           <p><a lang="en" class="btn btn-primary" href="/news" role="button" lang="en">Learn more &raquo;</a></p>
           <p><a lang="de" class="btn btn-primary" href="/news" role="button" lang="de">Mehr erfahren &raquo;</a></p>
           <p><a lang="fr" class="btn btn-primary" href="/news" role="button" lang="fr">En savoir plus &raquo;</a></p>
+          <p><a lang="it" class="btn btn-primary" href="/news" role="button" lang="it">Scopri di più &raquo;</a></p>
         </div>
       </div>
       <!--# include file="common/footer.inc" -->
diff --git a/merchants.html b/merchants.html
index 98d98481..09eece94 100644
--- a/merchants.html
+++ b/merchants.html
@@ -97,7 +97,7 @@
 	     puisque nous ne détenez aucune donnée sensible du client. Votre
 	     système aura signé cryptographiquement des contrats que vous pourrez
 	     utiliser en cas de litige auprès d'un tribunal.</p>
-	  <p lanf="it">Non verrai mai a conoscenza di informazioni sensibili sui tuoi clienti.
+	  <p lang="it">Non verrai mai a conoscenza di informazioni sensibili sui tuoi clienti.
 	     Dovrai assicurare che il tuo sito offra le corrette informazioni account per il tuo
 	     business, e che le conferme di pagamento dalla "banca" (mint) di Taler vengano correttamente validate.
 	     Come risultato, avrai la prova crittografica del pagamento per lo specifico contratto che hai
@@ -176,6 +176,7 @@
           <h2 lang="en">Flexible</h2>
           <h2 lang="de">Flexibel</h2>
           <h2 lang="fr">Flexible</h2>
+          <h2 lang="it">Flessibile</h2>
 	  <p lang="en">Taler can be used for different currencies (such as Euros
 	     or US Dollars) and different payment models limited only by what the
 	     mint supports in its interactions.</p>