From 1dfb2b6aa77efc450e8f42b0d6a1f031745bed11 Mon Sep 17 00:00:00 2001
From: idk <hankhill19580@gmail.com>
Date: Thu, 29 Oct 2020 23:13:03 -0400
Subject: [PATCH] nix old comparisons overview and add it to about

---
 i2p2www/pages/global/nav.html       |  1 -
 i2p2www/pages/site/about/intro.html | 48 +++++++++++++++++++++++++----
 2 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/i2p2www/pages/global/nav.html b/i2p2www/pages/global/nav.html
index 069fdd52..d4d4b709 100644
--- a/i2p2www/pages/global/nav.html
+++ b/i2p2www/pages/global/nav.html
@@ -26,7 +26,6 @@
           <li><a href="{{ site_url('about/performance') }}"><div class="menuitem"><span>{{ _('Performance') }}</span></div></a></li>
           <li class="has-sub"><div class="menuitem"><span>{{ _('Comparisons') }}</span></div>
             <ul>
-              <li><a href="{{ site_url('comparison') }}"><div class="menuitem"><span>{{ _('Overview of comparisons') }}</span></div></a></li>
               <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> #}
diff --git a/i2p2www/pages/site/about/intro.html b/i2p2www/pages/site/about/intro.html
index 9174753f..f4773536 100644
--- a/i2p2www/pages/site/about/intro.html
+++ b/i2p2www/pages/site/about/intro.html
@@ -6,7 +6,7 @@
 <p>{% 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 %}</p>
 
-<h3>I2P Cares About Privacy</h3>
+<h3>{% trans -%}I2P Cares About Privacy{%- endtrans %}</h3>
 
 <p>{% trans %}The Invisible Internet values privacy and consent, which can only be achieved with privacy-by-default. It is always 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 pattern recognition and blocking by censors. Because the network relies on peers to route traffic, location blocking is also reduced.{%- endtrans %}</p>
 
@@ -14,12 +14,12 @@ location and your identity.  The software ships with a router that connects you
 <p>{% trans %}I2P hides the server from the user and the user from the server. All I2P traffic is internal to the I2P network. Traffic inside I2P does not interact with the Internet directly. It is a layer on top of the Internet. It uses encrypted unidirectional tunnels between you and your peers. No one can see where traffic is coming from, where it is going or what the contents are.
 {%- endtrans %}</p> 
 
-<h3>How to Connect to the I2P Network</h3>
+<h3>{% trans -%}How to Connect to the I2P Network{%- endtrans %}</h3>
 
 <p>{% trans %}The Invisible Internet Project provides software to download that connects you to the network.In addition to the network  privacy benefits, I2P provides an application layer that allows people to use and create familiar apps for daily use. I2P provides its own unique DNS so that you can self host or mirror content on the network. You can create and own your platform that you can add to the I2P directory or only invite your friends. The I2P network functions in the same way the Internet does, just with some extra configuration. The best part is that if you do not find something you want, you can build it. When you download the I2P software, it includes everything you need to connect, share, and create privately. 
 {%- endtrans %}</p>
 
-<h3>An Overview of the Network</h3>
+<h3>{% trans -%}An Overview of the Network{%- endtrans %}</h3>
 
 <p>{% trans %}I2P uses cryptography to achieve a variety of properties for the tunnels it builds and the communications it transports. I2P tunnels use transports, NTCP2 and SSU, to hide the nature of the traffic being transported over it. Connections are encrypted from router-to-router, and from client-to-client(end-to-end). Forward-secrecy is provided for all connections. Because I2P is cryptographically addressed, I2P addresses are self-authenticating and only belong to the user who generated them.
 {%- endtrans %}</p>
