summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--common/navigation.j2.inc2
-rw-r--r--locale/de/LC_MESSAGES/messages.po26
-rw-r--r--locale/en/LC_MESSAGES/messages.po6
-rw-r--r--locale/es/LC_MESSAGES/messages.po6
-rw-r--r--locale/fr/LC_MESSAGES/messages.po6
-rw-r--r--locale/it/LC_MESSAGES/messages.po6
-rw-r--r--locale/pt/LC_MESSAGES/messages.po6
-rw-r--r--locale/ru/LC_MESSAGES/messages.po6
8 files changed, 42 insertions, 22 deletions
diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc
index b843297..fb44bb1 100644
--- a/common/navigation.j2.inc
+++ b/common/navigation.j2.inc
@@ -38,8 +38,8 @@
</button>
<ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
<li><a class="dropdown-item" href="{{ self_localized('en') }}">English [en]</a></li>
- <!--
<li><a class="dropdown-item" href="{{ self_localized('de') }}">Deutsch [de]</a></li>
+ <!--
<li><a class="dropdown-item" href="{{ self_localized('fr') }}">Fran&ccedil;ais [fr]</a></li>
<li><a class="dropdown-item" href="{{ self_localized('it') }}">Italiano [it]</a></li>
<li><a class="dropdown-item" href="{{ self_localized('es') }}">Espa&ntilde;ol [es]</a></li>
diff --git a/locale/de/LC_MESSAGES/messages.po b/locale/de/LC_MESSAGES/messages.po
index 3336aab..b2b9567 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: 2020-04-01 00:04+0200\n"
+"POT-Creation-Date: 2020-04-15 23:32+0200\n"
"PO-Revision-Date: 2020-04-13 20:39+0200\n"
"Last-Translator: Stefan Kügel <skuegel@web.de>\n"
"Language-Team: de <LL@li.org, de@taler.net>\n"
@@ -754,6 +754,21 @@ msgid "Does Taler support recurring payments?"
msgstr "Beherrscht Taler Daueraufträge (wiederkehrende Zahlungen)?"
#: template/faq.html.j2:176
+#, fuzzy
+#| msgid ""
+#| "Today, our wallet implementation does not support recurring payments. "
+#| "Recurring payments, where some fixed amount is paid on a regular basis "
+#| "are in theory possible with Taler, but they come with a few caveats. "
+#| "Specifically, recurring payments can only work if the Taler wallet is "
+#| "running and online around the desired time. Furthermore, given their "
+#| "repetitive nature they are linkable, and could thus be used to "
+#| "deanonymize the user making the recurring payment, for example by forcing "
+#| "the user offline at the time of the payment and observing that it does "
+#| "then not happen on time. Finally, the Taler wallet does not work with "
+#| "credit and thus the user would have to make sure to carry a sufficient "
+#| "balance for the recurring payment to be made. Still, they can be useful, "
+#| "and a future version of the Taler wallet will likely support them. But "
+#| "this is not a feature that we are targeting for Taler 1.0. at this time"
msgid ""
"Today, our wallet implementation does not support recurring payments. "
"Recurring payments, where some fixed amount is paid on a regular basis are "
@@ -767,7 +782,7 @@ msgid ""
"the user would have to make sure to carry a sufficient balance for the "
"recurring payment to be made. Still, they can be useful, and a future "
"version of the Taler wallet will likely support them. But this is not a "
-"feature that we are targeting for Taler 1.0. at this time"
+"feature that we are targeting for Taler 1.0. at this time."
msgstr ""
"Taler-Wallets bieten gegenwärtig noch nicht die Funktionalität für "
"Daueraufträge. Wiederkehrende Zahlungen mit einem fixen Zahlbetrag und "
@@ -819,8 +834,13 @@ msgstr ""
"der die Einzahlung auf das Treuhandkonto erfolgte."
#: template/features.html.j2:32
+#, fuzzy
+#| msgid ""
+#| "Payment are made after <span class=\"tlr\">exchanging existing money</"
+#| "span> into <em>electronic money</em> with the help of an Exchange "
+#| "service, that is, a payment service provider for Taler."
msgid ""
-"Payment are made after <span class=\"tlr\">exchanging existing money</span> "
+"Payments are made after <span class=\"tlr\">exchanging existing money</span> "
"into <em>electronic money</em> with the help of an Exchange service, that "
"is, a payment service provider for Taler."
msgstr ""
diff --git a/locale/en/LC_MESSAGES/messages.po b/locale/en/LC_MESSAGES/messages.po
index 47790b1..82c5a90 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-04-01 00:04+0200\n"
+"POT-Creation-Date: 2020-04-15 23:32+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"
@@ -574,7 +574,7 @@ msgid ""
"the user would have to make sure to carry a sufficient balance for the "
"recurring payment to be made. Still, they can be useful, and a future "
"version of the Taler wallet will likely support them. But this is not a "
-"feature that we are targeting for Taler 1.0. at this time"
+"feature that we are targeting for Taler 1.0. at this time."
msgstr ""
#: template/features.html.j2:7
@@ -598,7 +598,7 @@ msgstr ""
#: template/features.html.j2:32
msgid ""
-"Payment are made after <span class=\"tlr\">exchanging existing money</span> "
+"Payments are made after <span class=\"tlr\">exchanging existing money</span> "
"into <em>electronic money</em> with the help of an Exchange service, that "
"is, a payment service provider for Taler."
msgstr ""
diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po
index 11ef917..7a00964 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-04-01 00:04+0200\n"
+"POT-Creation-Date: 2020-04-15 23:32+0200\n"
"PO-Revision-Date: 2017-08-10 06:24+0200\n"
"Last-Translator: \n"
"Language-Team: es <LL@li.org>\n"
@@ -575,7 +575,7 @@ msgid ""
"the user would have to make sure to carry a sufficient balance for the "
"recurring payment to be made. Still, they can be useful, and a future "
"version of the Taler wallet will likely support them. But this is not a "
-"feature that we are targeting for Taler 1.0. at this time"
+"feature that we are targeting for Taler 1.0. at this time."
msgstr ""
#: template/features.html.j2:7
@@ -599,7 +599,7 @@ msgstr ""
#: template/features.html.j2:32
msgid ""
-"Payment are made after <span class=\"tlr\">exchanging existing money</span> "
+"Payments are made after <span class=\"tlr\">exchanging existing money</span> "
"into <em>electronic money</em> with the help of an Exchange service, that "
"is, a payment service provider for Taler."
msgstr ""
diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po
index 6523a18..8164c25 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: 2020-04-01 00:04+0200\n"
+"POT-Creation-Date: 2020-04-15 23:32+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"
@@ -574,7 +574,7 @@ msgid ""
"the user would have to make sure to carry a sufficient balance for the "
"recurring payment to be made. Still, they can be useful, and a future "
"version of the Taler wallet will likely support them. But this is not a "
-"feature that we are targeting for Taler 1.0. at this time"
+"feature that we are targeting for Taler 1.0. at this time."
msgstr ""
#: template/features.html.j2:7
@@ -598,7 +598,7 @@ msgstr ""
#: template/features.html.j2:32
msgid ""
-"Payment are made after <span class=\"tlr\">exchanging existing money</span> "
+"Payments are made after <span class=\"tlr\">exchanging existing money</span> "
"into <em>electronic money</em> with the help of an Exchange service, that "
"is, a payment service provider for Taler."
msgstr ""
diff --git a/locale/it/LC_MESSAGES/messages.po b/locale/it/LC_MESSAGES/messages.po
index 20d935c..1e8d843 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-04-01 00:04+0200\n"
+"POT-Creation-Date: 2020-04-15 23:32+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"
@@ -574,7 +574,7 @@ msgid ""
"the user would have to make sure to carry a sufficient balance for the "
"recurring payment to be made. Still, they can be useful, and a future "
"version of the Taler wallet will likely support them. But this is not a "
-"feature that we are targeting for Taler 1.0. at this time"
+"feature that we are targeting for Taler 1.0. at this time."
msgstr ""
#: template/features.html.j2:7
@@ -598,7 +598,7 @@ msgstr ""
#: template/features.html.j2:32
msgid ""
-"Payment are made after <span class=\"tlr\">exchanging existing money</span> "
+"Payments are made after <span class=\"tlr\">exchanging existing money</span> "
"into <em>electronic money</em> with the help of an Exchange service, that "
"is, a payment service provider for Taler."
msgstr ""
diff --git a/locale/pt/LC_MESSAGES/messages.po b/locale/pt/LC_MESSAGES/messages.po
index ad488f2..f43cd9e 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-04-01 00:04+0200\n"
+"POT-Creation-Date: 2020-04-15 23:32+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"
@@ -579,7 +579,7 @@ msgid ""
"the user would have to make sure to carry a sufficient balance for the "
"recurring payment to be made. Still, they can be useful, and a future "
"version of the Taler wallet will likely support them. But this is not a "
-"feature that we are targeting for Taler 1.0. at this time"
+"feature that we are targeting for Taler 1.0. at this time."
msgstr ""
#: template/features.html.j2:7
@@ -603,7 +603,7 @@ msgstr ""
#: template/features.html.j2:32
msgid ""
-"Payment are made after <span class=\"tlr\">exchanging existing money</span> "
+"Payments are made after <span class=\"tlr\">exchanging existing money</span> "
"into <em>electronic money</em> with the help of an Exchange service, that "
"is, a payment service provider for Taler."
msgstr ""
diff --git a/locale/ru/LC_MESSAGES/messages.po b/locale/ru/LC_MESSAGES/messages.po
index 713f04f..f1188ac 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-04-01 00:04+0200\n"
+"POT-Creation-Date: 2020-04-15 23:32+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"
@@ -580,7 +580,7 @@ msgid ""
"the user would have to make sure to carry a sufficient balance for the "
"recurring payment to be made. Still, they can be useful, and a future "
"version of the Taler wallet will likely support them. But this is not a "
-"feature that we are targeting for Taler 1.0. at this time"
+"feature that we are targeting for Taler 1.0. at this time."
msgstr ""
#: template/features.html.j2:7
@@ -604,7 +604,7 @@ msgstr ""
#: template/features.html.j2:32
msgid ""
-"Payment are made after <span class=\"tlr\">exchanging existing money</span> "
+"Payments are made after <span class=\"tlr\">exchanging existing money</span> "
"into <em>electronic money</em> with the help of an Exchange service, that "
"is, a payment service provider for Taler."
msgstr ""