From 05295151c3ff6a4dd4ff7fee29f0375f73670cb4 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Wed, 23 Aug 2017 11:11:28 +0200 Subject: move financial news to a separate page --- financial-news.html.j2 | 43 +++++++++++++++++++++++++++++++++++++++ financial-news.html.j2.inc | 16 --------------- index.html.j2 | 6 +----- investors.html.j2 | 11 +++++++++- locale/de/LC_MESSAGES/messages.po | 41 ++++++++++++++++++++++++++----------- locale/en/LC_MESSAGES/messages.po | 41 ++++++++++++++++++++++++++----------- locale/es/LC_MESSAGES/messages.po | 41 ++++++++++++++++++++++++++----------- locale/fr/LC_MESSAGES/messages.po | 41 ++++++++++++++++++++++++++----------- locale/it/LC_MESSAGES/messages.po | 41 ++++++++++++++++++++++++++----------- news/2014-12.inc | 6 ++++-- news/2015-11.inc | 6 ++++-- news/2016-12.inc | 6 ++++-- news/2017-02.inc | 6 ++++-- news/2017-03.inc | 6 ++++-- news/2017-04.inc | 6 ++++-- news/2017-08.inc | 6 ++++-- 16 files changed, 227 insertions(+), 96 deletions(-) create mode 100644 financial-news.html.j2 delete mode 100644 financial-news.html.j2.inc diff --git a/financial-news.html.j2 b/financial-news.html.j2 new file mode 100644 index 00000000..8ebe2d42 --- /dev/null +++ b/financial-news.html.j2 @@ -0,0 +1,43 @@ +{% extends "common/base.j2" %} +{% block body_content %} + +
+
+

{{ _("Financial News") }}

+
+

+ {% trans %} + This page explains (only in English) how Taler can change ongoing + developments in the financial industry. + {% endtrans %} +

+
+
+
+ +
+
+
+ +{% include "financial-news/2017-07-20.inc" %} +{% include "financial-news/2017-04-04.inc" %} +{% include "financial-news/2017-04-03.inc" %} +{% include "financial-news/2016-10-26.inc" %} +{% include "financial-news/2016-10-24.inc" %} +{% include "financial-news/2016-10-21.inc" %} +{% include "financial-news/2016-10-15.inc" %} +{% include "financial-news/2016-07-23.inc" %} +{% include "financial-news/2015-12-22.inc" %} +{% include "financial-news/2015-04-30.inc" %} +{% include "financial-news/2015-03-17.inc" %} +{% include "financial-news/2014-12-06.inc" %} +{% include "financial-news/2014-12-05.inc" %} +{% include "financial-news/2014-11-13.inc" %} +{% include "financial-news/2014-09-10.inc" %} +{% include "financial-news/2013-09-15.inc" %} + +
+
+
+ +{% endblock body_content %} diff --git a/financial-news.html.j2.inc b/financial-news.html.j2.inc deleted file mode 100644 index 0eb64c74..00000000 --- a/financial-news.html.j2.inc +++ /dev/null @@ -1,16 +0,0 @@ -{% include "financial-news/2017-07-20.inc" %} -{% include "financial-news/2017-04-04.inc" %} -{% include "financial-news/2017-04-03.inc" %} -{% include "financial-news/2016-10-26.inc" %} -{% include "financial-news/2016-10-24.inc" %} -{% include "financial-news/2016-10-21.inc" %} -{% include "financial-news/2016-10-15.inc" %} -{% include "financial-news/2016-07-23.inc" %} -{% include "financial-news/2015-12-22.inc" %} -{% include "financial-news/2015-04-30.inc" %} -{% include "financial-news/2015-03-17.inc" %} -{% include "financial-news/2014-12-06.inc" %} -{% include "financial-news/2014-12-05.inc" %} -{% include "financial-news/2014-11-13.inc" %} -{% include "financial-news/2014-09-10.inc" %} -{% include "financial-news/2013-09-15.inc" %} diff --git a/index.html.j2 b/index.html.j2 index 9378d937..54b0cdb8 100644 --- a/index.html.j2 +++ b/index.html.j2 @@ -141,14 +141,10 @@
-
+

