[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-www] branch stable updated (98b0950 -> 07d116b)
|
From: |
gnunet |
|
Subject: |
[taler-www] branch stable updated (98b0950 -> 07d116b) |
|
Date: |
Tue, 01 Dec 2020 23:30:12 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a change to branch stable
in repository www.
from 98b0950 use old style
add ab0ba57 enable new style formatting
add 6e989b3 I give up
add d923c7f update submodule, makes message extraction work again
add 07d116b remove bogus placeholder
No new revisions were added by this update.
Summary of changes:
build-system/taler-build-scripts | 2 +-
inc | 2 +-
locale/de/LC_MESSAGES/messages.po | 170 ++++++++++++++++++++----------------
locale/en/LC_MESSAGES/messages.po | 109 +++++++++++-------------
locale/es/LC_MESSAGES/messages.po | 175 +++++++++++++++++++++-----------------
locale/fr/LC_MESSAGES/messages.po | 173 ++++++++++++++++++++-----------------
locale/it/LC_MESSAGES/messages.po | 109 +++++++++++-------------
locale/jp/LC_MESSAGES/messages.po | 109 +++++++++++-------------
locale/messages.pot | 21 +++--
locale/pt/LC_MESSAGES/messages.po | 109 +++++++++++-------------
locale/ru/LC_MESSAGES/messages.po | 109 +++++++++++-------------
make_site.py | 1 +
template/docs.html.j2 | 16 ++--
13 files changed, 558 insertions(+), 547 deletions(-)
diff --git a/build-system/taler-build-scripts b/build-system/taler-build-scripts
index c9abff9..47f14fc 160000
--- a/build-system/taler-build-scripts
+++ b/build-system/taler-build-scripts
@@ -1 +1 @@
-Subproject commit c9abff9094f9e127b1b976dfd0702e6dce07c6d5
+Subproject commit 47f14fcf1d03d9dad1bae59987488ea05ecd307b
diff --git a/inc b/inc
index 76bbc33..4ae188a 160000
--- a/inc
+++ b/inc
@@ -1 +1 @@
-Subproject commit 76bbc33ea45cd415081f34ae93109fe5c9718fe2
+Subproject commit 4ae188ae658793c6cfddf60fdb5a563e590f9cfa
diff --git a/locale/de/LC_MESSAGES/messages.po
b/locale/de/LC_MESSAGES/messages.po
index 7407c96..1fe05a9 100644
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: German (Taler Website)\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-10-31 20:11+0100\n"
+"POT-Creation-Date: 2020-12-01 23:18+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-";
@@ -295,62 +295,67 @@ msgid "Merchant Backend Administration"
msgstr "Verwaltungs-Backend für Händler und Verkäufer"
#: template/docs.html.j2:40
-#, python-format
+#, fuzzy, python-format
+#| msgid ""
+#| "Tutorial and manual for operating a merchant. Also available as <a href="
+#| "\"https://%(baseurl)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
msgid ""
"Tutorial and manual for operating a merchant. Also available as <a href="
-"\"https://%(baseurl)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
+"\"https://%(docshost)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
msgstr ""
"Anleitung zum Aufsetzen der Verkäufer-Backends. Hier auch als <a href="
-"\"https://%(baseurl)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
+"\"https://%(docshost)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
-#: template/docs.html.j2:50
+#: template/docs.html.j2:49
msgid "Merchant API Tutorial"
msgstr "Beschreibung der API für Verkäufer"
-#: template/docs.html.j2:52
-#, python-format
-msgid ""
-"Tutorial for processing Taler payments using the merchant backend API. Also "
-"available as <a href=\"https://%(baseurl)s/pdf/taler-merchant-api-tutorial."
-"pdf\">PDF</a>."
+#: template/docs.html.j2:51
+#, fuzzy
+#| msgid ""
+#| "Tutorial for processing Taler payments using the merchant backend API. "
+#| "Also available as <a href=\"https://%(baseurl)s/pdf/taler-merchant-api-"
+#| "tutorial.pdf\">PDF</a>."
+msgid "Tutorial for processing Taler payments using the merchant backend API."
msgstr ""
"Anleitung zur Zahlungsabwicklung mit Taler unter Verwendung der API für "
-"Verkäufer (merchant backend API). Hier auch als <a href=\"https://";
-"%(baseurl)s/pdf/taler-merchant-api-tutorial.pdf\">PDF</a>."
+"Verkäufer (merchant backend API)."
-#: template/docs.html.j2:62
+#: template/docs.html.j2:54 template/docs.html.j2:65 template/docs.html.j2:76
+#: template/docs.html.j2:105 template/docs.html.j2:116
+#: template/docs.html.j2:161
+#, python-format
+msgid "Also available as <a href=\"%(link)s\">PDF</a>."
+msgstr ""
+
+#: template/docs.html.j2:60
msgid "Exchange"
msgstr "Taler-Exchange"
-#: template/docs.html.j2:64
-#, python-format
-msgid ""
-"Operator's manual for the GNU Taler exchange. Also available as <a href="
-"\"https://%(baseurl)s/pdf/taler-exchange-manual.pdf\">PDF</a>."
+#: template/docs.html.j2:62
+msgid "Operator's manual for the GNU Taler exchange."
msgstr ""
-"Anleitung für Exchange-Betreiber. Hier auch als <a href=\"https://";
-"%(baseurl)s/pdf/taler-exchange-manual.pdf\">PDF</a>."
-#: template/docs.html.j2:74
+#: template/docs.html.j2:71
msgid "Bank Integration"
msgstr "Bankintegration"
-#: template/docs.html.j2:76
-#, python-format
-msgid ""
-"Manual for tightly integrating Taler with banking applications. Also "
-"available as <a href=\"https://%(baseurl)s/pdf/taler-bank-manual.pdf\">PDF</"
-"a>."
+#: template/docs.html.j2:73
+#, fuzzy
+#| msgid ""
+#| "Manual for tightly integrating Taler with banking applications. Also "
+#| "available as <a href=\"https://%(baseurl)s/pdf/taler-bank-manual.pdf"
+#| "\">PDF</a>."
+msgid "Manual for tightly integrating Taler with banking applications."
msgstr ""
"Anleitung zum Aufsetzen der Schnittstellen zu Banken und Banking-"
-"Anwendungen. Hier auch als <a href=\"https://%(baseurl)s/pdf/taler-bank-"
-"manual.pdf\">PDF</a>."
+"Anwendungen."
-#: template/docs.html.j2:92
+#: template/docs.html.j2:88
msgid "Wallet"
msgstr "Taler-Wallet"
-#: template/docs.html.j2:94
+#: template/docs.html.j2:90
msgid ""
"Manual about the Taler wallets (WebExtensions, Android, CLI). You can "
"download pre-packaged binaries from <a href=\"wallet.html\">the Taler wallet "
@@ -360,124 +365,115 @@ msgstr ""
"Binaries ist möglich auf unserer <a href=\"wallet.html\">Webseite zum Taler-"
"Wallet</a>."
-#: template/docs.html.j2:104
+#: template/docs.html.j2:100
msgid "Back office"
msgstr "Prüfung des Zahlungseingangs"
-#: template/docs.html.j2:106
-#, python-format
-msgid ""
-"Manual to run the back-office Web application. Also available as <a href="
-"\"https://%(baseurl)s/pdf/taler-backoffice-manual.pdf\">PDF</a>."
+#: template/docs.html.j2:102
+msgid "Manual to run the back-office Web application."
msgstr ""
-"Anleitung der Anwendung, die Zahlungseingänge an Verkäufer prüft "
-"(webbasiertes Back-Office). Hier auch als <a href=\"https://%(baseurl)s/pdf/"
-"taler-backoffice-manual.pdf\">PDF</a>."
-#: template/docs.html.j2:116
+#: template/docs.html.j2:111
msgid "Merchant POS Terminal"
msgstr "POS-Terminal für Verkäufer"
-#: template/docs.html.j2:118
-#, python-format
-msgid ""
-"Manual for configuring and using the point of sale app. Also available as <a "
-"href=\"https://%(baseurl)s/pdf/taler-merchant-pos-terminal.pdf\">PDF</a>."
+#: template/docs.html.j2:113
+msgid "Manual for configuring and using the point of sale app."
msgstr ""
-"Anleitung zur Konfiguration und Verwendung der POS-App Taler Merchant. Hier "
-"auch als <a href=\"https://%(baseurl)s/pdf/taler-merchant-pos-terminal.pdf"
-"\">PDF</a>."
-#: template/docs.html.j2:128
+#: template/docs.html.j2:122
msgid "Cashier"
msgstr "Taler Cashier"
-#: template/docs.html.j2:130
+#: template/docs.html.j2:124
msgid "An app for taking in cash and handing out electronic cash."
msgstr "Anwendung für den Erwerb von Coins mit Bargeld."
-#: template/docs.html.j2:141
+#: template/docs.html.j2:135
msgid "Internals"
msgstr "Weitere Informationen"
-#: template/docs.html.j2:152
+#: template/docs.html.j2:146
msgid "HTTP API"
msgstr "HTTP-Schnittstellen"
-#: template/docs.html.j2:154
+#: template/docs.html.j2:148
msgid "Reference for the HTTP-based API for Taler components."
msgstr "Beschreibung der HTTP-basierten Programmierschnittstellen."
-#: template/docs.html.j2:162
+#: template/docs.html.j2:156
msgid "Onboarding"
msgstr "Mitmachen!"
-#: template/docs.html.j2:164
-msgid ""
-"Description of our taler.net setup and how to contribute. Also available as"
+#: template/docs.html.j2:158
+#, fuzzy
+#| msgid ""
+#| "Description of our taler.net setup and how to contribute. Also available "
+#| "as"
+msgid "Description of our taler.net setup and how to contribute."
msgstr ""
"Informationen für alle, die zur Entwicklung von Taler oder der Taler-"
"Webseite beitragen möchten. Hier auch als"
-#: template/docs.html.j2:177
+#: template/docs.html.j2:170
msgid "Community"
msgstr "Community"
-#: template/docs.html.j2:188
+#: template/docs.html.j2:181
msgid "Mailing List"
msgstr "Mailing-Liste"
-#: template/docs.html.j2:190
+#: template/docs.html.j2:183
msgid "The official GNU Taler mailing list."
msgstr "Die öffentliche Mailing-Liste zu Taler."
-#: template/docs.html.j2:196
+#: template/docs.html.j2:189
msgid "IRC"
msgstr "Internet Relay Chat"
-#: template/docs.html.j2:198
+#: template/docs.html.j2:191
msgid "Our IRC channel is #taler on freenode."
msgstr ""
"Einige unserer Teammitglieder sind im IRC-Kanal <tt>#taler</tt> auf <tt>irc."
"freenode.net</tt> für einen Chat zu erreichen."
-#: template/docs.html.j2:204
+#: template/docs.html.j2:197
msgid "Bug Tracker"
msgstr "Bug-Tracker"
-#: template/docs.html.j2:206
+#: template/docs.html.j2:199
msgid "Our bug tracker for bugs and feature request."
msgstr ""
"Unser Bug-Tracker sammelt sowohl Bugs als auch Anfragen nach zusätzlichen "
"Funktionen."
-#: template/docs.html.j2:216
+#: template/docs.html.j2:209
msgid "Code"
msgstr "Code"
-#: template/docs.html.j2:228
+#: template/docs.html.j2:221
msgid "Git repositories"
msgstr "Git-Repositories"
-#: template/docs.html.j2:230
+#: template/docs.html.j2:223
msgid "Git repositories for all of GNU Taler."
msgstr "Git-Repositories für alle Systemelemente von GNU Taler."
-#: template/docs.html.j2:236
+#: template/docs.html.j2:229
msgid "lcov results"
msgstr "LCOV-Ergebnisse"
-#: template/docs.html.j2:238
+#: template/docs.html.j2:231
msgid "Shows results of the code coverage analysis for our test suite."
msgstr ""
"Zeigt die Ergebnisse der Ausführunganalyse unseres Codes in der Entwicklung "
"(LCOV code coverage report)."
-#: template/docs.html.j2:244
+#: template/docs.html.j2:237
msgid "Continuous integration"
msgstr "Continuous integration"
-#: template/docs.html.j2:246
+#: template/docs.html.j2:239
msgid "Continuous integration and deployment is managed by our Buildbot."
msgstr ""
"Continuous integration und das Deployment der Codeentwicklung werden von "
@@ -2139,8 +2135,8 @@ msgid ""
"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."
+"well-documented Application Programming Interfaces (APIs) to allow "
+"frictionless integrations between GNU Taler and other projects."
msgstr ""
"Das Bezahlsystem soll einfach sein und für unerfahrene Nutzer intuitiv "
"bedienbar bleiben. Diese Nutzerfreundlichkeit gilt auch für "
@@ -2370,6 +2366,30 @@ msgstr "Andere Browser"
msgid "Wallets for other browsers will be provided in the near future."
msgstr "Wallets für andere Browser werden zukünftig bereitgestellt."
+#~ msgid ""
+#~ "Operator's manual for the GNU Taler exchange. Also available as <a "
+#~ "href=\"https://%(baseurl)s/pdf/taler-exchange-manual.pdf\">PDF</a>."
+#~ msgstr ""
+#~ "Anleitung für Exchange-Betreiber. Hier auch als <a href=\"https://";
+#~ "%(baseurl)s/pdf/taler-exchange-manual.pdf\">PDF</a>."
+
+#~ msgid ""
+#~ "Manual to run the back-office Web application. Also available as <a href="
+#~ "\"https://%(baseurl)s/pdf/taler-backoffice-manual.pdf\">PDF</a>."
+#~ msgstr ""
+#~ "Anleitung der Anwendung, die Zahlungseingänge an Verkäufer prüft "
+#~ "(webbasiertes Back-Office). Hier auch als <a href=\"https://%(baseurl)s/"
+#~ "pdf/taler-backoffice-manual.pdf\">PDF</a>."
+
+#~ msgid ""
+#~ "Manual for configuring and using the point of sale app. Also available as "
+#~ "<a href=\"https://%(baseurl)s/pdf/taler-merchant-pos-terminal.pdf\">PDF</"
+#~ "a>."
+#~ msgstr ""
+#~ "Anleitung zur Konfiguration und Verwendung der POS-App Taler Merchant. "
+#~ "Hier auch als <a href=\"https://%(baseurl)s/pdf/taler-merchant-pos-"
+#~ "terminal.pdf\">PDF</a>."
+
#, fuzzy
#~| msgid "News"
#~ msgid "News:"
diff --git a/locale/en/LC_MESSAGES/messages.po
b/locale/en/LC_MESSAGES/messages.po
index 31b1587..0826430 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:11+0100\n"
+"POT-Creation-Date: 2020-12-01 23:18+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"
@@ -248,159 +248,148 @@ msgstr ""
#, python-format
msgid ""
"Tutorial and manual for operating a merchant. Also available as <a href="
-"\"https://%(baseurl)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
+"\"https://%(docshost)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
msgstr ""
-#: template/docs.html.j2:50
+#: template/docs.html.j2:49
msgid "Merchant API Tutorial"
msgstr ""
-#: template/docs.html.j2:52
+#: template/docs.html.j2:51
+msgid "Tutorial for processing Taler payments using the merchant backend API."
+msgstr ""
+
+#: template/docs.html.j2:54 template/docs.html.j2:65 template/docs.html.j2:76
+#: template/docs.html.j2:105 template/docs.html.j2:116
+#: template/docs.html.j2:161
#, python-format
-msgid ""
-"Tutorial for processing Taler payments using the merchant backend API. Also "
-"available as <a href=\"https://%(baseurl)s/pdf/taler-merchant-api-tutorial."
-"pdf\">PDF</a>."
+msgid "Also available as <a href=\"%(link)s\">PDF</a>."
msgstr ""
-#: template/docs.html.j2:62
+#: template/docs.html.j2:60
msgid "Exchange"
msgstr ""
-#: template/docs.html.j2:64
-#, python-format
-msgid ""
-"Operator's manual for the GNU Taler exchange. Also available as <a href="
-"\"https://%(baseurl)s/pdf/taler-exchange-manual.pdf\">PDF</a>."
+#: template/docs.html.j2:62
+msgid "Operator's manual for the GNU Taler exchange."
msgstr ""
-#: template/docs.html.j2:74
+#: template/docs.html.j2:71
msgid "Bank Integration"
msgstr ""
-#: template/docs.html.j2:76
-#, python-format
-msgid ""
-"Manual for tightly integrating Taler with banking applications. Also "
-"available as <a href=\"https://%(baseurl)s/pdf/taler-bank-manual.pdf\">PDF</"
-"a>."
+#: template/docs.html.j2:73
+msgid "Manual for tightly integrating Taler with banking applications."
msgstr ""
-#: template/docs.html.j2:92
+#: template/docs.html.j2:88
msgid "Wallet"
msgstr ""
-#: template/docs.html.j2:94
+#: template/docs.html.j2:90
msgid ""
"Manual about the Taler wallets (WebExtensions, Android, CLI). You can "
"download pre-packaged binaries from <a href=\"wallet.html\">the Taler wallet "
"Web site</a>."
msgstr ""
-#: template/docs.html.j2:104
+#: template/docs.html.j2:100
msgid "Back office"
msgstr ""
-#: template/docs.html.j2:106
-#, python-format
-msgid ""
-"Manual to run the back-office Web application. Also available as <a href="
-"\"https://%(baseurl)s/pdf/taler-backoffice-manual.pdf\">PDF</a>."
+#: template/docs.html.j2:102
+msgid "Manual to run the back-office Web application."
msgstr ""
-#: template/docs.html.j2:116
+#: template/docs.html.j2:111
msgid "Merchant POS Terminal"
msgstr ""
-#: template/docs.html.j2:118
-#, python-format
-msgid ""
-"Manual for configuring and using the point of sale app. Also available as <a "
-"href=\"https://%(baseurl)s/pdf/taler-merchant-pos-terminal.pdf\">PDF</a>."
+#: template/docs.html.j2:113
+msgid "Manual for configuring and using the point of sale app."
msgstr ""
-#: template/docs.html.j2:128
+#: template/docs.html.j2:122
msgid "Cashier"
msgstr ""
-#: template/docs.html.j2:130
+#: template/docs.html.j2:124
msgid "An app for taking in cash and handing out electronic cash."
msgstr ""
-#: template/docs.html.j2:141
+#: template/docs.html.j2:135
msgid "Internals"
msgstr ""
-#: template/docs.html.j2:152
+#: template/docs.html.j2:146
msgid "HTTP API"
msgstr ""
-#: template/docs.html.j2:154
+#: template/docs.html.j2:148
msgid "Reference for the HTTP-based API for Taler components."
msgstr ""
-#: template/docs.html.j2:162
+#: template/docs.html.j2:156
msgid "Onboarding"
msgstr ""
-#: template/docs.html.j2:164
-msgid ""
-"Description of our taler.net setup and how to contribute. Also available as"
+#: template/docs.html.j2:158
+msgid "Description of our taler.net setup and how to contribute."
msgstr ""
-#: template/docs.html.j2:177
+#: template/docs.html.j2:170
msgid "Community"
msgstr ""
-#: template/docs.html.j2:188
+#: template/docs.html.j2:181
msgid "Mailing List"
msgstr ""
-#: template/docs.html.j2:190
+#: template/docs.html.j2:183
msgid "The official GNU Taler mailing list."
msgstr ""
-#: template/docs.html.j2:196
+#: template/docs.html.j2:189
msgid "IRC"
msgstr ""
-#: template/docs.html.j2:198
+#: template/docs.html.j2:191
msgid "Our IRC channel is #taler on freenode."
msgstr ""
-#: template/docs.html.j2:204
+#: template/docs.html.j2:197
msgid "Bug Tracker"
msgstr ""
-#: template/docs.html.j2:206
+#: template/docs.html.j2:199
msgid "Our bug tracker for bugs and feature request."
msgstr ""
-#: template/docs.html.j2:216
+#: template/docs.html.j2:209
msgid "Code"
msgstr ""
-#: template/docs.html.j2:228
+#: template/docs.html.j2:221
msgid "Git repositories"
msgstr ""
-#: template/docs.html.j2:230
+#: template/docs.html.j2:223
msgid "Git repositories for all of GNU Taler."
msgstr ""
-#: template/docs.html.j2:236
+#: template/docs.html.j2:229
msgid "lcov results"
msgstr ""
-#: template/docs.html.j2:238
+#: template/docs.html.j2:231
msgid "Shows results of the code coverage analysis for our test suite."
msgstr ""
-#: template/docs.html.j2:244
+#: template/docs.html.j2:237
msgid "Continuous integration"
msgstr ""
-#: template/docs.html.j2:246
+#: template/docs.html.j2:239
msgid "Continuous integration and deployment is managed by our Buildbot."
msgstr ""
@@ -1565,8 +1554,8 @@ msgid ""
"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."
+"well-documented Application Programming Interfaces (APIs) to allow "
+"frictionless integrations between GNU Taler and other projects."
msgstr ""
#: template/principles.html.j2:157
diff --git a/locale/es/LC_MESSAGES/messages.po
b/locale/es/LC_MESSAGES/messages.po
index 9249fb9..7496981 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-10-31 20:11+0100\n"
+"POT-Creation-Date: 2020-12-01 23:18+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-";
@@ -288,62 +288,61 @@ msgid "Merchant Backend Administration"
msgstr "Panel de administración de comerciante"
#: template/docs.html.j2:40
-#, python-format
+#, fuzzy, python-format
+#| msgid ""
+#| "Tutorial and manual for operating a merchant. Also available as <a href="
+#| "\"https://%(baseurl)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
msgid ""
"Tutorial and manual for operating a merchant. Also available as <a href="
-"\"https://%(baseurl)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
+"\"https://%(docshost)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
msgstr ""
"Tutorial y manual para operar como vendedor. También disponible en <a href="
-"\"https://%(baseurl)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
+"\"https://%(docshost)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
-#: template/docs.html.j2:50
+#: template/docs.html.j2:49
msgid "Merchant API Tutorial"
msgstr "Tutorial API vendedor"
-#: template/docs.html.j2:52
+#: template/docs.html.j2:51
+#, fuzzy
+#| msgid "Merchants process payments using the Taler backend:"
+msgid "Tutorial for processing Taler payments using the merchant backend API."
+msgstr "Procesamiento de pagos de comerciantes usando el backend de Taler:"
+
+#: template/docs.html.j2:54 template/docs.html.j2:65 template/docs.html.j2:76
+#: template/docs.html.j2:105 template/docs.html.j2:116
+#: template/docs.html.j2:161
#, python-format
-msgid ""
-"Tutorial for processing Taler payments using the merchant backend API. Also "
-"available as <a href=\"https://%(baseurl)s/pdf/taler-merchant-api-tutorial."
-"pdf\">PDF</a>."
+msgid "Also available as <a href=\"%(link)s\">PDF</a>."
msgstr ""
-"Tutorial para procesar pagos con Taler usando la API de vendedor. También "
-"disponible en <a href=\"https://%(baseurl)s/pdf/taler-merchant-api-tutorial."
-"pdf\">PDF</a>."
-#: template/docs.html.j2:62
+#: template/docs.html.j2:60
msgid "Exchange"
msgstr "Banco"
-#: template/docs.html.j2:64
-#, python-format
-msgid ""
-"Operator's manual for the GNU Taler exchange. Also available as <a href="
-"\"https://%(baseurl)s/pdf/taler-exchange-manual.pdf\">PDF</a>."
+#: template/docs.html.j2:62
+msgid "Operator's manual for the GNU Taler exchange."
msgstr ""
-"Manual del operador para el exchange de GNU Taler. También disponible en <a "
-"href=\"https://%(baseurl)s/pdf/taler-exchange-manual.pdf\">PDF</a>."
-#: template/docs.html.j2:74
+#: template/docs.html.j2:71
msgid "Bank Integration"
msgstr "Integración Bancaria"
-#: template/docs.html.j2:76
-#, python-format
-msgid ""
-"Manual for tightly integrating Taler with banking applications. Also "
-"available as <a href=\"https://%(baseurl)s/pdf/taler-bank-manual.pdf\">PDF</"
-"a>."
+#: template/docs.html.j2:73
+#, fuzzy
+#| msgid ""
+#| "Manual for tightly integrating Taler with banking applications. Also "
+#| "available as <a href=\"https://%(baseurl)s/pdf/taler-bank-manual.pdf"
+#| "\">PDF</a>."
+msgid "Manual for tightly integrating Taler with banking applications."
msgstr ""
-"Manual para integrar estrechamente Taler con aplicaciones bancarias. También "
-"disponible en <a href=\"https://%(baseurl)s/pdf/taler-bank-manual.pdf\">PDF</"
-"a>."
+"Manual para integrar estrechamente Taler con aplicaciones bancarias."
-#: template/docs.html.j2:92
+#: template/docs.html.j2:88
msgid "Wallet"
msgstr "Cartera"
-#: template/docs.html.j2:94
+#: template/docs.html.j2:90
msgid ""
"Manual about the Taler wallets (WebExtensions, Android, CLI). You can "
"download pre-packaged binaries from <a href=\"wallet.html\">the Taler wallet "
@@ -353,120 +352,111 @@ msgstr ""
"descargar los binarios pre-empaquetados desde <a href=\"wallet.html\">la "
"página Web de Taler</a>."
-#: template/docs.html.j2:104
+#: template/docs.html.j2:100
msgid "Back office"
msgstr "Panel de control interno"
-#: template/docs.html.j2:106
-#, python-format
-msgid ""
-"Manual to run the back-office Web application. Also available as <a href="
-"\"https://%(baseurl)s/pdf/taler-backoffice-manual.pdf\">PDF</a>."
+#: template/docs.html.j2:102
+msgid "Manual to run the back-office Web application."
msgstr ""
-"Manual para ejecutar el panel de control de la aplicación Web. También "
-"disponible en <a href=\"https://%(baseurl)s/pdf/taler-backoffice-manual.pdf"
-"\">PDF</a>."
-#: template/docs.html.j2:116
+#: template/docs.html.j2:111
msgid "Merchant POS Terminal"
msgstr "Terminal POS de vendedor"
-#: template/docs.html.j2:118
-#, python-format
-msgid ""
-"Manual for configuring and using the point of sale app. Also available as <a "
-"href=\"https://%(baseurl)s/pdf/taler-merchant-pos-terminal.pdf\">PDF</a>."
+#: template/docs.html.j2:113
+msgid "Manual for configuring and using the point of sale app."
msgstr ""
-"Manual para configurar y usar la app de punto de venta. También disponible "
-"en <a href=\"https://%(baseurl)s/pdf/taler-merchant-pos-terminal.pdf\">PDF</"
-"a>."
-#: template/docs.html.j2:128
+#: template/docs.html.j2:122
msgid "Cashier"
msgstr "Cajero"
-#: template/docs.html.j2:130
+#: template/docs.html.j2:124
msgid "An app for taking in cash and handing out electronic cash."
msgstr "Una aplicación para coger en efectivo y repartir efectivo electrónico."
-#: template/docs.html.j2:141
+#: template/docs.html.j2:135
msgid "Internals"
msgstr "Internos"
-#: template/docs.html.j2:152
+#: template/docs.html.j2:146
msgid "HTTP API"
msgstr "API HTTP"
-#: template/docs.html.j2:154
+#: template/docs.html.j2:148
msgid "Reference for the HTTP-based API for Taler components."
msgstr "Referencia para la API basada en HTTP para componentes de Taler."
-#: template/docs.html.j2:162
+#: template/docs.html.j2:156
msgid "Onboarding"
msgstr "A bordo"
-#: template/docs.html.j2:164
-msgid ""
-"Description of our taler.net setup and how to contribute. Also available as"
+#: template/docs.html.j2:158
+#, fuzzy
+#| msgid ""
+#| "Description of our taler.net setup and how to contribute. Also available "
+#| "as"
+msgid "Description of our taler.net setup and how to contribute."
msgstr ""
"Una descripción de nuestra instalación taler.net y como contribuir. También "
"disponible en"
-#: template/docs.html.j2:177
+#: template/docs.html.j2:170
msgid "Community"
msgstr "Comunidad"
-#: template/docs.html.j2:188
+#: template/docs.html.j2:181
msgid "Mailing List"
msgstr "Lista de correo"
-#: template/docs.html.j2:190
+#: template/docs.html.j2:183
msgid "The official GNU Taler mailing list."
msgstr "La lista de correo oficial de GNU Taler."
-#: template/docs.html.j2:196
+#: template/docs.html.j2:189
msgid "IRC"
msgstr "IRC"
-#: template/docs.html.j2:198
+#: template/docs.html.j2:191
msgid "Our IRC channel is #taler on freenode."
msgstr "Nuestro canal IRC en freenode es #taler."
-#: template/docs.html.j2:204
+#: template/docs.html.j2:197
msgid "Bug Tracker"
msgstr "Rastreador de errores"
-#: template/docs.html.j2:206
+#: template/docs.html.j2:199
msgid "Our bug tracker for bugs and feature request."
msgstr "Nuestro rastreador de errores y solicitud de características."
-#: template/docs.html.j2:216
+#: template/docs.html.j2:209
msgid "Code"
msgstr "Código"
-#: template/docs.html.j2:228
+#: template/docs.html.j2:221
msgid "Git repositories"
msgstr "Repositorios Git"
-#: template/docs.html.j2:230
+#: template/docs.html.j2:223
msgid "Git repositories for all of GNU Taler."
msgstr "Repositorios Git para todo GNU Taler."
-#: template/docs.html.j2:236
+#: template/docs.html.j2:229
msgid "lcov results"
msgstr "Resultados lcov"
-#: template/docs.html.j2:238
+#: template/docs.html.j2:231
msgid "Shows results of the code coverage analysis for our test suite."
msgstr ""
"Muestra los resultados del análisis de cobertura de código para nuestro "
"paquete de pruebas."
-#: template/docs.html.j2:244
+#: template/docs.html.j2:237
msgid "Continuous integration"
msgstr "Integración continua"
-#: template/docs.html.j2:246
+#: template/docs.html.j2:239
msgid "Continuous integration and deployment is managed by our Buildbot."
msgstr "La integración continua y despliegue es manejado por nuestro Buildbot."
@@ -2078,8 +2068,8 @@ msgid ""
"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."
+"well-documented Application Programming Interfaces (APIs) to allow "
+"frictionless integrations between GNU Taler and other projects."
msgstr ""
"GNU Taler debe ser usable por clientes no expertos incluyendo usuarios "
"finales de la cartera GNU Taler, los comerciantes que deseen aceptar pagos "
@@ -2253,6 +2243,39 @@ msgstr "Otros navegadores"
msgid "Wallets for other browsers will be provided in the near future."
msgstr "Carteras para otros navegadores serán provistas en un futuro próximo."
+#~ msgid ""
+#~ "Tutorial for processing Taler payments using the merchant backend API. "
+#~ "Also available as <a href=\"https://%(baseurl)s/pdf/taler-merchant-api-"
+#~ "tutorial.pdf\">PDF</a>."
+#~ msgstr ""
+#~ "Tutorial para procesar pagos con Taler usando la API de vendedor. También "
+#~ "disponible en <a href=\"https://%(baseurl)s/pdf/taler-merchant-api-"
+#~ "tutorial.pdf\">PDF</a>."
+
+#~ msgid ""
+#~ "Operator's manual for the GNU Taler exchange. Also available as <a "
+#~ "href=\"https://%(baseurl)s/pdf/taler-exchange-manual.pdf\">PDF</a>."
+#~ msgstr ""
+#~ "Manual del operador para el exchange de GNU Taler. También disponible en "
+#~ "<a href=\"https://%(baseurl)s/pdf/taler-exchange-manual.pdf\">PDF</a>."
+
+#~ msgid ""
+#~ "Manual to run the back-office Web application. Also available as <a href="
+#~ "\"https://%(baseurl)s/pdf/taler-backoffice-manual.pdf\">PDF</a>."
+#~ msgstr ""
+#~ "Manual para ejecutar el panel de control de la aplicación Web. También "
+#~ "disponible en <a href=\"https://%(baseurl)s/pdf/taler-backoffice-manual."
+#~ "pdf\">PDF</a>."
+
+#~ msgid ""
+#~ "Manual for configuring and using the point of sale app. Also available as "
+#~ "<a href=\"https://%(baseurl)s/pdf/taler-merchant-pos-terminal.pdf\">PDF</"
+#~ "a>."
+#~ msgstr ""
+#~ "Manual para configurar y usar la app de punto de venta. También "
+#~ "disponible en <a href=\"https://%(baseurl)s/pdf/taler-merchant-pos-"
+#~ "terminal.pdf\">PDF</a>."
+
#, fuzzy
#~| msgid "News"
#~ msgid "News:"
diff --git a/locale/fr/LC_MESSAGES/messages.po
b/locale/fr/LC_MESSAGES/messages.po
index c061635..6c2c5fb 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: French (Taler Website)\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-10-31 20:11+0100\n"
+"POT-Creation-Date: 2020-12-01 23:18+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-";
@@ -291,63 +291,66 @@ msgid "Merchant Backend Administration"
msgstr "Administration du système interne du commerçant"
#: template/docs.html.j2:40
-#, python-format
+#, fuzzy, python-format
+#| msgid ""
+#| "Tutorial and manual for operating a merchant. Also available as <a href="
+#| "\"https://%(baseurl)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
msgid ""
"Tutorial and manual for operating a merchant. Also available as <a href="
-"\"https://%(baseurl)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
+"\"https://%(docshost)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
msgstr ""
"Tutoriel et manuel pour l'exploitation d'un commerce. Également disponible "
-"en <a href=\"https://%(baseurl)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
+"en <a href=\"https://%(docshost)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
-#: template/docs.html.j2:50
+#: template/docs.html.j2:49
msgid "Merchant API Tutorial"
msgstr "Tutoriel pour l'API du commerçant"
-#: template/docs.html.j2:52
-#, python-format
-msgid ""
-"Tutorial for processing Taler payments using the merchant backend API. Also "
-"available as <a href=\"https://%(baseurl)s/pdf/taler-merchant-api-tutorial."
-"pdf\">PDF</a>."
+#: template/docs.html.j2:51
+#, fuzzy
+#| msgid ""
+#| "Tutorial for processing Taler payments using the merchant backend API. "
+#| "Also available as <a href=\"https://%(baseurl)s/pdf/taler-merchant-api-"
+#| "tutorial.pdf\">PDF</a>."
+msgid "Tutorial for processing Taler payments using the merchant backend API."
msgstr ""
"Tutoriel pour traiter des paiements à travers l'API du système interne du "
-"commerçant. Également disponible en <a href=\"https://%(baseurl)s/pdf/taler-"
-"merchant-api-tutorial.pdf\">PDF</a>."
+"commerçant."
-#: template/docs.html.j2:62
+#: template/docs.html.j2:54 template/docs.html.j2:65 template/docs.html.j2:76
+#: template/docs.html.j2:105 template/docs.html.j2:116
+#: template/docs.html.j2:161
+#, python-format
+msgid "Also available as <a href=\"%(link)s\">PDF</a>."
+msgstr ""
+
+#: template/docs.html.j2:60
msgid "Exchange"
msgstr "Bureau de change"
-#: template/docs.html.j2:64
-#, python-format
-msgid ""
-"Operator's manual for the GNU Taler exchange. Also available as <a href="
-"\"https://%(baseurl)s/pdf/taler-exchange-manual.pdf\">PDF</a>."
+#: template/docs.html.j2:62
+msgid "Operator's manual for the GNU Taler exchange."
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>."
-#: template/docs.html.j2:74
+#: template/docs.html.j2:71
msgid "Bank Integration"
msgstr "Intégration des banques"
-#: template/docs.html.j2:76
-#, python-format
-msgid ""
-"Manual for tightly integrating Taler with banking applications. Also "
-"available as <a href=\"https://%(baseurl)s/pdf/taler-bank-manual.pdf\">PDF</"
-"a>."
+#: template/docs.html.j2:73
+#, fuzzy
+#| msgid ""
+#| "Manual for tightly integrating Taler with banking applications. Also "
+#| "available as <a href=\"https://%(baseurl)s/pdf/taler-bank-manual.pdf"
+#| "\">PDF</a>."
+msgid "Manual for tightly integrating Taler with banking applications."
msgstr ""
-"Manuel pour intégrer Taler à des applications bancaires. Également "
-"disponible en <a href=\"https://%(baseurl)s/pdf/taler-bank-manual.pdf\">PDF</"
-"a>."
+"Manuel pour intégrer Taler à des applications bancaires."
-#: template/docs.html.j2:92
+#: template/docs.html.j2:88
msgid "Wallet"
msgstr "Porte-monnaie"
-#: template/docs.html.j2:94
+#: template/docs.html.j2:90
msgid ""
"Manual about the Taler wallets (WebExtensions, Android, CLI). You can "
"download pre-packaged binaries from <a href=\"wallet.html\">the Taler wallet "
@@ -357,125 +360,116 @@ msgstr ""
"Vous pouvez télécharger des exécutables pré-compilés sur le site Web du <a "
"href=\"wallet.html\">porte-monnaie Taler</a>."
-#: template/docs.html.j2:104
+#: template/docs.html.j2:100
msgid "Back office"
msgstr "Arrière boutique"
-#: template/docs.html.j2:106
-#, python-format
-msgid ""
-"Manual to run the back-office Web application. Also available as <a href="
-"\"https://%(baseurl)s/pdf/taler-backoffice-manual.pdf\">PDF</a>."
+#: template/docs.html.j2:102
+msgid "Manual to run the back-office Web application."
msgstr ""
-"Manuel pour faire fonctionner l'application Web d'arrière boutique. "
-"Également disponible en <a href=\"https://%(baseurl)s/pdf/taler-backoffice-"
-"manual.pdf\">PDF</a>."
-#: template/docs.html.j2:116
+#: template/docs.html.j2:111
msgid "Merchant POS Terminal"
msgstr "Terminal de point de vente commerçant"
-#: template/docs.html.j2:118
-#, python-format
-msgid ""
-"Manual for configuring and using the point of sale app. Also available as <a "
-"href=\"https://%(baseurl)s/pdf/taler-merchant-pos-terminal.pdf\">PDF</a>."
+#: template/docs.html.j2:113
+msgid "Manual for configuring and using the point of sale app."
msgstr ""
-"Manuel pour configurer et utiliser l'appli de point de vente. Également "
-"disponible en <a href=\"https://%(baseurl)s/pdf/taler-merchant-pos-terminal."
-"pdf\">PDF</a>."
-#: template/docs.html.j2:128
+#: template/docs.html.j2:122
#, fuzzy
msgid "Cashier"
msgstr "Caisse enregistreuse"
-#: template/docs.html.j2:130
+#: template/docs.html.j2:124
msgid "An app for taking in cash and handing out electronic cash."
msgstr ""
"Une application pour encaisser des espèces et rendre de la monnaie "
"électronique."
-#: template/docs.html.j2:141
+#: template/docs.html.j2:135
msgid "Internals"
msgstr "Pour les membres du projet"
-#: template/docs.html.j2:152
+#: template/docs.html.j2:146
msgid "HTTP API"
msgstr "API HTTP"
-#: template/docs.html.j2:154
+#: template/docs.html.j2:148
msgid "Reference for the HTTP-based API for Taler components."
msgstr "Manuel de référence de l'API HTTP pour les composants Taler."
-#: template/docs.html.j2:162
+#: template/docs.html.j2:156
msgid "Onboarding"
msgstr "Embarquer"
-#: template/docs.html.j2:164
-msgid ""
-"Description of our taler.net setup and how to contribute. Also available as"
+#: template/docs.html.j2:158
+#, fuzzy
+#| msgid ""
+#| "Description of our taler.net setup and how to contribute. Also available "
+#| "as"
+msgid "Description of our taler.net setup and how to contribute."
msgstr ""
"Description de notre déploiement de taler.net et comment contribuer. "
"Également disponible en"
-#: template/docs.html.j2:177
+#: template/docs.html.j2:170
msgid "Community"
msgstr "Communauté"
-#: template/docs.html.j2:188
+#: template/docs.html.j2:181
msgid "Mailing List"
msgstr "Liste de diffusion"
-#: template/docs.html.j2:190
+#: template/docs.html.j2:183
msgid "The official GNU Taler mailing list."
msgstr "La liste de diffusion GNU Taler officielle."
-#: template/docs.html.j2:196
+#: template/docs.html.j2:189
msgid "IRC"
msgstr "IRC"
-#: template/docs.html.j2:198
+#: template/docs.html.j2:191
msgid "Our IRC channel is #taler on freenode."
msgstr "Notre salon de discussion IRC est #taler sur freenode."
-#: template/docs.html.j2:204
+#: template/docs.html.j2:197
msgid "Bug Tracker"
msgstr "Bug Tracker"
-#: template/docs.html.j2:206
+#: template/docs.html.j2:199
msgid "Our bug tracker for bugs and feature request."
msgstr ""
"Notre gestionnaire de suivi pour les bogues et les demandes de "
"fonctionnalités."
-#: template/docs.html.j2:216
+#: template/docs.html.j2:209
msgid "Code"
msgstr "Code"
-#: template/docs.html.j2:228
+#: template/docs.html.j2:221
msgid "Git repositories"
msgstr "Dépôts Git"
-#: template/docs.html.j2:230
+#: template/docs.html.j2:223
msgid "Git repositories for all of GNU Taler."
msgstr "Dépôts Git pour l'ensemble de GNU Taler."
-#: template/docs.html.j2:236
+#: template/docs.html.j2:229
msgid "lcov results"
msgstr "Résultats lcov"
-#: template/docs.html.j2:238
+#: template/docs.html.j2:231
msgid "Shows results of the code coverage analysis for our test suite."
msgstr ""
"Présente les résultats d'analyse de couverture de code pour notre jeu de "
"tests."
-#: template/docs.html.j2:244
+#: template/docs.html.j2:237
msgid "Continuous integration"
msgstr "Intégration continue"
-#: template/docs.html.j2:246
+#: template/docs.html.j2:239
msgid "Continuous integration and deployment is managed by our Buildbot."
msgstr ""
"L'intégration continue et le déploiement sont contrôlés par notre Buildbot."
@@ -1889,8 +1883,8 @@ msgid ""
"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."
+"well-documented Application Programming Interfaces (APIs) to allow "
+"frictionless integrations between GNU Taler and other projects."
msgstr ""
"GNU Taler doit être utilisable par des clients non-experts, notamment les "
"utilisateurs finaux du porte-monnaie GNU Taler, les commerçants qui "
@@ -2082,6 +2076,31 @@ msgstr ""
"Les porte-monnaies pour d'autres navigateurs seront rendus disponibles dès "
"que possible."
+#~ msgid ""
+#~ "Operator's manual for the GNU Taler exchange. Also available as <a "
+#~ "href=\"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>."
+
+#~ msgid ""
+#~ "Manual to run the back-office Web application. Also available as <a href="
+#~ "\"https://%(baseurl)s/pdf/taler-backoffice-manual.pdf\">PDF</a>."
+#~ msgstr ""
+#~ "Manuel pour faire fonctionner l'application Web d'arrière boutique. "
+#~ "Également disponible en <a href=\"https://%(baseurl)s/pdf/taler-"
+#~ "backoffice-manual.pdf\">PDF</a>."
+
+#~ msgid ""
+#~ "Manual for configuring and using the point of sale app. Also available as "
+#~ "<a href=\"https://%(baseurl)s/pdf/taler-merchant-pos-terminal.pdf\">PDF</"
+#~ "a>."
+#~ msgstr ""
+#~ "Manuel pour configurer et utiliser l'appli de point de vente. Également "
+#~ "disponible en <a href=\"https://%(baseurl)s/pdf/taler-merchant-pos-"
+#~ "terminal.pdf\">PDF</a>."
+
#, fuzzy
#~| msgid "News"
#~ msgid "News:"
diff --git a/locale/it/LC_MESSAGES/messages.po
b/locale/it/LC_MESSAGES/messages.po
index b0adf43..836fc51 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:11+0100\n"
+"POT-Creation-Date: 2020-12-01 23:18+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"
@@ -248,159 +248,148 @@ msgstr ""
#, python-format
msgid ""
"Tutorial and manual for operating a merchant. Also available as <a href="
-"\"https://%(baseurl)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
+"\"https://%(docshost)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
msgstr ""
-#: template/docs.html.j2:50
+#: template/docs.html.j2:49
msgid "Merchant API Tutorial"
msgstr ""
-#: template/docs.html.j2:52
+#: template/docs.html.j2:51
+msgid "Tutorial for processing Taler payments using the merchant backend API."
+msgstr ""
+
+#: template/docs.html.j2:54 template/docs.html.j2:65 template/docs.html.j2:76
+#: template/docs.html.j2:105 template/docs.html.j2:116
+#: template/docs.html.j2:161
#, python-format
-msgid ""
-"Tutorial for processing Taler payments using the merchant backend API. Also "
-"available as <a href=\"https://%(baseurl)s/pdf/taler-merchant-api-tutorial."
-"pdf\">PDF</a>."
+msgid "Also available as <a href=\"%(link)s\">PDF</a>."
msgstr ""
-#: template/docs.html.j2:62
+#: template/docs.html.j2:60
msgid "Exchange"
msgstr ""
-#: template/docs.html.j2:64
-#, python-format
-msgid ""
-"Operator's manual for the GNU Taler exchange. Also available as <a href="
-"\"https://%(baseurl)s/pdf/taler-exchange-manual.pdf\">PDF</a>."
+#: template/docs.html.j2:62
+msgid "Operator's manual for the GNU Taler exchange."
msgstr ""
-#: template/docs.html.j2:74
+#: template/docs.html.j2:71
msgid "Bank Integration"
msgstr ""
-#: template/docs.html.j2:76
-#, python-format
-msgid ""
-"Manual for tightly integrating Taler with banking applications. Also "
-"available as <a href=\"https://%(baseurl)s/pdf/taler-bank-manual.pdf\">PDF</"
-"a>."
+#: template/docs.html.j2:73
+msgid "Manual for tightly integrating Taler with banking applications."
msgstr ""
-#: template/docs.html.j2:92
+#: template/docs.html.j2:88
msgid "Wallet"
msgstr ""
-#: template/docs.html.j2:94
+#: template/docs.html.j2:90
msgid ""
"Manual about the Taler wallets (WebExtensions, Android, CLI). You can "
"download pre-packaged binaries from <a href=\"wallet.html\">the Taler wallet "
"Web site</a>."
msgstr ""
-#: template/docs.html.j2:104
+#: template/docs.html.j2:100
msgid "Back office"
msgstr ""
-#: template/docs.html.j2:106
-#, python-format
-msgid ""
-"Manual to run the back-office Web application. Also available as <a href="
-"\"https://%(baseurl)s/pdf/taler-backoffice-manual.pdf\">PDF</a>."
+#: template/docs.html.j2:102
+msgid "Manual to run the back-office Web application."
msgstr ""
-#: template/docs.html.j2:116
+#: template/docs.html.j2:111
msgid "Merchant POS Terminal"
msgstr ""
-#: template/docs.html.j2:118
-#, python-format
-msgid ""
-"Manual for configuring and using the point of sale app. Also available as <a "
-"href=\"https://%(baseurl)s/pdf/taler-merchant-pos-terminal.pdf\">PDF</a>."
+#: template/docs.html.j2:113
+msgid "Manual for configuring and using the point of sale app."
msgstr ""
-#: template/docs.html.j2:128
+#: template/docs.html.j2:122
msgid "Cashier"
msgstr ""
-#: template/docs.html.j2:130
+#: template/docs.html.j2:124
msgid "An app for taking in cash and handing out electronic cash."
msgstr ""
-#: template/docs.html.j2:141
+#: template/docs.html.j2:135
msgid "Internals"
msgstr ""
-#: template/docs.html.j2:152
+#: template/docs.html.j2:146
msgid "HTTP API"
msgstr ""
-#: template/docs.html.j2:154
+#: template/docs.html.j2:148
msgid "Reference for the HTTP-based API for Taler components."
msgstr ""
-#: template/docs.html.j2:162
+#: template/docs.html.j2:156
msgid "Onboarding"
msgstr ""
-#: template/docs.html.j2:164
-msgid ""
-"Description of our taler.net setup and how to contribute. Also available as"
+#: template/docs.html.j2:158
+msgid "Description of our taler.net setup and how to contribute."
msgstr ""
-#: template/docs.html.j2:177
+#: template/docs.html.j2:170
msgid "Community"
msgstr ""
-#: template/docs.html.j2:188
+#: template/docs.html.j2:181
msgid "Mailing List"
msgstr ""
-#: template/docs.html.j2:190
+#: template/docs.html.j2:183
msgid "The official GNU Taler mailing list."
msgstr ""
-#: template/docs.html.j2:196
+#: template/docs.html.j2:189
msgid "IRC"
msgstr ""
-#: template/docs.html.j2:198
+#: template/docs.html.j2:191
msgid "Our IRC channel is #taler on freenode."
msgstr ""
-#: template/docs.html.j2:204
+#: template/docs.html.j2:197
msgid "Bug Tracker"
msgstr ""
-#: template/docs.html.j2:206
+#: template/docs.html.j2:199
msgid "Our bug tracker for bugs and feature request."
msgstr ""
-#: template/docs.html.j2:216
+#: template/docs.html.j2:209
msgid "Code"
msgstr ""
-#: template/docs.html.j2:228
+#: template/docs.html.j2:221
msgid "Git repositories"
msgstr ""
-#: template/docs.html.j2:230
+#: template/docs.html.j2:223
msgid "Git repositories for all of GNU Taler."
msgstr ""
-#: template/docs.html.j2:236
+#: template/docs.html.j2:229
msgid "lcov results"
msgstr ""
-#: template/docs.html.j2:238
+#: template/docs.html.j2:231
msgid "Shows results of the code coverage analysis for our test suite."
msgstr ""
-#: template/docs.html.j2:244
+#: template/docs.html.j2:237
msgid "Continuous integration"
msgstr ""
-#: template/docs.html.j2:246
+#: template/docs.html.j2:239
msgid "Continuous integration and deployment is managed by our Buildbot."
msgstr ""
@@ -1565,8 +1554,8 @@ msgid ""
"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."
+"well-documented Application Programming Interfaces (APIs) to allow "
+"frictionless integrations between GNU Taler and other projects."
msgstr ""
#: template/principles.html.j2:157
diff --git a/locale/jp/LC_MESSAGES/messages.po
b/locale/jp/LC_MESSAGES/messages.po
index 2c3bdf4..473824d 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:11+0100\n"
+"POT-Creation-Date: 2020-12-01 23:18+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-";
@@ -267,165 +267,154 @@ msgstr ""
#, python-format
msgid ""
"Tutorial and manual for operating a merchant. Also available as <a href="
-"\"https://%(baseurl)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
+"\"https://%(docshost)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
msgstr ""
-#: template/docs.html.j2:50
+#: template/docs.html.j2:49
msgid "Merchant API Tutorial"
msgstr ""
-#: template/docs.html.j2:52
+#: template/docs.html.j2:51
+msgid "Tutorial for processing Taler payments using the merchant backend API."
+msgstr ""
+
+#: template/docs.html.j2:54 template/docs.html.j2:65 template/docs.html.j2:76
+#: template/docs.html.j2:105 template/docs.html.j2:116
+#: template/docs.html.j2:161
#, python-format
-msgid ""
-"Tutorial for processing Taler payments using the merchant backend API. Also "
-"available as <a href=\"https://%(baseurl)s/pdf/taler-merchant-api-tutorial."
-"pdf\">PDF</a>."
+msgid "Also available as <a href=\"%(link)s\">PDF</a>."
msgstr ""
-#: template/docs.html.j2:62
+#: template/docs.html.j2:60
msgid "Exchange"
msgstr ""
-#: template/docs.html.j2:64
-#, python-format
-msgid ""
-"Operator's manual for the GNU Taler exchange. Also available as <a href="
-"\"https://%(baseurl)s/pdf/taler-exchange-manual.pdf\">PDF</a>."
+#: template/docs.html.j2:62
+msgid "Operator's manual for the GNU Taler exchange."
msgstr ""
-#: template/docs.html.j2:74
+#: template/docs.html.j2:71
msgid "Bank Integration"
msgstr ""
-#: template/docs.html.j2:76
-#, python-format
-msgid ""
-"Manual for tightly integrating Taler with banking applications. Also "
-"available as <a href=\"https://%(baseurl)s/pdf/taler-bank-manual.pdf\">PDF</"
-"a>."
+#: template/docs.html.j2:73
+msgid "Manual for tightly integrating Taler with banking applications."
msgstr ""
-#: template/docs.html.j2:92
+#: template/docs.html.j2:88
msgid "Wallet"
msgstr ""
-#: template/docs.html.j2:94
+#: template/docs.html.j2:90
msgid ""
"Manual about the Taler wallets (WebExtensions, Android, CLI). You can "
"download pre-packaged binaries from <a href=\"wallet.html\">the Taler wallet "
"Web site</a>."
msgstr ""
-#: template/docs.html.j2:104
+#: template/docs.html.j2:100
msgid "Back office"
msgstr ""
-#: template/docs.html.j2:106
-#, python-format
-msgid ""
-"Manual to run the back-office Web application. Also available as <a href="
-"\"https://%(baseurl)s/pdf/taler-backoffice-manual.pdf\">PDF</a>."
+#: template/docs.html.j2:102
+msgid "Manual to run the back-office Web application."
msgstr ""
-#: template/docs.html.j2:116
+#: template/docs.html.j2:111
msgid "Merchant POS Terminal"
msgstr ""
-#: template/docs.html.j2:118
-#, python-format
-msgid ""
-"Manual for configuring and using the point of sale app. Also available as <a "
-"href=\"https://%(baseurl)s/pdf/taler-merchant-pos-terminal.pdf\">PDF</a>."
+#: template/docs.html.j2:113
+msgid "Manual for configuring and using the point of sale app."
msgstr ""
-#: template/docs.html.j2:128
+#: template/docs.html.j2:122
msgid "Cashier"
msgstr ""
-#: template/docs.html.j2:130
+#: template/docs.html.j2:124
msgid "An app for taking in cash and handing out electronic cash."
msgstr ""
-#: template/docs.html.j2:141
+#: template/docs.html.j2:135
msgid "Internals"
msgstr ""
-#: template/docs.html.j2:152
+#: template/docs.html.j2:146
msgid "HTTP API"
msgstr ""
-#: template/docs.html.j2:154
+#: template/docs.html.j2:148
msgid "Reference for the HTTP-based API for Taler components."
msgstr ""
-#: template/docs.html.j2:162
+#: template/docs.html.j2:156
msgid "Onboarding"
msgstr ""
-#: template/docs.html.j2:164
-msgid ""
-"Description of our taler.net setup and how to contribute. Also available as"
+#: template/docs.html.j2:158
+msgid "Description of our taler.net setup and how to contribute."
msgstr ""
-#: template/docs.html.j2:177
+#: template/docs.html.j2:170
msgid "Community"
msgstr ""
-#: template/docs.html.j2:188
+#: template/docs.html.j2:181
#, fuzzy
#| msgid "The mailing list"
msgid "Mailing List"
msgstr "送り先"
-#: template/docs.html.j2:190
+#: template/docs.html.j2:183
#, fuzzy
#| msgid "The mailing list"
msgid "The official GNU Taler mailing list."
msgstr "送り先"
-#: template/docs.html.j2:196
+#: template/docs.html.j2:189
msgid "IRC"
msgstr ""
-#: template/docs.html.j2:198
+#: template/docs.html.j2:191
msgid "Our IRC channel is #taler on freenode."
msgstr ""
-#: template/docs.html.j2:204
+#: template/docs.html.j2:197
msgid "Bug Tracker"
msgstr ""
-#: template/docs.html.j2:206
+#: template/docs.html.j2:199
msgid "Our bug tracker for bugs and feature request."
msgstr ""
-#: template/docs.html.j2:216
+#: template/docs.html.j2:209
msgid "Code"
msgstr ""
-#: template/docs.html.j2:228
+#: template/docs.html.j2:221
msgid "Git repositories"
msgstr ""
-#: template/docs.html.j2:230
+#: template/docs.html.j2:223
msgid "Git repositories for all of GNU Taler."
msgstr ""
-#: template/docs.html.j2:236
+#: template/docs.html.j2:229
msgid "lcov results"
msgstr ""
-#: template/docs.html.j2:238
+#: template/docs.html.j2:231
msgid "Shows results of the code coverage analysis for our test suite."
msgstr ""
-#: template/docs.html.j2:244
+#: template/docs.html.j2:237
#, fuzzy
#| msgid "Contact information"
msgid "Continuous integration"
msgstr "連絡先"
-#: template/docs.html.j2:246
+#: template/docs.html.j2:239
msgid "Continuous integration and deployment is managed by our Buildbot."
msgstr ""
@@ -1590,8 +1579,8 @@ msgid ""
"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."
+"well-documented Application Programming Interfaces (APIs) to allow "
+"frictionless integrations between GNU Taler and other projects."
msgstr ""
#: template/principles.html.j2:157
diff --git a/locale/messages.pot b/locale/messages.pot
index ec6ca5d..e00264e 100644
--- a/locale/messages.pot
+++ b/locale/messages.pot
@@ -8,14 +8,14 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-12-01 20:13+0100\n"
+"POT-Creation-Date: 2020-12-01 23:18+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.6.0\n"
+"Generated-By: Babel 2.8.1\n"
#: common/base.j2:5 common/news.j2:5
msgid "GNU Taler"
@@ -250,14 +250,10 @@ msgid "Merchant Backend Administration"
msgstr ""
#: template/docs.html.j2:40
-msgid "Tutorial and manual for operating a merchant."
-msgstr ""
-
-#: template/docs.html.j2:43 template/docs.html.j2:54 template/docs.html.j2:65
-#: template/docs.html.j2:76 template/docs.html.j2:105 template/docs.html.j2:116
-#: template/docs.html.j2:161
#, python-format
-msgid "Also available as <a href=\"%(link)s\">PDF</a>."
+msgid ""
+"Tutorial and manual for operating a merchant. Also available as <a "
+"href=\"https://%(docshost)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
msgstr ""
#: template/docs.html.j2:49
@@ -268,6 +264,13 @@ msgstr ""
msgid "Tutorial for processing Taler payments using the merchant backend API."
msgstr ""
+#: template/docs.html.j2:54 template/docs.html.j2:65 template/docs.html.j2:76
+#: template/docs.html.j2:105 template/docs.html.j2:116
+#: template/docs.html.j2:161
+#, python-format
+msgid "Also available as <a href=\"%(link)s\">PDF</a>."
+msgstr ""
+
#: template/docs.html.j2:60
msgid "Exchange"
msgstr ""
diff --git a/locale/pt/LC_MESSAGES/messages.po
b/locale/pt/LC_MESSAGES/messages.po
index d60d245..201ea79 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:11+0100\n"
+"POT-Creation-Date: 2020-12-01 23:18+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"
@@ -253,159 +253,148 @@ msgstr ""
#, python-format
msgid ""
"Tutorial and manual for operating a merchant. Also available as <a href="
-"\"https://%(baseurl)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
+"\"https://%(docshost)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
msgstr ""
-#: template/docs.html.j2:50
+#: template/docs.html.j2:49
msgid "Merchant API Tutorial"
msgstr ""
-#: template/docs.html.j2:52
+#: template/docs.html.j2:51
+msgid "Tutorial for processing Taler payments using the merchant backend API."
+msgstr ""
+
+#: template/docs.html.j2:54 template/docs.html.j2:65 template/docs.html.j2:76
+#: template/docs.html.j2:105 template/docs.html.j2:116
+#: template/docs.html.j2:161
#, python-format
-msgid ""
-"Tutorial for processing Taler payments using the merchant backend API. Also "
-"available as <a href=\"https://%(baseurl)s/pdf/taler-merchant-api-tutorial."
-"pdf\">PDF</a>."
+msgid "Also available as <a href=\"%(link)s\">PDF</a>."
msgstr ""
-#: template/docs.html.j2:62
+#: template/docs.html.j2:60
msgid "Exchange"
msgstr ""
-#: template/docs.html.j2:64
-#, python-format
-msgid ""
-"Operator's manual for the GNU Taler exchange. Also available as <a href="
-"\"https://%(baseurl)s/pdf/taler-exchange-manual.pdf\">PDF</a>."
+#: template/docs.html.j2:62
+msgid "Operator's manual for the GNU Taler exchange."
msgstr ""
-#: template/docs.html.j2:74
+#: template/docs.html.j2:71
msgid "Bank Integration"
msgstr ""
-#: template/docs.html.j2:76
-#, python-format
-msgid ""
-"Manual for tightly integrating Taler with banking applications. Also "
-"available as <a href=\"https://%(baseurl)s/pdf/taler-bank-manual.pdf\">PDF</"
-"a>."
+#: template/docs.html.j2:73
+msgid "Manual for tightly integrating Taler with banking applications."
msgstr ""
-#: template/docs.html.j2:92
+#: template/docs.html.j2:88
msgid "Wallet"
msgstr ""
-#: template/docs.html.j2:94
+#: template/docs.html.j2:90
msgid ""
"Manual about the Taler wallets (WebExtensions, Android, CLI). You can "
"download pre-packaged binaries from <a href=\"wallet.html\">the Taler wallet "
"Web site</a>."
msgstr ""
-#: template/docs.html.j2:104
+#: template/docs.html.j2:100
msgid "Back office"
msgstr ""
-#: template/docs.html.j2:106
-#, python-format
-msgid ""
-"Manual to run the back-office Web application. Also available as <a href="
-"\"https://%(baseurl)s/pdf/taler-backoffice-manual.pdf\">PDF</a>."
+#: template/docs.html.j2:102
+msgid "Manual to run the back-office Web application."
msgstr ""
-#: template/docs.html.j2:116
+#: template/docs.html.j2:111
msgid "Merchant POS Terminal"
msgstr ""
-#: template/docs.html.j2:118
-#, python-format
-msgid ""
-"Manual for configuring and using the point of sale app. Also available as <a "
-"href=\"https://%(baseurl)s/pdf/taler-merchant-pos-terminal.pdf\">PDF</a>."
+#: template/docs.html.j2:113
+msgid "Manual for configuring and using the point of sale app."
msgstr ""
-#: template/docs.html.j2:128
+#: template/docs.html.j2:122
msgid "Cashier"
msgstr ""
-#: template/docs.html.j2:130
+#: template/docs.html.j2:124
msgid "An app for taking in cash and handing out electronic cash."
msgstr ""
-#: template/docs.html.j2:141
+#: template/docs.html.j2:135
msgid "Internals"
msgstr ""
-#: template/docs.html.j2:152
+#: template/docs.html.j2:146
msgid "HTTP API"
msgstr ""
-#: template/docs.html.j2:154
+#: template/docs.html.j2:148
msgid "Reference for the HTTP-based API for Taler components."
msgstr ""
-#: template/docs.html.j2:162
+#: template/docs.html.j2:156
msgid "Onboarding"
msgstr ""
-#: template/docs.html.j2:164
-msgid ""
-"Description of our taler.net setup and how to contribute. Also available as"
+#: template/docs.html.j2:158
+msgid "Description of our taler.net setup and how to contribute."
msgstr ""
-#: template/docs.html.j2:177
+#: template/docs.html.j2:170
msgid "Community"
msgstr ""
-#: template/docs.html.j2:188
+#: template/docs.html.j2:181
msgid "Mailing List"
msgstr ""
-#: template/docs.html.j2:190
+#: template/docs.html.j2:183
msgid "The official GNU Taler mailing list."
msgstr ""
-#: template/docs.html.j2:196
+#: template/docs.html.j2:189
msgid "IRC"
msgstr ""
-#: template/docs.html.j2:198
+#: template/docs.html.j2:191
msgid "Our IRC channel is #taler on freenode."
msgstr ""
-#: template/docs.html.j2:204
+#: template/docs.html.j2:197
msgid "Bug Tracker"
msgstr ""
-#: template/docs.html.j2:206
+#: template/docs.html.j2:199
msgid "Our bug tracker for bugs and feature request."
msgstr ""
-#: template/docs.html.j2:216
+#: template/docs.html.j2:209
msgid "Code"
msgstr ""
-#: template/docs.html.j2:228
+#: template/docs.html.j2:221
msgid "Git repositories"
msgstr ""
-#: template/docs.html.j2:230
+#: template/docs.html.j2:223
msgid "Git repositories for all of GNU Taler."
msgstr ""
-#: template/docs.html.j2:236
+#: template/docs.html.j2:229
msgid "lcov results"
msgstr ""
-#: template/docs.html.j2:238
+#: template/docs.html.j2:231
msgid "Shows results of the code coverage analysis for our test suite."
msgstr ""
-#: template/docs.html.j2:244
+#: template/docs.html.j2:237
msgid "Continuous integration"
msgstr ""
-#: template/docs.html.j2:246
+#: template/docs.html.j2:239
msgid "Continuous integration and deployment is managed by our Buildbot."
msgstr ""
@@ -1570,8 +1559,8 @@ msgid ""
"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."
+"well-documented Application Programming Interfaces (APIs) to allow "
+"frictionless integrations between GNU Taler and other projects."
msgstr ""
#: template/principles.html.j2:157
diff --git a/locale/ru/LC_MESSAGES/messages.po
b/locale/ru/LC_MESSAGES/messages.po
index 0344d91..e869a74 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:11+0100\n"
+"POT-Creation-Date: 2020-12-01 23:18+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"
@@ -254,159 +254,148 @@ msgstr ""
#, python-format
msgid ""
"Tutorial and manual for operating a merchant. Also available as <a href="
-"\"https://%(baseurl)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
+"\"https://%(docshost)s/pdf/taler-merchant-manual.pdf\">PDF</a>."
msgstr ""
-#: template/docs.html.j2:50
+#: template/docs.html.j2:49
msgid "Merchant API Tutorial"
msgstr ""
-#: template/docs.html.j2:52
+#: template/docs.html.j2:51
+msgid "Tutorial for processing Taler payments using the merchant backend API."
+msgstr ""
+
+#: template/docs.html.j2:54 template/docs.html.j2:65 template/docs.html.j2:76
+#: template/docs.html.j2:105 template/docs.html.j2:116
+#: template/docs.html.j2:161
#, python-format
-msgid ""
-"Tutorial for processing Taler payments using the merchant backend API. Also "
-"available as <a href=\"https://%(baseurl)s/pdf/taler-merchant-api-tutorial."
-"pdf\">PDF</a>."
+msgid "Also available as <a href=\"%(link)s\">PDF</a>."
msgstr ""
-#: template/docs.html.j2:62
+#: template/docs.html.j2:60
msgid "Exchange"
msgstr ""
-#: template/docs.html.j2:64
-#, python-format
-msgid ""
-"Operator's manual for the GNU Taler exchange. Also available as <a href="
-"\"https://%(baseurl)s/pdf/taler-exchange-manual.pdf\">PDF</a>."
+#: template/docs.html.j2:62
+msgid "Operator's manual for the GNU Taler exchange."
msgstr ""
-#: template/docs.html.j2:74
+#: template/docs.html.j2:71
msgid "Bank Integration"
msgstr ""
-#: template/docs.html.j2:76
-#, python-format
-msgid ""
-"Manual for tightly integrating Taler with banking applications. Also "
-"available as <a href=\"https://%(baseurl)s/pdf/taler-bank-manual.pdf\">PDF</"
-"a>."
+#: template/docs.html.j2:73
+msgid "Manual for tightly integrating Taler with banking applications."
msgstr ""
-#: template/docs.html.j2:92
+#: template/docs.html.j2:88
msgid "Wallet"
msgstr ""
-#: template/docs.html.j2:94
+#: template/docs.html.j2:90
msgid ""
"Manual about the Taler wallets (WebExtensions, Android, CLI). You can "
"download pre-packaged binaries from <a href=\"wallet.html\">the Taler wallet "
"Web site</a>."
msgstr ""
-#: template/docs.html.j2:104
+#: template/docs.html.j2:100
msgid "Back office"
msgstr ""
-#: template/docs.html.j2:106
-#, python-format
-msgid ""
-"Manual to run the back-office Web application. Also available as <a href="
-"\"https://%(baseurl)s/pdf/taler-backoffice-manual.pdf\">PDF</a>."
+#: template/docs.html.j2:102
+msgid "Manual to run the back-office Web application."
msgstr ""
-#: template/docs.html.j2:116
+#: template/docs.html.j2:111
msgid "Merchant POS Terminal"
msgstr ""
-#: template/docs.html.j2:118
-#, python-format
-msgid ""
-"Manual for configuring and using the point of sale app. Also available as <a "
-"href=\"https://%(baseurl)s/pdf/taler-merchant-pos-terminal.pdf\">PDF</a>."
+#: template/docs.html.j2:113
+msgid "Manual for configuring and using the point of sale app."
msgstr ""
-#: template/docs.html.j2:128
+#: template/docs.html.j2:122
msgid "Cashier"
msgstr ""
-#: template/docs.html.j2:130
+#: template/docs.html.j2:124
msgid "An app for taking in cash and handing out electronic cash."
msgstr ""
-#: template/docs.html.j2:141
+#: template/docs.html.j2:135
msgid "Internals"
msgstr ""
-#: template/docs.html.j2:152
+#: template/docs.html.j2:146
msgid "HTTP API"
msgstr ""
-#: template/docs.html.j2:154
+#: template/docs.html.j2:148
msgid "Reference for the HTTP-based API for Taler components."
msgstr ""
-#: template/docs.html.j2:162
+#: template/docs.html.j2:156
msgid "Onboarding"
msgstr ""
-#: template/docs.html.j2:164
-msgid ""
-"Description of our taler.net setup and how to contribute. Also available as"
+#: template/docs.html.j2:158
+msgid "Description of our taler.net setup and how to contribute."
msgstr ""
-#: template/docs.html.j2:177
+#: template/docs.html.j2:170
msgid "Community"
msgstr ""
-#: template/docs.html.j2:188
+#: template/docs.html.j2:181
msgid "Mailing List"
msgstr ""
-#: template/docs.html.j2:190
+#: template/docs.html.j2:183
msgid "The official GNU Taler mailing list."
msgstr ""
-#: template/docs.html.j2:196
+#: template/docs.html.j2:189
msgid "IRC"
msgstr ""
-#: template/docs.html.j2:198
+#: template/docs.html.j2:191
msgid "Our IRC channel is #taler on freenode."
msgstr ""
-#: template/docs.html.j2:204
+#: template/docs.html.j2:197
msgid "Bug Tracker"
msgstr ""
-#: template/docs.html.j2:206
+#: template/docs.html.j2:199
msgid "Our bug tracker for bugs and feature request."
msgstr ""
-#: template/docs.html.j2:216
+#: template/docs.html.j2:209
msgid "Code"
msgstr ""
-#: template/docs.html.j2:228
+#: template/docs.html.j2:221
msgid "Git repositories"
msgstr ""
-#: template/docs.html.j2:230
+#: template/docs.html.j2:223
msgid "Git repositories for all of GNU Taler."
msgstr ""
-#: template/docs.html.j2:236
+#: template/docs.html.j2:229
msgid "lcov results"
msgstr ""
-#: template/docs.html.j2:238
+#: template/docs.html.j2:231
msgid "Shows results of the code coverage analysis for our test suite."
msgstr ""
-#: template/docs.html.j2:244
+#: template/docs.html.j2:237
msgid "Continuous integration"
msgstr ""
-#: template/docs.html.j2:246
+#: template/docs.html.j2:239
msgid "Continuous integration and deployment is managed by our Buildbot."
msgstr ""
@@ -1571,8 +1560,8 @@ msgid ""
"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."
+"well-documented Application Programming Interfaces (APIs) to allow "
+"frictionless integrations between GNU Taler and other projects."
msgstr ""
#: template/principles.html.j2:157
diff --git a/make_site.py b/make_site.py
index c7d2615..3397844 100755
--- a/make_site.py
+++ b/make_site.py
@@ -27,6 +27,7 @@ env =
jinja2.Environment(loader=jinja2.FileSystemLoader(str(PurePath(__file__).p
trim_blocks=True,
undefined=jinja2.StrictUndefined,
autoescape=False)
+env.newstyle_gettext = True
if len(sys.argv) >= 2 and sys.argv[1] == "-vv":
DEBUG=1
diff --git a/template/docs.html.j2 b/template/docs.html.j2
index a8c01bb..bf564bd 100644
--- a/template/docs.html.j2
+++ b/template/docs.html.j2
@@ -37,10 +37,10 @@
<img src="{{ url('icons/icon-backend.svg') }}" height=60>
<h3>{{ _("Merchant Backend Administration")}}</h3>
</a>
- {% trans %}
+ {% trans docshost=siteconfitem['docshost'] %}
Tutorial and manual for operating a merchant.
+ Also available as <a href="https://{{ docshost
}}/pdf/taler-merchant-manual.pdf">PDF</a>.
{% endtrans %}
- {{ gettext('Also available as <a
href="%(link)s">PDF</a>.')|format(link="https://"; + siteconfitem['docshost'] +
"/pdf/taler-merchant-manual.pdf") }}
</div>
<div class="col-3">
@@ -51,7 +51,7 @@
{% trans %}
Tutorial for processing Taler payments using the merchant backend API.
{% endtrans %}
- {{ gettext('Also available as <a
href="%(link)s">PDF</a>.')|format(link="https://"; + siteconfitem['docshost'] +
"/pdf/taler-merchant-api-tutorial.pdf") }}
+ {{ 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">
@@ -62,7 +62,7 @@
{% trans %}
Operator's manual for the GNU Taler exchange.
{% endtrans %}
- {{ gettext('Also available as <a
href="%(link)s">PDF</a>.')|format(link="https://"; + siteconfitem['docshost'] +
"/pdf/taler-exchange-manual.pdf") }}
+ {{ 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,7 +73,7 @@
{% trans %}
Manual for tightly integrating Taler with banking applications.
{% endtrans %}
- {{ gettext('Also available as <a
href="%(link)s">PDF</a>.')|format(link="https://"; + siteconfitem['docshost'] +
"/pdf/taler-bank-manual.pdf") }}
+ {{ gettext('Also available as <a href="%(link)s">PDF</a>.',
link="https://"; + siteconfitem['docshost'] + "/pdf/taler-bank-manual.pdf") }}
</div>
</div>
@@ -102,7 +102,7 @@
{% trans %}
Manual to run the back-office Web application.
{% endtrans %}
- {{ gettext('Also available as <a
href="%(link)s">PDF</a>.')|format(link="https://"; + siteconfitem['docshost'] +
"/pdf/taler-backoffice-manual.pdf") }}
+ {{ gettext('Also available as <a href="%(link)s">PDF</a>.',
link="https://"; + siteconfitem['docshost'] +
"/pdf/taler-backoffice-manual.pdf") }}
</div>
<div class="col-3">
@@ -113,7 +113,7 @@
{% trans %}
Manual for configuring and using the point of sale app.
{% endtrans %}
- {{ gettext('Also available as <a
href="%(link)s">PDF</a>.')|format(link="https://"; + siteconfitem['docshost'] +
"/pdf/taler-merchant-pos-terminal.pdf") }}
+ {{ 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">
@@ -158,7 +158,7 @@
{% trans %}
Description of our taler.net setup and how to contribute.
{% endtrans %}
- {{ gettext('Also available as <a
href="%(link)s">PDF</a>.')|format(link="https://"; + siteconfitem['docshost'] +
"/pdf/developers-manual.pdf") }}
+ {{ 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 (98b0950 -> 07d116b),
gnunet <=