resolve merge conflicts

i2p2www/pages/global/nav.html

@@ -39,6 +39,15 @@
               <li><a href="{{ site_url('get-involved/develop/developers-keys') }}"><div class="menuitem"><span>{{ _('Developers keys') }}</span></div></a></li>
             </ul>
           </li>
+          <li class="has-sub"><div class="menuitem"><span>{{ _('Comparisons') }}</span></div>
+            <ul>
+              <li><a href="{{ site_url('comparison/tor') }}"><div class="menuitem"><span>Tor</span></div></a></li>
+              <li><a href="{{ site_url('comparison/freenet') }}"><div class="menuitem"><span>Freenet</span></div></a></li>
+              {#<li><a href="{{ site_url('comparison/gnunet') }}"><div class="menuitem"><span>GNUnet</span></div></a></li> #}
+              <li><a href="{{ site_url('comparison/other-networks') }}"><div class="menuitem"><span>{{ _('Other anonymous networks') }}</span></div></a></li>
+            </ul>
+          </li>
+          <li><a href="{{ site_url('contact') }}"><div class="menuitem"><span>{{ _('Contact us') }}</span></div></a></li>
         </ul>
       </li>
       <li class="has-sub"><div class="menuitem"><span>{{ _('Contributor Guides') }}</span></div>

i2p2www/pages/site/about/intro.html

@@ -66,4 +66,9 @@ The following are discussed on the <a href="{{ othernetworks }}">other networks
   <li>Haystack</li>
 </ul>
 
+<p>{% trans trac='https://trac.i2p2.de/report/1' -%}
+The content of this page is subject to update, discussion and dispute, and we welcome comments and additions.
+You may contribute an analysis by entering a <a href="{{ trac }}">new ticket on Trac</a>.
+{%- endtrans %}</p>
+
 {% endblock %}

i2p2www/pages/site/index.html

@@ -14,23 +14,21 @@
   <div class="aside">
     <h1>{% trans %}What is I2P?{% endtrans %}</h1>
     <ul>
-      <li>{% trans -%} I2P is an anonymous network built on top of the internet.
-        It allows users to create and access content and build online
-        communities on a network that is both distributed and dynamic. It is
-        intended to protect communication and resist monitoring by third parties
-        such as ISPs.
-      {% endtrans %}</li>
-      <li>{% trans -%}Aside from anonymizing traffic within the network, I2P
-        functions with the same capabilities as the Internet, however its design
-        and decentralization create a censorship resistant environment for the
-        free-flow of information.
-      {% endtrans %}</li>
-      <li>{% trans -%}Mirrored sites hosted on the network allow access to news
-        outlets and other resources in areas where information is being filtered
-        or denied. Online communities wishing to organize in
-        restrictive environments can do so anonymously to mitigate political
-        threat and protect each other.
-      {% endtrans %}</li>
+      <li>{% trans %}The Invisible Internet Project (I2P) is a fully encrypted private network layer that
+      has been developed with privacy and security by design in order to provide protection for your
+      activity, location and your identity. The software ships with a router that connects you to the
+      network and applications for sharing, communicating and building. {%- endtrans %}</li>
+    </ul>
+    <h1>{% trans %}I2P Cares about Privacy{% endtrans %}</h1>
+    <ul>
+      <li>{% trans %}The Invisible Internet values privacy and consent. It is about your choice to share,
+      your platform to own, and the connections you want to make. It is privacy by design, plain, simple
+      and truly free. Additionally I2P offers resistance to analysis and blocking by censors.{%- endtrans %}</li>
+      <li>{% trans %}I2P hides the server from the user and the user from the server. All I2P traffic is
+      internal to the I2P network. It does not connect you with the internet, but it is a layer on top of
+      the Internet. It uses encrypted, nested tunnels between you and your peers to assure that no one can
+      see where traffic is coming from, where it is going or what the contents are. {%- endtrans %}
+      </li>
       <li>
         <a href="{{ site_url('about/intro') }}"><em>{% trans %}Read more&hellip;{% endtrans %}</em></a>
       </li>