@@ -27,16 +27,52 @@ location and your identity.  The software ships with a router that connects you
 <p>{% trans %}I2P is a secure and traffic protecting Internet-like layer. The network is made up of peers ("routers") and unidirectional inbound and outbound virtual tunnels. Routers communicate with each other using protocols built on existing transport mechanisms (TCP, UDP, etc), passing messages. Client applications have their own cryptographic identifier ("Destination") which enables it to send and receive messages. These clients can connect to any router and authorize the temporary allocation ("lease") of some tunnels that will be used for sending and receiving messages through the network. I2P has its own internal network database (using a modification of the Kademlia DHT) for distributing routing and contact information securely.
 {%- endtrans %}</p>
 
-<h3>About Decentralization and I2P</h3>
+<h3>{% trans -%}About Decentralization and I2P{%- endtrans %}</h3>
 
 <p>{% trans %}The I2P network is almost completely decentralized, with exception to what are what are called "Reseed Servers," which is how you first join the network. This is to deal with the DHT ( Distributed Hash Table ) bootstrap problem. Basically, there's not a good and reliable way to get out of running at least one permanent bootstrap node that non-network users can find to get started. Once you're connected to the network, you only discover peers by building "exploratory" tunnels, but to make your initial connection, you need to get a peer set from somewhere. The reseed servers, which you can see listed on http://127.0.0.1:7657/configreseed in the Java I2P router, provide you with those peers. You then connect to them with the I2P router until you find one who you can reach and build exploratory tunnels through. Reseed servers can tell that you bootstrapped from them, but nothing else about your traffic on the I2P network.{%- endtrans %}</p>
 
-<h3>I see IP addresses of all other I2P nodes in the router console. Does that mean my IP address is visible by others?</h3>
+<h3>{% trans -%}I see IP addresses of all other I2P nodes in the router console. Does that mean my IP address is visible by others?{%- endtrans %}</h3>
 
 <p>{% trans %}Yes, this is how a fully distributed peer-to-peer network works. Every node participates in routing packets for others, so your IP address must be known to establish connections. While the fact that your computer runs I2P is public, nobody can see your activities in it. You can't say if a user behind this IP address is sharing files, hosting a website, doing research or just running a node to contribute bandwidth to the project.{%- endtrans %}
 
-<h3>What I2P Does Not Do</h3>
+<h3>{% trans -%}What I2P Does Not Do{%- endtrans %}</h3>
 
 <p>{% trans %}The I2P network does not officially "Exit" traffic. It has outproxies to the Internet run by volunteers, which are centralized services. I2P is primarily a hidden service network and outproxying is not an official function, nor is it advised. The privacy benefits you get from participating in the the I2P network come from remaining in the network and not accessing the internet. I2P recommends that you use Tor Browser or a trusted VPN when you want to browse the Internet privately.{%- endtrans %}</p>
 
+<h3>{% trans -%}Comparisons{%- endtrans %}</h3>
+
+<p>{% trans -%}
+There are a great many other applications and projects working on anonymous 
+communication and I2P has been inspired by much of their efforts.  This is not 
+a comprehensive list of anonymity resources - both freehaven's 
+<a href="http://freehaven.net/anonbib/topic.html">Anonymity Bibliography</a>
+and GNUnet's <a href="https://www.gnunet.org/links/">related projects</a>
+serve that purpose well.  That said, a few systems stand out for further
+comparison. The following have individual comparison pages:
+{%- endtrans %}</p>
+
+<ul>
+  <li><a href="{{ site_url('comparison/tor') }}">Tor / Onion Routing</a></li>
+  <li><a href="{{ site_url('comparison/freenet') }}">Freenet</a></li>
+  {#<li><a href="{{ site_url('comparison/gnunet') }}">GNUnet</a></li>#}
+</ul>
+
+<p>{% trans othernetworks=site_url('comparison/other-networks') -%}
+The following are discussed on the <a href="{{ othernetworks }}">other networks page:</a>
+{%- endtrans %}</p>
+
+<ul>
+  <li>RetroShare</li>
+  <li>Morphmix / Tarzan</li>
+  <li>Mixminion / Mixmaster</li>
+  <li>JAP</li>
+  <li>MUTE / AntsP2P</li>
+  <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 %}