taler-www

Main taler.net website
Log | Files | Refs | Submodules | README | LICENSE
commit ddabf4d61d2c15466615f22198d00704f78e2fd5
parent 5988acb35da9a6a8a0fc295dcdc524ec7983b2b6
Author: Christian Grothoff <christian@grothoff.org>
Date:   Tue, 17 Mar 2015 15:14:29 +0100

Merge branch 'master' of taler.net:www


Former-commit-id: 02834a28bb928e6873cb8806fa848e76e7b2c072
Diffstat:

Mabout.html | 16+++++++++++-----


Mcitizens.html | 2+-


Mcommon/header.inc | 26++++++++++++++++++++++++++


Mcommon/navigation.inc | 4++--


Mdevelopers.html | 17++++++++++++++---


Mfinancial-news.html | 2+-


Mgovernments.html | 2+-


Mindex.html | 20++++++++++++--------


Minvestors.html | 2+-


Mlang.js | 34+++++++++++++++++++++++++++++++---


Mmerchants.html | 2+-


Mnews.html | 11++++++++++-


12 files changed, 111 insertions(+), 27 deletions(-)

diff --git a/about.html b/about.html
@@ -19,7 +19,7 @@
       <!-- Example row of columns -->
       <div class="row">
         <div class="col-lg-4">
-          <h2><a href="http://grothoff.org/christian/">Christian Grothoff</a></h2>
+          <h2><a href="http://grothoff.org/christian/">Dr. Christian Grothoff</a></h2>
           <p lang="en">Local megalomaniac. I mean, who'd create a new payment system and a new Internet?</p>
           <p lang="de">&Ouml;rtlicher Gr&ouml;&szlig;enwahnsinniger. Ich meine,
 	  wer w&uuml;rde schon versuchen, ein neues Zahlungssystem und ein neues
@@ -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>
@@ -54,7 +54,7 @@
           <p lang="fr">Aime SEPA.</p>
         </div>
         <div class="col-lg-4">
-          <h2><a href="https://www.stallman.org/">Richard M. Stallman</a></h2>
+          <h2><a href="https://www.stallman.org/">Dr. Richard M. Stallman</a></h2>
           <p lang="en">Ethics enthusiast</p>
           <p lang="de">Chef GNUisance</p>
           <p lang="fr">Enthousiaste Ethique</p>
@@ -62,11 +62,17 @@
       </div>
       <div class="row">
         <div class="col-lg-4">
-          <h2><a href="http://www.onete.net/">Cristina Onete</a></h2>
+          <h2><a href="http://www.onete.net/">Dr. Cristina Onete</a></h2>
           <p lang="en">Theoretically deadly</p>
           <p lang="de">Theoretisch t&ouml;tlich</p>
           <p lang="fr">Fatale (en théorie)</p>
         </div>
+        <div class="col-lg-4">
+          <h2>Dr. Nana Karlstetter</h2>
+          <p lang="en">Realizing deep thought</p>
+          <p lang="de">Des Grundes wegen</p>
+          <p lang="fr">Basse fréquence</p>
+        </div>
       </div>
 
       <!--# include file="common/footer.inc" -->
diff --git 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/common/header.inc b/common/header.inc
@@ -1,3 +1,29 @@
+    <script>
+        /*
+        @licstart  The following is the entire license notice for the
+        JavaScript code in this page.
+
+        Copyright (C) 2014,2015 GNUnet e.V.
+
+        The JavaScript code in this page is free software: you can
+        redistribute it and/or modify it under the terms of the GNU
+        General Public License (GNU GPL) as published by the Free Software
+        Foundation, either version 3 of the License, or (at your option)
+        any later version.  The code is distributed WITHOUT ANY WARRANTY;
+        without even the implied warranty of MERCHANTABILITY or FITNESS
+        FOR A PARTICULAR PURPOSE.  See the GNU GPL for more details.
+
+        As additional permission under GNU GPL version 3 section 7, you
+        may distribute non-source (e.g., minimized or compacted) forms of
+        that code without the copy of the GNU GPL normally required by
+        section 4, provided you include this license notice and a URL
+        through which recipients can access the Corresponding Source.
+
+        @licend  The above is the entire license notice
+        for the JavaScript code in this page.
+        */
+    </script>
+
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="author" content="">
diff --git a/common/navigation.inc b/common/navigation.inc
@@ -27,8 +27,8 @@
             <li lang="en" class="m_investors"><a href="/investors">Investors</a></li>
             <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&nbsp;Us</a></li>
-            <li lang="de" class="m_about"><a href="/about">&Uuml;ber Uns</a></li> 
+            <li lang="en" class="m_about"><a href="/about">About&nbsp;us</a></li>
+            <li lang="de" class="m_about"><a href="/about">&Uuml;ber uns</a></li> 
             <li lang="fr" class="m_about"><a href="/about">À&nbsp;propos</a></li>
           </ul> 
         </div>
diff --git 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>
@@ -85,7 +85,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>
@@ -110,7 +110,7 @@
 	     avec le nom du stockage respectif. Une liste des lieux de stockage
 	     publics se trouve sur notre <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>
@@ -125,6 +125,17 @@
 	     <a href="http://www.git.taler.net/">documented code</a> et l'<a href="http://api.taler.net/">API documentation</a>, nous
 	     préparons un document exhaustif qui sera publié ici prochainement.</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
@@ -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
@@ -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
@@ -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>
@@ -85,14 +89,14 @@
           <h2 lang="en">Libre</h2>
           <h2 lang="de">Liberal</h2>
           <h2 lang="fr">Libre</h2>
-	  <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.
 	     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><a lang="en" class="btn btn-primary" href="/developers" role="button" lang="en">Learn more &raquo;</a></p>
@@ -143,9 +147,9 @@
         </div>
         <div class="col-lg-4">
           <h2>News</h2>
-	  <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="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>
           <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
@@ -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
@@ -1,3 +1,29 @@
+/**
+ * @licstart  The following is the entire license notice for the
+ *  JavaScript code in this page.
+ *
+ * Copyright (C) 2014 GNUnet e.V.
+ *
+ * The JavaScript code in this page is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU
+ * General Public License (GNU GPL) as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option)
+ * any later version.  The code is distributed WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU GPL for more details.
+ *
+ * As additional permission under GNU GPL version 3 section 7, you
+ * may distribute non-source (e.g., minimized or compacted) forms of
+ * that code without the copy of the GNU GPL normally required by
+ * section 4, provided you include this license notice and a URL
+ * through which recipients can access the Corresponding Source.
+ *
+ * @licend  The above is the entire license notice
+ * for the JavaScript code in this page.
+ */
+
+// @license magnet:?xt=urn:btih:1f739d935676111cfff4b4693e3816e664797050&dn=gpl-3.0.txt GPL-v3-or-Later
+
 function supports_html5_storage() {
 	try {
 		return 'sessionStorage' in window && window['sessionStorage'] !== null;
@@ -12,9 +38,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()
@@ -51,3 +77,5 @@ function activate_menu()
 		b[i].setAttribute('class', s + ' active');
 	}
 }
+
+// @license-end
diff --git 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
@@ -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">