From 7adf8d31a3d1e1219c0e762dcfc1e4c872882863 Mon Sep 17 00:00:00 2001
From: "G.B" <greta.brev@outlook.com>
Date: Sun, 22 Mar 2015 17:09:45 +0100
Subject: index2

Former-commit-id: b7d1548f4b2f1ee6434467499d06447408bb8a5c
---
 about.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'about.html')

diff --git a/about.html b/about.html
index e49bc55e..daa88f63 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 -->
-- 
cgit v1.2.3


From 92ece7bda3c33ec76c6085d30da30cbf48c0a313 Mon Sep 17 00:00:00 2001
From: "G.B" <greta.brev@outlook.com>
Date: Sun, 22 Mar 2015 17:21:32 +0100
Subject: about

Former-commit-id: 343fad378f36f3f0cb2c057185f2ee098fd69daa
---
 about.html | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'about.html')

diff --git a/about.html b/about.html
index daa88f63..96136fa8 100644
--- a/about.html
+++ b/about.html
@@ -26,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>
@@ -33,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">
@@ -47,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">
@@ -67,12 +73,14 @@
           <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>
 
-- 
cgit v1.2.3


From 165dcdfa6e232ec04898f5a557fc59da1e1e66ab Mon Sep 17 00:00:00 2001
From: "G.B" <greta.brev@outlook.com>
Date: Sun, 22 Mar 2015 22:24:51 +0100
Subject: translation to Italian-developers

Former-commit-id: 81277605f3c1b5f9084efa317c44ede600e205bf
---
 about.html      | 5 +++++
 developers.html | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'about.html')

diff --git a/about.html b/about.html
index 96136fa8..f08622a2 100644
--- a/about.html
+++ b/about.html
@@ -82,6 +82,11 @@
           <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</p>
+          <p lang="it">Traduttrici</p>
+        </div>  
       </div>
 
       <!--# include file="common/footer.inc" -->
diff --git a/developers.html b/developers.html
index d3f6d0b0..21568759 100644
--- a/developers.html
+++ b/developers.html
@@ -153,7 +153,7 @@
 	     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>
-- 
cgit v1.2.3


From 7130549c718667ae9325a498a9e0c9a84ff66e6b Mon Sep 17 00:00:00 2001
From: "G.B" <greta.brev@outlook.com>
Date: Sun, 22 Mar 2015 22:38:56 +0100
Subject: about

Former-commit-id: 9551ab1765b87f21ed25c6082a57c289a1cc6ba3
---
 about.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'about.html')

diff --git a/about.html b/about.html
index f08622a2..bab8e7c5 100644
--- a/about.html
+++ b/about.html
@@ -84,8 +84,8 @@
         </div>
         <div class="col-lg-4">
           <h2>Greta Breveglieri & Ylenia Baldanza</h2>
-          <p lang="en">Translators</p>
-          <p lang="it">Traduttrici</p>
+          <p lang="en">Translators and best fan ever</p>
+          <p lang="it">Traduttrici e migliori fan mai avute</p>
         </div>  
       </div>
 
-- 
cgit v1.2.3


From 44e6a0d0a98fbe70a3eab7d7218525c5c1e0b142 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Mon, 23 Mar 2015 13:59:58 +0100
Subject: adding a few missing translations

Former-commit-id: 70538e29b9e8925da767e258f707b6e90c368521
---
 about.html      | 6 ++++--
 developers.html | 7 +++++++
 merchants.html  | 1 +
 3 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'about.html')

diff --git a/about.html b/about.html
index f08622a2..a611a225 100644
--- a/about.html
+++ b/about.html
@@ -83,10 +83,12 @@
           <p lang="it">Realizzando pensieri profondi</p>
         </div>
         <div class="col-lg-4">
-          <h2>Greta Breveglieri & Ylenia Baldanza</h2>
+          <h2>Greta Breveglieri &amp; Ylenia Baldanza</h2>
           <p lang="en">Translators</p>
+          <p lang="de">&Uuml;bersetzer</p>
+          <p lang="fr">Traductrice</p>
           <p lang="it">Traduttrici</p>
-        </div>  
+        </div>
       </div>
 
       <!--# include file="common/footer.inc" -->
diff --git a/developers.html b/developers.html
index 21568759..840b5cda 100644
--- a/developers.html
+++ b/developers.html
@@ -159,12 +159,19 @@
           <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/merchants.html b/merchants.html
index e0ec2de2..09eece94 100644
--- a/merchants.html
+++ b/merchants.html
@@ -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>
-- 
cgit v1.2.3


From 3dd9af2ae672fcf869618346bb6278e754a6955b Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Tue, 24 Mar 2015 15:46:54 +0100
Subject: merge

Former-commit-id: 755750f13cc04e29ad19b30cbcea85eef7b7849d
---
 about.html | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'about.html')

diff --git a/about.html b/about.html
index cc5f5d09..a74e180f 100644
--- a/about.html
+++ b/about.html
@@ -83,19 +83,12 @@
           <p lang="it">Realizzando pensieri profondi</p>
         </div>
         <div class="col-lg-4">
-<<<<<<< HEAD
           <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>
-        </div>  
-=======
-          <h2>Greta Breveglieri &amp; Ylenia Baldanza</h2>
-          <p lang="en">Translators</p>
           <p lang="de">&Uuml;bersetzer</p>
           <p lang="fr">Traductrice</p>
-          <p lang="it">Traduttrici</p>
         </div>
->>>>>>> 70538e29b9e8925da767e258f707b6e90c368521
       </div>
 
       <!--# include file="common/footer.inc" -->
-- 
cgit v1.2.3