{{ _("Taler News") }}

{% include "news.html.j2.inc" %}
-
-

{{ _("Financial News") }}

- {% include "financial-news.html.j2.inc" %} -
{% endblock body_content %} diff --git a/investors.html.j2 b/investors.html.j2 index 551d938e..5ad01d46 100644 --- a/investors.html.j2 +++ b/investors.html.j2 @@ -85,8 +85,15 @@

{{ _("The Business Case") }}

- PDF

Download

 + PDF

{{ _("Download") }}

 +

+ {% trans %} + Our financial news page + explains in English how Taler can impact current developments in + the global payment market. + {% endtrans %} +

+ + {% endblock body_content %} diff --git a/locale/de/LC_MESSAGES/messages.po b/locale/de/LC_MESSAGES/messages.po index b0aebb17..4d7cce63 100644 --- a/locale/de/LC_MESSAGES/messages.po +++ b/locale/de/LC_MESSAGES/messages.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2017-08-22 21:13+0200\n" +"POT-Creation-Date: 2017-08-23 11:10+0200\n" "PO-Revision-Date: 2017-06-02 09:46+0100\n" "Last-Translator: Stefan Kügel \n" "Language-Team: de \n" @@ -1137,6 +1137,16 @@ msgstr "" "privaten Daten, weil die Taler-Wechselstube dadurch keine Kenntnis davon " "erlangt, welche der Münzen von welchen Käufern sie signiert." +#: financial-news.html.j2:6 +msgid "Financial News" +msgstr "Nachrichten aus der Finanzwelt" + +#: financial-news.html.j2:9 +msgid "" +"This page explains (only in English) how Taler can change ongoing " +"developments in the financial industry." +msgstr "" + #: glossary.html.j2:6 msgid "auditor" msgstr "" @@ -1959,10 +1969,6 @@ msgstr "" msgid "Taler News" msgstr "Taler-News" -#: index.html.j2:149 -msgid "Financial News" -msgstr "Nachrichten aus der Finanzwelt" - #: investors.html.j2:6 msgid "Invest in Taler!" msgstr "In Taler investieren!" @@ -2099,11 +2105,22 @@ msgstr "" msgid "The Business Case" msgstr "Der Businessplan" -#: investors.html.j2:107 +#: investors.html.j2:88 +msgid "Download" +msgstr "" + +#: investors.html.j2:91 +msgid "" +"Our financial news page explains in " +"English how Taler can impact current developments in the global payment " +"market." +msgstr "" + +#: investors.html.j2:114 msgid "Running a Taler payment service operator" msgstr "Ein Taler-Bezahlsystem als Serviceanbieter betreiben" -#: investors.html.j2:110 +#: investors.html.j2:117 #, fuzzy #| msgid "" #| "The payment service operator runs the Taler exchange.\n" @@ -2122,7 +2139,7 @@ msgstr "" "Banküberweisungen von und zu Geschäftsbanken und für den Betrieb der IT-" "Infrastruktur." -#: investors.html.j2:120 +#: investors.html.j2:127 msgid "" "Cryptographic operations, bandwidth and storage costs are less than 0.01 " "cent per transaction." @@ -2130,7 +2147,7 @@ msgstr "" "Die Kosten für die kryptographischen Berechnungen, die Bandbreite und " "Datenspeicherung betragen weniger als 0,01 Eurocent pro Transaktion." -#: investors.html.j2:122 +#: investors.html.j2:129 msgid "" "Multiple Taler transactions can be aggregated into larger wire transfers to " "merchants to minimize wire transfer costs." @@ -2139,7 +2156,7 @@ msgstr "" "können mehrere kleine Überweisungen auf das Girokonto der Verkäufer in einer " "Transaktion zusammengefasst und übertragen werden." -#: investors.html.j2:124 +#: investors.html.j2:131 msgid "" "Protocol allows the exchange to charge fees for any expensive operation " "(withdraw, deposit, refresh, refund or aggregated wire transfers)." @@ -2149,11 +2166,11 @@ msgstr "" "Geldbörse, Deponieren von Münzen, Refresh-Funktion, Erstattungen und " "aggregierte Überweisungen an Geschäftsbanken." -#: investors.html.j2:126 +#: investors.html.j2:133 msgid "Partnership with banks establishes consumer trust." msgstr "Partnerschaften mit Banken erhöhen das Kundenvertrauen." -#: investors.html.j2:128 +#: investors.html.j2:135 msgid "Partnership with free software community enables rapid deployment." msgstr "" "Partnerschaften mit der Free-Software-Bewegung ermöglichen eine rasche " diff --git a/locale/en/LC_MESSAGES/messages.po b/locale/en/LC_MESSAGES/messages.po index 019ba445..322ce944 100644 --- a/locale/en/LC_MESSAGES/messages.po +++ b/locale/en/LC_MESSAGES/messages.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2017-08-22 21:13+0200\n" +"POT-Creation-Date: 2017-08-23 11:10+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: en \n" @@ -602,6 +602,16 @@ msgid "" "knowing which coin it signed for which customer.

