summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--common/footer.j2.inc16
-rw-r--r--locale/de/LC_MESSAGES/messages.po29
-rw-r--r--locale/en/LC_MESSAGES/messages.po22
-rw-r--r--locale/es/LC_MESSAGES/messages.po25
-rw-r--r--locale/fr/LC_MESSAGES/messages.po22
-rw-r--r--locale/it/LC_MESSAGES/messages.po25
-rw-r--r--locale/pt/LC_MESSAGES/messages.po25
-rw-r--r--locale/ru/LC_MESSAGES/messages.po22
-rw-r--r--principles.html.j213
9 files changed, 77 insertions, 122 deletions
diff --git a/common/footer.j2.inc b/common/footer.j2.inc
index 74c5c18..3010308 100644
--- a/common/footer.j2.inc
+++ b/common/footer.j2.inc
@@ -6,21 +6,23 @@
</div>
</div>
<div class="row">
- <div class="col-12 col-sm-6">
+ <div class="col-12 col-sm-3">
<ul class="footer-list">
<li><p><a href="team.html">{{ _("Team") }}</a></p></li>
- <li><p><a href="contact.html">{{ _("Contact") }}</a></p></li>
</ul>
</div>
- <!-- div class="col-12 col-sm-4">
+ <div class="col-12 col-sm-3">
<ul class="footer-list">
- <li><p><a href="gsoc-codeless.html.j2">{{ _("GSoc 2018") }}</a></p></li>
- <li><p><a href="developers.html">{{ _("Developer Resources") }}</a></p></li>
+ <li><p><a href="contact.html">{{ _("Contact") }}</a></p></li>
</ul>
- </div -->
- <div class="col-12 col-sm-6">
+ </div>
+ <div class="col-12 col-sm-3">
<ul class="footer-list">
<li><p><a href="faq.html">{{ _("FAQ") }}</a></p></li>
+ </ul>
+ </div>
+ <div class="col-12 col-sm-3">
+ <ul class="footer-list">
<li><p><a href="bibliography.html">{{ _("Bibliography") }}</a></p></li>
</ul>
</div>
diff --git a/locale/de/LC_MESSAGES/messages.po b/locale/de/LC_MESSAGES/messages.po
index 5e43e57..133a19d 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-27 13:33+0200\n"
+"POT-Creation-Date: 2019-06-27 14:04+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"
@@ -27,7 +27,7 @@ msgid "by"
msgstr "von"
#: bibliography.html.j2:16 bibliography.html.j2:23 bibliography.html.j2:29
-#: common/footer.j2.inc:30
+#: common/footer.j2.inc:32
msgid "and"
msgstr "und"
@@ -2423,37 +2423,27 @@ msgstr "Taxierbare Anonyme Liberale Elektronische Reserven"
msgid "Team"
msgstr "Das Taler-Team"
-#: common/footer.j2.inc:12
+#: common/footer.j2.inc:16
msgid "Contact"
msgstr ""
-#: common/footer.j2.inc:17
-msgid "GSoc 2018"
-msgstr ""
-
-#: common/footer.j2.inc:18
-#, fuzzy
-#| msgid "Developers"
-msgid "Developer Resources"
-msgstr "Entwickler"
-
-#: common/footer.j2.inc:23
+#: common/footer.j2.inc:21
msgid "FAQ"
msgstr ""
-#: common/footer.j2.inc:24
+#: common/footer.j2.inc:26
#, fuzzy
#| msgid "GNU Taler Bibliography"
msgid "Bibliography"
msgstr "Bibliografie von GNU Taler"
-#: common/footer.j2.inc:33
+#: common/footer.j2.inc:35
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
+#: common/footer.j2.inc:37
msgid ""
"This page was created using <a href='https://www.gnu.org/'>Free Software</a> "
"only."
@@ -2472,6 +2462,11 @@ msgid "Docs"
msgstr ""
#, fuzzy
+#~| msgid "Developers"
+#~ msgid "Developer Resources"
+#~ msgstr "Entwickler"
+
+#, fuzzy
#~| msgid "About us"
#~ msgid "About"
#~ msgstr "Über uns"
diff --git a/locale/en/LC_MESSAGES/messages.po b/locale/en/LC_MESSAGES/messages.po
index b6b62a0..592c779 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: 2019-06-27 13:33+0200\n"
+"POT-Creation-Date: 2019-06-27 14:04+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"
@@ -27,7 +27,7 @@ msgid "by"
msgstr ""
#: bibliography.html.j2:16 bibliography.html.j2:23 bibliography.html.j2:29
-#: common/footer.j2.inc:30
+#: common/footer.j2.inc:32
msgid "and"
msgstr ""
@@ -1557,33 +1557,25 @@ msgstr ""
msgid "Team"
msgstr ""
-#: common/footer.j2.inc:12
+#: common/footer.j2.inc:16
msgid "Contact"
msgstr ""
-#: common/footer.j2.inc:17
-msgid "GSoc 2018"
-msgstr ""
-
-#: common/footer.j2.inc:18
-msgid "Developer Resources"
-msgstr ""
-
-#: common/footer.j2.inc:23
+#: common/footer.j2.inc:21
msgid "FAQ"
msgstr ""
-#: common/footer.j2.inc:24
+#: common/footer.j2.inc:26
msgid "Bibliography"
msgstr ""
-#: common/footer.j2.inc:33
+#: common/footer.j2.inc:35
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
+#: common/footer.j2.inc:37
msgid ""
"This page was created using <a href='https://www.gnu.org/'>Free Software</a> "
"only."
diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po
index 68aeaa8..98634d8 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: 2019-06-27 13:33+0200\n"
+"POT-Creation-Date: 2019-06-27 14:04+0200\n"
"PO-Revision-Date: 2017-08-10 06:24+0200\n"
"Last-Translator: \n"
"Language-Team: es <LL@li.org>\n"
@@ -28,7 +28,7 @@ msgid "by"
msgstr "por"
#: bibliography.html.j2:16 bibliography.html.j2:23 bibliography.html.j2:29
-#: common/footer.j2.inc:30
+#: common/footer.j2.inc:32
msgid "and"
msgstr "y"
@@ -2014,33 +2014,25 @@ msgstr "Reservas Electrónicas Gravales, Anónimas y Libres"
msgid "Team"
msgstr "El Equipo"
-#: common/footer.j2.inc:12
+#: common/footer.j2.inc:16
msgid "Contact"
msgstr "Contacto"
-#: common/footer.j2.inc:17
-msgid "GSoc 2018"
-msgstr ""
-
-#: common/footer.j2.inc:18
-msgid "Developer Resources"
-msgstr "Recursos de desarrollo"
-
-#: common/footer.j2.inc:23
+#: common/footer.j2.inc:21
msgid "FAQ"
msgstr "Preguntas frecuentes"
-#: common/footer.j2.inc:24
+#: common/footer.j2.inc:26
msgid "Bibliography"
msgstr "Bibliografía"
-#: common/footer.j2.inc:33
+#: common/footer.j2.inc:35
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
+#: common/footer.j2.inc:37
msgid ""
"This page was created using <a href='https://www.gnu.org/'>Free Software</a> "
"only."
@@ -2060,6 +2052,9 @@ msgstr ""
msgid "Docs"
msgstr ""
+#~ msgid "Developer Resources"
+#~ msgstr "Recursos de desarrollo"
+
#~ msgid "About"
#~ msgstr "Acerca de GNU Taler"
diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po
index 40ec987..89b5117 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: 2019-06-27 13:33+0200\n"
+"POT-Creation-Date: 2019-06-27 14:04+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: fr <LL@li.org>\n"
@@ -29,7 +29,7 @@ msgid "by"
msgstr ""
#: bibliography.html.j2:16 bibliography.html.j2:23 bibliography.html.j2:29
-#: common/footer.j2.inc:30
+#: common/footer.j2.inc:32
msgid "and"
msgstr ""
@@ -1587,33 +1587,25 @@ msgstr ""
msgid "Team"
msgstr ""
-#: common/footer.j2.inc:12
+#: common/footer.j2.inc:16
msgid "Contact"
msgstr ""
-#: common/footer.j2.inc:17
-msgid "GSoc 2018"
-msgstr ""
-
-#: common/footer.j2.inc:18
-msgid "Developer Resources"
-msgstr ""
-
-#: common/footer.j2.inc:23
+#: common/footer.j2.inc:21
msgid "FAQ"
msgstr ""
-#: common/footer.j2.inc:24
+#: common/footer.j2.inc:26
msgid "Bibliography"
msgstr ""
-#: common/footer.j2.inc:33
+#: common/footer.j2.inc:35
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
+#: common/footer.j2.inc:37
msgid ""
"This page was created using <a href='https://www.gnu.org/'>Free Software</a> "
"only."
diff --git a/locale/it/LC_MESSAGES/messages.po b/locale/it/LC_MESSAGES/messages.po
index 62de095..4444611 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: 2019-06-27 13:33+0200\n"
+"POT-Creation-Date: 2019-06-27 14:04+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"
@@ -27,7 +27,7 @@ msgid "by"
msgstr "di"
#: bibliography.html.j2:16 bibliography.html.j2:23 bibliography.html.j2:29
-#: common/footer.j2.inc:30
+#: common/footer.j2.inc:32
msgid "and"
msgstr "e"
@@ -2020,35 +2020,27 @@ msgstr "Tassabili Anonime Libere Elettroniche Riserve"
msgid "Team"
msgstr "La Squadra"
-#: common/footer.j2.inc:12
+#: common/footer.j2.inc:16
msgid "Contact"
msgstr "Contatti"
-#: common/footer.j2.inc:17
-msgid "GSoc 2018"
-msgstr ""
-
-#: common/footer.j2.inc:18
-msgid "Developer Resources"
-msgstr "Risorse per i programmatori"
-
-#: common/footer.j2.inc:23
+#: common/footer.j2.inc:21
msgid "FAQ"
msgstr "FAQ"
-#: common/footer.j2.inc:24
+#: common/footer.j2.inc:26
#, fuzzy
#| msgid "GNU Taler Bibliography"
msgid "Bibliography"
msgstr "Bibliografia"
-#: common/footer.j2.inc:33
+#: common/footer.j2.inc:35
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
+#: common/footer.j2.inc:37
msgid ""
"This page was created using <a href='https://www.gnu.org/'>Free Software</a> "
"only."
@@ -2068,6 +2060,9 @@ msgstr ""
msgid "Docs"
msgstr ""
+#~ msgid "Developer Resources"
+#~ msgstr "Risorse per i programmatori"
+
#~ msgid "About"
#~ msgstr "Chi siamo"
diff --git a/locale/pt/LC_MESSAGES/messages.po b/locale/pt/LC_MESSAGES/messages.po
index 9fa22d1..906c4c6 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: 2019-06-27 13:33+0200\n"
+"POT-Creation-Date: 2019-06-27 14:04+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"
@@ -32,7 +32,7 @@ msgid "by"
msgstr "por"
#: bibliography.html.j2:16 bibliography.html.j2:23 bibliography.html.j2:29
-#: common/footer.j2.inc:30
+#: common/footer.j2.inc:32
msgid "and"
msgstr "e"
@@ -1978,33 +1978,25 @@ msgstr "Reservas eletrônicas livres, anônimas, tributáveis"
msgid "Team"
msgstr "A equipe"
-#: common/footer.j2.inc:12
+#: common/footer.j2.inc:16
msgid "Contact"
msgstr "Contato"
-#: common/footer.j2.inc:17
-msgid "GSoc 2018"
-msgstr ""
-
-#: common/footer.j2.inc:18
-msgid "Developer Resources"
-msgstr "Recursos para desenvolvedores"
-
-#: common/footer.j2.inc:23
+#: common/footer.j2.inc:21
msgid "FAQ"
msgstr "FAQ"
-#: common/footer.j2.inc:24
+#: common/footer.j2.inc:26
msgid "Bibliography"
msgstr "Bibliografia"
-#: common/footer.j2.inc:33
+#: common/footer.j2.inc:35
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
+#: common/footer.j2.inc:37
msgid ""
"This page was created using <a href='https://www.gnu.org/'>Free Software</a> "
"only."
@@ -2024,6 +2016,9 @@ msgstr ""
msgid "Docs"
msgstr ""
+#~ msgid "Developer Resources"
+#~ msgstr "Recursos para desenvolvedores"
+
#~ msgid "About"
#~ msgstr "Sobre"
diff --git a/locale/ru/LC_MESSAGES/messages.po b/locale/ru/LC_MESSAGES/messages.po
index e05e3a4..65e9f50 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: 2019-06-27 13:33+0200\n"
+"POT-Creation-Date: 2019-06-27 14:04+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"
@@ -33,7 +33,7 @@ msgid "by"
msgstr ""
#: bibliography.html.j2:16 bibliography.html.j2:23 bibliography.html.j2:29
-#: common/footer.j2.inc:30
+#: common/footer.j2.inc:32
msgid "and"
msgstr ""
@@ -1563,33 +1563,25 @@ msgstr ""
msgid "Team"
msgstr ""
-#: common/footer.j2.inc:12
+#: common/footer.j2.inc:16
msgid "Contact"
msgstr ""
-#: common/footer.j2.inc:17
-msgid "GSoc 2018"
-msgstr ""
-
-#: common/footer.j2.inc:18
-msgid "Developer Resources"
-msgstr ""
-
-#: common/footer.j2.inc:23
+#: common/footer.j2.inc:21
msgid "FAQ"
msgstr ""
-#: common/footer.j2.inc:24
+#: common/footer.j2.inc:26
msgid "Bibliography"
msgstr ""
-#: common/footer.j2.inc:33
+#: common/footer.j2.inc:35
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
+#: common/footer.j2.inc:37
msgid ""
"This page was created using <a href='https://www.gnu.org/'>Free Software</a> "
"only."
diff --git a/principles.html.j2 b/principles.html.j2
index 3aba840..c51d7db 100644
--- a/principles.html.j2
+++ b/principles.html.j2
@@ -21,19 +21,16 @@ h2 {
<h1>GNU Taler: Design Principles</h1>
</div>
</div>
-<p>When designing GNU Taler, we had the following design principles in mind:</p>
-
+ <p>When designing GNU Taler, we had the following design principles in mind:</p>
<div class="row">
<div class="col-lg-6">
<h2>1. Free Software implementation</h2>
<p>
GNU Taler must be <a href="https://www.gnu.org/philosophy/free-sw.html">Free Software</a>.
- For merchants the Free Software
- reference implementation prevents vendor lock-in, as another payment provider can
- take over, should the current one provide inadequate quality of service. As
- the software of the payment provider itself is free, smaller or disadvantaged
- countries or organizations can run the payment system without being
- controlled by a foreign company.
+ For merchants, our Free Software
+ reference implementation prevents vendor lock-in. As
+ the software of the payment provider itself is free, countries can
+ deploy the payment system without compromising sovereignty.
</p>
<p>
Customers benefit from Free Software