[www] 01/02: 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 1a9bcbad69bb509902c5ff29019f05feaaeb21f6
Merge: c14b419 6b4d951
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Thu Mar 4 16:53:14 2021 +0100

    merge

 inc                               |  2 +-
 locale/es/LC_MESSAGES/messages.po | 68 ++++++++++++++++++++++++++-------------
 2 files changed, 47 insertions(+), 23 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 6ee0a67,887f355..bf7397e
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@@ -530,12 -551,14 +551,10 @@@ msgid "
  msgstr ""
  
  #: template/architecture.html.j2:6
- #, fuzzy
- #| msgid "System Architecture"
  msgid "GNUnet System Architecture"
- msgstr "Architectura del sistema"
+ msgstr "Arquitectura del sistema GNUnet"
  
 -#: template/architecture.html.j2:15
 -msgid "Legend"
 -msgstr ""
 -
 -#: template/architecture.html.j2:60
 +#: template/architecture.html.j2:20
  #, fuzzy
  #| msgid "Documentation"
  msgid "Foundations"
@@@ -549,12 -572,17 +568,17 @@@ msgid "
  "for addresses and self-organized decentralized routing algorithms, these "
  "subsystems replace the traditional TCP/IP stack."
  msgstr ""
+ "Las bases de GNUnet son una tabla hash distribuida (R5N), una capa de "
+ "mensajería encriptada tipo SCTP (CADET), una infraestructura de clave "
+ "pública (GNS) y un sistema de transporte conectable (TRANSPORT). <br> Al "
+ "utilizar claves públicas y algoritmos descentralizados auto-organizables de "
+ "enrutamiento, estos subsistemas reemplazan el stack TCP/IP."
  
 -#: template/architecture.html.j2:75
 +#: template/architecture.html.j2:35
  msgid "Security"
- msgstr ""
+ msgstr "Seguridad"
  
 -#: template/architecture.html.j2:78
 +#: template/architecture.html.j2:38
  msgid ""
  "GNUnet is implemented using a multi-process architecture. Each subsystem "
  "runs as a separate process, providing fault-isolation and enabling tight "

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