" msgstr "" +#: financial-news.html.j2:6 +msgid "Financial News" +msgstr "" + +#: financial-news.html.j2:9 +msgid "" +"This page explains (only in English) how Taler can change ongoing " +"developments in the financial industry." +msgstr "" + #: glossary.html.j2:6 msgid "auditor" msgstr "" @@ -1144,10 +1154,6 @@ msgstr "" msgid "Taler News" msgstr "" -#: index.html.j2:149 -msgid "Financial News" -msgstr "" - #: investors.html.j2:6 msgid "Invest in Taler!" msgstr "" @@ -1212,11 +1218,22 @@ msgstr "" msgid "The Business Case" msgstr "" -#: investors.html.j2:107 +#: investors.html.j2:88 +msgid "Download" +msgstr "" + +#: investors.html.j2:91 +msgid "" +"Our financial news page explains in " +"English how Taler can impact current developments in the global payment " +"market." +msgstr "" + +#: investors.html.j2:114 msgid "Running a Taler payment service operator" msgstr "" -#: investors.html.j2:110 +#: investors.html.j2:117 msgid "" "The payment service operator runs the Taler exchange. The exchange " "charges transaction fees to customers or merchants. Its operational " @@ -1224,29 +1241,29 @@ msgid "" "of the computing infrastructure." msgstr "" -#: investors.html.j2:120 +#: investors.html.j2:127 msgid "" "Cryptographic operations, bandwidth and storage costs are less than 0.01 " "cent per transaction." msgstr "" -#: investors.html.j2:122 +#: investors.html.j2:129 msgid "" "Multiple Taler transactions can be aggregated into larger wire transfers to " "merchants to minimize wire transfer costs." msgstr "" -#: investors.html.j2:124 +#: investors.html.j2:131 msgid "" "Protocol allows the exchange to charge fees for any expensive operation " "(withdraw, deposit, refresh, refund or aggregated wire transfers)." msgstr "" -#: investors.html.j2:126 +#: investors.html.j2:133 msgid "Partnership with banks establishes consumer trust." msgstr "" -#: investors.html.j2:128 +#: investors.html.j2:135 msgid "Partnership with free software community enables rapid deployment." msgstr "" diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po index 562dcc4f..b3c91d31 100644 --- a/locale/es/LC_MESSAGES/messages.po +++ b/locale/es/LC_MESSAGES/messages.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2017-08-22 21:13+0200\n" +"POT-Creation-Date: 2017-08-23 11:10+0200\n" "PO-Revision-Date: 2017-08-10 06:24+0200\n" "Last-Translator: \n" "Language-Team: es \n" @@ -822,6 +822,16 @@ msgstr "" "ya que impide que se conozcan las monedas utilizadas o los clientes " "involucrados.

