summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--about.html4
-rw-r--r--citizens.html2
-rw-r--r--developers.html17
-rw-r--r--financial-news.html2
-rw-r--r--governments.html2
-rw-r--r--index.html22
-rw-r--r--investors.html2
-rw-r--r--lang.js6
-rw-r--r--merchants.html2
-rw-r--r--news.html11
10 files changed, 52 insertions, 18 deletions
diff --git a/about.html b/about.html
index e16e2de3..e49bc55e 100644
--- a/about.html
+++ b/about.html
@@ -27,7 +27,7 @@
<p lang="fr">Mégalomane local, C'est à dire, qui voudrait créer un nouveau système de paiement et un nouvel Internet ?</p>
</div>
<div class="col-lg-4">
- <h2>Julian Kirsch</h2>
+ <h2><a href="https://www.sec.in.tum.de/julian-kirsch/">Julian Kirsch</a></h2>
<p lang="en">Hacks Linux, FreeBSD, Web sites and the deep state at leisure.</p>
<p lang="de">Hackt Linux, FreeBSD, Webseiten und den Staat im Staate
in seiner Freizeit.</p>
@@ -42,7 +42,7 @@
</div>
<div class="row">
<div class="col-lg-4">
- <h2>Sree Harsha Totakura</h2>
+ <h2><a href="http://sreeharsha.totakura.in/">Sree Harsha Totakura</a></h2>
<p lang="en">Mostly harmless</p>
<p lang="de">Gr&auml;&szlig;tenteils harmlos</p>
<p lang="fr">Principalement inoffensif</p>
diff --git a/citizens.html b/citizens.html
index 75537127..74da1005 100644
--- a/citizens.html
+++ b/citizens.html
@@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8">
- <title>Taler - Taxable Anonymous Libre Electronic Reserves: Citizens</title>
+ <title>GNU Taler - Taxable Anonymous Libre Electronic Reserves: Citizens</title>
<meta name="description" content="">
<!--# include file="common/header.inc" -->
</head>
diff --git a/developers.html b/developers.html
index 481c2340..d3f6d0b0 100644
--- a/developers.html
+++ b/developers.html
@@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8">
- <title>Taler - Taxable Anonymous Libre Electronic Reserves: Developers</title>
+ <title>GNU Taler - Taxable Anonymous Libre Electronic Reserves: Developers</title>
<meta name="description" content="">
<!--# include file="common/header.inc" -->
</head>
@@ -104,7 +104,7 @@
</div>
</div>
<div class="row">
- <div class="col-lg-6">
+ <div class="col-lg-4">
<h2 lang="en">Code</h2>
<h2 lang="de">Code</h2>
<h2 lang="fr">Code</h2>
@@ -136,7 +136,7 @@
repository. Una lista delle repository pubbiche può essere trovata al nostro
<a href="http://www.git.taler.net/">GitWeb</a>.</p>
</div>
- <div class="col-lg-6">
+ <div class="col-lg-4">
<h2 lang="en">Documentation</h2>
<h2 lang="de">Dokumentation</h2>
<h2 lang="fr">Documentation</h2>
@@ -155,6 +155,17 @@
e la <a href="http://api.taler.net/">documentazione API</a>, siamo preparando un
documento integrale di progettazione che sarù presto pubblicato qui.</p>
</div>
+ <div class="col-lg-4">
+ <h2 lang="en">Discussion</h2>
+ <h2 lang="de">Diskussion</h2>
+ <h2 lang="fr">Discussion</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>
+ </div>
</div>
<!--# include file="common/footer.inc" -->
diff --git a/financial-news.html b/financial-news.html
index c67f4c52..528e1c41 100644
--- a/financial-news.html
+++ b/financial-news.html
@@ -1,7 +1,7 @@
<html>
<head>
<meta charset="utf-8">
- <title>Taler - Taxable Anonymous Libre Electronic Reserves: Financial News</title>
+ <title>GNU Taler - Taxable Anonymous Libre Electronic Reserves: Financial News</title>
<meta name="description" content="">
<!--# include file="common/header.inc" -->
</head>
diff --git a/governments.html b/governments.html
index 9f52b315..97e1d3ad 100644
--- a/governments.html
+++ b/governments.html
@@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8">
- <title>Taler - Taxable Anonymous Libre Electronic Reserves: Governments</title>
+ <title>GNU Taler - Taxable Anonymous Libre Electronic Reserves: Governments</title>
<meta name="description" content="">
<!--# include file="common/header.inc" -->
</head>
diff --git a/index.html b/index.html
index b38f6cc7..9a56f790 100644
--- a/index.html
+++ b/index.html
@@ -2,7 +2,9 @@
<html>
<head>
<meta charset="utf-8">
- <title lang="en">Taler - Taxable Anonymous Libre Electronic Reserves</title>
+ <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>
<meta name="description" content="Anonymous electronic payments for civil society">
<!--# include file="common/header.inc" -->
</head>
@@ -10,7 +12,9 @@
<div class="container">
<!--# include file="common/navigation.inc" -->
<!-- Jumbotron -->
- <img width="100%" src="/images/logo-2014-medium.png"></img>
+ <div class="jumbotron">
+ <img align="middle" width="33%" src="/images/logo-2014-medium.png"></img>
+ </div>
<div class="jumbotron">
<h1 lang="en">Electronic payments for a liberal society!</h1>
<h1 lang="de">Elektronisches Bezahlen f&uuml;r eine freiheitliche Gesellschaft!</h1>
@@ -101,15 +105,19 @@
<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, welche ein offenes Protokoll
+ <p lang="de">Taler ist freie Software des <a href="http://www.gnu.org/">GNU Projektes</a>, welche ein offenes Protokoll
implementiert. Der Code ist frei verf&uuml;gbar und jeder ist
eingeladen, die Referenzimplementierung in eigene Projekte zu
&uuml;bernehmen.</p>
- <p lang="fr">Taler est un logiciel libre exécutant un protocole
+ <p lang="fr">Taler est un logiciel libre du <a href="http://www.gnu.org/">GNU</a> exécutant un protocole
ouvert. Vous pouvez tous inspecter notre code et intégrer notre mise
en oeuvre de référence dans vos applications.</p>
<p lang="it">Taler è un free software che utilizza un protocollo aperto. Chiunque
@@ -172,10 +180,16 @@
</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&auml;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><a lang="en" class="btn btn-primary" href="/news" role="button" lang="en">Learn more &raquo;</a></p>
<p><a lang="de" class="btn btn-primary" href="/news" role="button" lang="de">Mehr erfahren &raquo;</a></p>
<p><a lang="fr" class="btn btn-primary" href="/news" role="button" lang="fr">En savoir plus &raquo;</a></p>
diff --git a/investors.html b/investors.html
index 2049b4cb..19ea21b6 100644
--- a/investors.html
+++ b/investors.html
@@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8">
- <title>Taler - Taxable Anonymous Libre Electronic Reserves: Investors</title>
+ <title>GNU Taler - Taxable Anonymous Libre Electronic Reserves: Investors</title>
<meta name="description" content="">
<!--# include file="common/header.inc" -->
</head>
diff --git a/lang.js b/lang.js
index 197b7c29..c00cf34a 100644
--- a/lang.js
+++ b/lang.js
@@ -12,9 +12,9 @@ function setLang(l)
if (supports_html5_storage()) {
sessionStorage.setItem('lang', l);
}
- if (l == 'en') document.title = 'Taler - Taxable Anonymous Libre Electronic Reserve';
- if (l == 'de') document.title = 'Taler - Taxierbare Anonyme Liberale Elektronische Reserven';
- if (l == 'fr') document.title = 'Taler - Taxable Anonyme Libre Électronique Réserve';
+ 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';
}
function get_default_lang()
diff --git a/merchants.html b/merchants.html
index 157f47ba..98d98481 100644
--- a/merchants.html
+++ b/merchants.html
@@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8">
- <title>Taler - Taxable Anonymous Libre Electronic Reserves: Merchants</title>
+ <title>GNU Taler - Taxable Anonymous Libre Electronic Reserves: Merchants</title>
<meta name="description" content="">
<!--# include file="common/header.inc" -->
</head>
diff --git a/news.html b/news.html
index f5536284..69c626d1 100644
--- a/news.html
+++ b/news.html
@@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8">
- <title>Taler - Taxable Anonymous Libre Electronic Reserves: News</title>
+ <title>GNU Taler - Taxable Anonymous Libre Electronic Reserves: News</title>
<meta name="description" content="">
<!--# include file="common/header.inc" -->
</head>
@@ -17,6 +17,15 @@
<div class="row">
<div class="col-lg-12">
+ <h2>2-2015: Taler becomes an official GNU package</h2>
+ <p>Taler was accepted into the GNU project today. GNU will offer advice,
+ advocacy and cooperation --- and host our official public
+ mailinglist <a href="mailto:taler@gnu.org">taler@gnu.org</a>.</p>
+ </div>
+ </div>
+
+ <div class="row">
+ <div class="col-lg-12">
<h2>12-2014: Watch Christian Grothoff's FOSSA talk on Taler</h2>
<p>
<video id="video" poster="/images/fossa2014.png" autobuffer height="360" width="640" controls="controls">
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-08 04:05:40 +0000