[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[www] 07/07: merge
From: |
gnunet |
Subject: |
[www] 07/07: merge |
Date: |
Fri, 12 Mar 2021 16:09:10 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository www.
commit 8cca97d25e2aa3b4c7ee969bcceaf98132cc632d
Merge: de258eb 1a859f1
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Fri Mar 12 16:07:28 2021 +0100
merge
inc | 2 +-
locale/es/LC_MESSAGES/messages.po | 77 ++++++++++++++++++++++++++++++------
locale/fr/LC_MESSAGES/messages.po | 83 +++++++++++++++++++++------------------
locale/it/LC_MESSAGES/messages.po | 44 ++++++++++++++++-----
locale/ja/LC_MESSAGES/messages.po | 74 +++++++++++++++++++++++++---------
5 files changed, 199 insertions(+), 81 deletions(-)
diff --cc inc
index 99a0de7,99a0de7..4ae188a
--- a/inc
+++ b/inc
@@@ -1,1 -1,1 +1,1 @@@
--Subproject commit 99a0de7cac0033db10a0bed9f476900ece1e402a
++Subproject commit 4ae188ae658793c6cfddf60fdb5a563e590f9cfa
diff --cc locale/es/LC_MESSAGES/messages.po
index f07ea96,18d844c..cccfca0
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@@ -1928,8 -1233,12 +1965,15 @@@ msgstr "
#: template/gns.html.j2:28
msgid "Overview"
- msgstr ""
+ msgstr "visión general"
+
++<<<<<<< HEAD
++=======
+ #: template/gns.html.j2:37
+ msgid "Features"
+ msgstr "Características"
++>>>>>>> weblate/master
#: template/gns.html.j2:39
msgid ""
"The GNU Name System (GNS) is secure and decentralized naming system. It "
diff --cc locale/fr/LC_MESSAGES/messages.po
index caa9b89,63099a6..8850545
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@@ -61,13 -63,12 +63,13 @@@ msgstr "Signaler des problèmes sur ce
#: common/navigation.j2.inc:38
msgid "About"
- msgstr ""
+ msgstr "À propos"
#: common/navigation.j2.inc:39 news/index.html.j2:8
+#: news/oldnews-2011.html.j2:13 news/oldnews-2013.html.j2:13
#: news/oldnews-2018.html.j2:13 news/oldnews-2019.html.j2:13
msgid "News"
- msgstr ""
+ msgstr "Nouveautés"
#: common/navigation.j2.inc:40 template/index.html.j2:289
msgid "Applications"
@@@ -155,25 -156,25 +157,28 @@@ msgstr "API REST
#: common/navigation.j2.inc:89
msgid "FAQ"
- msgstr ""
+ msgstr "F.A.Q"
-#: news/index.html.j2:11 news/oldnews-2018.html.j2:16
+#: news/index.html.j2:11 news/oldnews-2011.html.j2:16
+#: news/oldnews-2013.html.j2:16 news/oldnews-2018.html.j2:16
#: news/oldnews-2019.html.j2:16
+ #, fuzzy
msgid "News posts about changes related to GNUnet such as releases and events"
msgstr ""
+ "Publications d'actualités de changements liés à GNUnet comme des parutions "
+ "et des évènements"
-#: news/index.html.j2:16 news/oldnews-2018.html.j2:21
+#: news/index.html.j2:16 news/oldnews-2011.html.j2:21
+#: news/oldnews-2013.html.j2:21 news/oldnews-2018.html.j2:21
#: news/oldnews-2019.html.j2:21
msgid "subscribe to our RSS feed"
- msgstr ""
+ msgstr "Abonnez-vous à notre Flux RSS"
-#: news/index.html.j2:36 news/oldnews-2018.html.j2:40
+#: news/index.html.j2:36 news/oldnews-2011.html.j2:40
+#: news/oldnews-2013.html.j2:40 news/oldnews-2018.html.j2:40
#: news/oldnews-2019.html.j2:40
msgid "read more"
- msgstr ""
+ msgstr "Plus de détails"
#: news/index.html.j2:45
msgid "News archives:"
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [www] branch master updated (de258eb -> 8cca97d), gnunet, 2021/03/12
- [www] 05/07: Translated using Weblate (Italian), gnunet, 2021/03/12
- [www] 02/07: Translated using Weblate (Spanish), gnunet, 2021/03/12
- [www] 04/07: Translated using Weblate (French), gnunet, 2021/03/12
- [www] 03/07: Translated using Weblate (Spanish), gnunet, 2021/03/12
- [www] 01/07: Translated using Weblate (Spanish), gnunet, 2021/03/12
- [www] 06/07: Translated using Weblate (Japanese), gnunet, 2021/03/12
- [www] 07/07: merge,
gnunet <=