[GNUnet-SVN] [www] 04/11: Merge branch 'master' of ssh://git.gnunet.org/www

[gnunet]

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

xrs pushed a commit to branch master
in repository www.

commit fe36bc275b6b47f54a188abff81c587101e3399f
Merge: fdcca11 c6f26b6
Author: xrs <address@hidden>
AuthorDate: Mon Jul 1 20:33:29 2019 +0200

    Merge branch 'master' of ssh://git.gnunet.org/www

 common/footer.j2.inc              |  2 +-
 locale/de/LC_MESSAGES/messages.po |  4 +-
 locale/en/LC_MESSAGES/messages.po |  2 +-
 locale/es/LC_MESSAGES/messages.po |  4 +-
 locale/fr/LC_MESSAGES/messages.po |  4 +-
 locale/it/LC_MESSAGES/messages.po | 77 +++++++++++++++++++++++----------------
 template/use.html.j2              |  2 +-
 7 files changed, 55 insertions(+), 40 deletions(-)

diff --cc locale/it/LC_MESSAGES/messages.po
index ddb8e2a,9d78309..d348b01
--- a/locale/it/LC_MESSAGES/messages.po
+++ b/locale/it/LC_MESSAGES/messages.po
@@@ -8,7 -8,7 +8,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: PROJECT VERSION\n"
  "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
- "POT-Creation-Date: 2019-06-30 09:10+0200\n"
 -"POT-Creation-Date: 2019-07-01 15:53+0200\n"
++"POT-Creation-Date: 2019-07-01 20:30+0200\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  "Language-Team: LANGUAGE <address@hidden>\n"
@@@ -1728,20 -1728,20 +1728,19 @@@ msgid "
  "<p>The following GNUnet installation instructions help you building from "
  "source for your distribution.</p> <p><i>Please note that the installation "
  "process will get much easier once we have proper packages again (planned for 
"
--"winter 2019).</i></p>"
++"winter 2019).</i></p> <p>You have already installed GNUnet and want to use "
++"it? <a href=\"https://gnunet.org/en/use\";>Check this out!</a> </p>"
  msgstr ""
  
--#: template/install.html.j2:15
++#: template/install.html.j2:19
  msgid ""
--"<p>You have already installed GNUnet and want to use it? <a href=\"https://";
--"gnunet.org/en/use\">Check this out!</a> </p> <p>Please be aware that this "
--"project is still in an early alpha stage when it comes to running software – 
"
--"its not an easy task to rewrite the whole Internet! We are happy to get your 
"
--"<a href=\"engage.html\">helping hand</a> anytime!</p> <p>Further information 
"
--"is available in our <a href=\"https://docs.gnunet.org/#toc-Using-";
--"GNUnet-1\">handbook</a>.</p> <p>If you have any queries about the "
--"installation or the usage, please <a href=\"engage.html\">get in 
touch!</a></"
--"p>"
++"<p>Please be aware that this project is still in an early alpha stage when "
++"it comes to running software – its not an easy task to rewrite the whole "
++"Internet! We are happy to get your <a href=\"engage.html\">helping hand</a> "
++"anytime!</p> <p>Further information is available in our <a href=\"https://";
++"docs.gnunet.org/#toc-Using-GNUnet-1\">handbook</a>.</p> <p>If you have any "
++"queries about the installation or the usage, please <a href=\"engage.html"
++"\">get in touch!</a></p>"
  msgstr ""
  
  #: template/news.html.j2.inc:11
@@@ -1830,40 -1830,40 +1829,56 @@@ msgstr "
  msgid "How to use GNUnet - in a nutshell"
  msgstr ""
  
--#: template/use.html.j2:18
--msgid "Make sure your GNUnet installation works..."
++#: template/use.html.j2:12 template/use.html.j2:64
++msgid "Filesharing"
  msgstr ""
  
--#: template/use.html.j2:33
--msgid "... and play around with it."
++#: template/use.html.j2:13
++msgid "CADET"
  msgstr ""
  
--#: template/use.html.j2:50
--msgid "Filesharing"
++#: template/use.html.j2:14
++msgid "Minimal Groupchat"
  msgstr ""
  
--#: template/use.html.j2:91
--msgid "CADET (and Chat)"
++#: template/use.html.j2:15
++msgid "GNS with CLI"
  msgstr ""
  
--#: template/use.html.j2:125
--msgid "Chatting with a (simple) client"
++#: template/use.html.j2:16
++msgid "GNS with Browser"
  msgstr ""
  
--#: template/use.html.j2:167
--msgid "Name resolution using GNS on the command line"
++#: template/use.html.j2:17 template/use.html.j2:330
++msgid "VPN"
  msgstr ""
  
--#: template/use.html.j2:239
--msgid "Name resolution using GNS with a browser"
++#: template/use.html.j2:18 template/use.html.j2:391
++msgid "Conversation"
  msgstr ""
  
--#: template/use.html.j2:316
--msgid "VPN"
++#: template/use.html.j2:32
++msgid "Make sure your GNUnet installation works..."
  msgstr ""
  
--#: template/use.html.j2:377
--msgid "Conversation"
++#: template/use.html.j2:47
++msgid "... and play around with it."
++msgstr ""
++
++#: template/use.html.j2:105
++msgid "CADET (and Chat)"
++msgstr ""
++
++#: template/use.html.j2:139
++msgid "Chatting with a (simple) client"
++msgstr ""
++
++#: template/use.html.j2:181
++msgid "Name resolution using GNS on the command line"
++msgstr ""
++
++#: template/use.html.j2:253
++msgid "Name resolution using GNS with a browser"
  msgstr ""
  
  #: template/video.html.j2:6

-- 
To stop receiving notification emails like this one, please contact
address@hidden.