fix footer

1 files changed, 134 insertions, 125 deletions

diff --git a/locale/de/LC_MESSAGES/messages.po b/locale/de/LC_MESSAGES/messages.po
index 430c309b..5e43e578 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: 2019-06-25 21:47+0200\n"
+"POT-Creation-Date: 2019-06-27 13:33+0200\n"
 "PO-Revision-Date: 2017-06-02 09:46+0100\n"
 "Last-Translator: Stefan Kügel <skuegel@web.de>\n"
 "Language-Team: de <LL@li.org, de@taler.net>\n"
@@ -13,83 +13,6 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n!=1)\n"
 "Generated-By: Babel 2.4.0\n"
 
-#: about.html.j2:16
-msgid ""
-"GNU maintainer. Network security &amp; privacy researcher. Software "
-"architect."
-msgstr ""
-"GNU Maintainer. Netzwerksicherheit und Privatsphäre. Software-Architekt."
-
-#: about.html.j2:21
-msgid ""
-"Entrepreneur, Investor, Fortune 100 CIO, IT company director in different "
-"industries, …."
-msgstr ""
-"Unternehmer, Investor, CIO bei Marktführern, Leiter von IT-Firmen in "
-"verschiedenen Branchen..."
-
-#: about.html.j2:28
-msgid "Applied cryptography. Contact to W3c &amp; Tor."
-msgstr "Angewandte Kryptografie. Ansprechpartner für W3C und TOR."
-
-#: about.html.j2:33
-msgid "Theoretical foundations."
-msgstr "Theoretische Grundlagen."
-
-#: about.html.j2:38
-msgid "Founder of the GNU project. Ethical guidance and licensing."
-msgstr "Gründer des GNU project. Ethische Richtlinien und Lizenzvergabe."
-
-#: about.html.j2:45
-msgid "PhD Student, TU Munich. Currently teaching."
-msgstr "Doktorand an der TU München. Zurzeit lehrend tätig."
-
-#: about.html.j2:50
-msgid "PhD Student, Inria.."
-msgstr "Doktorand, Inria."
-
-#: about.html.j2:55
-msgid "Software engineer."
-msgstr "Software-Ingenieur."
-
-#: about.html.j2:62
-msgid "Sustainable business development."
-msgstr "Nachhaltige Unternehmensentwicklung."
-
-#: about.html.j2:66
-msgid "Software engineer. Works on libebics."
-msgstr "Software-Ingenieur. Arbeitet an libebics."
-
-#: about.html.j2:72 about.html.j2:76 about.html.j2:80
-msgid "Translator (Spanish)"
-msgstr "Übersetzer (Spanisch)."
-
-#: about.html.j2:86 about.html.j2:90 about.html.j2:94
-msgid "Translator (Italian)"
-msgstr "Übersetzer (Italienisch)."
-
-#: about.html.j2:98
-#, fuzzy
-#| msgid "Translator (Spanish)"
-msgid "Translator (German)"
-msgstr "Übersetzer (Deutsch)."
-
-#: about.html.j2:104
-msgid "Hardware security module"
-msgstr "Hardware-Sicherheitsmodul"
-
-#: about.html.j2:108
-msgid "Risk management"
-msgstr "Risikomanagement"
-
-#: about.html.j2:112
-msgid "PhD student, TU Munich. Currently teaching."
-msgstr "Doktorand an der TU München. Zurzeit lehrend tätig."
-
-#: about.html.j2:118
-msgid "Software engineer. Works on Android wallet."
-msgstr "Software-Ingenieur. Arbeitet an einer Android-Geldbörse."
-
 #: architecture.html.j2:6
 msgid "Taler System Architecture"
 msgstr "Systemarchitektur von Taler"
@@ -677,16 +600,17 @@ msgstr "In welchem Zusammenhang steht Taler mit Bitcoin oder Blockchains?"
 #| "Taler is not based on proof-of-work or any other distributed consensus\n"
 #| "mechanism.  Instead Taler is based on blind signatures.</p>\n"
 msgid ""
-"<p>Taler does not use any Blockchain technology or Bitcoin directly. Taler "
-"is not based on proof-of-work or any other distributed consensus mechanism. "
-"Instead Taler is based on blind signatures.</p>"
+"<p>Taler does not require any Blockchain technology, and is also not based "
+"on proof-of-work or any other distributed consensus mechanism. Instead, "
+"Taler is based on blind signatures. However, it is theoretically possible to "
+"combine Taler with peer-to-peer crypto-currencies like Bitcoin.</p>"
 msgstr ""
 "Taler verwendet keine Blockchain-Technologie oder Bitcoin selbst. Auch auf "
 "elektronisches gegenseitiges Beglaubigen in einem Web-of-trust- oder proof-"
 "of-work-Verfahren verzichtet Taler. Stattdessen setzt Taler auf Verfahren "
 "mit blinden Signaturen."
 
