summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
m---------build-system/taler-build-scripts0
m---------inc0
-rw-r--r--locale/de/LC_MESSAGES/messages.po11
-rw-r--r--locale/en/LC_MESSAGES/messages.po7
-rw-r--r--locale/es/LC_MESSAGES/messages.po7
-rw-r--r--locale/fr/LC_MESSAGES/messages.po42
-rw-r--r--locale/it/LC_MESSAGES/messages.po7
-rw-r--r--locale/pt/LC_MESSAGES/messages.po7
-rw-r--r--locale/ru/LC_MESSAGES/messages.po7
-rw-r--r--papers/codeblau-report-2020-q2.pdfbin0 -> 129969 bytes
-rw-r--r--papers/codeblau-response-2020-q2.pdfbin0 -> 110881 bytes
-rw-r--r--www.yml5
12 files changed, 50 insertions, 43 deletions
diff --git a/build-system/taler-build-scripts b/build-system/taler-build-scripts
-Subproject b2604317980b9cb26f1445dfb6ff82c84f9cbe6
+Subproject eaebfbb4887d9410bc89e75bd142d5213f44296
diff --git a/inc b/inc
-Subproject 6e522eaca9b5001985e4cae836174c4230cf63a
+Subproject 5b8718e28143b2b68eb65fba2de14972fedf916
diff --git a/locale/de/LC_MESSAGES/messages.po b/locale/de/LC_MESSAGES/messages.po
index 2f9ca16b..7d9f779e 100644
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -2,11 +2,11 @@ msgid ""
msgstr ""
"Project-Id-Version: German (Taler Website)\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-06-17 13:04+0200\n"
+"POT-Creation-Date: 2020-06-17 18:55+0200\n"
"PO-Revision-Date: 2020-06-17 11:10+0000\n"
"Last-Translator: Christian Grothoff <christian@grothoff.org>\n"
-"Language-Team: German <http://weblate.taler.net/projects/gnu-taler/"
-"taler-website/de/>\n"
+"Language-Team: German <http://weblate.taler.net/projects/gnu-taler/taler-"
+"website/de/>\n"
"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -1830,7 +1830,6 @@ msgstr ""
"... in the area of computing, freedom means not using proprietary software"
#: template/principles.html.j2:36
-#, python-format
msgid ""
"GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.html"
"\">Free/Libre Software</a>. For merchants, Free/Libre Software prevents "
@@ -1838,8 +1837,8 @@ msgid ""
"to process their payments. For countries, Free/Libre software means GNU "
"Taler can not compromise sovereignty by imposing restrictions or "
"requirements. And for exchange operators, transparency is crucial to satisfy "
-"<a href=\"https://en.wikipedia.org/wiki/Kerckhoffs%27s_principle"
-"\">Kerckhoff's principle</a> and to establish public confidence."
+"<a href=\"https://en.wikipedia.org/wiki/Kerckhoffs's_principle\">Kerckhoff's "
+"principle</a> and to establish public confidence."
msgstr ""
#: template/principles.html.j2:49
diff --git a/locale/en/LC_MESSAGES/messages.po b/locale/en/LC_MESSAGES/messages.po
index e884a4cc..3b5f5d2c 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: 2020-06-17 13:04+0200\n"
+"POT-Creation-Date: 2020-06-17 18:55+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: en <LL@li.org>\n"
@@ -1410,7 +1410,6 @@ msgid ""
msgstr ""
#: template/principles.html.j2:36
-#, python-format
msgid ""
"GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.html"
"\">Free/Libre Software</a>. For merchants, Free/Libre Software prevents "
@@ -1418,8 +1417,8 @@ msgid ""
"to process their payments. For countries, Free/Libre software means GNU "
"Taler can not compromise sovereignty by imposing restrictions or "
"requirements. And for exchange operators, transparency is crucial to satisfy "
-"<a href=\"https://en.wikipedia.org/wiki/Kerckhoffs%27s_principle"
-"\">Kerckhoff's principle</a> and to establish public confidence."
+"<a href=\"https://en.wikipedia.org/wiki/Kerckhoffs's_principle\">Kerckhoff's "
+"principle</a> and to establish public confidence."
msgstr ""
#: template/principles.html.j2:49
diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po
index ca01a579..07b857e4 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: 2020-06-17 13:04+0200\n"
+"POT-Creation-Date: 2020-06-17 18:55+0200\n"
"PO-Revision-Date: 2017-08-10 06:24+0200\n"
"Last-Translator: \n"
"Language-Team: es <LL@li.org>\n"
@@ -1411,7 +1411,6 @@ msgid ""
msgstr ""
#: template/principles.html.j2:36
-#, python-format
msgid ""
"GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.html"
"\">Free/Libre Software</a>. For merchants, Free/Libre Software prevents "
@@ -1419,8 +1418,8 @@ msgid ""
"to process their payments. For countries, Free/Libre software means GNU "
"Taler can not compromise sovereignty by imposing restrictions or "
"requirements. And for exchange operators, transparency is crucial to satisfy "
-"<a href=\"https://en.wikipedia.org/wiki/Kerckhoffs%27s_principle"
-"\">Kerckhoff's principle</a> and to establish public confidence."
+"<a href=\"https://en.wikipedia.org/wiki/Kerckhoffs's_principle\">Kerckhoff's "
+"principle</a> and to establish public confidence."
msgstr ""
#: template/principles.html.j2:49
diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po
index 7184fe54..dae20568 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -1,12 +1,12 @@
msgid ""
msgstr ""
"Project-Id-Version: French (Taler Website)\n"
-"Report-Msgid-Bugs-To: weblate@taler.net\n"
-"POT-Creation-Date: 2020-06-17 13:04+0200\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2020-06-17 18:55+0200\n"
"PO-Revision-Date: 2020-06-27 08:41+0000\n"
"Last-Translator: pitchum <pitchum@gramaton.org>\n"
-"Language-Team: French <http://weblate.taler.net/projects/gnu-taler/"
-"taler-website/fr/>\n"
+"Language-Team: French <http://weblate.taler.net/projects/gnu-taler/taler-"
+"website/fr/>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -299,8 +299,8 @@ msgid ""
"\"https://%(baseurl)s/pdf/taler-exchange-manual.pdf\">PDF</a>."
msgstr ""
"Manuel d'exploitation pour un bureau de change GNU Taler. Également "
-"disponible en <a href=\"https://%(baseurl)s/pdf/taler-exchange-manual.pdf\""
-">PDF</a>."
+"disponible en <a href=\"https://%(baseurl)s/pdf/taler-exchange-manual.pdf"
+"\">PDF</a>."
#: template/docs.html.j2:74
msgid "Bank Integration"
@@ -314,8 +314,8 @@ msgid ""
"a>."
msgstr ""
"Manuel pour intégrer Taler à des applications bancaires. Également "
-"disponible en <a href=\"https://%(baseurl)s/pdf/taler-bank-manual.pdf\""
-">PDF</a>."
+"disponible en <a href=\"https://%(baseurl)s/pdf/taler-bank-manual.pdf\">PDF</"
+"a>."
#: template/docs.html.j2:92
msgid "Wallet"
@@ -1656,7 +1656,16 @@ msgstr ""
"propriétaire"
#: template/principles.html.j2:36
-#, python-format
+#, fuzzy
+#| msgid ""
+#| "GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.html"
+#| "\">Free/Libre Software</a>. For merchants, Free/Libre Software prevents "
+#| "vendor lock-in meaning merchants can easily choose another service "
+#| "provider to process their payments. For countries, Free/Libre software "
+#| "means GNU Taler can not compromise sovereignty by imposing restrictions "
+#| "or requirements. And for exchange operators, transparency is crucial to "
+#| "satisfy <a href=\"https://en.wikipedia.org/wiki/Kerckhoffs%27s_principle"
+#| "\">Kerckhoff's principle</a> and to establish public confidence."
msgid ""
"GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.html"
"\">Free/Libre Software</a>. For merchants, Free/Libre Software prevents "
@@ -1664,19 +1673,18 @@ msgid ""
"to process their payments. For countries, Free/Libre software means GNU "
"Taler can not compromise sovereignty by imposing restrictions or "
"requirements. And for exchange operators, transparency is crucial to satisfy "
-"<a href=\"https://en.wikipedia.org/wiki/Kerckhoffs%27s_principle"
-"\">Kerckhoff's principle</a> and to establish public confidence."
+"<a href=\"https://en.wikipedia.org/wiki/Kerckhoffs's_principle\">Kerckhoff's "
+"principle</a> and to establish public confidence."
msgstr ""
-"GNU Taler doit être un <a href=\"https://www.gnu.org/philosophy/free-sw."
-"html\">logiciel libre</a>. Pour les commerçants, un logiciel libre empêche "
-"le verrouillage fournisseur, c'est à dire que les commerçants peuvent "
+"GNU Taler doit être un <a href=\"https://www.gnu.org/philosophy/free-sw.html"
+"\">logiciel libre</a>. Pour les commerçants, un logiciel libre empêche le "
+"verrouillage fournisseur, c'est à dire que les commerçants peuvent "
"facilement faire appel à un autre fournisseur pour traiter leurs paiements. "
"Pour un pays, un logiciel libre signifie que GNU Taler ne peut pas "
"compromettre la souveraineté en imposant des restrictions ou des exigences. "
"Et pour les opérateurs de change, la transparence est primordiale pour "
-"satisfaire au <a href=\"https://fr.wikipedia.org/wiki/"
-"Principe_de_Kerckhoffs\">principe de Kerckhoffs</a> et pour inspirer "
-"confiance."
+"satisfaire au <a href=\"https://fr.wikipedia.org/wiki/Principe_de_Kerckhoffs"
+"\">principe de Kerckhoffs</a> et pour inspirer confiance."
#: template/principles.html.j2:49
msgid ""
diff --git a/locale/it/LC_MESSAGES/messages.po b/locale/it/LC_MESSAGES/messages.po
index 658d373d..df365568 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: 2020-06-17 13:04+0200\n"
+"POT-Creation-Date: 2020-06-17 18:55+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: it <LL@li.org>\n"
@@ -1410,7 +1410,6 @@ msgid ""
msgstr ""
#: template/principles.html.j2:36
-#, python-format
msgid ""
"GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.html"
"\">Free/Libre Software</a>. For merchants, Free/Libre Software prevents "
@@ -1418,8 +1417,8 @@ msgid ""
"to process their payments. For countries, Free/Libre software means GNU "
"Taler can not compromise sovereignty by imposing restrictions or "
"requirements. And for exchange operators, transparency is crucial to satisfy "
-"<a href=\"https://en.wikipedia.org/wiki/Kerckhoffs%27s_principle"
-"\">Kerckhoff's principle</a> and to establish public confidence."
+"<a href=\"https://en.wikipedia.org/wiki/Kerckhoffs's_principle\">Kerckhoff's "
+"principle</a> and to establish public confidence."
msgstr ""
#: template/principles.html.j2:49
diff --git a/locale/pt/LC_MESSAGES/messages.po b/locale/pt/LC_MESSAGES/messages.po
index 7b760136..539c0fdd 100644
--- a/locale/pt/LC_MESSAGES/messages.po
+++ b/locale/pt/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GNU taler master\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-06-17 13:04+0200\n"
+"POT-Creation-Date: 2020-06-17 18:55+0200\n"
"PO-Revision-Date: 2018-01-28 15:27-0200\n"
"Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
"Language-Team: Brazilian Portuguese\n"
@@ -1415,7 +1415,6 @@ msgid ""
msgstr ""
#: template/principles.html.j2:36
-#, python-format
msgid ""
"GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.html"
"\">Free/Libre Software</a>. For merchants, Free/Libre Software prevents "
@@ -1423,8 +1422,8 @@ msgid ""
"to process their payments. For countries, Free/Libre software means GNU "
"Taler can not compromise sovereignty by imposing restrictions or "
"requirements. And for exchange operators, transparency is crucial to satisfy "
-"<a href=\"https://en.wikipedia.org/wiki/Kerckhoffs%27s_principle"
-"\">Kerckhoff's principle</a> and to establish public confidence."
+"<a href=\"https://en.wikipedia.org/wiki/Kerckhoffs's_principle\">Kerckhoff's "
+"principle</a> and to establish public confidence."
msgstr ""
#: template/principles.html.j2:49
diff --git a/locale/ru/LC_MESSAGES/messages.po b/locale/ru/LC_MESSAGES/messages.po
index 21feede5..df6d1ff6 100644
--- a/locale/ru/LC_MESSAGES/messages.po
+++ b/locale/ru/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-06-17 13:04+0200\n"
+"POT-Creation-Date: 2020-06-17 18:55+0200\n"
"PO-Revision-Date: 2017-12-29 11:14+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: ru <LL@li.org>\n"
@@ -1416,7 +1416,6 @@ msgid ""
msgstr ""
#: template/principles.html.j2:36
-#, python-format
msgid ""
"GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.html"
"\">Free/Libre Software</a>. For merchants, Free/Libre Software prevents "
@@ -1424,8 +1423,8 @@ msgid ""
"to process their payments. For countries, Free/Libre software means GNU "
"Taler can not compromise sovereignty by imposing restrictions or "
"requirements. And for exchange operators, transparency is crucial to satisfy "
-"<a href=\"https://en.wikipedia.org/wiki/Kerckhoffs%27s_principle"
-"\">Kerckhoff's principle</a> and to establish public confidence."
+"<a href=\"https://en.wikipedia.org/wiki/Kerckhoffs's_principle\">Kerckhoff's "
+"principle</a> and to establish public confidence."
msgstr ""
#: template/principles.html.j2:49
diff --git a/papers/codeblau-report-2020-q2.pdf b/papers/codeblau-report-2020-q2.pdf
new file mode 100644
index 00000000..55d52cdf
--- /dev/null
+++ b/papers/codeblau-report-2020-q2.pdf
Binary files differ
diff --git a/papers/codeblau-response-2020-q2.pdf b/papers/codeblau-response-2020-q2.pdf
new file mode 100644
index 00000000..205af451
--- /dev/null
+++ b/papers/codeblau-response-2020-q2.pdf
Binary files differ
diff --git a/www.yml b/www.yml
index 33d86d0a..43972683 100644
--- a/www.yml
+++ b/www.yml
@@ -26,6 +26,11 @@ staticfiles:
- robots.txt
meetingnotes:
newsposts:
+ - page: 2020-07.html
+ date: 2020-07-01
+ title: Exchange independent security audit report published
+ abstract:
+ content:
- page: 2020-04.html
date: 2020-04-01
title: Exchange ready for external security audit