[taler-www] 08/08: merge

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository www.

commit 4d35de08c171b57f0bcf5df600bef2226290fe4c
Merge: ecfddb3 bec47d7
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Sat Feb 27 21:22:27 2021 +0100

    merge

 locale/ar/LC_MESSAGES/messages.po |  23 +++++---
 locale/de/LC_MESSAGES/messages.po |  53 +++++------------
 locale/hi/LC_MESSAGES/messages.po | 120 +++++++++++++++++++++++++-------------
 locale/ja/LC_MESSAGES/messages.po |  36 +++++++-----
 locale/ko/LC_MESSAGES/messages.po | 118 +++++++++++++++++++++----------------
 5 files changed, 197 insertions(+), 153 deletions(-)

diff --cc locale/de/LC_MESSAGES/messages.po
index a4ac362,d368d8d..9651bec
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@@ -1459,16 -1449,9 +1449,16 @@@ msgid "
  "... in the area of computing, freedom means not using proprietary software"
  msgstr ""
  "... im digitalen Zeitalter bedeutet Freiheit, keine proprietäre Software "
- "einzusetzen."
+ "einzusetzen"
  
  #: template/principles.html.j2:36
 +#, fuzzy
 +#| msgid ""
 +#| "GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.html";
 +#| "\">Free Software</a>. For merchants, our Free Software reference "
 +#| "implementation prevents vendor lock-in. As the software of the payment "
 +#| "provider itself is free, countries can deploy the payment system without "
 +#| "compromising sovereignty."
  msgid ""
  "GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.html";
  "\">Free/Libre Software</a>. For merchants, Free/Libre Software prevents "
@@@ -1737,7 -1706,7 +1710,7 @@@ msgstr "9. Gesunden Wettbewerb antreibe
  msgid "A competitive market"
  msgstr "Ein Markt ohne Monopolsituation und Kartellmacht"
  
--# I don't really understand the meaning of " to join the systems".
++# I don't really understand the meaning of " to join the systems".
  # For now I've translated this sentence as if its meaning was "to connect to 
the existing payment systems"
  #: template/principles.html.j2:197
  msgid ""
@@@ -1763,7 -1732,7 +1736,7 @@@ msgstr "
  "Kartelle über die Verfügbarkeit und Zugänglichkeit von Zahlungsdiensten "
  "bestimmen."
  
--# I don't really understand the meaning of " to join the systems".
++# I don't really understand the meaning of " to join the systems".
  # For now I've translated this sentence as if its meaning was "to connect to 
the existing payment systems"
  #: template/principles.html.j2:209
  msgid ""
diff --cc locale/ja/LC_MESSAGES/messages.po
index 915067a,4a331a5..fd4057f
--- a/locale/ja/LC_MESSAGES/messages.po
+++ b/locale/ja/LC_MESSAGES/messages.po
@@@ -7,11 -7,11 +7,11 @@@ msgid "
  msgstr ""
  "Project-Id-Version: PROJECT VERSION\n"
  "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
- "POT-Creation-Date: 2021-02-26 11:12+0100\n"
- "PO-Revision-Date: 2021-02-25 19:30+0000\n"
+ "POT-Creation-Date: 2021-02-01 19:53+0100\n"
+ "PO-Revision-Date: 2021-02-27 20:12+0000\n"
  "Last-Translator: Miyuki Komatsu <miykom@gmail.com>\n"
 -"Language-Team: Japanese <http://weblate.taler.net/projects/gnu-taler/";
 -"main-web-site/ja/>\n"
 +"Language-Team: Japanese <http://weblate.taler.net/projects/gnu-taler/main-";
 +"web-site/ja/>\n"
  "Language: ja\n"
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=UTF-8\n"

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.