aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schanzenbach <mschanzenbach@posteo.de>2020-07-04 15:27:37 +0200
committerMartin Schanzenbach <mschanzenbach@posteo.de>2020-07-04 15:27:37 +0200
commit2a0a29dedf64d6d330237cd4741b89b13270eeaa (patch)
tree19beabbfbd6a5ebf1eb1633632d7078502c7e9e1
parent67392740fe034a23a95b23ba062b75ab55bc97e1 (diff)
downloadwww-2a0a29dedf64d6d330237cd4741b89b13270eeaa.tar.gz
www-2a0a29dedf64d6d330237cd4741b89b13270eeaa.zip
text change
m---------inc0
-rw-r--r--template/index.html.j222
2 files changed, 13 insertions, 9 deletions
diff --git a/inc b/inc
Subproject 5b8718e28143b2b68eb65fba2de14972fedf916 Subproject 44ad8ae9f2f1ab275d2e93f7778a1ca3fca6cb2
diff --git a/template/index.html.j2 b/template/index.html.j2
index 205462b1..acc3c358 100644
--- a/template/index.html.j2
+++ b/template/index.html.j2
@@ -68,9 +68,10 @@
68 </div> 68 </div>
69 <div class="col-lg-6"> 69 <div class="col-lg-6">
70 <section> 70 <section>
71 <h2>{{ _("GNUnet helps buildung a new Internet") }}</h2>
71 <p> 72 <p>
72 {% trans %} 73 {% trans %}
73 GNUnet is a new network protocol stack for building secure, 74 GNUnet is a network protocol stack for building secure,
74 distributed, and privacy-preserving applications.<br/> 75 distributed, and privacy-preserving applications.<br/>
75 With 76 With
76 strong roots in 77 strong roots in
@@ -123,12 +124,12 @@
123 </div> 124 </div>
124 <div class="col-lg-6"> 125 <div class="col-lg-6">
125 <section> 126 <section>
127 <h2>{{ _("GNUnet provides privacy-by design") }}</h2>
126 <p> 128 <p>
127 {% trans %} 129 {% trans %}
128 GNUnet provides 130 It provides <a class="link" href="https://www.w3.org/2014/strint/papers/65.pdf">
129 <a class="link" href="https://www.w3.org/2014/strint/papers/65.pdf">privacy by design</a>,
130 improving addressing, routing, naming and 131 improving addressing, routing, naming and
131 content distribution in a technically robust manner - as 132 content distribution</a> in a technically robust manner - as
132 opposed to ad-hoc designs in place today. 133 opposed to ad-hoc designs in place today.
133 <!-- 134 <!--
134 Proposal from fabian gerlach: GNUnet is built 135 Proposal from fabian gerlach: GNUnet is built
@@ -176,9 +177,10 @@
176 </div> 177 </div>
177 <div class="col-lg-6"> 178 <div class="col-lg-6">
178 <section> 179 <section>
180 <h2>{{ _("GNUnet supports a free and open society") }}</h2>
179 <p> 181 <p>
180 {% trans %} 182 {% trans %}
181 GNUnet is made for a free and open society: It&#39;s a self-organizing network and it 183 GNUnet is a self-organizing network and it
182 is <a class="link" href="http://www.gnu.org/philosophy/free-sw.html">free software</a> 184 is <a class="link" href="http://www.gnu.org/philosophy/free-sw.html">free software</a>
183 as in freedom. GNUnet puts you in control of your data. 185 as in freedom. GNUnet puts you in control of your data.
184 You determine which data to share with whom, and you&#39;re not 186 You determine which data to share with whom, and you&#39;re not
@@ -236,12 +238,14 @@
236 </div> 238 </div>
237 <div class="col-lg-6"> 239 <div class="col-lg-6">
238 <section> 240 <section>
241 <h2>{{ _("GNUnet is a framework") }}</h2>
239 <p> 242 <p>
240 {% trans %} 243 {% trans %}
241 GNUnet is a metadata-preserving foundation for your 244 It offers a metadata-preserving foundation for your
242 application, covering areas from addressing to reliable 245 application. It offers components for addressing, reliable
243 bidirectional Axolotl-encrypted channels, with advanced 246 encrypted channels with advanced
244 routing. Our work is based on continuous research spanning 247 routing and resource discovery and naming.
248 Our work is based on continuous research spanning
245 almost two decades. 249 almost two decades.
246 {% endtrans %} 250 {% endtrans %}
247 </p> 251 </p>