-#: faq.html.j2:11
+#: faq.html.j2:13
 #, fuzzy
 #| msgid ""
 #| "<p>It would be possible, however, to withdraw coins denominated in\n"
@@ -702,11 +626,11 @@ msgstr ""
 "einer dafür geeigneten Wechselstube zu überweisen. Dies brächte gegenüber "
 "Bitcoin sogar den Vorteil von sofortigen Zahlungsbestätigungen."
 
-#: faq.html.j2:18
+#: faq.html.j2:20
 msgid "Where is the balance in my wallet stored?"
 msgstr "Wo ist der Münzbestand in meiner Taler-Geldbörse gespeichert?"
 
-#: faq.html.j2:19
+#: faq.html.j2:21
 #, fuzzy
 #| msgid ""
 #| "<p>Your wallet stores digital coins and thus ultimately your computer\n"
@@ -722,11 +646,11 @@ msgstr ""
 "speichert dagegen auf einem Konto, das sie treuhänderisch verwaltet, die "
 "Forderungen von noch nicht gebuchten Münzen."
 
-#: faq.html.j2:25
+#: faq.html.j2:27
 msgid "What if my wallet is lost?"
 msgstr "Was passiert bei Verlust der Taler-Geldbörse?"
 
-#: faq.html.j2:26
+#: faq.html.j2:28
 #, fuzzy
 #| msgid ""
 #| "<p>Since the digital coins of value in your wallet are anonymized, the\n"
@@ -743,7 +667,7 @@ msgstr ""
 "wiederherstellen. Wie bei echten Geldbörsen mit Banknoten und Münzen sind "
 "ihre Eigentümer allein verantwortlich für deren Sicherung."
 
-#: faq.html.j2:32
+#: faq.html.j2:34
 #, fuzzy
 #| msgid ""
 #| "<p>The risk of losing a wallet can be mitigated by making backups or\n"
@@ -756,11 +680,11 @@ msgstr ""
 "man Backups von ihnen anfertigt oder ihren Bestand an digitalen Münzen "
 "niedrig hält."
 
-#: faq.html.j2:37
+#: faq.html.j2:39
 msgid "What if my computer is hacked?"
 msgstr "Was ist, wenn mein Computer gehackt wurde?"
 
-#: faq.html.j2:38
+#: faq.html.j2:40
 #, fuzzy
 #| msgid ""
 #| "<p>In case of a compromise of one of your devices, an attacker can\n"
@@ -776,13 +700,13 @@ msgstr ""
 "an, den Bestand regelmäßig zu kontrollieren, um einen solchen Einbruch "
 "festzustellen."
 
-#: faq.html.j2:44
+#: faq.html.j2:46
 msgid "Can I send money to my friend with Taler?"
 msgstr ""
 "Kann ich mit Taler anderen Personen oder Freunden meine digitalen Münzen "
 "senden?"
 
-#: faq.html.j2:45
+#: faq.html.j2:47
 #, fuzzy
 #| msgid ""
 #| "<p>If your friend provides goods or services for you in exchange for a\n"
@@ -798,7 +722,7 @@ msgstr ""
 "einrichten, um deine Zahlung von der Taler-Geldbörse auf dem Girokonto ihrer "
 "Geschäftsbank zu erhalten."
 
-#: faq.html.j2:50
+#: faq.html.j2:52
 #, fuzzy
 #| msgid ""
 #| "<p>Future versions of the Taler wallet may allow exchanging coins\n"
@@ -810,11 +734,11 @@ msgstr ""
 "Zukünftige Versionen der Taler-Geldbörse sehen vor, unter Freunden auch "
 "direkt digitale Münzen auszutauschen."
 
-#: faq.html.j2:56
+#: faq.html.j2:58
 msgid "How does Taler handle payments in different currencies?"
 msgstr "Wie geht Taler um mit digitalen Münzen anderer Währungen?"
 
-#: faq.html.j2:57
+#: faq.html.j2:59
 #, fuzzy
 #| msgid ""
 #| "<p>Taler wallets can store digital coins corresponding to multiple\n"
@@ -827,18 +751,18 @@ msgstr ""
 "die in unterschiedlichen Währungen wie Euro, US-Dollar oder Bitcoin notiert "
 "sind."
 
-#: faq.html.j2:61
+#: faq.html.j2:63
 #, fuzzy
 #| msgid ""
 #| "<p>Taler currently does not offer conversion between currencies.</p>\n"
 msgid "<p>Taler currently does not offer conversion between currencies.</p>"
 msgstr "Taler bietet jedoch derzeitig keinen Umtausch zwischen Währungen."
 
