[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-www] 03/05: update all language strings; solve merge conflict
|
From: |
gnunet |
|
Subject: |
[taler-www] 03/05: update all language strings; solve merge conflict |
|
Date: |
Tue, 30 Jul 2024 08:12:30 +0200 |
This is an automated email from the git hooks/post-receive script.
skuegel pushed a commit to branch stable
in repository www.
commit 5f40d852d7a242bb767cff78382964179d2d292a
Merge: a994a0e2 409d51a2
Author: Stefan Kügel <skuegel@web.de>
AuthorDate: Mon Jul 1 23:16:21 2024 +0200
update all language strings; solve merge conflict
locale/ar/LC_MESSAGES/messages.po | 51 +++++++++---------
locale/cs/LC_MESSAGES/messages.po | 77 ++++++++++++---------------
locale/de/LC_MESSAGES/messages.po | 57 ++++++++++----------
locale/en/LC_MESSAGES/messages.po | 36 ++++++-------
locale/es/LC_MESSAGES/messages.po | 97 ++++++++++++++++++----------------
locale/fi/LC_MESSAGES/messages.po | 62 ++++++++++++----------
locale/fr/LC_MESSAGES/messages.po | 57 ++++++++++----------
locale/hi/LC_MESSAGES/messages.po | 70 ++++++++++++------------
locale/hu/LC_MESSAGES/messages.po | 61 +++++++++++----------
locale/it/LC_MESSAGES/messages.po | 53 ++++++++++---------
locale/ja/LC_MESSAGES/messages.po | 69 +++++++++++-------------
locale/ko/LC_MESSAGES/messages.po | 63 +++++++++++-----------
locale/messages.pot | 37 ++++++-------
locale/nl/LC_MESSAGES/messages.po | 54 ++++++++++---------
locale/pt/LC_MESSAGES/messages.po | 68 +++++++++++-------------
locale/pt_BR/LC_MESSAGES/messages.po | 63 +++++++++++-----------
locale/ru/LC_MESSAGES/messages.po | 65 ++++++++++++-----------
locale/sv/LC_MESSAGES/messages.po | 67 ++++++++++-------------
locale/tr/LC_MESSAGES/messages.po | 65 ++++++++++++++---------
locale/uk/LC_MESSAGES/messages.po | 63 +++++++++++++---------
locale/zh_Hans/LC_MESSAGES/messages.po | 58 ++++++++++----------
locale/zh_Hant/LC_MESSAGES/messages.po | 61 +++++++++++----------
template/wallet.html.j2 | 15 +++---
23 files changed, 694 insertions(+), 675 deletions(-)
diff --cc template/wallet.html.j2
index c8d87f04,9bf7e28d..b113bd42
--- a/template/wallet.html.j2
+++ b/template/wallet.html.j2
@@@ -199,9 -198,9 +198,9 @@@ document.addEventListener('DOMContentLo
<ul>
<li>
-- <p>{% trans %}You can
-- <a
href="https://taler.net/files/wallet/wallet-nightly-debug-latest.apk";
target="_blank" rel="noopener noreferrer">
- download the APK for Android</a> directly.{% endtrans %}</p>
- directly download the APK for Android.</a>{% endtrans %}</p>
++ <p>
++ {% trans %}You can <a
href="https://taler.net/files/wallet/wallet-nightly-debug-latest.apk";
target="_blank" rel="noopener noreferrer">directly download the APK for
Android.</a>{% endtrans %}
++ </p>
</li>
<li>
<a
href="https://play.google.com/store/apps/details?id=net.taler.wallet";
target="_blank" rel="noopener noreferrer">
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.