[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-www] branch stable updated (bfdaaf9 -> e489e5d)
|
From: |
gnunet |
|
Subject: |
[taler-www] branch stable updated (bfdaaf9 -> e489e5d) |
|
Date: |
Tue, 01 Dec 2020 20:07:05 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a change to branch stable
in repository www.
from bfdaaf9 fix links
add e489e5d fix links
No new revisions were added by this update.
Summary of changes:
locale/de/LC_MESSAGES/messages.po | 20 +++++++++++++++-----
locale/en/LC_MESSAGES/messages.po | 2 +-
locale/es/LC_MESSAGES/messages.po | 29 ++++++++++++++++++++---------
locale/fr/LC_MESSAGES/messages.po | 16 +++++++++++++---
locale/it/LC_MESSAGES/messages.po | 2 +-
locale/jp/LC_MESSAGES/messages.po | 14 ++++++++++----
locale/pt/LC_MESSAGES/messages.po | 2 +-
locale/ru/LC_MESSAGES/messages.po | 2 +-
template/docs.html.j2 | 35 ++++++++++++++---------------------
9 files changed, 76 insertions(+), 46 deletions(-)
diff --git a/locale/de/LC_MESSAGES/messages.po
b/locale/de/LC_MESSAGES/messages.po
index b0e787e..7407c96 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-10-31 20:06+0100\n"
+"POT-Creation-Date: 2020-10-31 20:11+0100\n"
"PO-Revision-Date: 2020-11-30 20:48+0000\n"
"Last-Translator: Stefan <eintritt@hotmail.com>\n"
-"Language-Team: German <http://weblate.taler.net/projects/gnu-taler/";
-"main-web-site/de/>\n"
+"Language-Team: German <http://weblate.taler.net/projects/gnu-taler/main-web-";
+"site/de/>\n"
"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -39,8 +39,8 @@ msgid ""
"GNU Taler is developed as part of the <a href='https://www.gnu.org/'>GNU "
"project</a> for the GNU operating system."
msgstr ""
-"GNU Taler wird entwickelt als Teilprojekt des <a href='https://www.gnu.org/";
-"'>GNU project</a> für das GNU operating system."
+"GNU Taler wird entwickelt als Teilprojekt des <a href='https://www.gnu.";
+"org/'>GNU project</a> für das GNU operating system."
#: common/footer.j2.inc:30 template/bibliography.html.j2:34
msgid "and"
@@ -2122,6 +2122,16 @@ msgid "Buy with one click. Easy for children."
msgstr "Mit einem Klick bezahlen"
#: template/principles.html.j2:140
+#, fuzzy
+#| msgid ""
+#| "GNU Taler must be usable for non-expert customers including end-users of "
+#| "a GNU Taler wallet, merchants who wish to accept payments using GNU "
+#| "Taler, and 3rd party application developers for e-commerce and other "
+#| "platforms. GNU Taler must follow best-practices usability guidelines and "
+#| "incorporate feedback from experts and users. Free/Libre software also "
+#| "requires Free/Libre documentation to allow for informed choices. GNU "
+#| "Taler must provide well-documented Advanced Programming Interfaces (APIs) "
+#| "to allow frictionless integrations between GNU Taler and other projects."
msgid ""
"GNU Taler must be usable for non-expert customers including end-users of a "
"GNU Taler wallet, merchants who wish to accept payments using GNU Taler, and "
diff --git a/locale/en/LC_MESSAGES/messages.po
b/locale/en/LC_MESSAGES/messages.po
index d09f9c6..31b1587 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-10-31 20:06+0100\n"
+"POT-Creation-Date: 2020-10-31 20:11+0100\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"
diff --git a/locale/es/LC_MESSAGES/messages.po
b/locale/es/LC_MESSAGES/messages.po
index 03ecd3d..9249fb9 100644
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -2,11 +2,11 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-07-04 22:21+0200\n"
+"POT-Creation-Date: 2020-10-31 20:11+0100\n"
"PO-Revision-Date: 2020-11-12 22:46+0000\n"
"Last-Translator: Javier Sepulveda <javier.sepulveda@uv.es>\n"
-"Language-Team: Spanish <http://weblate.taler.net/projects/gnu-taler/";
-"main-web-site/es/>\n"
+"Language-Team: Spanish <http://weblate.taler.net/projects/gnu-taler/main-web-";
+"site/es/>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -1682,9 +1682,9 @@ msgid ""
"risk of fraud."
msgstr ""
"Taler es un sistema de pago rentable el cual te provee con una prueba "
-"criptográfica de que el pago ha sido realizado correctamente en "
-"milisegundos.Tus clientes Web pagan con niveles de conveniencia desconocidos "
-"hasta ahora sin riesgo de fraude."
+"criptográfica de que el pago ha sido realizado correctamente en milisegundos."
+"Tus clientes Web pagan con niveles de conveniencia desconocidos hasta ahora "
+"sin riesgo de fraude."
#: template/merchants.html.j2:22
msgid "Fast"
@@ -1913,8 +1913,8 @@ msgid ""
"<a href=\"https://en.wikipedia.org/wiki/Kerckhoffs's_principle\">Kerckhoff's "
"principle</a> and to establish public confidence."
msgstr ""
-"GNU Taler debe ser <a href=\"https://www.gnu.org/philosophy/free-sw.html\"";
-">Software Libre</a>. Para comerciantes, el software libre previene el "
+"GNU Taler debe ser <a href=\"https://www.gnu.org/philosophy/free-sw.html";
+"\">Software Libre</a>. Para comerciantes, el software libre previene el "
"bloqueo en un proveedor, significando que los comerciantes pueden fácilmente "
"elegir otro proveedor de servicio para procesar sus pagos. Para los países, "
"el Software Libre significa que GNU Taler no puede comprometer la soberanía "
@@ -2061,6 +2061,16 @@ msgid "Buy with one click. Easy for children."
msgstr "Comprar con un solo clic. Sencillo para niños."
#: template/principles.html.j2:140
+#, fuzzy
+#| msgid ""
+#| "GNU Taler must be usable for non-expert customers including end-users of "
+#| "a GNU Taler wallet, merchants who wish to accept payments using GNU "
+#| "Taler, and 3rd party application developers for e-commerce and other "
+#| "platforms. GNU Taler must follow best-practices usability guidelines and "
+#| "incorporate feedback from experts and users. Free/Libre software also "
+#| "requires Free/Libre documentation to allow for informed choices. GNU "
+#| "Taler must provide well-documented Advanced Programming Interfaces (APIs) "
+#| "to allow frictionless integrations between GNU Taler and other projects."
msgid ""
"GNU Taler must be usable for non-expert customers including end-users of a "
"GNU Taler wallet, merchants who wish to accept payments using GNU Taler, and "
@@ -2187,7 +2197,8 @@ msgstr "No tienes instalada la cartera todavía."
#: template/wallet.html.j2:126
msgid "Install the wallet for your browser below, then check out the"
-msgstr "Instala la cartera para tu navegador a continuación, luego comprueba
la"
+msgstr ""
+"Instala la cartera para tu navegador a continuación, luego comprueba la"
#: template/wallet.html.j2:130
msgid "demonstration"
diff --git a/locale/fr/LC_MESSAGES/messages.po
b/locale/fr/LC_MESSAGES/messages.po
index 96ede9a..c061635 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -2,11 +2,11 @@ msgid ""
msgstr ""
"Project-Id-Version: French (Taler Website)\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-10-31 20:06+0100\n"
+"POT-Creation-Date: 2020-10-31 20:11+0100\n"
"PO-Revision-Date: 2020-11-17 12:56+0000\n"
"Last-Translator: pitchum <pitchum@gramaton.org>\n"
-"Language-Team: French <http://weblate.taler.net/projects/gnu-taler/";
-"main-web-site/fr/>\n"
+"Language-Team: French <http://weblate.taler.net/projects/gnu-taler/main-web-";
+"site/fr/>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -1872,6 +1872,16 @@ msgid "Buy with one click. Easy for children."
msgstr "Acheter en un clic. Un jeu d'enfant."
#: template/principles.html.j2:140
+#, fuzzy
+#| msgid ""
+#| "GNU Taler must be usable for non-expert customers including end-users of "
+#| "a GNU Taler wallet, merchants who wish to accept payments using GNU "
+#| "Taler, and 3rd party application developers for e-commerce and other "
+#| "platforms. GNU Taler must follow best-practices usability guidelines and "
+#| "incorporate feedback from experts and users. Free/Libre software also "
+#| "requires Free/Libre documentation to allow for informed choices. GNU "
+#| "Taler must provide well-documented Advanced Programming Interfaces (APIs) "
+#| "to allow frictionless integrations between GNU Taler and other projects."
msgid ""
"GNU Taler must be usable for non-expert customers including end-users of a "
"GNU Taler wallet, merchants who wish to accept payments using GNU Taler, and "
diff --git a/locale/it/LC_MESSAGES/messages.po
b/locale/it/LC_MESSAGES/messages.po
index b541569..b0adf43 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-10-31 20:06+0100\n"
+"POT-Creation-Date: 2020-10-31 20:11+0100\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"
diff --git a/locale/jp/LC_MESSAGES/messages.po
b/locale/jp/LC_MESSAGES/messages.po
index 65dbbca..2c3bdf4 100644
--- a/locale/jp/LC_MESSAGES/messages.po
+++ b/locale/jp/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-10-31 20:06+0100\n"
+"POT-Creation-Date: 2020-10-31 20:11+0100\n"
"PO-Revision-Date: 2020-09-25 22:16+0000\n"
"Last-Translator: Maki Konno <maki.7719@gmail.com>\n"
"Language-Team: Japanese <http://weblate.taler.net/projects/gnu-taler/main-";
@@ -372,12 +372,16 @@ msgid "Community"
msgstr ""
#: template/docs.html.j2:188
+#, fuzzy
+#| msgid "The mailing list"
msgid "Mailing List"
-msgstr ""
+msgstr "送り先"
#: template/docs.html.j2:190
+#, fuzzy
+#| msgid "The mailing list"
msgid "The official GNU Taler mailing list."
-msgstr ""
+msgstr "送り先"
#: template/docs.html.j2:196
msgid "IRC"
@@ -416,8 +420,10 @@ msgid "Shows results of the code coverage analysis for our
test suite."
msgstr ""
#: template/docs.html.j2:244
+#, fuzzy
+#| msgid "Contact information"
msgid "Continuous integration"
-msgstr ""
+msgstr "連絡先"
#: template/docs.html.j2:246
msgid "Continuous integration and deployment is managed by our Buildbot."
diff --git a/locale/pt/LC_MESSAGES/messages.po
b/locale/pt/LC_MESSAGES/messages.po
index 6a59c48..d60d245 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-10-31 20:06+0100\n"
+"POT-Creation-Date: 2020-10-31 20:11+0100\n"
"PO-Revision-Date: 2018-01-28 15:27-0200\n"
"Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
"Language-Team: Brazilian Portuguese\n"
diff --git a/locale/ru/LC_MESSAGES/messages.po
b/locale/ru/LC_MESSAGES/messages.po
index a01d625..0344d91 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-10-31 20:06+0100\n"
+"POT-Creation-Date: 2020-10-31 20:11+0100\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"
diff --git a/template/docs.html.j2 b/template/docs.html.j2
index d6fd4c4..6c84c44 100644
--- a/template/docs.html.j2
+++ b/template/docs.html.j2
@@ -37,11 +37,10 @@
<img src="{{ url('icons/icon-backend.svg') }}" height=60>
<h3>{{ _("Merchant Backend Administration")}}</h3>
</a>
- {% trans baseurl=siteconfitem['docshost'] %}
+ {% trans %}
Tutorial and manual for operating a merchant.
- Also available as
- <a href="https://{{ baseurl }}/pdf/taler-merchant-manual.pdf">PDF</a>.
{% endtrans %}
+ {{ gettext('Also available as <a href="%(link)s">PDF</a>.',
link="https://"; + siteconfitem['docshost'] + "/pdf/taler-merchant-manual.pdf")
}}
</div>
<div class="col-3">
@@ -49,11 +48,10 @@
<img src="{{ url('icons/icon-market.svg') }}" height=60>
<h3>{{ _("Merchant API Tutorial") }}</h3>
</a>
- {% trans baseurl=siteconfitem['docshost'] %}
+ {% trans %}
Tutorial for processing Taler payments using the merchant backend API.
- Also available as
- <a href="https://{{ baseurl
}}/pdf/taler-merchant-api-tutorial.pdf">PDF</a>.
{% endtrans %}
+ {{ gettext('Also available as <a href="%(link)s">PDF</a>.',
link="https://"; + siteconfitem['docshost'] +
"/pdf/taler-merchant-api-tutorial.pdf") }}
</div>
<div class="col-3">
@@ -61,11 +59,10 @@
<img src="{{ url('icons/icon-exchange.svg') }}" height=60>
<h3>{{ _("Exchange")}}</h3>
</a>
- {% trans baseurl=siteconfitem['docshost'] %}
+ {% trans %}
Operator's manual for the GNU Taler exchange.
- Also available as
- <a href="https://{{ baseurl }}/pdf/taler-exchange-manual.pdf">PDF</a>.
{% endtrans %}
+ {{ gettext('Also available as <a href="%(link)s">PDF</a>.',
link="https://"; + siteconfitem['docshost'] + "/pdf/taler-exchange-manual.pdf")
}}
</div>
<div class="col-3">
@@ -73,11 +70,10 @@
<img src="{{ url('icons/icon-bank.svg') }}" height=60>
<h3>{{ _("Bank Integration") }}</h3>
</a>
- {% trans baseurl=siteconfitem['docshost'] %}
+ {% trans %}
Manual for tightly integrating Taler with banking applications.
- Also available as
- <a href="https://{{ baseurl }}/pdf/taler-bank-manual.pdf">PDF</a>.
{% endtrans %}
+ {{ gettext('Also available as <a href="%(link)s">PDF</a>.',
link="https://"; + siteconfitem['docshost'] + "/pdf/taler-bank-manual.pdf") }}
</div>
</div>
@@ -103,11 +99,10 @@
<img src="{{ url('icons/icon-backoffice.svg') }}" height=60>
<h3>{{ _("Back office") }}</h3>
</a>
- {% trans baseurl=siteconfitem['docshost'] %}
+ {% trans %}
Manual to run the back-office Web application.
- Also available as
- <a href="https://{{ baseurl
}}/pdf/taler-backoffice-manual.pdf">PDF</a>.
{% endtrans %}
+ {{ gettext('Also available as <a href="%(link)s">PDF</a>.',
link="https://"; + siteconfitem['docshost'] +
"/pdf/taler-backoffice-manual.pdf") }}
</div>
<div class="col-3">
@@ -115,11 +110,10 @@
<img src="{{ url('icons/icon-market.svg') }}" height=60>
<h3>{{ _("Merchant POS Terminal") }}</h3>
</a>
- {% trans baseurl=siteconfitem['docshost'] %}
+ {% trans %}
Manual for configuring and using the point of sale app.
- Also available as
- <a href="https://{{ baseurl
}}/pdf/taler-merchant-pos-terminal.pdf">PDF</a>.
{% endtrans %}
+ {{ gettext('Also available as <a href="%(link)s">PDF</a>.',
link="https://"; + siteconfitem['docshost'] +
"/pdf/taler-merchant-pos-terminal.pdf") }}
</div>
<div class="col-3">
@@ -161,11 +155,10 @@
<img src="{{ url('icons/icon-developers.svg') }}" height=60>
<h3>{{ _("Onboarding")}}</h3>
</a>
- {% trans baseurl=siteconfitem['docshost'] %}
+ {% trans %}
Description of our taler.net setup and how to contribute.
- Also available as
{% endtrans %}
- <a href="https://{{ baseurl }}/pdf/developers-manual.pdf">PDF</a>.
+ {{ gettext('Also available as <a href="%(link)s">PDF</a>.',
link="https://"; + siteconfitem['docshost'] + "/pdf/developers-manual.pdf") }}
</div>
</div>
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-www] branch stable updated (bfdaaf9 -> e489e5d),
gnunet <=