" +#: financial-news.html.j2:6 +msgid "Financial News" +msgstr "Noticias Financieras" + +#: financial-news.html.j2:9 +msgid "" +"This page explains (only in English) how Taler can change ongoing " +"developments in the financial industry." +msgstr "" + #: glossary.html.j2:6 msgid "auditor" msgstr "Auditor" @@ -1530,10 +1540,6 @@ msgstr "" msgid "Taler News" msgstr "Noticias de Taler" -#: index.html.j2:149 -msgid "Financial News" -msgstr "Noticias Financieras" - #: investors.html.j2:6 msgid "Invest in Taler!" msgstr "¡Invierta en Taler!" @@ -1625,11 +1631,22 @@ msgstr "" msgid "The Business Case" msgstr "El Caso de los Negocios" -#: investors.html.j2:107 +#: investors.html.j2:88 +msgid "Download" +msgstr "" + +#: investors.html.j2:91 +msgid "" +"Our financial news page explains in " +"English how Taler can impact current developments in the global payment " +"market." +msgstr "" + +#: investors.html.j2:114 msgid "Running a Taler payment service operator" msgstr "Operar una plataforma de servicio de pago de Taler" -#: investors.html.j2:110 +#: investors.html.j2:117 msgid "" "The payment service operator runs the Taler exchange. The exchange " "charges transaction fees to customers or merchants. Its operational " @@ -1642,7 +1659,7 @@ msgstr "" "transferencias electrónicas y del funcionamiento de la infraestructura " "informática." -#: investors.html.j2:120 +#: investors.html.j2:127 msgid "" "Cryptographic operations, bandwidth and storage costs are less than 0.01 " "cent per transaction." @@ -1650,7 +1667,7 @@ msgstr "" "Las operaciones criptográficas, el ancho de banda y los costes de " "almacenamiento son inferiores a 0.01 centavos por transacción." -#: investors.html.j2:122 +#: investors.html.j2:129 msgid "" "Multiple Taler transactions can be aggregated into larger wire transfers to " "merchants to minimize wire transfer costs." @@ -1659,7 +1676,7 @@ msgstr "" "electrónicas más grandes de los comerciantes para reducir al mínimo los " "costes de la transferencia bancaria." -#: investors.html.j2:124 +#: investors.html.j2:131 msgid "" "Protocol allows the exchange to charge fees for any expensive operation " "(withdraw, deposit, refresh, refund or aggregated wire transfers)." @@ -1668,11 +1685,11 @@ msgstr "" "cualquier operación que tenga un coste (retirar, depositar, actualizar, " "reembolsar o realizar transferencias electrónicas agrupadas)." -#: investors.html.j2:126 +#: investors.html.j2:133 msgid "Partnership with banks establishes consumer trust." msgstr "La asociación con bancos consolida la confianza del consumidor." -#: investors.html.j2:128 +#: investors.html.j2:135 msgid "Partnership with free software community enables rapid deployment." msgstr "" "La asociación con la comunidad de software libre permite un despliegue " diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po index a22f9df6..7c7e33f7 100644 --- a/locale/fr/LC_MESSAGES/messages.po +++ b/locale/fr/LC_MESSAGES/messages.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2017-08-22 21:13+0200\n" +"POT-Creation-Date: 2017-08-23 11:10+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: fr \n" @@ -616,6 +616,16 @@ msgid "" "knowing which coin it signed for which customer.

