diff options
| -rw-r--r-- | common/footer.inc | 1 | ||||
| -rw-r--r-- | common/navigation.inc | 8 | ||||
| -rw-r--r-- | index.html | 13 | ||||
| -rw-r--r-- | lang.js | 3 |
4 files changed, 9 insertions, 16 deletions
diff --git a/common/footer.inc b/common/footer.inc index f6854bec..6dc786fc 100644 --- a/common/footer.inc +++ b/common/footer.inc @@ -3,6 +3,7 @@ <p lang="en">This page was created using <a href="https://www.gnu.org/">Free Software</a> only.</p> <p lang="de">Diese Seite wurde allein durch Einsatz von <a href="https://www.gnu.org/">Freier Software</a> erstellt.</p> <p lang="fr">This page was created using <a href="https://www.gnu.org/">Free Software</a> only.</p> + <p lang="it">This page was created using <a href="https://www.gnu.org/">Free Software</a> only.</p> </div> <script type="text/javascript">//<![CDATA[ loadLang(); diff --git a/common/navigation.inc b/common/navigation.inc index 0be5105d..19cd76c5 100644 --- a/common/navigation.inc +++ b/common/navigation.inc @@ -28,9 +28,9 @@ <li lang="de" class="m_investors"><a href="/investors">Investoren</a></li> <li lang="fr" class="m_investors"><a href="/investors">Investisseurs</a></li> <li lang="en" class="m_about"><a href="/about">About us</a></li> - <li lang="de" class="m_about"><a href="/about">Über uns</a></li> + <li lang="de" class="m_about"><a href="/about">Über uns</a></li> <li lang="fr" class="m_about"><a href="/about">À propos</a></li> - </ul> + </ul> </div> </div> <div class="navbar navbar-default navbar-fixed-bottom" role="navigation"> @@ -38,6 +38,6 @@ <a href="#" onclick="setLang('en');"><img src="images/gb.png" alt="English"></img></a> <a href="#" onclick="setLang('de');"><img src="images/de.png" alt="Deutsch"></img></a> <a href="#" onclick="setLang('fr');"><img src="images/fr.png" alt="Français"></img></a> + <a href="#" onclick="setLang('it');"><img src="images/it.png" alt="Italiano"></img></a> </div> - </div> - + </div> @@ -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> @@ -41,11 +41,12 @@ function setLang(l) if (l == 'en') document.title = 'GNU Taler - Taxable Anonymous Libre Electronic Reserve'; if (l == 'de') document.title = 'GNU Taler - Taxierbare Anonyme Liberale Elektronische Reserven'; if (l == 'fr') document.title = 'GNU Taler - Taxable Anonyme Libre Électronique Réserve'; + if (l == 'it') document.title = 'GNU Taler'; } function get_default_lang() { - langs = ['en', 'de', 'fr']; + langs = ['en', 'de', 'fr', 'it']; for (var i in navigator.languages) { for (var j in langs) { |