aboutsummaryrefslogtreecommitdiff
path: root/index.html
diff options
context:
space:
mode:
authorG.B <greta.brev@outlook.com>2015-03-22 11:00:39 +0100
committerG.B <greta.brev@outlook.com>2015-03-22 11:00:39 +0100
commit329df23570cfe6167fb1359e51573c5274b061b1 (patch)
tree1776d120e597497e205c2f2182fc5403b2e1d042 /index.html
parent10d802907a24a1020d5ebf1a495d44c390f37a4c (diff)
parent655d6715c42c94c453ab6b8de4d1a6fa492beeb2 (diff)
downloadwww-329df23570cfe6167fb1359e51573c5274b061b1.tar.gz
www-329df23570cfe6167fb1359e51573c5274b061b1.zip
our translations to Italian
Former-commit-id: 5eddfa9f0dd8863a853f1e995209e92f8d4c44b1
Diffstat (limited to 'index.html')
-rw-r--r--index.html22
1 files changed, 18 insertions, 4 deletions
diff --git a/index.html b/index.html
index b38f6cc7..9a56f790 100644
--- a/index.html
+++ b/index.html
@@ -2,7 +2,9 @@
2<html> 2<html>
3 <head> 3 <head>
4 <meta charset="utf-8"> 4 <meta charset="utf-8">
5 <title lang="en">Taler - Taxable Anonymous Libre Electronic Reserves</title> 5 <title lang="en">GNU Taler - Taxable Anonymous Libre Electronic Reserves</title>
6 <title lang="fr">GNU Taler - Taxable Anonyme Libre Electronique Réserve</title>
7 <title lang="de">GNU Taler - Taxable Anonyme Liberal Electronische Reserven</title>
6 <meta name="description" content="Anonymous electronic payments for civil society"> 8 <meta name="description" content="Anonymous electronic payments for civil society">
7 <!--# include file="common/header.inc" --> 9 <!--# include file="common/header.inc" -->
8 </head> 10 </head>
@@ -10,7 +12,9 @@
10 <div class="container"> 12 <div class="container">
11 <!--# include file="common/navigation.inc" --> 13 <!--# include file="common/navigation.inc" -->
12 <!-- Jumbotron --> 14 <!-- Jumbotron -->
13 <img width="100%" src="/images/logo-2014-medium.png"></img> 15 <div class="jumbotron">
16 <img align="middle" width="33%" src="/images/logo-2014-medium.png"></img>
17 </div>
14 <div class="jumbotron"> 18 <div class="jumbotron">
15 <h1 lang="en">Electronic payments for a liberal society!</h1> 19 <h1 lang="en">Electronic payments for a liberal society!</h1>
16 <h1 lang="de">Elektronisches Bezahlen f&uuml;r eine freiheitliche Gesellschaft!</h1> 20 <h1 lang="de">Elektronisches Bezahlen f&uuml;r eine freiheitliche Gesellschaft!</h1>
@@ -101,15 +105,19 @@
101 <h2 lang="en">Libre</h2> 105 <h2 lang="en">Libre</h2>
102 <h2 lang="de">Liberal</h2> 106 <h2 lang="de">Liberal</h2>
103 <h2 lang="fr">Libre</h2> 107 <h2 lang="fr">Libre</h2>
108<<<<<<< HEAD
104 <h2 lang="it">Libre</hr> 109 <h2 lang="it">Libre</hr>
105 <p lang="en">Taler is free software implementing an open protocol. 110 <p lang="en">Taler is free software implementing an open protocol.
111=======
112 <p lang="en">Taler is free software from <a href="http://www.gnu.org/">GNU</a> implementing an open protocol.
113>>>>>>> 82316c4625b8dced25adb1bdabe182a74b648f83
106 Anybody is welcome to inspect our code and integrate our reference 114 Anybody is welcome to inspect our code and integrate our reference
107 implementation into their applications.</p> 115 implementation into their applications.</p>
108 <p lang="de">Taler ist freie Software, welche ein offenes Protokoll 116 <p lang="de">Taler ist freie Software des <a href="http://www.gnu.org/">GNU Projektes</a>, welche ein offenes Protokoll
109 implementiert. Der Code ist frei verf&uuml;gbar und jeder ist 117 implementiert. Der Code ist frei verf&uuml;gbar und jeder ist
110 eingeladen, die Referenzimplementierung in eigene Projekte zu 118 eingeladen, die Referenzimplementierung in eigene Projekte zu
111 &uuml;bernehmen.</p> 119 &uuml;bernehmen.</p>
112 <p lang="fr">Taler est un logiciel libre exécutant un protocole 120 <p lang="fr">Taler est un logiciel libre du <a href="http://www.gnu.org/">GNU</a> exécutant un protocole
113 ouvert. Vous pouvez tous inspecter notre code et intégrer notre mise 121 ouvert. Vous pouvez tous inspecter notre code et intégrer notre mise
114 en oeuvre de référence dans vos applications.</p> 122 en oeuvre de référence dans vos applications.</p>
115 <p lang="it">Taler è un free software che utilizza un protocollo aperto. Chiunque 123 <p lang="it">Taler è un free software che utilizza un protocollo aperto. Chiunque
@@ -172,10 +180,16 @@
172 </div> 180 </div>
173 <div class="col-lg-4"> 181 <div class="col-lg-4">
174 <h2>News</h2> 182 <h2>News</h2>
183<<<<<<< HEAD
175 <p lang="en">Video of Taler presentation at FOSSA now online.</p> 184 <p lang="en">Video of Taler presentation at FOSSA now online.</p>
176 <p lang="de">Video der Taler Pr&auml;sentation von FOSSA jetzt online.</p> 185 <p lang="de">Video der Taler Pr&auml;sentation von FOSSA jetzt online.</p>
177 <p lang="fr">Video du présentation de Taler à FOSSA disponible.</p> 186 <p lang="fr">Video du présentation de Taler à FOSSA disponible.</p>
178 <p lang="it">Il video della presentazione di Taler a FOSSA è ora online.</p> 187 <p lang="it">Il video della presentazione di Taler a FOSSA è ora online.</p>
188=======
189 <p lang="en">Taler becomes a GNU package.</p>
190 <p lang="de">Taler wird ein GNU Paket.</p>
191 <p lang="fr">Taler intégre le GNU project.</p>
192>>>>>>> 82316c4625b8dced25adb1bdabe182a74b648f83
179 <p><a lang="en" class="btn btn-primary" href="/news" role="button" lang="en">Learn more &raquo;</a></p> 193 <p><a lang="en" class="btn btn-primary" href="/news" role="button" lang="en">Learn more &raquo;</a></p>
180 <p><a lang="de" class="btn btn-primary" href="/news" role="button" lang="de">Mehr erfahren &raquo;</a></p> 194 <p><a lang="de" class="btn btn-primary" href="/news" role="button" lang="de">Mehr erfahren &raquo;</a></p>
181 <p><a lang="fr" class="btn btn-primary" href="/news" role="button" lang="fr">En savoir plus &raquo;</a></p> 195 <p><a lang="fr" class="btn btn-primary" href="/news" role="button" lang="fr">En savoir plus &raquo;</a></p>
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-09 02:20:35 +0000