diff options
Diffstat (limited to 'index.html')
-rw-r--r-- | index.html | 13 |
1 files changed, 2 insertions, 11 deletions
@@ -5,6 +5,7 @@ <title lang="en">GNU Taler - Taxable Anonymous Libre Electronic Reserves</title> <title lang="fr">GNU Taler - Taxable Anonyme Libre Electronique Réserve</title> <title lang="de">GNU Taler - Taxable Anonyme Liberal Electronische Reserven</title> + <title lang="it">GNU Taler</title> <meta name="description" content="Anonymous electronic payments for civil society"> <!--# include file="common/header.inc" --> </head> @@ -105,12 +106,8 @@ <h2 lang="en">Libre</h2> <h2 lang="de">Liberal</h2> <h2 lang="fr">Libre</h2> -<<<<<<< HEAD <h2 lang="it">Libre</hr> - <p lang="en">Taler is free software implementing an open protocol. -======= <p lang="en">Taler is free software from <a href="http://www.gnu.org/">GNU</a> implementing an open protocol. ->>>>>>> 82316c4625b8dced25adb1bdabe182a74b648f83 Anybody is welcome to inspect our code and integrate our reference implementation into their applications.</p> <p lang="de">Taler ist freie Software des <a href="http://www.gnu.org/">GNU Projektes</a>, welche ein offenes Protokoll @@ -180,16 +177,10 @@ </div> <div class="col-lg-4"> <h2>News</h2> -<<<<<<< HEAD - <p lang="en">Video of Taler presentation at FOSSA now online.</p> - <p lang="de">Video der Taler Präsentation von FOSSA jetzt online.</p> - <p lang="fr">Video du présentation de Taler à FOSSA disponible.</p> - <p lang="it">Il video della presentazione di Taler a FOSSA è ora online.</p> -======= <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> ->>>>>>> 82316c4625b8dced25adb1bdabe182a74b648f83 + <p lang="it">Taler & GNU project.</p> <p><a lang="en" class="btn btn-primary" href="/news" role="button" lang="en">Learn more »</a></p> <p><a lang="de" class="btn btn-primary" href="/news" role="button" lang="de">Mehr erfahren »</a></p> <p><a lang="fr" class="btn btn-primary" href="/news" role="button" lang="fr">En savoir plus »</a></p> |