" msgstr "" +#: financial-news.html.j2:6 +msgid "Financial News" +msgstr "" + +#: financial-news.html.j2:9 +msgid "" +"This page explains (only in English) how Taler can change ongoing " +"developments in the financial industry." +msgstr "" + #: glossary.html.j2:6 msgid "auditor" msgstr "" @@ -1158,10 +1168,6 @@ msgstr "" msgid "Taler News" msgstr "" -#: index.html.j2:149 -msgid "Financial News" -msgstr "" - #: investors.html.j2:6 msgid "Invest in Taler!" msgstr "" @@ -1226,11 +1232,22 @@ msgstr "" msgid "The Business Case" msgstr "" -#: investors.html.j2:107 +#: investors.html.j2:88 +msgid "Download" +msgstr "" + +#: investors.html.j2:91 +msgid "" +"Our financial news page explains in " +"English how Taler can impact current developments in the global payment " +"market." +msgstr "" + +#: investors.html.j2:114 msgid "Running a Taler payment service operator" msgstr "" -#: investors.html.j2:110 +#: investors.html.j2:117 msgid "" "The payment service operator runs the Taler exchange. The exchange " "charges transaction fees to customers or merchants. Its operational " @@ -1238,29 +1255,29 @@ msgid "" "of the computing infrastructure." msgstr "" -#: investors.html.j2:120 +#: investors.html.j2:127 msgid "" "Cryptographic operations, bandwidth and storage costs are less than 0.01 " "cent per transaction." msgstr "" -#: investors.html.j2:122 +#: investors.html.j2:129 msgid "" "Multiple Taler transactions can be aggregated into larger wire transfers to " "merchants to minimize wire transfer costs." msgstr "" -#: investors.html.j2:124 +#: investors.html.j2:131 msgid "" "Protocol allows the exchange to charge fees for any expensive operation " "(withdraw, deposit, refresh, refund or aggregated wire transfers)." msgstr "" -#: investors.html.j2:126 +#: investors.html.j2:133 msgid "Partnership with banks establishes consumer trust." msgstr "" -#: investors.html.j2:128 +#: investors.html.j2:135 msgid "Partnership with free software community enables rapid deployment." msgstr "" diff --git a/locale/it/LC_MESSAGES/messages.po b/locale/it/LC_MESSAGES/messages.po index dc6b7538..5116bf4b 100644 --- a/locale/it/LC_MESSAGES/messages.po +++ b/locale/it/LC_MESSAGES/messages.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2017-08-22 21:13+0200\n" +"POT-Creation-Date: 2017-08-23 11:10+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: it \n" @@ -838,6 +838,16 @@ msgstr "" "L'uso della blind signature protegge la tua privacy in quanto impedisce al " "cambio di sapere quale moneta ha firmato e per quale cliente.

" +#: financial-news.html.j2:6 +msgid "Financial News" +msgstr "" + +#: financial-news.html.j2:9 +msgid "" +"This page explains (only in English) how Taler can change ongoing " +"developments in the financial industry." +msgstr "" + #: glossary.html.j2:6 msgid "auditor" msgstr "revisore" @@ -1441,10 +1451,6 @@ msgstr "" msgid "Taler News" msgstr "" -#: index.html.j2:149 -msgid "Financial News" -msgstr "" - #: investors.html.j2:6 msgid "Invest in Taler!" msgstr "" @@ -1509,11 +1515,22 @@ msgstr "" msgid "The Business Case" msgstr "" -#: investors.html.j2:107 +#: investors.html.j2:88 +msgid "Download" +msgstr "" + +#: investors.html.j2:91 +msgid "" +"Our financial news page explains in " +"English how Taler can impact current developments in the global payment " +"market." +msgstr "" + +#: investors.html.j2:114 msgid "Running a Taler payment service operator" msgstr "" -#: investors.html.j2:110 +#: investors.html.j2:117 msgid "" "The payment service operator runs the Taler exchange. The exchange " "charges transaction fees to customers or merchants. Its operational " @@ -1521,29 +1538,29 @@ msgid "" "of the computing infrastructure." msgstr "" -#: investors.html.j2:120 +#: investors.html.j2:127 msgid "" "Cryptographic operations, bandwidth and storage costs are less than 0.01 " "cent per transaction." msgstr "" -#: investors.html.j2:122 +#: investors.html.j2:129 msgid "" "Multiple Taler transactions can be aggregated into larger wire transfers to " "merchants to minimize wire transfer costs." msgstr "" -#: investors.html.j2:124 +#: investors.html.j2:131 msgid "" "Protocol allows the exchange to charge fees for any expensive operation " "(withdraw, deposit, refresh, refund or aggregated wire transfers)." msgstr "" -#: investors.html.j2:126 +#: investors.html.j2:133 msgid "Partnership with banks establishes consumer trust." msgstr "" -#: investors.html.j2:128 +#: investors.html.j2:135 msgid "Partnership with free software community enables rapid deployment." msgstr "" diff --git a/news/2014-12.inc b/news/2014-12.inc index 311e54bf..a234919c 100644 --- a/news/2014-12.inc +++ b/news/2014-12.inc @@ -1,8 +1,10 @@