-#: faq.html.j2:65
+#: faq.html.j2:67
 msgid "How does Taler protect my privacy?"
 msgstr "Wie schützt Taler meine privaten Daten?"
 
-#: faq.html.j2:66
+#: faq.html.j2:68
 #, fuzzy
 #| msgid ""
 #| "<p>Your wallet stores digital coins that are <a\n"
@@ -859,11 +783,11 @@ msgstr ""
 "privaten Daten, weil die Taler-Wechselstube dadurch keine Kenntnis davon "
 "erlangt, welche der Münzen von welchen Käufern sie signiert."
 
-#: faq.html.j2:77
+#: faq.html.j2:79
 msgid "How much does it cost?"
 msgstr ""
 
-#: faq.html.j2:78
+#: faq.html.j2:80
 msgid ""
 "<p>The Taler protocol allows any exchange to set its own fee structure, "
 "allowing operators to set fees for withdrawing, depositing, refreshing or "
@@ -876,11 +800,11 @@ msgid ""
 "regulator and could thus easily be 10x higher.</p>"
 msgstr ""
 
-#: faq.html.j2:93
+#: faq.html.j2:95
 msgid "Does Taler work with international payments?"
 msgstr ""
 
-#: faq.html.j2:94
+#: faq.html.j2:96
 msgid ""
 "<p>Taler's wallet supports multiple currencies, but the system currently "
 "does not support conversion between currencies. However, in principle an "
@@ -891,24 +815,24 @@ msgid ""
 "future.</p>"
 msgstr ""
 
-#: faq.html.j2:107
+#: faq.html.j2:109
 msgid "How does Taler relate to the (European) Electronic Money Directive?"
 msgstr ""
 
-#: faq.html.j2:108
+#: faq.html.j2:110
 msgid ""
 "<p>We believe the European Electronic Money Directive provides part of the "
 "regulatory framework a Taler exchange with coins denominated in Euros would "
 "have to follow.</p>"
 msgstr ""
 
-#: faq.html.j2:116
+#: faq.html.j2:118
 msgid ""
 "What bank would guarantee the conversion between Taler coins and bank money "
 "in regular bank accounts?"
 msgstr ""
 
-#: faq.html.j2:117
+#: faq.html.j2:119
 msgid ""
 "<p>The exchange would be operated by a bank or in cooperation with a bank, "
 "and that bank would hold the funds in escrow. Note that this bank could be a "
@@ -918,13 +842,13 @@ msgid ""
 "Taler coins into regular bank money.</p>"
 msgstr ""
 
-#: faq.html.j2:127
+#: faq.html.j2:129
 msgid ""
 "To whom would consumers complain to in case of non-conversion or non-"
 "compliance?"
 msgstr ""
 
-#: faq.html.j2:128
+#: faq.html.j2:130
 msgid ""
 "<p>Any exchange should be audited by one or more independent auditors. "
 "Merchants and consumer wallets will report certain issues automatically to "
@@ -933,11 +857,11 @@ msgid ""
 "respective regulatory authorities, or even the general public.</p>"
 msgstr ""
 
-#: faq.html.j2:138
+#: faq.html.j2:140
 msgid "Are there any projects already using Taler?"
 msgstr ""
 
-#: faq.html.j2:139
+#: faq.html.j2:141
 msgid ""
 "<p>We are aware of several businesses running exploratory projects or having "
 "developed working prototypes. We are also in discussions with several "
@@ -947,11 +871,11 @@ msgid ""
 "gnunet.org/bugs/\">our bugtracker</a> for a list of open issues).</p>"
 msgstr ""
 
-#: faq.html.j2:151
+#: faq.html.j2:153
 msgid "Does Taler support recurring payments?"
 msgstr ""
 
-#: faq.html.j2:153
+#: faq.html.j2:155
 msgid ""
 "<p>Today, our wallet implementation does not support recurring payments. "
 "Recurring payments, where some fixed amount is paid on a regular basis are "
@@ -2408,6 +2332,83 @@ msgstr "Taler in den Medien"
 msgid "SchemaFuzz"
 msgstr ""
 
