final

Former-commit-id: 3081363f2e37546750381f773c0b1e39a9418834

3 files changed, 17 insertions, 0 deletions

diff --git a/about.html b/about.html
index bab8e7c5..cc5f5d09 100644
--- a/about.html
+++ b/about.html
@@ -83,10 +83,19 @@
           <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" -->
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>