[www] branch stable updated (2203476 -> fe200ba)

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a change to branch stable
in repository www.

    from 2203476  more clarification
     add 7587bee  adjust my maintainer name
     add fe200ba  add funding geant ngitrust dissens

No new revisions were added by this update.

Summary of changes:
 locale/de/LC_MESSAGES/messages.po |   2 +-
 locale/es/LC_MESSAGES/messages.po |   2 +-
 locale/fr/LC_MESSAGES/messages.po |   2 +-
 locale/it/LC_MESSAGES/messages.po |   2 +-
 static/images/ngi_trust.png       | Bin 0 -> 78449 bytes
 template/about.html.j2            |  16 ++++++++++++++++
 template/gnurl.html.j2            |   2 +-
 7 files changed, 21 insertions(+), 5 deletions(-)
 create mode 100644 static/images/ngi_trust.png

diff --git a/locale/de/LC_MESSAGES/messages.po 
b/locale/de/LC_MESSAGES/messages.po
index bef9c6d..0647713 100644
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2018-02-24 17:42\n"
 "Last-Translator: Torsten Grothoff <address@hidden>\n"
 "Language-Team: German <address@hidden>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
 "Generated-By: Babel 2.4.0\n"
 
 #~ msgid "GNUnet"
diff --git a/locale/es/LC_MESSAGES/messages.po 
b/locale/es/LC_MESSAGES/messages.po
index 13e165e..a19f6a5 100644
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
 "Generated-By: Babel 2.4.0\n"
 
 #~ msgid "Contact"
diff --git a/locale/fr/LC_MESSAGES/messages.po 
b/locale/fr/LC_MESSAGES/messages.po
index 2a89f10..1d1ec76 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -12,8 +12,8 @@ msgstr ""
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
 "Generated-By: Babel 2.4.0\n"
diff --git a/locale/it/LC_MESSAGES/messages.po 
b/locale/it/LC_MESSAGES/messages.po
index 433198f..ca9bf92 100644
--- a/locale/it/LC_MESSAGES/messages.po
+++ b/locale/it/LC_MESSAGES/messages.po
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: it\n"
 "Generated-By: Babel 2.4.0\n"
 
 #~ msgid "_project_title"
diff --git a/static/images/ngi_trust.png b/static/images/ngi_trust.png
new file mode 100644
index 0000000..8490a06
Binary files /dev/null and b/static/images/ngi_trust.png differ
diff --git a/template/about.html.j2 b/template/about.html.j2
index 45ef9fc..48be94e 100644
--- a/template/about.html.j2
+++ b/template/about.html.j2
@@ -118,6 +118,22 @@
             <img src="{{ url('static/images/nlnet_logo.gif') }}" alt="NLnet 
logo">
             </p>
           </li>
+          <li>
+            <p>
+            {% trans %}
+            We're receiving funding from GEANT's Next Generation Internet
+            funding "NGI TRUST" to integrate re:claimID with the GNU Taler 
payment
+            system in a pilot in order to demonstrate the practical feasibility
+            and benefits of privacy enhancing technologies for users and
+            commercial service providers. The project is called "Decentralized
+            Identities for Self-Sovereign End-users" (DISSENS).
+            {% endtrans %}
+            <br>
+            <a href="https://wiki.geant.org/display/NGITrust/";>GEANT NGI 
TRUST</a><br>
+            <img style="width: 35%" src="{{ url('static/images/ngi_trust.png') 
}}" alt="NGI TRUST logo">
+            </p>
+          </li>
+
         </ul>
        <br>
        {% trans %}
diff --git a/template/gnurl.html.j2 b/template/gnurl.html.j2
index 7393bb6..c502de7 100644
--- a/template/gnurl.html.j2
+++ b/template/gnurl.html.j2
@@ -394,7 +394,7 @@
           <h2>{{ _("Maintainer and Cryptographic signatures") }}</h3>
           <p>
             {% trans %}
-             gnurl/libgnurl is maintained by ng0.
+             gnurl/libgnurl is maintained by Nikita.
              Releases are signed with the OpenPGP Key
               <b>A88C8ADD129828D7EAC02E52E22F9BBFEE348588</b>,
              with the key fingerprint

-- 
To stop receiving notification emails like this one, please contact
address@hidden.