[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-merchant-demos] 02/02: Merge branch 'master' of ssh://git.t
|
From: |
gnunet |
|
Subject: |
[taler-taler-merchant-demos] 02/02: Merge branch 'master' of ssh://git.taler.net/taler-merchant-demos |
|
Date: |
Thu, 20 May 2021 23:31:49 +0200 |
This is an automated email from the git hooks/post-receive script.
skuegel pushed a commit to branch master
in repository taler-merchant-demos.
commit ea17362d031de5c3a550cc1a15c84c6457eaad5c
Merge: d8b4bab a5bedb7
Author: Stefan Kügel <skuegel@web.de>
AuthorDate: Thu May 20 23:29:14 2021 +0200
Merge branch 'master' of ssh://git.taler.net/taler-merchant-demos
talermerchantdemos/blog/blog.py | 12 +++++-------
translations/it/LC_MESSAGES/messages.po | 16 ++++++++--------
translations/ru/LC_MESSAGES/messages.po | 12 ++++++------
translations/zh_Hant/LC_MESSAGES/messages.po | 4 ++++
4 files changed, 23 insertions(+), 21 deletions(-)
diff --cc translations/zh_Hant/LC_MESSAGES/messages.po
index e3b59b8,8f1ed48..a09390d
--- a/translations/zh_Hant/LC_MESSAGES/messages.po
+++ b/translations/zh_Hant/LC_MESSAGES/messages.po
@@@ -8,7 -8,7 +8,11 @@@ msgstr "
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: eintritt@hotmail.com\n"
"POT-Creation-Date: 2021-03-12 18:42+0100\n"
++<<<<<<< HEAD
+"PO-Revision-Date: 2021-05-20 20:47+0000\n"
++=======
+ "PO-Revision-Date: 2021-05-16 06:58+0000\n"
++>>>>>>> a5bedb7db9ceaa0342306f12f900914a8e9b4155
"Last-Translator: Ting-Yi Fu <futingyi0215@gmail.com>\n"
"Language-Team: Chinese (Traditional) <http://weblate.taler.net/projects/";
"gnu-taler/demonstration-pages/zh_Hant/>\n"
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.