12-2014: Watch Christian Grothoff's FOSSA talk on Taler

-

+

+ Creative Commons License
"Taler" by Christian Grothoff, produced by FOSSA, Inria Rennes Bretagne Atlantique is licensed under a Creative Commons Attribution NoDerivatives 3.0 Unported License.

diff --git a/news/2015-11.inc b/news/2015-11.inc index f2526a64..df7e3b02 100644 --- a/news/2015-11.inc +++ b/news/2015-11.inc @@ -1,8 +1,10 @@

11-2015: Christian Grothoff's explains the goals behind Taler

-

+

+ Creative Commons License
"Taler" by Christian Grothoff, produced by Inria Rennes Bretagne Atlantique is licensed under a Creative Commons Attribution NoDerivatives 3.0 Unported License.

diff --git a/news/2016-12.inc b/news/2016-12.inc index 569caa5d..d45a4198 100644 --- a/news/2016-12.inc +++ b/news/2016-12.inc @@ -1,8 +1,10 @@

12-2016: Christian Grothoff explains Taler at hasgeek in Bangalore

-

+

+ Creative Commons License
"Taler" by Christian Grothoff, produced by hasgeek is licensed under a Creative Commons Attribution NoDerivatives 3.0 Unported License.

diff --git a/news/2017-02.inc b/news/2017-02.inc index 85dfd0d8..aa825e50 100644 --- a/news/2017-02.inc +++ b/news/2017-02.inc @@ -1,8 +1,10 @@

02-2017: Florian Dold explains Taler at 50p in Bangalore

-

+

+ Creative Commons License
"Taler" by Florian Dold, produced by 50p is licensed under a Creative Commons Attribution NoDerivatives 3.0 Unported License.

diff --git a/news/2017-03.inc b/news/2017-03.inc index 9d575d09..4478a038 100644 --- a/news/2017-03.inc +++ b/news/2017-03.inc @@ -1,8 +1,10 @@

03-2017: Sva explains GNU Taler at FOSSASIA in Singapore

-

+

+ Creative Commons License
"Taler" by Sva, produced by Engineers.SG is licensed under a Creative Commons Attribution NoDerivatives 3.0 Unported License.

diff --git a/news/2017-04.inc b/news/2017-04.inc index a14fc8cc..50cd9b4c 100644 --- a/news/2017-04.inc +++ b/news/2017-04.inc @@ -1,9 +1,11 @@

04-2017: Sva explains GNU Taler at EasterHegg and Torsten demonstrates it is child's play

-

+

+ Creative Commons License
"Taler" by Sva, produced by c3voc.de is licensed under a Creative Commons Attribution NoDerivatives 3.0 Unported License.

diff --git a/news/2017-08.inc b/news/2017-08.inc index 42447108..d4e0fb7b 100644 --- a/news/2017-08.inc +++ b/news/2017-08.inc @@ -1,9 +1,11 @@

08-2017: We explain GNU Taler at SHA 2017

-

+

+ Creative Commons License
"Taler" by Jeff Burdges, Christian Grothoff and Sereni-T, produced by c3voc.de is licensed under a Creative Commons Attribution NoDerivatives 3.0 Unported License.

-- cgit v1.2.3