+#: team.html.j2:16
+msgid ""
+"GNU maintainer. Network security &amp; privacy researcher. Software "
+"architect."
+msgstr ""
+"GNU Maintainer. Netzwerksicherheit und Privatsphäre. Software-Architekt."
+
+#: team.html.j2:21
+msgid ""
+"Entrepreneur, Investor, Fortune 100 CIO, IT company director in different "
+"industries, …."
+msgstr ""
+"Unternehmer, Investor, CIO bei Marktführern, Leiter von IT-Firmen in "
+"verschiedenen Branchen..."
+
+#: team.html.j2:28
+msgid "Applied cryptography. Contact to W3c &amp; Tor."
+msgstr "Angewandte Kryptografie. Ansprechpartner für W3C und TOR."
+
+#: team.html.j2:33
+msgid "Theoretical foundations."
+msgstr "Theoretische Grundlagen."
+
+#: team.html.j2:38
+msgid "Founder of the GNU project. Ethical guidance and licensing."
+msgstr "Gründer des GNU project. Ethische Richtlinien und Lizenzvergabe."
+
+#: team.html.j2:45
+msgid "PhD Student, TU Munich. Currently teaching."
+msgstr "Doktorand an der TU München. Zurzeit lehrend tätig."
+
+#: team.html.j2:50
+msgid "PhD Student, Inria.."
+msgstr "Doktorand, Inria."
+
+#: team.html.j2:55
+msgid "Software engineer."
+msgstr "Software-Ingenieur."
+
+#: team.html.j2:62
+msgid "Sustainable business development."
+msgstr "Nachhaltige Unternehmensentwicklung."
+
+#: team.html.j2:66
+msgid "Software engineer. Works on libebics."
+msgstr "Software-Ingenieur. Arbeitet an libebics."
+
+#: team.html.j2:72 team.html.j2:76 team.html.j2:80
+msgid "Translator (Spanish)"
+msgstr "Übersetzer (Spanisch)."
+
+#: team.html.j2:86 team.html.j2:90 team.html.j2:94
+msgid "Translator (Italian)"
+msgstr "Übersetzer (Italienisch)."
+
+#: team.html.j2:98
+#, fuzzy
+#| msgid "Translator (Spanish)"
+msgid "Translator (German)"
+msgstr "Übersetzer (Deutsch)."
+
+#: team.html.j2:104
+msgid "Hardware security module"
+msgstr "Hardware-Sicherheitsmodul"
+
+#: team.html.j2:108
+msgid "Risk management"
+msgstr "Risikomanagement"
+
+#: team.html.j2:112
+msgid "PhD student, TU Munich. Currently teaching."
+msgstr "Doktorand an der TU München. Zurzeit lehrend tätig."
+
+#: team.html.j2:118
+msgid "Software engineer. Works on Android wallet."
+msgstr "Software-Ingenieur. Arbeitet an einer Android-Geldbörse."
+
 #: common/base.j2:5
 msgid "GNU Taler"
 msgstr "Das Taler-Bezahlsystem"
@@ -2416,21 +2417,19 @@ msgstr "Das Taler-Bezahlsystem"
 msgid "Taxable Anonymous Libre Electronic Reserves"
 msgstr "Taxierbare Anonyme Liberale Elektronische Reserven"
 
-#: common/footer.j2.inc:11
+#: common/footer.j2.inc:11 common/navigation.j2.inc:18
 #, fuzzy
-#| msgid "About us"
-msgid "About"
-msgstr "Über uns"
+#| msgid "The Team"
+msgid "Team"
+msgstr "Das Taler-Team"
 
 #: common/footer.j2.inc:12
 msgid "Contact"
 msgstr ""
 
 #: common/footer.j2.inc:17
-#, fuzzy
-#| msgid "Investors"
-msgid "For Investors"
-msgstr "Investoren"
+msgid "GSoc 2018"
+msgstr ""
 
 #: common/footer.j2.inc:18
 #, fuzzy
@@ -2448,7 +2447,13 @@ msgstr ""
 msgid "Bibliography"
 msgstr "Bibliografie von GNU Taler"
 
-#: common/footer.j2.inc:34
+#: common/footer.j2.inc:33
+msgid ""
+"We are grateful for support and free hosting of this site by <a href='http://"
+"www.bfh.ch/'>BFH</a>"
+msgstr ""
+
+#: common/footer.j2.inc:35
 msgid ""
 "This page was created using <a href='https://www.gnu.org/'>Free Software</a> "
 "only."
@@ -2459,18 +2464,22 @@ msgid "Features"
 msgstr ""
 
 #: common/navigation.j2.inc:16
-msgid "Design"
+msgid "Principles"
 msgstr ""
 
 #: common/navigation.j2.inc:17
 msgid "Docs"
 msgstr ""
 
-#: common/navigation.j2.inc:18
 #, fuzzy
-#| msgid "The Team"
-msgid "Team"
-msgstr "Das Taler-Team"
+#~| msgid "About us"
+#~ msgid "About"
+#~ msgstr "Über uns"
+
+#, fuzzy
+#~| msgid "Investors"
+#~ msgid "For Investors"
+#~ msgstr "Investoren"
 
 #~ msgid "Citizens"
 #~ msgstr "Bürger"