Merge branch 'master' of taler.net:/var/git/www

3 files changed, 35 insertions, 16 deletions

diff --git a/financial-news.html b/financial-news.html
index c5bde835..f55487e9 100644
--- a/financial-news.html
+++ b/financial-news.html
@@ -15,6 +15,19 @@
       <div class="row">
 
         <div class="col-lg-12">
+          <h2>22-12-2015: Sicherheitsforscher hacken das EC-Bezahlsystem</h2>
+          <p>Security researchers found serious security flaws in the German &quot;electronic cash&quot; system
+             which enable criminals to withdraw funds from merchant accounts based on the information printed
+             on receipts and other information obtained from public sources or point-of-sales terminals purchased
+             online.<br>
+             The German &quot;electronic cash&quot; system is based on the &quot;Poseidon&quot; protocol, for
+             which there is no publicly accessible specification or reference implementation. This has allowed 
+             such major security holes to persist for decades.
+          </p>
+          <p><a class="btn btn-info" href="http://www.zeit.de/digital/datenschutz/2015-12/electronic-cash-bezahlsystem-terminals-gehackt" role="button">Source</a></p>
+        </div>
+
+        <div class="col-lg-12">
           <h2>30-4-2015: 1970 Researchers Predicted Debit Cards Would be Great for Surveillance</h2>
           <p>&quot;Suppose you were an advisor to the head of the KGB,
           the Soviet Secret Police. Suppose you are given the
@@ -51,6 +64,7 @@
           </p>
           <p><a class="btn btn-info" href="http://www.ocregister.com/articles/gas-644344-card-fees.html" role="button">Source</a></p>
         </div>
+
         <div class="col-lg-12">
           <h2>5-12-2014: US judge rules banks can sue merchant for bad security</h2>
           <p>Merchants taking credit card data from customers now have to additionally
diff --git a/index.html b/index.html
index 552efa77..37b431da 100644
--- a/index.html
+++ b/index.html
@@ -25,31 +25,26 @@
          <h1 lang="es">¡Pagos electrónicos para una sociedad libre!</h1>
          <p lang="en">Taler is a new electronic payment system under development
             at <a href="http://www.inria.fr/">Inria</a>.  Today, this website only
-            presents the advantages our system is expected to provide.  During
-            2015, we will make more code and documentation public.  We expect to
+            presents the advantages our system is expected to provide.  We expect to
             make the payment system available to the general public in 2016.</p>
          <p lang="de">Taler ist ein neues elektronisches Zahlungssystem, welches
             bei <a href="http://www.inria.fr/">Inria</a> entwickelt wird. Zum
-            heutigen Tag zeigt diese Seite die Vorteile unseres Systems auf. Im
-            Laufe des Jahres 2015 sollen mehr Code sowie zus&auml;tzliche Dokumentation
-            &ouml;ffentlich gemacht werden. Voraussichtlicher Startpunkt des
+            heutigen Tag zeigt diese Seite die Vorteile unseres Systems auf. 
+            Voraussichtlicher Startpunkt des
             Zahlungssystems f&uuml;r den allgemeinen Gebrauch ist das Jahr
             2016.</p>
          <p lang="fr">Taler est nouveau système de paiement électronique en
             développement à <a href="http://www.inria.fr/">Inria</a>. Ce site web
             présente aujourd'hui seulement les avantages que notre système doit
-            fournir. Au cours de l'année 2015, nous ferons plus de code et de
-            documentation publique. Nous estimons pouvoir rendre le système de
+            fournir. Nous estimons pouvoir rendre le système de
             paiement disponible au grand public en 2016.</p>
          <p lang="it">Taler è un nuovo sistema di pagamento elettronico in fase di
             sviluppo presso Inria. Oggi questo sito presenta solo i vantaggi che
-            ci si aspetta il nostro sistema fornisca. Durante il 2015, renderemo pubblici
-            più codici e più documentazione. Riteniamo di poter rendere il
+            ci si aspetta il nostro sistema fornisca. Riteniamo di poter rendere il
             sistema di pagamento disponibile al pubblico nel 2016.</p>
          <p lang="es">Taler es un nuevo sistema de pagos electrónicos en desarrollo
             en <a href="http://www.inria.fr/">Inria</a>.  Hoy, este sitio web sólo
-            presenta las ventajas que nuestro sistema espera ofrecer.  Durante
-                        2015, publicaremos más información y código. Estimamos tener disponible
+            presenta las ventajas que nuestro sistema espera ofrecer.  Estimamos tener disponible
                         el sistema para el público en general en 2016.</p>
       </div>
       <div class="row">
@@ -220,11 +215,11 @@
         </div>
         <div class="col-lg-4">
           <h2>News</h2>
-          <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 lang="it">Taler diventa parte del progetto GNU.</p>
-          <p lang="es">Taler forma parte del proyecto GNU.</p>
+          <p lang="en">Taler demo online.</p>
+          <p lang="de">Taler demo online.</p>
+          <p lang="fr">Taler version démo en ligne.</p>
+          <p lang="it" note="outdated">Taler diventa parte del progetto GNU.</p>
+          <p lang="es" note="outdated">Taler forma parte del proyecto GNU.</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/news.html b/news.html
index 69c626d1..9eca45e0 100644
--- a/news.html
+++ b/news.html
@@ -17,6 +17,16 @@
 
       <div class="row">
         <div class="col-lg-12">
+          <h2>12-2015: Taler Demo for Chrome/Chromium online</h2>
+          <p>We finally have a first simple demo for Taler online. The Firefox-variant
+             still needs some love, but you can start to try out the demo using
+             the Chrome/Chromium browser at <a href="http://demo.taler.net/">demo.taler.net</a>.
+             Please provide feedback to our <a href="https://gnunet.org/bugs/">bug tracker</a>.</p>
+        </div>
+      </div>
+
+      <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