diff options
author | Christian Grothoff <christian@grothoff.org> | 2015-03-22 13:11:07 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2015-03-22 13:11:07 +0100 |
commit | 2a73dff7e840f5f436a4c74b10fbfcb9bc60ad81 (patch) | |
tree | 6b77b2e96aa5aa36b645393dd7f32a3416a9711b /index.html | |
parent | b76568654b8c404083ac11581ed1aa5f7a3313d5 (diff) | |
download | www-2a73dff7e840f5f436a4c74b10fbfcb9bc60ad81.tar.gz www-2a73dff7e840f5f436a4c74b10fbfcb9bc60ad81.zip |
fixing misc. minor issues with Italian integration
Former-commit-id: 9bd57e761407431f63408d286ee06c2dceefec87
Diffstat (limited to 'index.html')
-rw-r--r-- | index.html | 13 |
1 files changed, 2 insertions, 11 deletions
@@ -5,6 +5,7 @@ | |||
5 | <title lang="en">GNU 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> | 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> | 7 | <title lang="de">GNU Taler - Taxable Anonyme Liberal Electronische Reserven</title> |
8 | <title lang="it">GNU Taler</title> | ||
8 | <meta name="description" content="Anonymous electronic payments for civil society"> | 9 | <meta name="description" content="Anonymous electronic payments for civil society"> |
9 | <!--# include file="common/header.inc" --> | 10 | <!--# include file="common/header.inc" --> |
10 | </head> | 11 | </head> |
@@ -105,12 +106,8 @@ | |||
105 | <h2 lang="en">Libre</h2> | 106 | <h2 lang="en">Libre</h2> |
106 | <h2 lang="de">Liberal</h2> | 107 | <h2 lang="de">Liberal</h2> |
107 | <h2 lang="fr">Libre</h2> | 108 | <h2 lang="fr">Libre</h2> |
108 | <<<<<<< HEAD | ||
109 | <h2 lang="it">Libre</hr> | 109 | <h2 lang="it">Libre</hr> |
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. | 110 | <p lang="en">Taler is free software from <a href="http://www.gnu.org/">GNU</a> implementing an open protocol. |
113 | >>>>>>> 82316c4625b8dced25adb1bdabe182a74b648f83 | ||
114 | Anybody is welcome to inspect our code and integrate our reference | 111 | Anybody is welcome to inspect our code and integrate our reference |
115 | implementation into their applications.</p> | 112 | implementation into their applications.</p> |
116 | <p lang="de">Taler ist freie Software des <a href="http://www.gnu.org/">GNU Projektes</a>, welche ein offenes Protokoll | 113 | <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 @@ | |||
180 | </div> | 177 | </div> |
181 | <div class="col-lg-4"> | 178 | <div class="col-lg-4"> |
182 | <h2>News</h2> | 179 | <h2>News</h2> |
183 | <<<<<<< HEAD | ||
184 | <p lang="en">Video of Taler presentation at FOSSA now online.</p> | ||
185 | <p lang="de">Video der Taler Präsentation von FOSSA jetzt online.</p> | ||
186 | <p lang="fr">Video du présentation de Taler à FOSSA disponible.</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> | 180 | <p lang="en">Taler becomes a GNU package.</p> |
190 | <p lang="de">Taler wird ein GNU Paket.</p> | 181 | <p lang="de">Taler wird ein GNU Paket.</p> |
191 | <p lang="fr">Taler intégre le GNU project.</p> | 182 | <p lang="fr">Taler intégre le GNU project.</p> |
192 | >>>>>>> 82316c4625b8dced25adb1bdabe182a74b648f83 | 183 | <p lang="it">Taler & GNU project.</p> |
193 | <p><a lang="en" class="btn btn-primary" href="/news" role="button" lang="en">Learn more »</a></p> | 184 | <p><a lang="en" class="btn btn-primary" href="/news" role="button" lang="en">Learn more »</a></p> |
194 | <p><a lang="de" class="btn btn-primary" href="/news" role="button" lang="de">Mehr erfahren »</a></p> | 185 | <p><a lang="de" class="btn btn-primary" href="/news" role="button" lang="de">Mehr erfahren »</a></p> |
195 | <p><a lang="fr" class="btn btn-primary" href="/news" role="button" lang="fr">En savoir plus »</a></p> | 186 | <p><a lang="fr" class="btn btn-primary" href="/news" role="button" lang="fr">En savoir plus »</a></p> |