diff --git a/pots/about.pot b/pots/about.pot
index 9aa8988c..1d614c49 100644
--- a/pots/about.pot
+++ b/pots/about.pot
@@ -1,14 +1,14 @@
 # Translations template for I2P.
-# Copyright (C) 2020 ORGANIZATION
+# Copyright (C) 2021 ORGANIZATION
 # This file is distributed under the same license as the I2P project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2020.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2021.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P website\n"
 "Report-Msgid-Bugs-To: http://trac.i2p2.de\n"
-"POT-Creation-Date: 2020-11-16 17:04+0000\n"
+"POT-Creation-Date: 2021-04-26 14:51+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -120,42 +120,44 @@ msgid ""
 "and building."
 msgstr ""
 
-#: i2p2www/pages/site/about/intro.html:11
-msgid ""
-"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."
+#: i2p2www/pages/site/about/intro.html:9
+msgid "I2P Cares About Privacy"
 msgstr ""
 
-#: i2p2www/pages/site/about/intro.html:14
+#: i2p2www/pages/site/about/intro.html:11
 msgid ""
 "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."
+"peers. No one can see where traffic is coming from, where it is going, or"
+" what the contents are. 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."
 msgstr ""
 
-#: i2p2www/pages/site/about/intro.html:19
+#: i2p2www/pages/site/about/intro.html:14
+msgid "How to Connect to the I2P Network"
+msgstr ""
+
+#: i2p2www/pages/site/about/intro.html:16
 msgid ""
 "The Invisible Internet Project provides software to download that "
-"connects you to the network.In addition to the network  privacy benefits,"
+"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."
+"your own platform that you can add to the I2P directory or only invite "
+"your friends. The I2P network functions the same way the Internet does. "
+"When you download the I2P software, it includes everything you need to "
+"connect, share, and create privately."
 msgstr ""
 
-#: i2p2www/pages/site/about/intro.html:24
+#: i2p2www/pages/site/about/intro.html:18
+msgid "An Overview of the Network"
+msgstr ""
+
+#: i2p2www/pages/site/about/intro.html:20
 msgid ""
 "I2P uses cryptography to achieve a variety of properties for the tunnels "
 "it builds and the communications it transports. I2P tunnels use "
@@ -166,7 +168,7 @@ msgid ""
 "are self-authenticating and only belong to the user who generated them."
 msgstr ""
 
-#: i2p2www/pages/site/about/intro.html:27
+#: i2p2www/pages/site/about/intro.html:23
 msgid ""
 "I2P is a secure and traffic protecting Internet-like layer. The network "
 "is made up of peers (\"routers\") and unidirectional inbound and outbound"
@@ -181,11 +183,15 @@ msgid ""
 "contact information securely."
 msgstr ""
 
-#: i2p2www/pages/site/about/intro.html:32
+#: i2p2www/pages/site/about/intro.html:26
+msgid "About Decentralization and I2P"
+msgstr ""
+
+#: i2p2www/pages/site/about/intro.html:28
 msgid ""
 "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 ) "
+"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 "
@@ -199,7 +205,13 @@ msgid ""
 "your traffic on the I2P network."
 msgstr ""
 
-#: i2p2www/pages/site/about/intro.html:36
+#: i2p2www/pages/site/about/intro.html:30
+msgid ""
+"I see IP addresses of all other I2P nodes in the router console. Does "
+"that mean my IP address is visible by others?"
+msgstr ""
+
+#: i2p2www/pages/site/about/intro.html:32
 msgid ""
 "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 "
@@ -209,7 +221,11 @@ msgid ""
 "research or just running a node to contribute bandwidth to the project."
 msgstr ""
 
-#: i2p2www/pages/site/about/intro.html:40
+#: i2p2www/pages/site/about/intro.html:34
+msgid "What I2P Does Not Do"
+msgstr ""
+
+#: i2p2www/pages/site/about/intro.html:36
 msgid ""
 "The I2P network does not officially \"Exit\" traffic. It has outproxies "
 "to the Internet run by volunteers, which are centralized services. I2P is"
@@ -220,6 +236,32 @@ msgid ""
 "or a trusted VPN when you want to browse the Internet privately."
 msgstr ""
 
+#: i2p2www/pages/site/about/intro.html:38
+msgid "Comparisons"
+msgstr ""
+
+#: i2p2www/pages/site/about/intro.html:40
+msgid ""
+"There are a great many other applications and projects working on "
+"anonymous \n"
+"communication and I2P has been inspired by much of their efforts.  This "
+"is not \n"
+"a comprehensive list of anonymity resources - both freehaven's \n"
+"<a href=\"http://freehaven.net/anonbib/topic.html\">Anonymity "
+"Bibliography</a>\n"
+"and GNUnet's <a href=\"https://www.gnunet.org/links/\">related "
+"projects</a>\n"
+"serve that purpose well.  That said, a few systems stand out for further\n"
+"comparison. The following have individual comparison pages:"
+msgstr ""
+
+#: i2p2www/pages/site/about/intro.html:56
+#, python-format
+msgid ""
+"The following are discussed on the <a href=\"%(othernetworks)s\">other "
+"networks page:</a>"
+msgstr ""
+
 #: i2p2www/pages/site/about/media.html:2
 msgid "Presentations on I2P"
 msgstr ""
@@ -289,17 +331,18 @@ msgid ""
 "HOPE New York July 17, 2010 - Brief overview of I2P by zzz, at the end of"
 " Adrian Hong's talk\n"
 "\"Hackers for Human Rights\".\n"
-"<a href=\"%(mp3)s\">MP3 audio</a>"
+"<a href=\"%(mp3)s\">MP3 audio</a>\n"
+"<a href=\"%(vid)s\">Youtube Video</a> (I2P part at 44 minutes)"
 msgstr ""
 
-#: i2p2www/pages/site/about/media.html:56
+#: i2p2www/pages/site/about/media.html:57
 #, python-format
 msgid ""
 "<a href=\"%(link)s\">Into the I2P Darknet: Welcome to Cipherspace</a>\n"
 "Adrian Crenshaw. Schmoocon Firetalk, January 2011"
 msgstr ""
 
-#: i2p2www/pages/site/about/media.html:61
+#: i2p2www/pages/site/about/media.html:62
 #, python-format
 msgid ""
 "<a href=\"%(link)s\">Using techhnology to advance liberty</a>\n"
@@ -310,7 +353,7 @@ msgid ""
 "I2P covered from 10:00 to 20:00 in the video."
 msgstr ""
 
-#: i2p2www/pages/site/about/media.html:69
+#: i2p2www/pages/site/about/media.html:70
 #, python-format
 msgid ""
 "<a href=\"%(link)s\">Common Darknet Weaknesses</a>\n"
@@ -319,14 +362,14 @@ msgid ""
 "11-15, 2011."
 msgstr ""
 
-#: i2p2www/pages/site/about/media.html:75
+#: i2p2www/pages/site/about/media.html:76
 #, python-format
 msgid ""
 "<a href=\"%(link)s\">I2P / Tor Workshop Notes</a>\n"
 "Adrian Crenshaw. DEF CON 19, Las Vegas, August 6, 2011."
 msgstr ""
 
-#: i2p2www/pages/site/about/media.html:80
+#: i2p2www/pages/site/about/media.html:81
 #, python-format
 msgid ""
 "<a href=\"%(live)s\">Cipherspaces/Darknets: An Overview Of Attack "
@@ -337,13 +380,13 @@ msgid ""
 "Adrian Crenshaw. DEF CON 19, Las Vegas, August 7, 2011."
 msgstr ""
 
-#: i2p2www/pages/site/about/media.html:90
+#: i2p2www/pages/site/about/media.html:91
 msgid ""
 "<a href=\"http://0x375.org/\">Modern cipherspace ecosystems</a>, 0x375 "
 "0x06 (Thessaloniki Tech Talk Sessions), November 4, 2011."
 msgstr ""
 
-#: i2p2www/pages/site/about/media.html:94
+#: i2p2www/pages/site/about/media.html:95
 #, python-format
 msgid ""
 "<a href=\"%(link)s\">I2P - The Anonymous Network</a>\n"
@@ -352,14 +395,14 @@ msgid ""
 "January 25, 2012."
 msgstr ""
 
-#: i2p2www/pages/site/about/media.html:100
+#: i2p2www/pages/site/about/media.html:101
 #, python-format
 msgid ""
 "<a href=\"%(link)s\">I2PCon 2015</a>\n"
 "Toronto, August 15-16, 2015"
 msgstr ""
 
-#: i2p2www/pages/site/about/media.html:105
+#: i2p2www/pages/site/about/media.html:106
 #, python-format
 msgid ""
 "<a href=\"%(link)s\">I2P - Still alive! (pdf)</a>\n"
@@ -368,7 +411,7 @@ msgid ""
 "2015"
 msgstr ""
 
-#: i2p2www/pages/site/about/media.html:112
+#: i2p2www/pages/site/about/media.html:113
 #, python-format
 msgid ""
 "Replacing Weary Crypto: Upgrading the I2P network with stronger "
@@ -378,7 +421,7 @@ msgid ""
 "str4d, Real World Crypto, Stanford, January 8, 2016"
 msgstr ""
 
-#: i2p2www/pages/site/about/media.html:120
+#: i2p2www/pages/site/about/media.html:121
 #, python-format
 msgid ""
 "Onions and Garlic: the protocols of I2P\n"
@@ -388,7 +431,7 @@ msgid ""
 "Whitewater, February 17, 2016"
 msgstr ""
 
-#: i2p2www/pages/site/about/media.html:128
+#: i2p2www/pages/site/about/media.html:129
 #, python-format
 msgid ""
 "The Invisible Internet Project - An overview and guide to the technology\n"
@@ -397,18 +440,18 @@ msgid ""
 "Andrew Savchenko (bircoph), FOSDEM, Brussel, February 4, 2018"
 msgstr ""
 
-#: i2p2www/pages/site/about/media.html:136
+#: i2p2www/pages/site/about/media.html:137
 #, python-format
 msgid ""
 "<a href=\"%(link)s\">Intro to I2P for App Developers (mp4)</a>\n"
 "idk"
 msgstr ""
 
-#: i2p2www/pages/site/about/media.html:144
+#: i2p2www/pages/site/about/media.html:145
 msgid "Tutorials"
 msgstr ""
 
-#: i2p2www/pages/site/about/media.html:147
+#: i2p2www/pages/site/about/media.html:148
 #, python-format
 msgid ""
 "<a href=\"%(link)s\">I2P Windows Tutorial</a>\n"
@@ -417,7 +460,7 @@ msgid ""
 "By <a href=\"http://telecomix.org/\">Telecomix</a>"
 msgstr ""
 
-#: i2p2www/pages/site/about/media.html:154
+#: i2p2www/pages/site/about/media.html:155
 #, python-format
 msgid ""
 "<a href=\"%(link)s\">I2P Debian Tutorial</a>\n"
@@ -426,7 +469,7 @@ msgid ""
 "By <a href=\"http://telecomix.org/\">Telecomix</a>"
 msgstr ""
 
-#: i2p2www/pages/site/about/media.html:161
+#: i2p2www/pages/site/about/media.html:162
 #, python-format
 msgid ""
 "<a href=\"%(link)s\">How to set up anonymous site in I2P</a>\n"
@@ -435,7 +478,7 @@ msgid ""
 "By <a href=\"http://telecomix.org/\">Telecomix</a>"
 msgstr ""
 
-#: i2p2www/pages/site/about/media.html:168
+#: i2p2www/pages/site/about/media.html:169
 #, python-format
 msgid ""
 "<a href=\"%(link)s\">I2P Tutorial Mac OS X</a>\n"
@@ -445,7 +488,7 @@ msgid ""
 "By <a href=\"http://telecomix.org/\">Telecomix</a>"
 msgstr ""
 
-#: i2p2www/pages/site/about/media.html:175
+#: i2p2www/pages/site/about/media.html:176
 #, python-format
 msgid ""
 "<a href=\"%(link)s\">Felix Atari explains the basic principles of I2P</a>"
@@ -455,7 +498,7 @@ msgid ""
 "By <a href=\"http://telecomix.org/\">Telecomix</a>"
 msgstr ""
 
-#: i2p2www/pages/site/about/media.html:182
+#: i2p2www/pages/site/about/media.html:183
 #, python-format
 msgid ""
 "<a href=\"%(link)s\">How to get onto I2P, the anonymous P2P Darknet "
@@ -465,7 +508,7 @@ msgid ""
 "access I2P."
 msgstr ""
 
-#: i2p2www/pages/site/about/media.html:188
+#: i2p2www/pages/site/about/media.html:189
 #, python-format
 msgid ""
 "<a href=\"%(link)s\">How to connect to I2P</a>\n"
@@ -473,7 +516,7 @@ msgid ""
 "How to install I2P on Ubuntu."
 msgstr ""
 
-#: i2p2www/pages/site/about/media.html:194
+#: i2p2www/pages/site/about/media.html:195
 #, python-format
 msgid ""
 "<a href=\"%(link)s\">Installing the I2P darknet software in Linux</a>\n"
@@ -482,7 +525,7 @@ msgid ""
 "January 2011"
 msgstr ""
 
-#: i2p2www/pages/site/about/media.html:201
+#: i2p2www/pages/site/about/media.html:202
 #, python-format
 msgid ""
 "<a href=\"%(link)s\">Short garlic routing animation</a>\n"
@@ -490,11 +533,11 @@ msgid ""
 "Adrian Crenshaw.\n"
 msgstr ""
 
-#: i2p2www/pages/site/about/media.html:209
+#: i2p2www/pages/site/about/media.html:210
 msgid "Articles and Interviews"
 msgstr ""
 
-#: i2p2www/pages/site/about/media.html:212
+#: i2p2www/pages/site/about/media.html:213
 #, python-format
 msgid ""
 "Lance James (0x90) Interviewed by DistributedCity\n"
@@ -503,7 +546,7 @@ msgid ""
 "July 26, 2002."
 msgstr ""
 
-#: i2p2www/pages/site/about/media.html:220
+#: i2p2www/pages/site/about/media.html:221
 #, python-format
 msgid ""
 "Lance James (0x90) Interviewed by El País\n"
@@ -512,7 +555,7 @@ msgid ""
 "October 31, 2002."
 msgstr ""
 
-#: i2p2www/pages/site/about/media.html:227
+#: i2p2www/pages/site/about/media.html:228
 #, python-format
 msgid ""
 "<a href=\"%(link)s\">2003 Business Week article referencing "
@@ -520,7 +563,7 @@ msgid ""
 "September 14, 2003."
 msgstr ""
 
-#: i2p2www/pages/site/about/media.html:232
+#: i2p2www/pages/site/about/media.html:233
 #, python-format
 msgid ""
 "<a href=\"%(link)s\">Netzwelt.de article about being anonymous in the "
@@ -529,7 +572,7 @@ msgid ""
 "November 2007."
 msgstr ""
 
-#: i2p2www/pages/site/about/media.html:238
+#: i2p2www/pages/site/about/media.html:239
 #, python-format
 msgid ""
 "<a href=\"%(link)s\">zzz interviewed by gulli.com</a>\n"
@@ -537,7 +580,7 @@ msgid ""
 "<a href=\"%(german)s\">German translation</a>"
 msgstr ""
 
-#: i2p2www/pages/site/about/media.html:245
+#: i2p2www/pages/site/about/media.html:246
 #, python-format
 msgid ""
 "<a href=\"%(mp3)s\">zzz interviewed on the InfoSec Daily Podcast Ep. 454 "
@@ -548,7 +591,7 @@ msgid ""
 " tracker</a>)"
 msgstr ""
 
-#: i2p2www/pages/site/about/media.html:251
+#: i2p2www/pages/site/about/media.html:252
 #, python-format
 msgid ""
 "<a href=\"%(link)s\">I2P - Anonymity for the Masses</a>,\n"
@@ -556,7 +599,7 @@ msgid ""
 "November 11, 2011."
 msgstr ""
 
-#: i2p2www/pages/site/about/media.html:257
+#: i2p2www/pages/site/about/media.html:258
 #, python-format
 msgid ""
 "<a href=\"%(mp3)s\">zzz and Lance James interviewed on the InfoSec Daily "
@@ -567,7 +610,7 @@ msgid ""
 " tracker</a>)"
 msgstr ""
 
-#: i2p2www/pages/site/about/media.html:263
+#: i2p2www/pages/site/about/media.html:264
 #, python-format
 msgid ""
 "<a href=\"%(mp3)s\">Jeff and Str4d interviewed on the Brakeing Down "
@@ -575,7 +618,7 @@ msgid ""
 "Part 1, February 28, 2015"
 msgstr ""
 
-#: i2p2www/pages/site/about/media.html:268
+#: i2p2www/pages/site/about/media.html:269
 #, python-format
 msgid ""
 "<a href=\"%(mp3)s\">Jeff and Str4d interviewed on the Brakeing Down "
@@ -583,7 +626,7 @@ msgid ""
 "Part 2, March 6, 2015"
 msgstr ""
 
-#: i2p2www/pages/site/about/media.html:273
+#: i2p2www/pages/site/about/media.html:274
 #, python-format
 msgid ""
 "<a href=\"%(link)s\">Fireside With Lei - Episode 18: Lance James. "
@@ -593,7 +636,7 @@ msgid ""
 "Robert Lei, December 31, 2018"
 msgstr ""
 
-#: i2p2www/pages/site/about/media.html:282
+#: i2p2www/pages/site/about/media.html:283
 #, python-format
 msgid ""
 "<a href=\"%(mhatta)s\">Articles by I2P contributor Masayuki Hatta on "
@@ -601,7 +644,7 @@ msgid ""
 "2019\n"
 msgstr ""
 
-#: i2p2www/pages/site/about/media.html:287
+#: i2p2www/pages/site/about/media.html:288
 #, python-format
 msgid ""
 "<a href=\"%(ctrl)s\">Enabling both .onion and .i2p routing with Proxy "
@@ -609,17 +652,17 @@ msgid ""
 "Daniel Aleksandersen, February 7 2019"
 msgstr ""
 
-#: i2p2www/pages/site/about/media.html:294
+#: i2p2www/pages/site/about/media.html:295
 msgid "Other"
 msgstr ""
 
-#: i2p2www/pages/site/about/media.html:297
+#: i2p2www/pages/site/about/media.html:298
 msgid ""
 "I2P mentioned in Netflix's \"House of Cards\" Season 2 Episode 2,\n"
 "February 14, 2014"
 msgstr ""
 
-#: i2p2www/pages/site/about/media.html:302
+#: i2p2www/pages/site/about/media.html:303
 #, python-format
 msgid ""
 "<a href=\"%(meeh)s\">A curated list by I2P contributor meeh of I2P "
@@ -637,7 +680,7 @@ msgid ""
 "actually installing an I2P router and an accompanying bundle of basic \n"
 "applications. The I2P Java distribution is the first I2P software gateway"
 " and \n"
-"has been actively developed since 2001."
+"has been actively developed since 2003."
 msgstr ""
 
 #: i2p2www/pages/site/about/software.html:10
@@ -714,8 +757,8 @@ msgstr ""
 #: i2p2www/pages/site/about/software.html:37
 #, python-format
 msgid ""
-"<strong><a href=\"%(addressbook)s\">The AddressBook</a></strong>: This is"
-" a locally-defined list of \n"
+"<strong><a href=\"%(addressbook)s\">The Address Book</a></strong>: This "
+"is a locally-defined list of \n"
 "human-readable addresses ( ie: i2p-projekt.i2p) and corresponding I2P "
 "addresses.(udhdrtrcetjm5sxzskjyr5ztpeszydbh4dpl3pl4utgqqw2v4jna.b32.i2p) "
 "It integrates with other applications to \n"
@@ -735,7 +778,7 @@ msgid ""
 "adapter for forwarding services ( ie SSH ) into I2P and proxying client \n"
 "requests to and from I2P. It provides a variety of “Tunnel Types” which "
 "are \n"
-"able able to do advance filtering of traffic before it reaches I2P."
+"able to do advance filtering of traffic before it reaches I2P."
 msgstr ""
 
 #: i2p2www/pages/site/about/software.html:50
@@ -913,7 +956,6 @@ msgstr ""
 #: i2p2www/pages/site/about/team.html:46 i2p2www/pages/site/about/team.html:91
 #: i2p2www/pages/site/about/team.html:161
 #: i2p2www/pages/site/about/team.html:188
-#: i2p2www/pages/site/about/team.html:203
 #: i2p2www/pages/site/about/team.html:236
 msgid "vacant"
 msgstr ""
@@ -1138,6 +1180,10 @@ msgstr ""
 msgid "Console"
 msgstr ""
 
+#: i2p2www/pages/site/about/team.html:203
+msgid "IDK/Sadie"
+msgstr ""
+
 #: i2p2www/pages/site/about/team.html:204
 msgid "Router console HTML/CSS design"
 msgstr ""
@@ -1350,8 +1396,8 @@ msgstr ""
 
 #: i2p2www/pages/site/about/i2pcon/2015.html:44
 msgid ""
-"Note that in-I2P torrents may also be available on the clearnet due to "
-"bridging by Vuze clients."
+"Note that in-I2P torrents may also be available on the non-private "
+"internet due to bridging by Vuze clients."
 msgstr ""
 
 #: i2p2www/pages/site/about/i2pcon/2015.html:50
diff --git a/pots/blog.pot b/pots/blog.pot
index d647a89b..9a790c9b 100644
--- a/pots/blog.pot
+++ b/pots/blog.pot
@@ -1,14 +1,14 @@
 # Translations template for I2P.
-# Copyright (C) 2020 ORGANIZATION
+# Copyright (C) 2021 ORGANIZATION
 # This file is distributed under the same license as the I2P project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2020.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2021.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P website\n"
 "Report-Msgid-Bugs-To: http://trac.i2p2.de\n"
-"POT-Creation-Date: 2020-11-16 17:04+0000\n"
+"POT-Creation-Date: 2021-04-26 14:51+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -86,6 +86,8 @@ msgstr ""
 #: i2p2www/blog/2020/02/25/0.9.45-Release.rst:28
 #: i2p2www/blog/2020/05/25/0.9.46-Release.rst:40
 #: i2p2www/blog/2020/08/24/0.9.47-Release.rst:33
+#: i2p2www/blog/2020/11/30/0.9.48-Release.rst:33
+#: i2p2www/blog/2021/02/17/0.9.49-Release.rst:45
 msgid "RELEASE DETAILS"
 msgstr ""
 
@@ -155,6 +157,8 @@ msgstr ""
 #: i2p2www/blog/2020/02/25/0.9.45-Release.rst:41
 #: i2p2www/blog/2020/05/25/0.9.46-Release.rst:52
 #: i2p2www/blog/2020/08/24/0.9.47-Release.rst:49
+#: i2p2www/blog/2020/11/30/0.9.48-Release.rst:51
+#: i2p2www/blog/2021/02/17/0.9.49-Release.rst:64
 msgid "Bug Fixes"
 msgstr ""
 
@@ -214,6 +218,8 @@ msgstr ""
 #: i2p2www/blog/2020/02/25/0.9.45-Release.rst:48
 #: i2p2www/blog/2020/05/25/0.9.46-Release.rst:61
 #: i2p2www/blog/2020/08/24/0.9.47-Release.rst:62
+#: i2p2www/blog/2020/11/30/0.9.48-Release.rst:65
+#: i2p2www/blog/2021/02/17/0.9.49-Release.rst:76
 msgid "Other"
 msgstr ""
 
@@ -274,6 +280,8 @@ msgstr ""
 #: i2p2www/blog/2020/02/25/0.9.45-Release.rst:65
 #: i2p2www/blog/2020/05/25/0.9.46-Release.rst:87
 #: i2p2www/blog/2020/08/24/0.9.47-Release.rst:76
+#: i2p2www/blog/2020/11/30/0.9.48-Release.rst:93
+#: i2p2www/blog/2021/02/17/0.9.49-Release.rst:97
 msgid "SHA256 Checksums:"
 msgstr ""
 
@@ -1748,6 +1756,8 @@ msgstr ""
 #: i2p2www/blog/2020/02/25/0.9.45-Release.rst:55
 #: i2p2www/blog/2020/05/25/0.9.46-Release.rst:78
 #: i2p2www/blog/2020/08/24/0.9.47-Release.rst:67
+#: i2p2www/blog/2020/11/30/0.9.48-Release.rst:83
+#: i2p2www/blog/2021/02/17/0.9.49-Release.rst:87
 msgid "Translation updates"
 msgstr ""
 
@@ -1924,6 +1934,8 @@ msgstr ""
 #: i2p2www/blog/2020/02/25/0.9.45-Release.rst:22
 #: i2p2www/blog/2020/05/25/0.9.46-Release.rst:34
 #: i2p2www/blog/2020/08/24/0.9.47-Release.rst:27
+#: i2p2www/blog/2020/11/30/0.9.48-Release.rst:27
+#: i2p2www/blog/2021/02/17/0.9.49-Release.rst:39
 msgid ""
 "As usual, we recommend that you update to this release. The best way to\n"
 "maintain security and help the network is to run the latest release."
@@ -2803,6 +2815,8 @@ msgstr ""
 #: i2p2www/blog/2020/02/25/0.9.45-Release.rst:30
 #: i2p2www/blog/2020/05/25/0.9.46-Release.rst:42
 #: i2p2www/blog/2020/08/24/0.9.47-Release.rst:35
+#: i2p2www/blog/2020/11/30/0.9.48-Release.rst:35
+#: i2p2www/blog/2021/02/17/0.9.49-Release.rst:47
 msgid "Changes"
 msgstr ""
 
@@ -5098,6 +5112,8 @@ msgstr ""
 #: i2p2www/blog/2020/02/25/0.9.45-Release.rst:11
 #: i2p2www/blog/2020/05/25/0.9.46-Release.rst:11
 #: i2p2www/blog/2020/08/24/0.9.47-Release.rst:11
+#: i2p2www/blog/2020/11/30/0.9.48-Release.rst:11
+#: i2p2www/blog/2021/02/17/0.9.49-Release.rst:11
 msgid "Update details"
 msgstr ""
 
@@ -5289,6 +5305,8 @@ msgstr ""
 #: i2p2www/blog/2020/02/25/0.9.45-Release.rst:60
 #: i2p2www/blog/2020/05/25/0.9.46-Release.rst:82
 #: i2p2www/blog/2020/08/24/0.9.47-Release.rst:71
+#: i2p2www/blog/2020/11/30/0.9.48-Release.rst:88
+#: i2p2www/blog/2021/02/17/0.9.49-Release.rst:92
 msgid "Full list of fixed bugs"
 msgstr ""
 
@@ -12279,3 +12297,432 @@ msgstr ""
 msgid "i2psnark: Increase max pipeline"
 msgstr ""
 
+#: i2p2www/blog/2020/11/30/0.9.48-Release.rst:2
+msgid "0.9.48 Release"
+msgstr ""
+
+#: i2p2www/blog/2020/11/30/0.9.48-Release.rst:9
+msgid "0.9.48 with performance enhancements"
+msgstr ""
+
+#: i2p2www/blog/2020/11/30/0.9.48-Release.rst:16
+msgid ""
+"0.9.48 enables our new end-to-end encryption protocol (proposal 144) for "
+"most services.\n"
+"We have added preliminary support for new tunnel build message encryption"
+" (proposal 152).\n"
+"There are significant performance improvements throughout the router."
+msgstr ""
+
+#: i2p2www/blog/2020/11/30/0.9.48-Release.rst:22
+msgid ""
+"Packages for Ubuntu Xenial (16.04 LTS) are no longer supported.\n"
+"Users on that platform should upgrade so you may continue to receive I2P "
+"updates."
+msgstr ""
+
+#: i2p2www/blog/2020/11/30/0.9.48-Release.rst:37
+msgid "Avoid old DSA-SHA1 routers for lookups, stores, and tunnel peers"
+msgstr ""
+
+#: i2p2www/blog/2020/11/30/0.9.48-Release.rst:38
+msgid "Block same-country connections when in hidden mode"
+msgstr ""
+
+#: i2p2www/blog/2020/11/30/0.9.48-Release.rst:39
+msgid "BOB: Add deprecation warning"
+msgstr ""
+
+#: i2p2www/blog/2020/11/30/0.9.48-Release.rst:40
+msgid "Build: Drop support for Xenial; ant 1.9.8 or higher required to build"
+msgstr ""
+
+#: i2p2www/blog/2020/11/30/0.9.48-Release.rst:41
+msgid "i2ptunnel: Enable dual-key encryption for most tunnel types"
+msgstr ""
+
+#: i2p2www/blog/2020/11/30/0.9.48-Release.rst:42
+msgid "JBigI: Add library for Linux aarch64, zen, and zen2"
+msgstr ""
+
+#: i2p2www/blog/2020/11/30/0.9.48-Release.rst:43
+msgid "Preliminary support for ECIES-X25519 routers (proposals 152 and 156)"
+msgstr ""
+
+#: i2p2www/blog/2020/11/30/0.9.48-Release.rst:44
+msgid "Ratchet: Efficiency improvements and memory reduction"
+msgstr ""
+
+#: i2p2www/blog/2020/11/30/0.9.48-Release.rst:45
+msgid "SSU: Randomize intro key"
+msgstr ""
+
+#: i2p2www/blog/2020/11/30/0.9.48-Release.rst:46
+msgid "SSU performance improvements"
+msgstr ""
+
+#: i2p2www/blog/2020/11/30/0.9.48-Release.rst:47
+msgid "System tray: Enable by default for Linux KDE and LXDE"
+msgstr ""
+
+#: i2p2www/blog/2020/11/30/0.9.48-Release.rst:53
+msgid "Build: Set release property for better runtime compatibility"
+msgstr ""
+
+#: i2p2www/blog/2020/11/30/0.9.48-Release.rst:54
+msgid "Console: Fix Jetty not starting on Java 11.0.9.1"
+msgstr ""
+
+#: i2p2www/blog/2020/11/30/0.9.48-Release.rst:55
+msgid "i2psnark: Limit size of embedded video"
+msgstr ""
+
+#: i2p2www/blog/2020/11/30/0.9.48-Release.rst:56
+msgid "Improved IPv6 address validation"
+msgstr ""
+
+#: i2p2www/blog/2020/11/30/0.9.48-Release.rst:57
+msgid "Installer: Disable pack200 to support Java 14+"
+msgstr ""
+
+#: i2p2www/blog/2020/11/30/0.9.48-Release.rst:58
+msgid "Installer: Add missing linux armv7 and aarch64 wrapper binaries"
+msgstr ""
+
+#: i2p2www/blog/2020/11/30/0.9.48-Release.rst:59
+msgid "i2ptunnel: Filter server response headers when not compressing"
+msgstr ""
+
+#: i2p2www/blog/2020/11/30/0.9.48-Release.rst:60
+msgid "NTCP2: Fix sending termination message on idle timeout"
+msgstr ""
+
+#: i2p2www/blog/2020/11/30/0.9.48-Release.rst:61
+msgid "Streaming: Fix handling of tag options"
+msgstr ""
+
+#: i2p2www/blog/2020/11/30/0.9.48-Release.rst:67
+msgid "Build: Reproducible build fix"
+msgstr ""
+
+#: i2p2www/blog/2020/11/30/0.9.48-Release.rst:68
+msgid "Core: Refactoring of data structures to reduce memory usage"
+msgstr ""
+
+#: i2p2www/blog/2020/11/30/0.9.48-Release.rst:69
+msgid "Crypto: Cache HMAC256 instances"
+msgstr ""
+
+#: i2p2www/blog/2020/11/30/0.9.48-Release.rst:70
+msgid "i2psnark: Hide BEP 48 padding directory in UI"
+msgstr ""
+
+#: i2p2www/blog/2020/11/30/0.9.48-Release.rst:71
+msgid "i2psnark: Checks for unsupported v2 torrents"
+msgstr ""
+
+#: i2p2www/blog/2020/11/30/0.9.48-Release.rst:72
+msgid "i2psnark: Remove old opentrackers"
+msgstr ""
+
+#: i2p2www/blog/2020/11/30/0.9.48-Release.rst:73
+msgid "i2ptunnel: Improved support for offline keys"
+msgstr ""
+
+#: i2p2www/blog/2020/11/30/0.9.48-Release.rst:75
+msgid "NetDB: Increase minimum floodfill version for leaseset lookups"
+msgstr ""
+
+#: i2p2www/blog/2020/11/30/0.9.48-Release.rst:76
+msgid "NTCP: Set nodelay on sockets"
+msgstr ""
+
+#: i2p2www/blog/2020/11/30/0.9.48-Release.rst:77
+msgid "Proxy: Remove old jump servers"
+msgstr ""
+
+#: i2p2www/blog/2020/11/30/0.9.48-Release.rst:78
+msgid "Ratchet: Rotate keys faster"
+msgstr ""
+
+#: i2p2www/blog/2020/11/30/0.9.48-Release.rst:80
+msgid "Wrapper 3.5.44 (new installs only)"
+msgstr ""
+
+#: i2p2www/blog/2020/11/30/0.9.48-Release.rst:82
+msgid "New partial translations for Kurdish, Turkmen, Argentinian Spanish"
+msgstr ""
+
+#: i2p2www/blog/2020/12/10/Hello-git-goodbye-mtn.rst:2
+#: i2p2www/blog/2020/12/10/Hello-git-goodbye-mtn.rst:11
+msgid "Hello Git, Goodbye Monotone"
+msgstr ""
+
+#: i2p2www/blog/2020/12/10/Hello-git-goodbye-mtn.rst:9
+msgid "Hello git, goodbye mtn"
+msgstr ""
+
+#: i2p2www/blog/2020/12/10/Hello-git-goodbye-mtn.rst:16
+msgid "The I2P Git Migration is nearly concluded"
+msgstr ""
+
+#: i2p2www/blog/2020/12/10/Hello-git-goodbye-mtn.rst:21
+msgid ""
+"For over a decade, I2P has relied on the venerable Monotone service to "
+"support\n"
+"its version control needs, but during the past few years, most of the "
+"world has\n"
+"moved on to the now-universal Git version control system. In that same\n"
+"time, the I2P Network has become faster and more reliable, and accessible"
+"\n"
+"workarounds to Git's non-resumability have been developed."
+msgstr ""
+
+#: i2p2www/blog/2020/12/10/Hello-git-goodbye-mtn.rst:29
+msgid ""
+"Today marks a significant occasion for I2P, as we switched off the old "
+"mtn\n"
+"i2p.i2p branch, and moved the development of the core Java I2P libraries "
+"from\n"
+"Monotone to Git officially."
+msgstr ""
+
+#: i2p2www/blog/2020/12/10/Hello-git-goodbye-mtn.rst:35
+msgid ""
+"While our use of mtn has been questioned in the past, and it's not always"
+" been a\n"
+"popular choice, I'd like to take this moment, as perhaps the very last "
+"project to use\n"
+"Monotone to thank the Monotone developers, current and former, wherever "
+"they are,\n"
+"for the software they created."
+msgstr ""
+
+#: i2p2www/blog/2020/12/10/Hello-git-goodbye-mtn.rst:44
+msgid "GPG Signing"
+msgstr ""
+
+#: i2p2www/blog/2020/12/10/Hello-git-goodbye-mtn.rst:49
+msgid ""
+"Checkins to the I2P Project repositories require you to configure GPG "
+"signing for\n"
+"your git commits, including Merge Requests and Pull Requests. Please "
+"configure\n"
+"your git client for GPG signing before you fork i2p.i2p and check "
+"anything in."
+msgstr ""
+
+#: i2p2www/blog/2020/12/10/Hello-git-goodbye-mtn.rst:55
+msgid "Official Repositories and Gitlab/Github Syncing"
+msgstr ""
+
+#: i2p2www/blog/2020/12/10/Hello-git-goodbye-mtn.rst:60
+msgid ""
+"The official repository is the one hosted at https://i2pgit.org/i2p-"
+"hackers/i2p.i2p\n"
+"and at https://git.idk.i2p/i2p-hackers/i2p.i2p, but there is a \"Mirror\""
+" available\n"
+"at Github at https://github.com/i2p/i2p.i2p."
+msgstr ""
+
+#: i2p2www/blog/2020/12/10/Hello-git-goodbye-mtn.rst:66
+msgid ""
+"Now that we're on git, we can synchronize repositories from our own self-"
+"hosted Gitlab\n"
+"instance, to Github, and back again. This means that it is possible to "
+"create and submit\n"
+"a merge request on Gitlab and when it is merged, the result will be "
+"synced with Github,\n"
+"and a Pull Request on Github, when merged, will appear on Gitlab."
+msgstr ""
+
+#: i2p2www/blog/2020/12/10/Hello-git-goodbye-mtn.rst:73
+msgid ""
+"This means that it's possible to submit code to us through our Gitlab "
+"instance or through\n"
+"Github depending on what you prefer, however, more of the I2P developers "
+"are regularly\n"
+"monitoring Gitlab than Github. MR's to Gitlab are more likely to be "
+"merged sooner\n"
+"than PR's to Github."
+msgstr ""
+
+#: i2p2www/blog/2020/12/10/Hello-git-goodbye-mtn.rst:80
+msgid "Thanks"
+msgstr ""
+
+#: i2p2www/blog/2020/12/10/Hello-git-goodbye-mtn.rst:85
+msgid ""
+"Congratulations and thanks to everyone who helped in the git migration, "
+"especially\n"
+"zzz, eche|on, nextloop, and our site mirror operators! While some of us "
+"will miss\n"
+"Monotone, it has become a barrier for new and existing participants in "
+"I2P development\n"
+"and we're excited to join the world of developers using Git to manage "
+"their distributed\n"
+"projects."
+msgstr ""
+
+#: i2p2www/blog/2021/02/17/0.9.49-Release.rst:2
+msgid "0.9.49 Release"
+msgstr ""
+
+#: i2p2www/blog/2021/02/17/0.9.49-Release.rst:9
+msgid "0.9.49 with SSU fixes and faster crypto"
+msgstr ""
+
+#: i2p2www/blog/2021/02/17/0.9.49-Release.rst:16
+msgid ""
+"0.9.49 continues the work to make I2P faster and more secure.\n"
+"We have several improvements and fixes for the SSU (UDP) transport that "
+"should result in faster speeds.\n"
+"This release also starts the migration to new, faster ECIES-X25519 "
+"encryption for routers.\n"
+"(Destinations have been using this encryption for a few releases now)\n"
+"We've been working on the specifications and protocols for new encryption"
+" for several years,\n"
+"and we are getting close to the end of it! The migration will take "
+"several releases to complete."
+msgstr ""
+
+#: i2p2www/blog/2021/02/17/0.9.49-Release.rst:25
+msgid ""
+"For this release, to minimize disruption, only new installs and a very "
+"small percentage of existing installs\n"
+"(randomly selected at restart) will be using the new encryption.\n"
+"If your router does \"rekey\" to use the new encryption, it may have "
+"lower traffic or less reliability than usual for several days after you "
+"restart.\n"
+"This is normal, because your router has generated a new identity.\n"
+"Your performance should recover after a while."
+msgstr ""
+
+#: i2p2www/blog/2021/02/17/0.9.49-Release.rst:33
+msgid ""
+"We have \"rekeyed\" the network twice before, when changing the default "
+"signature type,\n"
+"but this is the first time we've changed the default encryption type.\n"
+"Hopefully it will all go smoothly, but we're starting slowly to be sure."
+msgstr ""
+
+#: i2p2www/blog/2021/02/17/0.9.49-Release.rst:49
+msgid "Build: Git migration"
+msgstr ""
+
+#: i2p2www/blog/2021/02/17/0.9.49-Release.rst:50
+msgid "Build: Move web resources to wars"
+msgstr ""
+
+#: i2p2www/blog/2021/02/17/0.9.49-Release.rst:51
+msgid "i2psnark WebSeed support"
+msgstr ""
+
+#: i2p2www/blog/2021/02/17/0.9.49-Release.rst:52
+msgid "i2psnark padding file support"
+msgstr ""
+
+#: i2p2www/blog/2021/02/17/0.9.49-Release.rst:53
+msgid "i2ptunnel: Move proxy resources to jar"
+msgstr ""
+
+#: i2p2www/blog/2021/02/17/0.9.49-Release.rst:54
+msgid "Router: Redesign ECIES encryption for floodfills (proposal 156)"
+msgstr ""
+
+#: i2p2www/blog/2021/02/17/0.9.49-Release.rst:55
+msgid "Router: Verify RI stores after startup"
+msgstr ""
+
+#: i2p2www/blog/2021/02/17/0.9.49-Release.rst:56
+msgid "Router: Reduce Sybil threshold"
+msgstr ""
+
+#: i2p2www/blog/2021/02/17/0.9.49-Release.rst:57
+msgid "Router: ECIES for new routers"
+msgstr ""
+
+#: i2p2www/blog/2021/02/17/0.9.49-Release.rst:58
+msgid "Router: Start of ECIES migration"
+msgstr ""
+
+#: i2p2www/blog/2021/02/17/0.9.49-Release.rst:59
+msgid "SSU: Send individual fragments of messages"
+msgstr ""
+
+#: i2p2www/blog/2021/02/17/0.9.49-Release.rst:60
+msgid "SSU: Westwood+ congestion control"
+msgstr ""
+
+#: i2p2www/blog/2021/02/17/0.9.49-Release.rst:61
+msgid "SSU: Fast retransmit"
+msgstr ""
+
+#: i2p2www/blog/2021/02/17/0.9.49-Release.rst:66
+msgid "Build: Fix Gradle build"
+msgstr ""
+
+#: i2p2www/blog/2021/02/17/0.9.49-Release.rst:67
+msgid "Crypto: Increase ratchet tag window to prevent message loss"
+msgstr ""
+
+#: i2p2www/blog/2021/02/17/0.9.49-Release.rst:68
+msgid "I2CP: Fix encrypted leaseset combined with ECIES crypto or offline keys"
+msgstr ""
+
+#: i2p2www/blog/2021/02/17/0.9.49-Release.rst:69
+msgid "i2ptunnel: Fix config file saving issues"
+msgstr ""
+
+#: i2p2www/blog/2021/02/17/0.9.49-Release.rst:70
+msgid "Router: Fix leaseset request fails causing watchdog to bark"
+msgstr ""
+
+#: i2p2www/blog/2021/02/17/0.9.49-Release.rst:71
+msgid "Router: Hidden mode fixes"
+msgstr ""
+
+#: i2p2www/blog/2021/02/17/0.9.49-Release.rst:72
+msgid "SSU: Fix partial acks not being sent"
+msgstr ""
+
+#: i2p2www/blog/2021/02/17/0.9.49-Release.rst:73
+msgid "SSU: Fix occasional high CPU usage"
+msgstr ""
+
+#: i2p2www/blog/2021/02/17/0.9.49-Release.rst:78
+msgid "Crypto: AES performance improvements"
+msgstr ""
+
+#: i2p2www/blog/2021/02/17/0.9.49-Release.rst:79
+msgid "DoH: Change to RFC 8484 style"
+msgstr ""
+
+#: i2p2www/blog/2021/02/17/0.9.49-Release.rst:80
+msgid "i2ptunnel: Remove DSA shared clients"
+msgstr ""
+
+#: i2p2www/blog/2021/02/17/0.9.49-Release.rst:81
+msgid "Proxy: Add jump servers"
+msgstr ""
+
+#: i2p2www/blog/2021/02/17/0.9.49-Release.rst:82
+msgid "Router: Add more countries for hidden mode"
+msgstr ""
+
+#: i2p2www/blog/2021/02/17/0.9.49-Release.rst:83
+msgid "Router: Tunnel peer selection changes"
+msgstr ""
+
+#: i2p2www/blog/2021/02/17/0.9.49-Release.rst:84
+msgid "Router: Move Sybil subsystem from console to router for embedded use"
+msgstr ""
+
+#: i2p2www/blog/2021/02/17/0.9.49-Release.rst:85
+msgid "Router: Verify RI stores for a while after startup"
+msgstr ""
+
+#: i2p2www/blog/2021/02/17/0.9.49-Release.rst:86
+msgid "Util: New unit tests"
+msgstr ""
+
diff --git a/pots/comparison.pot b/pots/comparison.pot
index acdb487e..4681f977 100644
--- a/pots/comparison.pot
+++ b/pots/comparison.pot
@@ -1,14 +1,14 @@
 # Translations template for I2P.
-# Copyright (C) 2020 ORGANIZATION
+# Copyright (C) 2021 ORGANIZATION
 # This file is distributed under the same license as the I2P project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2020.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2021.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P website\n"
 "Report-Msgid-Bugs-To: http://trac.i2p2.de\n"
-"POT-Creation-Date: 2020-11-16 17:04+0000\n"
+"POT-Creation-Date: 2021-04-26 14:51+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -425,7 +425,7 @@ msgstr ""
 
 #: i2p2www/pages/site/comparison/tor.html:63
 #: i2p2www/pages/site/comparison/tor.html:68
-msgid "Eepsite or Destination"
+msgid "I2P Site or Destination"
 msgstr ""
 
 #: i2p2www/pages/site/comparison/tor.html:64
diff --git a/pots/docs.pot b/pots/docs.pot
index 2cd7c32a..41802f97 100644
--- a/pots/docs.pot
+++ b/pots/docs.pot
@@ -1,14 +1,14 @@
 # Translations template for I2P.
-# Copyright (C) 2020 ORGANIZATION
+# Copyright (C) 2021 ORGANIZATION
 # This file is distributed under the same license as the I2P project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2020.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2021.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P website\n"
 "Report-Msgid-Bugs-To: http://trac.i2p2.de\n"
-"POT-Creation-Date: 2020-11-16 17:04+0000\n"
+"POT-Creation-Date: 2021-04-26 14:51+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -105,11 +105,11 @@ msgid "Application-Layer Topics"
 msgstr ""
 
 #: i2p2www/pages/site/docs/index.html:42 i2p2www/pages/site/docs/naming.html:2
-msgid "Naming and Addressbook"
+msgid "Naming and Address Book"
 msgstr ""
 
 #: i2p2www/pages/site/docs/index.html:43
-msgid "Addressbook Subscription Feed Commands"
+msgid "Address Book Subscription Feed Commands"
 msgstr ""
 
 #: i2p2www/pages/site/docs/index.html:44
@@ -126,7 +126,7 @@ msgstr ""
 msgid "Managed Clients"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:47 i2p2www/pages/site/docs/index.html:239
+#: i2p2www/pages/site/docs/index.html:47 i2p2www/pages/site/docs/index.html:240
 msgid "Embedding the router in your application"
 msgstr ""
 
@@ -143,7 +143,7 @@ msgstr ""
 msgid "hostsdb.blockfile Format"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:51 i2p2www/pages/site/docs/index.html:205
+#: i2p2www/pages/site/docs/index.html:51 i2p2www/pages/site/docs/index.html:206
 msgid "Configuration File Format"
 msgstr ""
 
@@ -238,12 +238,12 @@ msgid "I2CP API Javadoc"
 msgstr ""
 
 #: i2p2www/pages/site/docs/index.html:112
-#: i2p2www/pages/site/docs/index.html:145
+#: i2p2www/pages/site/docs/index.html:146
 msgid "Common data structures specification"
 msgstr ""
 
 #: i2p2www/pages/site/docs/index.html:114
-#: i2p2www/pages/site/docs/index.html:149
+#: i2p2www/pages/site/docs/index.html:150
 msgid "Data Structures Javadoc"
 msgstr ""
 
@@ -256,308 +256,312 @@ msgid "How client messages are end-to-end encrypted by the router."
 msgstr ""
 
 #: i2p2www/pages/site/docs/index.html:120
-msgid "ECIES-X25519-AEAD-Ratchet encryption"
+msgid "ECIES-X25519-AEAD-Ratchet encryption for destinations"
 msgstr ""
 
 #: i2p2www/pages/site/docs/index.html:121
-msgid "ElGamal/AES+SessionTag encryption"
+msgid "ECIES-X25519 encryption for routers"
 msgstr ""
 
 #: i2p2www/pages/site/docs/index.html:122
-#: i2p2www/pages/site/docs/index.html:160
+msgid "ElGamal/AES+SessionTag encryption"
+msgstr ""
+
+#: i2p2www/pages/site/docs/index.html:123
+#: i2p2www/pages/site/docs/index.html:161
 msgid "ElGamal and AES cryptography details"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:125
+#: i2p2www/pages/site/docs/index.html:126
 #: i2p2www/pages/site/docs/how/tech-intro.html:11
 #: i2p2www/pages/site/docs/how/tech-intro.html:325
 msgid "Network Database"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:126
+#: i2p2www/pages/site/docs/index.html:127
 msgid ""
 "Distributed storage and retrieval of information about routers and "
 "clients."
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:128
+#: i2p2www/pages/site/docs/index.html:129
 msgid "Network database overview, details, and threat analysis"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:129
+#: i2p2www/pages/site/docs/index.html:130
 msgid "Cryptographic hashes"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:130
+#: i2p2www/pages/site/docs/index.html:131
 msgid "Cryptographic signatures"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:131
+#: i2p2www/pages/site/docs/index.html:132
 msgid "Red25519 signatures"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:132
-#: i2p2www/pages/site/docs/index.html:197
+#: i2p2www/pages/site/docs/index.html:133
+#: i2p2www/pages/site/docs/index.html:198
 msgid "Router reseed specification"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:133
+#: i2p2www/pages/site/docs/index.html:134
 msgid "Base32 Addresses for Encrypted Leasesets"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:136
+#: i2p2www/pages/site/docs/index.html:137
 msgid "Router Message Protocol"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:137
+#: i2p2www/pages/site/docs/index.html:138
 msgid ""
 "I2P is a message-oriented router. The messages sent between routers are "
 "defined by the I2NP protocol."
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:139
+#: i2p2www/pages/site/docs/index.html:140
 msgid "I2NP - I2P Network Protocol Overview"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:141
+#: i2p2www/pages/site/docs/index.html:142
 msgid "I2NP Specification"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:143
+#: i2p2www/pages/site/docs/index.html:144
 msgid "I2NP Javadoc"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:147
+#: i2p2www/pages/site/docs/index.html:148
 msgid "Encrypted Leaseset specification"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:152
+#: i2p2www/pages/site/docs/index.html:153
 #: i2p2www/pages/site/docs/how/tech-intro.html:10
 #: i2p2www/pages/site/docs/how/tech-intro.html:224
 msgid "Tunnels"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:153
+#: i2p2www/pages/site/docs/index.html:154
 msgid ""
 "Selecting peers, requesting tunnels through those peers, and encrypting "
 "and routing messages through these tunnels."
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:155
+#: i2p2www/pages/site/docs/index.html:156
 msgid "Peer profiling and selection"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:156
+#: i2p2www/pages/site/docs/index.html:157
 msgid "Tunnel routing overview"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:157
+#: i2p2www/pages/site/docs/index.html:158
 msgid "Garlic routing and \"garlic\" terminology"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:158
+#: i2p2www/pages/site/docs/index.html:159
 msgid "Tunnel building and encryption"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:159
+#: i2p2www/pages/site/docs/index.html:160
 msgid "ElGamal/AES"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:159
+#: i2p2www/pages/site/docs/index.html:160
 msgid "for build request encryption"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:161
 #: i2p2www/pages/site/docs/index.html:162
+#: i2p2www/pages/site/docs/index.html:163
 msgid "Tunnel building specification"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:163
+#: i2p2www/pages/site/docs/index.html:164
 msgid "Low-level tunnel message specification"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:164
+#: i2p2www/pages/site/docs/index.html:165
 #: i2p2www/pages/site/docs/tunnels/unidirectional.html:2
 msgid "Unidirectional Tunnels"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:165
+#: i2p2www/pages/site/docs/index.html:166
 #: i2p2www/pages/site/docs/how/peer-selection.html:299
 msgid "Peer Profiling and Selection in the I2P Anonymous Network"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:166
+#: i2p2www/pages/site/docs/index.html:167
 msgid "2009 paper (pdf), not current but still generally accurate"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:169
+#: i2p2www/pages/site/docs/index.html:170
 msgid "Transport Layer"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:170
+#: i2p2www/pages/site/docs/index.html:171
 msgid "The protocols for direct (point-to-point) router to router communication."
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:172
+#: i2p2www/pages/site/docs/index.html:173
 msgid "Transport layer overview"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:174
+#: i2p2www/pages/site/docs/index.html:175
 msgid "TCP-based transport overview and specification"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:176
+#: i2p2www/pages/site/docs/index.html:177
 msgid "NTCP2 specification"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:178
+#: i2p2www/pages/site/docs/index.html:179
 msgid "UDP-based transport overview"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:180
+#: i2p2www/pages/site/docs/index.html:181
 msgid "SSU specification"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:182
+#: i2p2www/pages/site/docs/index.html:183
 msgid "NTCP transport encryption"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:184
+#: i2p2www/pages/site/docs/index.html:185
 msgid "SSU transport encryption"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:186
+#: i2p2www/pages/site/docs/index.html:187
 msgid "Transport Javadoc"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:188
+#: i2p2www/pages/site/docs/index.html:189
 msgid "NTCP Javadoc"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:190
+#: i2p2www/pages/site/docs/index.html:191
 msgid "SSU Javadoc"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:193
+#: i2p2www/pages/site/docs/index.html:194
 msgid "Other Router Topics"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:195
+#: i2p2www/pages/site/docs/index.html:196
 msgid "Router software updates"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:199
+#: i2p2www/pages/site/docs/index.html:200
 msgid "Native BigInteger Library"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:201
+#: i2p2www/pages/site/docs/index.html:202
 msgid "Time synchronization and NTP"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:203
+#: i2p2www/pages/site/docs/index.html:204
 msgid "Performance"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:210
+#: i2p2www/pages/site/docs/index.html:211
 msgid "Developer's Guides and Resources"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:212
+#: i2p2www/pages/site/docs/index.html:213
 msgid "New Developer's Guide"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:214
+#: i2p2www/pages/site/docs/index.html:215
 msgid "New Translator's Guide"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:216
+#: i2p2www/pages/site/docs/index.html:217
 msgid "Monotone Guide"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:218
+#: i2p2www/pages/site/docs/index.html:219
 msgid "Developer Guidelines"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:220
+#: i2p2www/pages/site/docs/index.html:221
 msgid "Javadocs on the standard internet:"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:221
-#: i2p2www/pages/site/docs/index.html:227
-#: i2p2www/pages/site/docs/index.html:229
-#: i2p2www/pages/site/docs/index.html:231
+#: i2p2www/pages/site/docs/index.html:222
+#: i2p2www/pages/site/docs/index.html:228
+#: i2p2www/pages/site/docs/index.html:230
+#: i2p2www/pages/site/docs/index.html:232
 #, python-format
 msgid "Server %(num)s"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:222
-#: i2p2www/pages/site/docs/index.html:235
+#: i2p2www/pages/site/docs/index.html:223
+#: i2p2www/pages/site/docs/index.html:236
 msgid ""
 "Note: always verify that javadocs are current by checking the release "
 "number."
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:224
+#: i2p2www/pages/site/docs/index.html:225
 msgid "Javadocs inside I2P:"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:237
+#: i2p2www/pages/site/docs/index.html:238
 msgid "Proposals"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:241
+#: i2p2www/pages/site/docs/index.html:242
 msgid "How to Set up a Reseed Server"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:243
+#: i2p2www/pages/site/docs/index.html:244
 msgid "Ports used by I2P"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:245
+#: i2p2www/pages/site/docs/index.html:246
 msgid "Automatic updates to development builds inside I2P"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:247
+#: i2p2www/pages/site/docs/index.html:248
 msgid "Updating the wrapper manually"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:249
+#: i2p2www/pages/site/docs/index.html:250
 msgid "User forum"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:251
+#: i2p2www/pages/site/docs/index.html:252
 msgid "Developer forum inside I2P"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:253
+#: i2p2www/pages/site/docs/index.html:254
 msgid "Bug tracker"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:256
+#: i2p2www/pages/site/docs/index.html:257
 msgid "Viewmtn inside I2P"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:259
+#: i2p2www/pages/site/docs/index.html:260
 msgid "I2P Source exported to GitHub"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:261
+#: i2p2www/pages/site/docs/index.html:262
 msgid "I2P Source Git Repo inside I2P"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:263
+#: i2p2www/pages/site/docs/index.html:264
 msgid "Source translation at Transifex"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:265
+#: i2p2www/pages/site/docs/index.html:266
 msgid "Roadmap"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:267
+#: i2p2www/pages/site/docs/index.html:268
 msgid "To Do List"
 msgstr ""
 
-#: i2p2www/pages/site/docs/index.html:267
+#: i2p2www/pages/site/docs/index.html:268
 msgid "not current"
 msgstr ""
 
@@ -565,31 +569,32 @@ msgstr ""
 msgid ""
 "I2P ships with a generic naming library and a base implementation \n"
 "designed to work off a local name to destination mapping, as well as an\n"
-"add-on application called the <a href=\"#addressbook\">addressbook</a>. \n"
+"add-on application called the <a href=\"#addressbook\">address book</a>."
+" \n"
 "I2P also supports <a href=\"#base32\">Base32 hostnames</a> similar to "
 "Tor's .onion addresses."
 msgstr ""
 
 #: i2p2www/pages/site/docs/naming.html:15
 msgid ""
-"The addressbook is a web-of-trust\n"
+"The address book is a web-of-trust\n"
 "driven secure, distributed, and human readable naming system, sacrificing"
 " only\n"
 "the call for all human readable names to be globally unique by mandating "
 "only\n"
 "local uniqueness.  While all messages in I2P are cryptographically "
 "addressed\n"
-"by their destination, different people can have local addressbook entries"
-" for\n"
+"by their destination, different people can have local address book "
+"entries for\n"
 "\"Alice\" which refer to different destinations.  People can still "
 "discover new\n"
-"names by importing published addressbooks of peers specified in their web"
-" of trust,\n"
+"names by importing published address books of peers specified in their "
+"web of trust,\n"
 "by adding in the entries provided through a third party, or (if some "
 "people organize\n"
-"a series of published addressbooks using a first come first serve "
+"a series of published address books using a first come first serve "
 "registration\n"
-"system) people can choose to treat these addressbooks as name servers, "
+"system) people can choose to treat these address books as name servers, "
 "emulating\n"
 "traditional DNS."
 msgstr ""
@@ -649,7 +654,7 @@ msgstr ""
 
 #: i2p2www/pages/site/docs/naming.html:65
 msgid ""
-"The <a href=\"#addressbook\">addressbook</a> application which merges "
+"The <a href=\"#addressbook\">address book</a> application which merges "
 "external\n"
 "host lists, retrieved via HTTP, with the local list."
 msgstr ""
@@ -658,7 +663,7 @@ msgstr ""
 msgid ""
 "The <a href=\"#susidns\">SusiDNS</a> application which is a simple web "
 "front-end\n"
-"for addressbook configuration and viewing of the local host lists."
+"for address book configuration and viewing of the local host lists."
 msgstr ""
 
 #: i2p2www/pages/site/docs/naming.html:76
@@ -716,8 +721,8 @@ msgstr ""
 
 #: i2p2www/pages/site/docs/naming.html:116
 msgid ""
-"The Blockfile Naming Service stores multiple \"addressbooks\" in a single"
-"\n"
+"The Blockfile Naming Service stores multiple \"address books\" in a "
+"single\n"
 "database file named hostsdb.blockfile.\n"
 "This Naming Service is the default since release 0.8.8."
 msgstr ""
@@ -737,7 +742,7 @@ msgid ""
 "In addition, the blockfile provides the capability of arbitrary metadata "
 "storage\n"
 "(such as added date, source, and comments) for each entry to implement "
-"advanced addressbook features.\n"
+"advanced address book features.\n"
 "The blockfile storage requirement is a modest increase over the hosts.txt"
 " format, and the blockfile provides\n"
 "approximately 10x reduction in lookup times."
@@ -795,7 +800,7 @@ msgid ""
 "The HTTP proxy does a lookup via the router for all hostnames ending in "
 "'.i2p'.\n"
 "Otherwise, it forwards the request to a configured HTTP outproxy.\n"
-"Thus, in practice, all HTTP (eepsite) hostnames must end in the pseudo-"
+"Thus, in practice, all HTTP (I2P Site) hostnames must end in the pseudo-"
 "Top Level Domain '.i2p'."
 msgstr ""
 
@@ -815,7 +820,7 @@ msgid ""
 msgstr ""
 
 #: i2p2www/pages/site/docs/naming.html:183
-msgid "Addressbook"
+msgid "Address Book"
 msgstr ""
 
 #: i2p2www/pages/site/docs/naming.html:184
@@ -824,7 +829,7 @@ msgstr ""
 
 #: i2p2www/pages/site/docs/naming.html:186
 msgid ""
-"The addressbook application periodically\n"
+"The address book application periodically\n"
 "retrieves other users' hosts.txt files and merges\n"
 "them with the local hosts.txt, after several checks.\n"
 "Naming conflicts are resolved on a first-come first-served\n"
@@ -849,12 +854,12 @@ msgid ""
 "which contains a copy of the hosts.txt included\n"
 "in the I2P release.\n"
 "Users must configure additional subscriptions in their\n"
-"local addressbook application (via subscriptions.txt or <a "
+"local address book application (via subscriptions.txt or <a "
 "href=\"#susidns\">SusiDNS</a>)."
 msgstr ""
 
 #: i2p2www/pages/site/docs/naming.html:211
-msgid "Some other public addressbook subscription links:"
+msgid "Some other public address book subscription links:"
 msgstr ""
 
 #: i2p2www/pages/site/docs/naming.html:218
@@ -873,7 +878,7 @@ msgstr ""
 msgid ""
 "While there are hopefully not any technical limitations within I2P on "
 "host names,\n"
-"the addressbook enforces several restrictions on host names\n"
+"the address book enforces several restrictions on host names\n"
 "imported from subscriptions.\n"
 "It does this for basic typographical sanity and compatibility with "
 "browsers,\n"
@@ -965,7 +970,7 @@ msgid ""
 "and do not denote any actual naming or trust hierarchy.\n"
 "If the name 'host.i2p' already exists, there is nothing\n"
 "to prevent anybody from adding a name 'a.host.i2p' to their hosts.txt,\n"
-"and this name can be imported by others' addressbook.\n"
+"and this name can be imported by others' address book.\n"
 "Methods to deny subdomains to non-domain 'owners' (certificates?),\n"
 "and the desirability and feasibility of these methods,\n"
 "are topics for future discussion."
@@ -982,7 +987,7 @@ msgstr ""
 
 #: i2p2www/pages/site/docs/naming.html:323
 msgid ""
-"As the addressbook application does not use privatehosts.txt at all, in "
+"As the address book application does not use privatehosts.txt at all, in "
 "practice\n"
 "this file is the only place where it is appropriate to place private "
 "aliases or\n"
@@ -999,8 +1004,8 @@ msgstr ""
 
 #: i2p2www/pages/site/docs/naming.html:338
 msgid ""
-"Addressbook will publish the merged hosts.txt to a location\n"
-"(traditionally hosts.txt in the local eepsite's home directory) to be "
+"Address Book will publish the merged hosts.txt to a location\n"
+"(traditionally hosts.txt in the local I2P Site's home directory) to be "
 "accessed by others\n"
 "for their subscriptions.\n"
 "This step is optional and is disabled by default."
@@ -1008,8 +1013,8 @@ msgstr ""
 
 #: i2p2www/pages/site/docs/naming.html:346
 msgid ""
-"The addressbook application, together with eepget, saves the Etag and/or "
-"Last-Modified\n"
+"The address book application, together with eepget, saves the Etag and/or"
+" Last-Modified\n"
 "information returned by the web server of the subscription.\n"
 "This greatly reduces the bandwidth required, as the web server will\n"
 "return a '304 Not Modified' on the next fetch if nothing has changed."
@@ -1048,7 +1053,7 @@ msgstr ""
 #: i2p2www/pages/site/docs/naming.html:375
 msgid ""
 "It is recommended that host add services impose, at a minimum, the "
-"restrictions imposed by the addressbook application listed above.\n"
+"restrictions imposed by the address book application listed above.\n"
 "Host add services may impose additional restrictions on hostnames and "
 "keys, for example:"
 msgstr ""
@@ -1129,18 +1134,18 @@ msgstr ""
 
 #: i2p2www/pages/site/docs/naming.html:448
 msgid ""
-"SusiDNS is simply a web interface front-end to configuring addressbook "
+"SusiDNS is simply a web interface front-end to configuring address book "
 "subscriptions\n"
-"and accessing the four addressbook files.\n"
-"All the real work is done by the 'addressbook' application."
+"and accessing the four address book files.\n"
+"All the real work is done by the 'address book' application."
 msgstr ""
 
 #: i2p2www/pages/site/docs/naming.html:454
 msgid ""
-"Currently, there is little enforcement of addressbook naming rules within"
-" SusiDNS,\n"
+"Currently, there is little enforcement of address book naming rules "
+"within SusiDNS,\n"
 "so a user may enter hostnames locally that would be rejected by\n"
-"the addressbook subscription rules."
+"the address book subscription rules."
 msgstr ""
 
 #: i2p2www/pages/site/docs/naming.html:460
@@ -1609,7 +1614,7 @@ msgid "Version history"
 msgstr ""
 
 #: i2p2www/pages/site/docs/api/bob.html:77
-#: i2p2www/pages/site/docs/api/samv3.html:32
+#: i2p2www/pages/site/docs/api/samv3.html:41
 msgid "Version"
 msgstr ""
 
@@ -1768,7 +1773,7 @@ msgstr ""
 #: i2p2www/pages/site/docs/api/bob.html:214
 msgid ""
 "Now all we need to do is telnet into 127.0.0.1, port 37337,\n"
-"send the destination key or host address from addressbook we want to "
+"send the destination key or host address from address book we want to "
 "contact.\n"
 "In this case, we want to contact \"mouth\", all we do is paste in the\n"
 "key and it goes."
@@ -1789,12 +1794,12 @@ msgid "Here is what happened..."
 msgstr ""
 
 #: i2p2www/pages/site/docs/api/bob.html:258
-msgid "You can connect to EEPSITES too!"
+msgid "You can connect to I2P SITES too!"
 msgstr ""
 
 #: i2p2www/pages/site/docs/api/bob.html:291
 msgid ""
-"Pretty cool isn't it? Try some other well known EEPSITES if you like, "
+"Pretty cool isn't it? Try some other well known I2P SITES if you like, "
 "nonexistent ones,\n"
 "etc, to get a feel for what kind of output to expect in different "
 "situations.\n"
@@ -2037,7 +2042,7 @@ msgid ""
 msgstr ""
 
 #: i2p2www/pages/site/docs/api/datagrams.html:120
-#: i2p2www/pages/site/docs/transport/ssu.html:652
+#: i2p2www/pages/site/docs/transport/ssu.html:675
 msgid "Specification"
 msgstr ""
 
@@ -2779,7 +2784,7 @@ msgid ""
 "with no outproxying\n"
 "capabilities. An example application would be a web application that does"
 " client-type\n"
-"requests, or loopback-testing an eepsite as a diagnostic tool."
+"requests, or loopback-testing an I2P Site as a diagnostic tool."
 msgstr ""
 
 #: i2p2www/pages/site/docs/api/i2ptunnel.html:184
@@ -2881,31 +2886,31 @@ msgid ""
 "<a href=\"%(samv3)s\">SAM</a>'s streaming support."
 msgstr ""
 
-#: i2p2www/pages/site/docs/api/samv3.html:30
+#: i2p2www/pages/site/docs/api/samv3.html:39
 msgid "Library Name"
 msgstr ""
 
-#: i2p2www/pages/site/docs/api/samv3.html:31
+#: i2p2www/pages/site/docs/api/samv3.html:40
 msgid "Language"
 msgstr ""
 
-#: i2p2www/pages/site/docs/api/samv3.html:33
+#: i2p2www/pages/site/docs/api/samv3.html:42
 msgid "STREAM"
 msgstr ""
 
-#: i2p2www/pages/site/docs/api/samv3.html:34
+#: i2p2www/pages/site/docs/api/samv3.html:43
 msgid "DGRAM"
 msgstr ""
 
-#: i2p2www/pages/site/docs/api/samv3.html:35
+#: i2p2www/pages/site/docs/api/samv3.html:44
 msgid "RAW"
 msgstr ""
 
-#: i2p2www/pages/site/docs/api/samv3.html:36
+#: i2p2www/pages/site/docs/api/samv3.html:45
 msgid "Site"
 msgstr ""
 
-#: i2p2www/pages/site/docs/api/samv3.html:42
+#: i2p2www/pages/site/docs/api/samv3.html:51
 msgid "wrapper"
 msgstr ""
 
@@ -2972,7 +2977,7 @@ msgstr ""
 #: i2p2www/pages/site/docs/api/socks.html:48
 msgid ""
 "The SOCKS proxy\n"
-"supports standard addressbook names, but not Base64 destinations.\n"
+"supports standard address book names, but not Base64 destinations.\n"
 "Base32 hashes should work as of release 0.7.\n"
 "It supports outgoing connections only, i.e. an I2PTunnel Client.\n"
 "UDP support is stubbed out but not working yet.\n"
@@ -3701,7 +3706,7 @@ msgstr ""
 #: i2p2www/pages/site/docs/protocol/i2cp.html:975
 #: i2p2www/pages/site/docs/protocol/i2np.html:233
 #: i2p2www/pages/site/docs/transport/ntcp.html:544
-#: i2p2www/pages/site/docs/transport/ssu.html:587
+#: i2p2www/pages/site/docs/transport/ssu.html:610
 #: i2p2www/pages/site/docs/tunnels/implementation.html:506
 msgid "Future Work"
 msgstr ""
@@ -4709,8 +4714,8 @@ msgstr ""
 
 #: i2p2www/pages/site/docs/applications/embedding.html:311
 msgid ""
-"This may be obvious, but join the community. Run I2P 24/7. Start an "
-"eepsite about your project.\n"
+"This may be obvious, but join the community. Run I2P 24/7. Start an I2P "
+"Site about your project.\n"
 "Hang out in IRC #i2p-dev. Post on the forums. Spread the word.\n"
 "We can help get you users, testers, translators, or even coders."
 msgstr ""
@@ -4880,24 +4885,24 @@ msgid ""
 "“Start” button to begin seeding the torrent."
 msgstr ""
 
-#: i2p2www/pages/site/docs/applications/git.html:8
+#: i2p2www/pages/site/docs/applications/git.html:7
 msgid ""
 "Tutorial for setting up git access through an I2P Tunnel. This tunnel "
 "will act as your access point to a single git service on I2P."
 msgstr ""
 
-#: i2p2www/pages/site/docs/applications/git.html:10
+#: i2p2www/pages/site/docs/applications/git.html:8
 msgid ""
-"Depending on how the git service is configured, it may or may not offer "
-"all services on the same address. In the case of gittest.i2p, there is a "
-"public HTTP URL, but this URL is read-only and cannot be used to make "
-"changes. To do that, you must also know the SSH base32, which isn’t "
-"public at this time. Unless I’ve told you the SSH base32 to gittest.i2p, "
-"head over to the <a href=\"GITLAB.md\">Server</a> tutorial to set up your"
-" own."
+"If you intend to use the service at i2pgit.org/git.idk.i2p, then you "
+"probably already have a tunnel configured and much of this\n"
+"tutorial will not apply to you."
 msgstr ""
 
-#: i2p2www/pages/site/docs/applications/git.html:12
+#: i2p2www/pages/site/docs/applications/git.html:10
+msgid "First: Set up an account at a Git service"
+msgstr ""
+
+#: i2p2www/pages/site/docs/applications/git.html:11
 msgid ""
 "To create your repositories on a remote git service, sign up for a user "
 "account at that service. Of course it’s also possible to create "
@@ -4906,7 +4911,28 @@ msgid ""
 "the server. Gitlab has a very simple sign-up form:"
 msgstr ""
 
-#: i2p2www/pages/site/docs/applications/git.html:17
+#: i2p2www/pages/site/docs/applications/git.html:12
+msgid ""
+"These are generic instructions for any in-i2p Git instance with HTTP and "
+"SSH gateways.\n"
+"If you intend to contribute to I2P, you should create an account at the "
+"I2P gitlab, which is open to the\n"
+"community. Account registration may take a few days to complete, as the "
+"admin needs to sort through a large\n"
+"number of spam registrations. You can help this by getting in touch with "
+"the admin to confirm you are human\n"
+"using the instructions on the home page."
+msgstr ""
+
+#: i2p2www/pages/site/docs/applications/git.html:18
+msgid "Inside I2P - (http://git.idk.i2p)"
+msgstr ""
+
+#: i2p2www/pages/site/docs/applications/git.html:20
+msgid "Outside I2P - (https://i2pgit.org)"
+msgstr ""
+
+#: i2p2www/pages/site/docs/applications/git.html:27
 msgid ""
 "To make sure the setup process works, it helps to make a repository to "
 "test with from the server, and for the sake of this tutorial, we’re going"
@@ -4914,11 +4940,11 @@ msgid ""
 "hackers/i2p.i2p repository:"
 msgstr ""
 
-#: i2p2www/pages/site/docs/applications/git.html:24
+#: i2p2www/pages/site/docs/applications/git.html:34
 msgid "Then, fork it to your account."
 msgstr ""
 
-#: i2p2www/pages/site/docs/applications/git.html:32
+#: i2p2www/pages/site/docs/applications/git.html:42
 msgid ""
 "To have read-write access to my server, you’ll need to set up a tunnel "
 "for your SSH client. As an example, we’re going to use the HTTP tunnel "
@@ -4927,7 +4953,7 @@ msgid ""
 "configure git to use the pre-configured I2P HTTP Proxy. For example:"
 msgstr ""
 
-#: i2p2www/pages/site/docs/applications/git.html:40
+#: i2p2www/pages/site/docs/applications/git.html:50
 msgid ""
 "Then, add the address you will be pushing and pulling from. Note that "
 "this example address is for Read-Only HTTP-over-I2P clones, if your admin"
@@ -4936,29 +4962,48 @@ msgid ""
 "substitute it for the base32 in this step, which will fail."
 msgstr ""
 
-#: i2p2www/pages/site/docs/applications/git.html:44
+#: i2p2www/pages/site/docs/applications/git.html:54
 msgid "Pick a port to forward the I2P service to locally."
 msgstr ""
 
-#: i2p2www/pages/site/docs/applications/git.html:48
+#: i2p2www/pages/site/docs/applications/git.html:58
 msgid ""
 "I use it alot, so I start my client tunnel automatically, but it’s up to "
 "you."
 msgstr ""
 
-#: i2p2www/pages/site/docs/applications/git.html:52
+#: i2p2www/pages/site/docs/applications/git.html:62
 msgid "When you’re all done, it should look alot like this."
 msgstr ""
 
-#: i2p2www/pages/site/docs/applications/git.html:56
+#: i2p2www/pages/site/docs/applications/git.html:66
 msgid "Fourth: Attempt a clone"
 msgstr ""
 
-#: i2p2www/pages/site/docs/applications/git.html:57
+#: i2p2www/pages/site/docs/applications/git.html:67
 msgid "Now your tunnel is all set up, you can attempt a clone over SSH."
 msgstr ""
 
-#: i2p2www/pages/site/docs/applications/git.html:60
+#: i2p2www/pages/site/docs/applications/git.html:68
+msgid ""
+"Git Privacy: Committing to git adds a timestamp to git commit messages, "
+"which may be configured to reflect your local time zone. To enforce the "
+"use of UTC for all commits, you are advised to use a git alias, such as:"
+msgstr ""
+
+#: i2p2www/pages/site/docs/applications/git.html:70
+msgid "which will allow you to substitute"
+msgstr ""
+
+#: i2p2www/pages/site/docs/applications/git.html:72
+msgid "for"
+msgstr ""
+
+#: i2p2www/pages/site/docs/applications/git.html:74
+msgid "in order to obscure your local time zone."
+msgstr ""
+
+#: i2p2www/pages/site/docs/applications/git.html:78
 msgid ""
 "You might get an error where the remote end hangs up unexpectedly. "
 "Unfortunately git still doesn’t support resumable cloning. Until it does,"
@@ -4966,31 +5011,31 @@ msgid ""
 "easiest is to try and clone to a shallow depth:"
 msgstr ""
 
-#: i2p2www/pages/site/docs/applications/git.html:63
+#: i2p2www/pages/site/docs/applications/git.html:81
 msgid ""
 "Once you’ve performed a shallow clone, you can fetch the rest resumably "
 "by changing to the repo directory and running:"
 msgstr ""
 
-#: i2p2www/pages/site/docs/applications/git.html:65
+#: i2p2www/pages/site/docs/applications/git.html:83
 msgid ""
 "At this point, you still don’t have all your branches yet. You can get "
 "them by running the following commands:"
 msgstr ""
 
-#: i2p2www/pages/site/docs/applications/git.html:68
+#: i2p2www/pages/site/docs/applications/git.html:86
 msgid ""
 "Which tells git to alter the repository configuration so that fetching "
 "from origin fetches all branches."
 msgstr ""
 
-#: i2p2www/pages/site/docs/applications/git.html:69
+#: i2p2www/pages/site/docs/applications/git.html:87
 msgid ""
 "If that doesn’t work, you can try opening the tunnel configuration menu "
 "and adding some backup tunnels."
 msgstr ""
 
-#: i2p2www/pages/site/docs/applications/git.html:73
+#: i2p2www/pages/site/docs/applications/git.html:91
 msgid ""
 "If that doesn’t work, then the next easy thing to try is to decrease the "
 "tunnel length. Don’t do this if you believe you are at risk of your code-"
@@ -4999,11 +5044,11 @@ msgid ""
 "sounds unlikely to you then you can probably do it safely."
 msgstr ""
 
-#: i2p2www/pages/site/docs/applications/git.html:77
+#: i2p2www/pages/site/docs/applications/git.html:95
 msgid "<em>Suggested Workflow for Developers!</em>"
 msgstr ""
 
-#: i2p2www/pages/site/docs/applications/git.html:78
+#: i2p2www/pages/site/docs/applications/git.html:96
 msgid ""
 "Revision control can make your life easier, but it works best if you use "
 "it well! In light of this, we strongly suggest a fork-first, feature-"
@@ -5014,54 +5059,62 @@ msgid ""
 "take the following steps:"
 msgstr ""
 
-#: i2p2www/pages/site/docs/applications/git.html:80
+#: i2p2www/pages/site/docs/applications/git.html:98
 msgid ""
 "<strong>Never make changes to the Master Branch</strong>. You will be "
 "using the master branch to periodially obtain updates to the official "
 "source code. All changes should be made in feature branches."
 msgstr ""
 
-#: i2p2www/pages/site/docs/applications/git.html:83
+#: i2p2www/pages/site/docs/applications/git.html:101
 msgid ""
 "Set up a second remote in your local repository using the upstream source"
 " code."
 msgstr ""
 
-#: i2p2www/pages/site/docs/applications/git.html:85
+#: i2p2www/pages/site/docs/applications/git.html:103
 msgid "Pull in any upstream changes on your current master:"
 msgstr ""
 
-#: i2p2www/pages/site/docs/applications/git.html:87
+#: i2p2www/pages/site/docs/applications/git.html:105
 msgid ""
 "Before making any changes to the source code, check out a new feature "
 "branch to develop on:"
 msgstr ""
 
-#: i2p2www/pages/site/docs/applications/git.html:89
+#: i2p2www/pages/site/docs/applications/git.html:107
 msgid ""
 "When you’re done with your changes, commit them and push them to your "
 "branch"
 msgstr ""
 
-#: i2p2www/pages/site/docs/applications/git.html:92
+#: i2p2www/pages/site/docs/applications/git.html:110
 msgid ""
 "Submit a merge request. When the merge request is approved and brought "
 "into the upstream master, check out the master locally and pull in the "
 "changes:"
 msgstr ""
 
-#: i2p2www/pages/site/docs/applications/git.html:95
+#: i2p2www/pages/site/docs/applications/git.html:113
 msgid ""
 "Whenever a change to the upstream master(i2p-hackers/i2p.i2p) is made, "
 "you can update your master code using this procedure as well."
 msgstr ""
 
+#: i2p2www/pages/site/docs/applications/git.html:117
+msgid ""
+"The git utccommit alias solution to git timestamp issue was arrived at "
+"from the information first published here"
+msgstr ""
+
 #: i2p2www/pages/site/docs/applications/gitlab.html:6
 msgid "Gitlab over I2P Setup"
 msgstr ""
 
 #: i2p2www/pages/site/docs/applications/gitlab.html:7
-msgid "Mirror I2P Git repositories and Bridge Clearnet repositories for others."
+msgid ""
+"Mirror I2P Git repositories and Bridge Non-private internet.repositories "
+"for others."
 msgstr ""
 
 #: i2p2www/pages/site/docs/applications/gitlab.html:10
@@ -5729,669 +5782,6 @@ msgid ""
 "that port."
 msgstr ""
 
-#: i2p2www/pages/site/docs/applications/supported.html:2
-msgid "Supported Applications"
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:5
-#: i2p2www/pages/site/docs/applications/supported.html:188
-msgid "Blogging, Forums, and Wikis"
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:7
-#: i2p2www/pages/site/docs/applications/supported.html:234
-msgid "Decentralized File Storage"
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:10
-#: i2p2www/pages/site/docs/applications/supported.html:246
-msgid "Development Tools"
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:13
-#: i2p2www/pages/site/docs/applications/supported.html:248
-msgid "Version control"
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:17
-#: i2p2www/pages/site/docs/applications/supported.html:267
-msgid "Domain Naming"
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:19
-#: i2p2www/pages/site/docs/applications/supported.html:285
-msgid "Email"
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:22
-#: i2p2www/pages/site/docs/applications/supported.html:330
-msgid "File Sharing"
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:25
-#: i2p2www/pages/site/docs/applications/supported.html:332
-msgid "BitTorrent clients"
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:27
-#: i2p2www/pages/site/docs/applications/supported.html:375
-msgid "BitTorrent trackers and indexers"
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:36
-#: i2p2www/pages/site/docs/applications/supported.html:442
-msgid "Network Administration"
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:39
-#: i2p2www/pages/site/docs/applications/supported.html:444
-msgid "General-purpose socket utilities"
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:46
-#: i2p2www/pages/site/docs/applications/supported.html:485
-msgid "Real-time Chat"
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:49
-#: i2p2www/pages/site/docs/applications/supported.html:487
-msgid "Instant messaging clients"
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:51
-#: i2p2www/pages/site/docs/applications/supported.html:497
-msgid "IRC clients"
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:53
-#: i2p2www/pages/site/docs/applications/supported.html:548
-msgid "IRC servers"
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:58
-#: i2p2www/pages/site/docs/applications/supported.html:564
-msgid "Web Browsing"
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:61
-#: i2p2www/pages/site/docs/applications/supported.html:566
-msgid "Anonymous websites"
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:63
-#: i2p2www/pages/site/docs/applications/supported.html:615
-msgid "Proxy software"
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:65
-#: i2p2www/pages/site/docs/applications/supported.html:640
-msgid "Inproxies"
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:67
-#: i2p2www/pages/site/docs/applications/supported.html:681
-msgid "Outproxies"
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:72
-#: i2p2www/pages/site/docs/applications/supported.html:695
-msgid "Website Hosting"
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:75
-#: i2p2www/pages/site/docs/applications/supported.html:710
-msgid "Web servers"
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:82
-#, python-format
-msgid ""
-"This is intended to be a comprehensive listing of applications used with\n"
-"I2P. If you know of something that's missing please submit a ticket on\n"
-"<a href=\"%(trac)s\">Trac</a>, and be sure to select the\n"
-"“www” component in the submission form."
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:89
-msgid ""
-"\n"
-"Supported applications are tagged with one or more of the following:"
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:94
-#: i2p2www/pages/site/docs/applications/supported.html:281
-#: i2p2www/pages/site/docs/applications/supported.html:313
-#: i2p2www/pages/site/docs/applications/supported.html:338
-#: i2p2www/pages/site/docs/applications/supported.html:707
-msgid "bundled"
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:97
-msgid ""
-"<em>Bundled application</em> — I2P ships with a few officially\n"
-"supported applications that let new users take immediate advantage of\n"
-"some of I2P's more useful capabilities."
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:105
-#: i2p2www/pages/site/docs/applications/supported.html:197
-#: i2p2www/pages/site/docs/applications/supported.html:210
-#: i2p2www/pages/site/docs/applications/supported.html:222
-#: i2p2www/pages/site/docs/applications/supported.html:230
-#: i2p2www/pages/site/docs/applications/supported.html:243
-#: i2p2www/pages/site/docs/applications/supported.html:294
-#: i2p2www/pages/site/docs/applications/supported.html:407
-#: i2p2www/pages/site/docs/applications/supported.html:429
-#: i2p2www/pages/site/docs/applications/supported.html:438
-#: i2p2www/pages/site/docs/applications/supported.html:526
-msgid "plugin"
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:108
-#, python-format
-msgid ""
-"<em>Third-party plugin</em> — I2P's plugin system provides convenient\n"
-"deployment of I2P-enabled applications and allows tighter integration\n"
-"with the router. Plugins are [reviewed by the community](<a href=\n"
-"\"http://%(plugins)s\">http://%(plugins)s</a>) to identify security and\n"
-"anonymity issues."
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:119
-#: i2p2www/pages/site/docs/applications/supported.html:222
-#: i2p2www/pages/site/docs/applications/supported.html:230
-#: i2p2www/pages/site/docs/applications/supported.html:243
-#: i2p2www/pages/site/docs/applications/supported.html:254
-#: i2p2www/pages/site/docs/applications/supported.html:263
-#: i2p2www/pages/site/docs/applications/supported.html:326
-#: i2p2www/pages/site/docs/applications/supported.html:345
-#: i2p2www/pages/site/docs/applications/supported.html:356
-#: i2p2www/pages/site/docs/applications/supported.html:371
-#: i2p2www/pages/site/docs/applications/supported.html:417
-#: i2p2www/pages/site/docs/applications/supported.html:429
-#: i2p2www/pages/site/docs/applications/supported.html:438
-#: i2p2www/pages/site/docs/applications/supported.html:453
-#: i2p2www/pages/site/docs/applications/supported.html:459
-#: i2p2www/pages/site/docs/applications/supported.html:465
-#: i2p2www/pages/site/docs/applications/supported.html:475
-#: i2p2www/pages/site/docs/applications/supported.html:481
-#: i2p2www/pages/site/docs/applications/supported.html:493
-#: i2p2www/pages/site/docs/applications/supported.html:526
-#: i2p2www/pages/site/docs/applications/supported.html:532
-#: i2p2www/pages/site/docs/applications/supported.html:538
-#: i2p2www/pages/site/docs/applications/supported.html:544
-#: i2p2www/pages/site/docs/applications/supported.html:621
-#: i2p2www/pages/site/docs/applications/supported.html:630
-#: i2p2www/pages/site/docs/applications/supported.html:636
-#: i2p2www/pages/site/docs/applications/supported.html:707
-#: i2p2www/pages/site/docs/applications/supported.html:722
-#: i2p2www/pages/site/docs/applications/supported.html:728
-#: i2p2www/pages/site/docs/applications/supported.html:734
-#: i2p2www/pages/site/docs/applications/supported.html:740
-msgid "standalone"
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:119
-#: i2p2www/pages/site/docs/applications/supported.html:197
-#: i2p2www/pages/site/docs/applications/supported.html:204
-#: i2p2www/pages/site/docs/applications/supported.html:210
-#: i2p2www/pages/site/docs/applications/supported.html:216
-#: i2p2www/pages/site/docs/applications/supported.html:365
-#: i2p2www/pages/site/docs/applications/supported.html:389
-#: i2p2www/pages/site/docs/applications/supported.html:398
-#: i2p2www/pages/site/docs/applications/supported.html:554
-#: i2p2www/pages/site/docs/applications/supported.html:560
-msgid "standalone/mod"
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:122
-msgid ""
-"<em>Third-party standalone application</em> — Many standard network\n"
-"applications only require careful setup and configuration to communicate\n"
-"anonymously over I2P. These are tagged with <em>standalone</em>. Some\n"
-"applications, tagged with <em>standalone/mod</em>, require patching to\n"
-"function properly over I2P or to prevent inadvertent disclosure of\n"
-"identifying information such as the user's hostname or external IP\n"
-"address."
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:135
-#: i2p2www/pages/site/docs/applications/supported.html:304
-#: i2p2www/pages/site/docs/applications/supported.html:574
-#: i2p2www/pages/site/docs/applications/supported.html:584
-#: i2p2www/pages/site/docs/applications/supported.html:593
-#: i2p2www/pages/site/docs/applications/supported.html:599
-#: i2p2www/pages/site/docs/applications/supported.html:605
-#: i2p2www/pages/site/docs/applications/supported.html:611
-#: i2p2www/pages/site/docs/applications/supported.html:653
-#: i2p2www/pages/site/docs/applications/supported.html:661
-#: i2p2www/pages/site/docs/applications/supported.html:670
-#: i2p2www/pages/site/docs/applications/supported.html:677
-#: i2p2www/pages/site/docs/applications/supported.html:691
-msgid "service"
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:138
-msgid ""
-"<em>Third-party essential network service</em> — Services which on\n"
-"the I2P network are analogous to those provided on the public Internet\n"
-"by hosting providers, ISPs, and Google: eepsite indexes and jump\n"
-"services, search engines, email, DNS-style name services, hosting,\n"
-"proxies, etc. These services focus on boosting the usefulness of the\n"
-"network as a whole, and making network content more discoverable."
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:150
-#: i2p2www/pages/site/docs/applications/supported.html:222
-msgid "unmaintained"
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:153
-msgid ""
-"<em>Unmaintained</em> — This is used to tag plugins, applications,\n"
-"and services which appear to be unmaintained and may be removed from\n"
-"this listing in the future."
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:161
-#, python-format
-msgid ""
-"Warning: Using an application, plugin, or service with I2P\n"
-"doesn't automatically protect your anonymity. I2P is merely a set of "
-"tools\n"
-"which can help you mitigate certain <a "
-"href=\"%(threatmodel)s\">identified\n"
-"threats to anonymity</a>. We do not and cannot make any guarantees about "
-"the\n"
-"safety of the applications, plugins, and services listed below. Most\n"
-"applications and plugins must be properly configured, and some will need "
-"to\n"
-"be patched — and even then your anonymity might not be assured. "
-"Similarly,\n"
-"services could put your anonymity at risk, either by design or through\n"
-"carelessness on their part or your own."
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:173
-msgid ""
-"If you have doubts about the suitability of an application,\n"
-"plugin, or service for use with I2P, you are urged to inquire about "
-"privacy\n"
-"issues with its maintainers, to search its mailing lists and bug tracker "
-"if\n"
-"one exists, and consult trusted, knowledgeable members of the I2P\n"
-"community."
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:181
-msgid ""
-"Take responsibility for your own anonymity and safety — always\n"
-"seek expert advice, educate yourself, practice good judgment, be mindful "
-"of\n"
-"disclosing personally identifying information, and don't take\n"
-"shortcuts."
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:203
-msgid "Lightweight forum software."
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:209
-msgid "Another lightweight blogging platform."
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:215
-msgid "Most popular open source forum software."
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:221
-msgid "Distributed forums software, originally developed by jrandom."
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:226
-#, python-format
-msgid ""
-"A Java-based MediaWiki clone. No external database needed.\n"
-"Plugin available <a href=\"http://%(plugins)s/plugins/jamwiki\">here</a>."
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:238
-#, python-format
-msgid ""
-"Port of the <a href=\"http://tahoe-lafs.org/\"><strong>Tahoe-"
-"LAFS</strong></a>\n"
-"distributed file system to the I2P network. Controller plugin <a href=\n"
-"\"http://%(stats)s/i2p/plugins/\">here</a>."
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:253
-msgid "Most popular distributed version control system."
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:259
-#, python-format
-msgid ""
-"Another distributed version control system. Currently\n"
-"<a href=\"%(monotone)s\">used in I2P development</a>."
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:271
-#, python-format
-msgid ""
-"Provides management of addressbooks, which are part of a simple,\n"
-"user-controlled <a href=\"%(naming)s\">I2P naming system</a> somewhat\n"
-"analogous to the Internet's Domain Name System (DNS). Addressbooks map\n"
-"Base64 destinations to short, usually human-readable “domain” names "
-"ending\n"
-"with a .i2p suffix which the I2P router's HTTP client can resolve back to"
-"\n"
-"Base64 addresses. (<em>Note:</em> While Base64 destinations are globally\n"
-"unique, addressbook “domain” names only resolve to unique destinations\n"
-"locally.)"
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:290
-msgid ""
-"Serverless peer-to-peer email application using a distributed hash table\n"
-"(DHT) for secure mail storage."
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:299
-msgid ""
-"Provides email service within the I2P network via @mail.i2p addresses,\n"
-"and email gateway service between the I2P network and the public Internet"
-"\n"
-"via @i2pmail.org addresses. One of the oldest continuous services on I2P."
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:309
-msgid ""
-"Simple web browser-based email interface. Configured to use Postman's\n"
-"email service by default."
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:318
-#, python-format
-msgid ""
-"Can be configured to use Postman's email service. See\n"
-"<a href=\"%(reviews)s\">this comparison of MUAs</a>,\n"
-"and configuration settings for\n"
-"<a href=\"%(smtp)s\">SMTP</a> and <a href=\"%(pop3)s\">POP3</a>."
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:337
-msgid "I2P's integrated BitTorrent client."
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:343
-msgid ""
-"Modified version of I2PSnark, no more supported neither\n"
-"    functional."
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:350
-msgid ""
-"\n"
-"A fork of rufus that uses the Basic Open Bridge (BOB) and has many\n"
-"improvements, including using the latest wxwidgets and python. It also\n"
-"supports use of seedless if installed for trackerless torrents and\n"
-"magnet-link like fetching of torrents within I2P.\n"
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:361
-msgid ""
-"Clean, full-featured cross-platform BitTorrent client with official\n"
-"ports for several GUI toolkits."
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:370
-msgid "Has a plugin providing I2P support."
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:377
-#, python-format
-msgid ""
-"For a detailed feature comparison of I2P-enabled trackers/indexers, see\n"
-"<a href=\"http://%(zzz)s/files/trackers.html\">here</a>."
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:385
-msgid ""
-"The code that powered one of the first major tracker/indexer sites on the"
-"\n"
-"Internet. Patched for I2P."
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:394
-#, python-format
-msgid ""
-"Lightweight tracker/indexer. I2P mod available in the i2p.opentracker\n"
-"branch of the <a href=\"%(newdevs)s\">I2P Monotone repository</a>."
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:403
-#, python-format
-msgid ""
-"<a href=\"http://%(zzz)s/\">zzz's</a> Java-based open tracker. More info\n"
-"<a href=\"http://%(zzz)s/topics/598?page=1#p2085\">here</a>."
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:416
-msgid "I2P port of the aMule ED2K client."
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:425
-#, python-format
-msgid ""
-"Port of the <a href=\"http://www.phex.org/mambo/\">Phex</a> Gnutella "
-"client. Website\n"
-"for plugin version <a href=\"http://%(stats)s/i2p/plugins/\">here</a>."
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:434
-#, python-format
-msgid ""
-"Cache for Gnutella peers on I2P. Website for plugin version\n"
-"<a href=\"http://%(stats)s/i2p/plugins/\">here</a>."
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:449
-msgid ""
-"OpenBSD's rewrite of the Unix standard tool, netcat, for socket relaying."
-"\n"
-"Several clones, ports, and forks have appeared over the years."
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:458
-msgid "Like netcat but more powerful."
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:464
-msgid ""
-"Proxy providing simple, transparent SOCKS-ification of network "
-"applications."
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:474
-msgid ""
-"Most popular implementation of the Secure Shell (SSH) protocol and "
-"related tools."
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:480
-msgid "Open source Secure Shell (SSH) client for Windows."
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:492
-msgid "IM client with multiple incarnations, unsuported."
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:499
-msgid ""
-"Many IRC clients leak identifying information to servers or other\n"
-"clients, so I2P's IRC and SOCKS IRC client tunnels filter certain inbound"
-"\n"
-"and outbound messages to scrub data such as LAN IP addresses, external IP"
-"\n"
-"addresses, local hostnames, and the name and version of the IRC client. "
-"Two\n"
-"message types in particular, DCC and CTCP, can't be sufficiently "
-"anonymized\n"
-"without changes to the protocols or to IRC client/server code, so they "
-"are\n"
-"completely blocked, except for CTCP ACTION (the message emitted by the\n"
-"<code>/me</code> command) which isn't inherently dangerous."
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:510
-msgid ""
-"I2P's IRC filtering may not cover every possible leak — users should also"
-"\n"
-"check if their client is sending their real name or local username. "
-"Packet\n"
-"sniffers such as <a href=\"http://www.wireshark.org/\">Wireshark</a> are\n"
-"useful here. Eliminating remaining leaks may be as simple as changing the"
-"\n"
-"client's default configuration. If that doesn't help, inform the I2P\n"
-"developers; they may be able to solve it via additional filtering."
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:522
-#, python-format
-msgid ""
-"Small Java-based IRC client. Plugin available <a href=\n"
-"\"http://%(stats)s/i2p/plugins/\">here</a>."
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:531
-msgid "Cross-platform graphical IRC client based on XChat."
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:537
-msgid "Unixy terminal-based IRC client."
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:543
-msgid "Another Unixy terminal-based IRC client."
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:553
-msgid "IRC server developed from scratch."
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:559
-msgid "Most popular IRC server."
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:571
-msgid ""
-"Any website hosted anonymously on I2P, reachable through the I2P router's"
-" HTTP proxy."
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:579
-msgid ""
-"Distributed anonymous websites hosted\n"
-"using Tahoe-LAFS-I2P, currently only reachable with Tahoe-LAFS-I2P\n"
-"clients or through the Tahoe-LAFS-I2P HTTP proxy."
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:589
-#, python-format
-msgid ""
-"Website for <a href=\"http://%(sponge)s/\">sponge's</a> jump service.\n"
-"Source code available."
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:598
-msgid "Another jump service."
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:604
-msgid "Dynamically updated eepsite index."
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:610
-#, python-format
-msgid "Website for <a href=\"http://%(zzz)s/\">zzz's</a> jump service."
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:620
-msgid "SOCKS-enabled caching web proxy with basic filtering capabilities."
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:626
-msgid ""
-"Privacy-focused non-caching web proxy with advanced filtering\n"
-"capabilities. Excels at removing ads and other junk."
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:635
-msgid "Venerable caching web proxy."
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:642
-msgid "Gateways allowing users on the public Internet to access eepsites."
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:649
-#, python-format
-msgid ""
-"<a href=\"http://%(tino)s/\">tino's</a> inproxy on the public Internet,\n"
-"currently out of service,"
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:658
-#: i2p2www/pages/site/docs/applications/supported.html:667
-#: i2p2www/pages/site/docs/applications/supported.html:674
-msgid "Another inproxy on the public Internet."
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:683
-msgid ""
-"Gateways allowing I2P users to access content hosted on the public "
-"Internet."
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:690
-msgid "Publicly advertised outproxy running Squid, located in Europe."
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:700
-msgid ""
-"Lightweight web server and Java servlet container. I2P is tightly\n"
-"integrated with a bundled copy of Jetty which by default is configured to"
-"\n"
-"host the <a href=\"http://127.0.0.1:7658/\">user's eepsite</a>. The "
-"bundled\n"
-"Jetty also serves the I2P router console and web applications bundled "
-"with\n"
-"I2P."
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:712
-msgid ""
-"In addition to Jetty, any web server should function over I2P without\n"
-"modification so long as it's HTTP-compliant. Some web servers known to\n"
-"currently serve content on the I2P network are:"
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:721
-msgid "Most popular web server on the public WWW."
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:727
-msgid "Web server and Java servlet container. More features than Jetty."
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:733
-msgid "Fast lightweight web server."
-msgstr ""
-
-#: i2p2www/pages/site/docs/applications/supported.html:739
-msgid "High-performance lightweight web server."
-msgstr ""
-
 #: i2p2www/pages/site/docs/discussions/naming.html:2
 msgid "Naming discussion"
 msgstr ""
@@ -6562,8 +5952,8 @@ msgstr ""
 #: i2p2www/pages/site/docs/discussions/naming.html:106
 #, python-format
 msgid ""
-"Possible improvements would be a replacement or supplement to addressbook"
-" (see <a href=\"http://%(i2host)s/\">%(i2host)sp</a>),\n"
+"Possible improvements would be a replacement or supplement to address "
+"book (see <a href=\"http://%(i2host)s/\">%(i2host)sp</a>),\n"
 "or something simple like subscribing to http://example.i2p/cgi-"
 "bin/recenthosts.cgi rather than http://example.i2p/hosts.txt.\n"
 "If a hypothetical recenthosts.cgi distributed all hosts from the last 24 "
@@ -6583,7 +5973,7 @@ msgid ""
 "Modified if there are none.\n"
 "In this way, the script efficiently returns only the hosts the subscriber"
 "\n"
-"does not know about, in an addressbook-compatible manner."
+"does not know about, in an address book-compatible manner."
 msgstr ""
 
 #: i2p2www/pages/site/docs/discussions/naming.html:121
@@ -6612,7 +6002,7 @@ msgstr ""
 #: i2p2www/pages/site/docs/discussions/naming.html:139
 msgid ""
 "<b>Requires configuration and \"trust\":</b>\n"
-"Out-of-the-box addressbook is only subscribed to "
+"Out-of-the-box address book is only subscribed to "
 "http://www.i2p2.i2p/hosts.txt, which is rarely updated,\n"
 "leading to poor new-user experience."
 msgstr ""
@@ -6628,7 +6018,8 @@ msgstr ""
 
 #: i2p2www/pages/site/docs/discussions/naming.html:149
 msgid ""
-"As another example, the \"Eepsite Unknown\" error page in the HTTP Proxy\n"
+"As another example, the \"I2P Site Unknown\" error page in the HTTP Proxy"
+"\n"
 "lists some jump services, but doesn't \"recommend\" any one in "
 "particular,\n"
 "and it's up to the user to pick one (or not).\n"
@@ -6668,7 +6059,7 @@ msgstr ""
 #: i2p2www/pages/site/docs/discussions/naming.html:178
 msgid ""
 "<b>Not reliable:</b>\n"
-"It depends on specific servers for addressbook subscriptions."
+"It depends on specific servers for address book subscriptions."
 msgstr ""
 
 #: i2p2www/pages/site/docs/discussions/naming.html:182
@@ -6681,7 +6072,7 @@ msgid ""
 "is possible by implementing an \"everybody is a root DNS server\" "
 "solution, or by\n"
 "something even simpler, like a script that adds everybody in your "
-"hosts.txt to your addressbook."
+"hosts.txt to your address book."
 msgstr ""
 
 #: i2p2www/pages/site/docs/discussions/naming.html:190
@@ -6696,7 +6087,7 @@ msgid ""
 "<b>Awkward, not real-time:</b>\n"
 "It's a patchwork of hosts.txt providers, key-add web form providers, jump"
 " service providers,\n"
-"eepsite status reporters.\n"
+"I2P Site status reporters.\n"
 "Jump servers and subscriptions are a pain, it should just work like DNS."
 msgstr ""
 
@@ -6775,8 +6166,8 @@ msgstr ""
 #: i2p2www/pages/site/docs/discussions/naming.html:258
 msgid ""
 "Any new system should be stacked with HostsTxt, or should\n"
-"implement local storage and/or the addressbook subscription functions, "
-"since addressbook\n"
+"implement local storage and/or the address book subscription functions, "
+"since address book\n"
 "only knows about the hosts.txt files and format."
 msgstr ""
 
@@ -6791,7 +6182,7 @@ msgid ""
 "is always null.\n"
 "With a null certificate, base64 destinations are always 516 bytes ending "
 "in \"AAAA\",\n"
-"and this is checked in the addressbook merge mechanism, and possibly "
+"and this is checked in the address book merge mechanism, and possibly "
 "other places.\n"
 "Also, there is no method available to generate a certificate or add it to"
 " a\n"
@@ -6818,7 +6209,7 @@ msgid ""
 "With any certificate implementation must come the method for verifying "
 "the\n"
 "certificates.\n"
-"Presumably this would happen in the addressbook merge code.\n"
+"Presumably this would happen in the address book merge code.\n"
 "Is there a method for multiple types of certificates, or multiple "
 "certificates?"
 msgstr ""
@@ -7698,7 +7089,7 @@ msgid ""
 "anonymous IP layer, where\n"
 "messages are addressed to cryptographic keys (Destinations) and can be "
 "significantly larger than IP\n"
-"packets. Some example uses of the network include \"eepsites\" "
+"packets. Some example uses of the network include \"I2P Sites\" "
 "(webservers hosting normal web\n"
 "applications within I2P), a BitTorrent client (\"I2PSnark\"), or a "
 "distributed data store. With the\n"
@@ -9213,8 +8604,8 @@ msgid ""
 "Then, all lookups and stores for a key in that keyspace would be directed"
 "\n"
 "to one of the attacker's routers.\n"
-"If successful, this could be an effective DOS attack on a particular "
-"eepsite, for example."
+"If successful, this could be an effective DOS attack on a particular I2P "
+"Site, for example."
 msgstr ""
 
 #: i2p2www/pages/site/docs/how/network-database.html:842
@@ -10095,7 +9486,7 @@ msgid ""
 "router \n"
 "- for instance, one proxying in to IRC servers, another supporting the "
 "user's \n"
-"anonymous webserver (\"eepsite\"), another for an I2Phex instance, "
+"anonymous webserver (\"I2P Site\"), another for an I2Phex instance, "
 "another for \n"
 "torrents, etc."
 msgstr ""
@@ -11305,14 +10696,14 @@ msgid ""
 msgstr ""
 
 #: i2p2www/pages/site/docs/how/tech-intro.html:835
-msgid "Naming library and addressbook"
+msgid "Naming library and address book"
 msgstr ""
 
 #: i2p2www/pages/site/docs/how/tech-intro.html:836
 #, python-format
 msgid ""
-"For more information see the <a href=\"%(naming)s\">Naming and "
-"Addressbook</a> page."
+"For more information see the <a href=\"%(naming)s\">Naming and Address "
+"Book</a> page."
 msgstr ""
 
 #: i2p2www/pages/site/docs/how/tech-intro.html:840
@@ -11342,26 +10733,26 @@ msgid ""
 "base \n"
 "implementation designed to work off a local name to destination mapping, "
 "as \n"
-"well as an optional add-on application called the \"addressbook\". The "
-"addressbook \n"
+"well as an optional add-on application called the \"Address Book\". The "
+"address book \n"
 "is a web-of-trust-driven secure, distributed, and human readable naming "
 "system, \n"
 "sacrificing only the call for all human readable names to be globally "
 "unique \n"
 "by mandating only local uniqueness. While all messages in I2P are "
 "cryptographically \n"
-"addressed by their destination, different people can have local "
-"addressbook \n"
+"addressed by their destination, different people can have local address "
+"book \n"
 "entries for \"Alice\" which refer to different destinations. People can "
 "still \n"
-"discover new names by importing published addressbooks of peers specified"
-" \n"
+"discover new names by importing published address books of peers "
+"specified \n"
 "in their web of trust, by adding in the entries provided through a third "
 "party, \n"
-"or (if some people organize a series of published addressbooks using a "
+"or (if some people organize a series of published address books using a "
 "first \n"
 "come first serve registration system) people can choose to treat these "
-"addressbooks \n"
+"address books \n"
 "as name servers, emulating traditional DNS."
 msgstr ""
 
@@ -11440,8 +10831,8 @@ msgid ""
 "distribution \n"
 "network, Syndie is designed to run on top of existing networks, "
 "syndicating \n"
-"content through eepsites, Tor hidden services, Freenet freesites, normal "
-"websites, \n"
+"content through I2P Sites, Tor hidden services, Freenet freesites, normal"
+" websites, \n"
 "usenet newsgroups, email lists, RSS feeds, etc. Data published with "
 "Syndie \n"
 "is done so as to offer pseudonymous authentication to anyone reading or "
@@ -11507,8 +10898,8 @@ msgstr ""
 msgid ""
 "I2PTunnel enables most of the applications in use. An \"httpserver\" "
 "pointing \n"
-"at a webserver lets anyone run their own anonymous website (or "
-"\"eepsite\") \n"
+"at a webserver lets anyone run their own anonymous website (or \"I2P "
+"Site\") \n"
 "- a webserver is bundled with I2P for this purpose, but any webserver can"
 " \n"
 "be used. Anyone may run a \"client\" pointing at one of the anonymously "
@@ -11534,7 +10925,7 @@ msgid ""
 " \n"
 "tracker and peer communication over I2P. Tracker requests are forwarded "
 "through \n"
-"the eepproxy to eepsites specified in the torrent file while tracker "
+"the eepproxy to I2P Sites specified in the torrent file while tracker "
 "responses \n"
 "refer to peers by their destination explicitly, allowing i2p-bt to open "
 "up \n"
@@ -11634,8 +11025,8 @@ msgid ""
 "activity \n"
 "patterns of the user. At the moment the developers work on a "
 "decentralized \n"
-"mailsystem, called \"v2mail\". More information can be found on the "
-"eepsite \n"
+"mailsystem, called \"v2mail\". More information can be found on the I2P "
+"Site \n"
 "<a href=\"http://%(postman)s/\">%(postman)s</a>."
 msgstr ""
 
@@ -12017,7 +11408,7 @@ msgid ""
 "Those who want to defend against it \n"
 "would want to take appropriate countermeasures, such as\n"
 "setting low bandwidth limits, and using unpublished or encrypted "
-"leasesets for eepsites.\n"
+"leasesets for I2P Sites.\n"
 "Other countermeasures, such as nontrivial delays and restricted routes, "
 "are\n"
 "not currently implemented."
@@ -12148,7 +11539,7 @@ msgstr ""
 
 #: i2p2www/pages/site/docs/how/threat-model.html:325
 msgid ""
-"For eepsites or other hosted services, we support\n"
+"For I2P Sites or other hosted services, we support\n"
 "simultaneous hosting on multiple routers, or\n"
 "<a href=\"#intersection\">multihoming</a>"
 msgstr ""
@@ -12874,8 +12265,8 @@ msgstr ""
 #: i2p2www/pages/site/docs/how/threat-model.html:862
 #, python-format
 msgid ""
-"<a href=\"%(naming)s\">Naming system services</a>, including addressbook "
-"subscription providers, add-host services,\n"
+"<a href=\"%(naming)s\">Naming system services</a>, including address book"
+" subscription providers, add-host services,\n"
 "and jump services, could be malicious. Substantial protections for "
 "subscriptions were implemented\n"
 "in release 0.6.1.31, with additional enhancements in subsequent releases."
@@ -15922,11 +15313,11 @@ msgid ""
 "Charlie as in a direct establishment."
 msgstr ""
 
-#: i2p2www/pages/site/docs/transport/ssu.html:421
+#: i2p2www/pages/site/docs/transport/ssu.html:422
 msgid "Peer testing"
 msgstr ""
 
-#: i2p2www/pages/site/docs/transport/ssu.html:423
+#: i2p2www/pages/site/docs/transport/ssu.html:424
 msgid ""
 "The automation of collaborative reachability testing for peers is\n"
 "enabled by a sequence of PeerTest messages.  With its proper \n"
@@ -15935,7 +15326,7 @@ msgid ""
 "quite simple:"
 msgstr ""
 
-#: i2p2www/pages/site/docs/transport/ssu.html:442
+#: i2p2www/pages/site/docs/transport/ssu.html:443
 msgid ""
 "Each of the PeerTest messages carry a nonce identifying the\n"
 "test series itself, as initialized by Alice.  If Alice doesn't \n"
@@ -15945,7 +15336,7 @@ msgid ""
 "that may be reached are as follows:"
 msgstr ""
 
-#: i2p2www/pages/site/docs/transport/ssu.html:452
+#: i2p2www/pages/site/docs/transport/ssu.html:453
 msgid ""
 "If she doesn't receive a response from Bob, she will retransmit\n"
 "up to a certain number of times, but if no response ever arrives,\n"
@@ -15955,7 +15346,7 @@ msgid ""
 "Charlie to reply."
 msgstr ""
 
-#: i2p2www/pages/site/docs/transport/ssu.html:461
+#: i2p2www/pages/site/docs/transport/ssu.html:462
 msgid ""
 "If Alice doesn't receive a PeerTest message with the \n"
 "expected nonce from a third party (Charlie), she will retransmit\n"
@@ -15967,7 +15358,7 @@ msgid ""
 "IP and port that Bob offered up should be forwarded)."
 msgstr ""
 
-#: i2p2www/pages/site/docs/transport/ssu.html:472
+#: i2p2www/pages/site/docs/transport/ssu.html:473
 msgid ""
 "If Alice receives Bob's PeerTest message and both of Charlie's\n"
 "PeerTest messages but the enclosed IP and port numbers in Bob's \n"
@@ -15978,7 +15369,7 @@ msgid ""
 "remote connectivity, ignoring further port discovery."
 msgstr ""
 
-#: i2p2www/pages/site/docs/transport/ssu.html:482
+#: i2p2www/pages/site/docs/transport/ssu.html:483
 msgid ""
 "If Alice receives Charlie's first message but not his second,\n"
 "she will retransmit her PeerTest message to Charlie up to a \n"
@@ -15986,7 +15377,7 @@ msgid ""
 "that Charlie is either confused or no longer online."
 msgstr ""
 
-#: i2p2www/pages/site/docs/transport/ssu.html:490
+#: i2p2www/pages/site/docs/transport/ssu.html:491
 msgid ""
 "Alice should choose Bob arbitrarily from known peers who seem\n"
 "to be capable of participating in peer tests.  Bob in turn should\n"
@@ -15997,7 +15388,7 @@ msgid ""
 "to designate a new peer as Bob and try again with a different nonce."
 msgstr ""
 
-#: i2p2www/pages/site/docs/transport/ssu.html:500
+#: i2p2www/pages/site/docs/transport/ssu.html:501
 msgid ""
 "Alice's introduction key is included in all of the PeerTest \n"
 "messages so that she doesn't need to already have an established\n"
@@ -16006,11 +15397,11 @@ msgid ""
 "with either Bob or Charlie, but it is not required."
 msgstr ""
 
-#: i2p2www/pages/site/docs/transport/ssu.html:528
+#: i2p2www/pages/site/docs/transport/ssu.html:529
 msgid "Transmission window, ACKs and Retransmissions"
 msgstr ""
 
-#: i2p2www/pages/site/docs/transport/ssu.html:529
+#: i2p2www/pages/site/docs/transport/ssu.html:530
 #, python-format
 msgid ""
 "The DATA message may contain ACKs of full messages and\n"
@@ -16020,7 +15411,7 @@ msgid ""
 "for details."
 msgstr ""
 
-#: i2p2www/pages/site/docs/transport/ssu.html:537
+#: i2p2www/pages/site/docs/transport/ssu.html:538
 #, python-format
 msgid ""
 "The details of windowing, ACK, and retransmission strategies are not "
@@ -16035,11 +15426,11 @@ msgid ""
 "See the code for initial, min and max parameters."
 msgstr ""
 
-#: i2p2www/pages/site/docs/transport/ssu.html:549
+#: i2p2www/pages/site/docs/transport/ssu.html:550
 msgid "Security"
 msgstr ""
 
-#: i2p2www/pages/site/docs/transport/ssu.html:550
+#: i2p2www/pages/site/docs/transport/ssu.html:551
 msgid ""
 "UDP source addresses may, of course, be spoofed.\n"
 "Additionally, the IPs and ports contained inside specific\n"
@@ -16048,31 +15439,24 @@ msgid ""
 "Also, certain actions and responses may need to be rate-limited."
 msgstr ""
 
-#: i2p2www/pages/site/docs/transport/ssu.html:558
+#: i2p2www/pages/site/docs/transport/ssu.html:559
 msgid ""
 "The details of validation are not specified\n"
 "here. Implementers should add defenses where appropriate."
 msgstr ""
 
-#: i2p2www/pages/site/docs/transport/ssu.html:564
+#: i2p2www/pages/site/docs/transport/ssu.html:565
 msgid "Peer capabilities"
 msgstr ""
 
-#: i2p2www/pages/site/docs/transport/ssu.html:568
+#: i2p2www/pages/site/docs/transport/ssu.html:575
 msgid ""
 "If the peer address contains the 'B' capability, that means \n"
 "they are willing and able to participate in peer tests as\n"
 "a 'Bob' or 'Charlie'."
 msgstr ""
 
-#: i2p2www/pages/site/docs/transport/ssu.html:580
-msgid ""
-"If the peer address contains the 'C' capability, that means\n"
-"they are willing and able to serve as an introducer - serving\n"
-"as a Bob for an otherwise unreachable Alice."
-msgstr ""
-
-#: i2p2www/pages/site/docs/transport/ssu.html:589
+#: i2p2www/pages/site/docs/transport/ssu.html:612
 msgid ""
 "Analysis of current SSU performance, including assessment of window size "
 "adjustment\n"
@@ -16081,14 +15465,14 @@ msgid ""
 "performance, is a topic for future work."
 msgstr ""
 
-#: i2p2www/pages/site/docs/transport/ssu.html:595
+#: i2p2www/pages/site/docs/transport/ssu.html:618
 msgid ""
 "The current implementation repeatedly sends acknowledgments for the same "
 "packets,\n"
 "which unnecessarily increases overhead."
 msgstr ""
 
-#: i2p2www/pages/site/docs/transport/ssu.html:600
+#: i2p2www/pages/site/docs/transport/ssu.html:623
 msgid ""
 "The default small MTU value of 620 should be analyzed and possibly "
 "increased.\n"
@@ -16097,15 +15481,15 @@ msgid ""
 "Probably not."
 msgstr ""
 
-#: i2p2www/pages/site/docs/transport/ssu.html:606
+#: i2p2www/pages/site/docs/transport/ssu.html:629
 msgid "The protocol should be extended to exchange MTUs during the setup."
 msgstr ""
 
-#: i2p2www/pages/site/docs/transport/ssu.html:610
+#: i2p2www/pages/site/docs/transport/ssu.html:633
 msgid "Rekeying is currently unimplemented and may never be."
 msgstr ""
 
-#: i2p2www/pages/site/docs/transport/ssu.html:614
+#: i2p2www/pages/site/docs/transport/ssu.html:637
 msgid ""
 "The potential use of the 'challenge' fields in RelayIntro and "
 "RelayResponse,\n"
@@ -16113,7 +15497,7 @@ msgid ""
 "undocumented."
 msgstr ""
 
-#: i2p2www/pages/site/docs/transport/ssu.html:619
+#: i2p2www/pages/site/docs/transport/ssu.html:642
 msgid ""
 "Instead of a single fragment per packet, a more efficient\n"
 "strategy may be to bundle multiple message fragments into the same "
@@ -16121,7 +15505,7 @@ msgid ""
 "so long as it doesn't exceed the MTU."
 msgstr ""
 
-#: i2p2www/pages/site/docs/transport/ssu.html:625
+#: i2p2www/pages/site/docs/transport/ssu.html:648
 msgid ""
 "A set of fixed packet sizes may be appropriate to further hide the data \n"
 "fragmentation to external adversaries, but the tunnel, garlic, and end to"
@@ -16129,34 +15513,34 @@ msgid ""
 "end padding should be sufficient for most needs until then."
 msgstr ""
 
-#: i2p2www/pages/site/docs/transport/ssu.html:631
+#: i2p2www/pages/site/docs/transport/ssu.html:654
 msgid ""
 "Why are introduction keys the same as the router hash, should it be "
 "changed, would there be any benefit?"
 msgstr ""
 
-#: i2p2www/pages/site/docs/transport/ssu.html:635
+#: i2p2www/pages/site/docs/transport/ssu.html:658
 msgid "Capacities appear to be unused."
 msgstr ""
 
-#: i2p2www/pages/site/docs/transport/ssu.html:639
+#: i2p2www/pages/site/docs/transport/ssu.html:662
 msgid ""
 "Signed-on times in SessionCreated and SessionConfirmed appear to be "
 "unused or unverified."
 msgstr ""
 
-#: i2p2www/pages/site/docs/transport/ssu.html:644
+#: i2p2www/pages/site/docs/transport/ssu.html:667
 msgid "Implementation Diagram"
 msgstr ""
 
-#: i2p2www/pages/site/docs/transport/ssu.html:645
+#: i2p2www/pages/site/docs/transport/ssu.html:668
 msgid ""
 "This diagram\n"
 "should accurately reflect the current implementation, however there may "
 "be small differences."
 msgstr ""
 
-#: i2p2www/pages/site/docs/transport/ssu.html:653
+#: i2p2www/pages/site/docs/transport/ssu.html:676
 msgid "Now on the SSU specification page"
 msgstr ""
 
@@ -17046,7 +16430,7 @@ msgid ""
 " case. \n"
 "Therefore, the paper claims it isn't an advantage at all, but a "
 "disadvantage, at least\n"
-"with long-living eepsites."
+"with long-living I2P Sites."
 msgstr ""
 
 #: i2p2www/pages/site/docs/tunnels/unidirectional.html:88
@@ -17066,7 +16450,7 @@ msgid ""
 "example, somebody could make a list of possible IPs then issue subpoenas "
 "to \n"
 "each. Or the attacker could DDoS each in turn and via a simple \n"
-"intersection attack see if the eepsite goes down or is slowed down. So "
+"intersection attack see if the I2P Site goes down or is slowed down. So "
 "close \n"
 "may be good enough, or time may be more important."
 msgstr ""
diff --git a/pots/get-involved.pot b/pots/get-involved.pot
index 45b85d62..b1541b14 100644
--- a/pots/get-involved.pot
+++ b/pots/get-involved.pot
@@ -1,14 +1,14 @@
 # Translations template for I2P.
-# Copyright (C) 2020 ORGANIZATION
+# Copyright (C) 2021 ORGANIZATION
 # This file is distributed under the same license as the I2P project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2020.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2021.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P website\n"
 "Report-Msgid-Bugs-To: http://trac.i2p2.de\n"
-"POT-Creation-Date: 2020-11-16 17:04+0000\n"
+"POT-Creation-Date: 2021-04-26 14:51+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,67 +17,77 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 1.3\n"
 
-#: i2p2www/pages/site/get-involved/bounties.html:2
-msgid "Bounties"
-msgstr ""
-
-#: i2p2www/pages/site/get-involved/bounties.html:4
-msgid ""
-"Thank you for your interest in contributing to I2P!<br>\n"
-"<br>\n"
-"Currently there is no bounty system available.\n"
-"<br>"
-msgstr ""
-
 #: i2p2www/pages/site/get-involved/donate.html:2
-#: i2p2www/pages/site/get-involved/index.html:111
+#: i2p2www/pages/site/get-involved/index.html:107
+#: i2p2www/pages/site/get-involved/index.html:109
 msgid "Donate"
 msgstr ""
 
 #: i2p2www/pages/site/get-involved/donate.html:4
+msgid "Thank you for your interest in contributing to I2P!"
+msgstr ""
+
+#: i2p2www/pages/site/get-involved/donate.html:5
 msgid ""
-"Thank you for your interest in contributing to I2P!<br>\n"
-"<br>\n"
-"For nearly two decades the I2P network has provided protected "
-"communication\n"
-"platforms and access to information and resources to individuals who are\n"
-"concerned about online privacy. Designed with security and privacy first,"
-"\n"
-"peer-to-peer and decentralized, it continues to provide the opportunity "
-"for\n"
-"access to the free flow of information on its network and resist internet"
-"\n"
-"filtering and blocks. I2P has done this with the support of its community"
-"\n"
-"through volunteers and donations."
+"For almost two decades the Invisible Internet Project (I2P) has\n"
+"researched and developed a transport layer and software with a focus on "
+"providing\n"
+"privacy and security for online communication. The Invisible Internet "
+"Project\n"
+"(I2P) supports the right to access. The project works to constantly "
+"improve\n"
+"its circumvention abilities and resistance."
+msgstr ""
+
+#: i2p2www/pages/site/get-involved/donate.html:12
+msgid "Both the network and its software is completely free to use."
+msgstr ""
+
+#: i2p2www/pages/site/get-involved/donate.html:14
+msgid "Who Uses The Invisible Internet?"
 msgstr ""
 
 #: i2p2www/pages/site/get-involved/donate.html:16
 msgid ""
-"Your donations help I2P continue to be an alternative option for\n"
-"online communication for everyone and create a space to resist the "
-"persistence\n"
-"of surveillance and monitoring of our digital lives. Your donations "
-"facilitate\n"
-"research and development to create applications that will increase access"
-" to I2P\n"
-"services, and its outreach in at-risk communities."
+"\n"
+"People who are concerned about their privacy and interested in "
+"alternatives to the internet make use of the network and its applications"
+" to chat, email, torrent and run their own sites and forums. In some "
+"circumstances individuals rely on the network to communicate due to "
+"safety issues or censorship. Researchers, developers and digital rights "
+"defenders make use of the network as well.\n"
+msgstr ""
+
+#: i2p2www/pages/site/get-involved/donate.html:20
+msgid "How Is The Invisible Internet Project Funded and How Is That Funding Used?"
 msgstr ""
 
 #: i2p2www/pages/site/get-involved/donate.html:22
+#, python-format
 msgid ""
-"I2P accepts donations in cryptocurrencies and via Paypal. Android\n"
-"users may also support the project through the Google Play Store by "
-"choosing\n"
+"The Invisible Internet Project (I2P) is 100% community funded. In the "
+"past the Project has received a grant from DuckDuckGo, and has received "
+"support from the OTF Usability Lab providers. This helped to guide "
+"improvements to the Java software and website UX and information "
+"architecture.\n"
+"Donations support I2P maintainers server costs, and other costs "
+"associated with keeping the network services up and running. Donations "
+"support improving the I2P protocol, application layer, outreach and "
+"design."
+msgstr ""
+
+#: i2p2www/pages/site/get-involved/donate.html:25
+msgid ""
+"I2P accepts donations in cryptocurrencies and via Paypal. Android users "
+"may also support the project through the Google Play Store by choosing "
 "the \"Donate\" edition. I2P funding is handled by meeh."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/donate.html:27
+#: i2p2www/pages/site/get-involved/donate.html:28
 msgid ""
-"The following addresses are valid as of June 10th, 2019. Please note\n"
-"that any other addresses not listed here are no longer valid. Please note"
-" that\n"
-"addresses may update and more coins may be added. "
+"The following addresses are valid as of June 10th, 2019. Please note that"
+" any other addresses not listed here are no longer valid. Please note "
+"that addresses may update and more coins may be added. "
 msgstr ""
 
 #: i2p2www/pages/site/get-involved/donate.html:31
@@ -157,67 +167,89 @@ msgid ""
 msgstr ""
 
 #: i2p2www/pages/site/get-involved/index.html:2
-msgid "Get Involved!"
+msgid "Get Involved"
 msgstr ""
 
 #: i2p2www/pages/site/get-involved/index.html:4
-msgid "There are many ways you can help I2P!"
+msgid "There are many ways you can help I2P."
 msgstr ""
 
 #: i2p2www/pages/site/get-involved/index.html:5
-msgid ""
-"To get involved, please feel free to join us on the #i2p-dev IRC channel "
-"(on\n"
-"irc.freenode.net, irc.oftc.net, or within I2P on irc.echelon.i2p, "
-"irc.dg.i2p or\n"
-"irc.postman.i2p). We also have a forum, which is available at <a "
-"href=\"https://i2pforum.net\">i2pforum.net</a>\n"
-"on the clearnet and at <a href=\"http://i2pforum.i2p\">i2pforum.i2p</a> "
-"inside the network. If you don't want to\n"
-"create an account on our forum, some of our developers are active "
-"Redditors who\n"
-"will talk to you on <a href=\"https://reddit.com/r/i2p\">r/i2p</a>."
-msgstr ""
-
-#: i2p2www/pages/site/get-involved/index.html:13
 #, python-format
 msgid ""
-"If you're interested in joining our <a href=\"%(team)s\">team</a>, please"
-" get in\n"
-"touch as we're always looking for eager contributors!"
+"To get involved, please feel free to join us on the forum, which is "
+"available at <a href=\"https://i2pforum.net\">i2pforum.net</a>\n"
+"on the non-private internet and at <a "
+"href=\"http://i2pforum.i2p\">i2pforum.i2p</a>\n"
+"inside the I2P network, or to create an account on our project Gitlab <a "
+"href=\"http://git.idk.i2p\">inside the I2P network here</a> or <a "
+"href=\"https://i2pgit.org\"> on the non-private internet here</a>. If you"
+" don't want to create an account on our forum, some \n"
+"of our developers are active Redditors who will talk to you on <a "
+"href=\"https://reddit.com/r/i2p\">r/i2p</a> and many of\n"
+"us also operate <a href=\"https://github.com/\">Github</a> accounts where"
+" we work on I2P-Related projects, but we do not\n"
+"offer official support for I2P contributions via Github.\n"
+"For real-time chat, there is an IRC network within I2P. Please join the "
+"#i2p-dev IRC channel (on\n"
+"irc.freenode.net, irc.oftc.net, or within I2P on irc.echelon.i2p, "
+"irc.dg.i2p or irc.postman.i2p).\n"
+"Other contact information is maintained on <a href=\"%(team)s\">this "
+"page</a>."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/index.html:17
+#: i2p2www/pages/site/get-involved/index.html:16
+#, python-format
 msgid ""
-"We need help in many areas, and you don't need to know Java to "
-"contribute!\n"
-"Here's a list to help get you started!"
+"If you're interested in development, <a href=\"%(team)s\">please get in\n"
+"touch as we're always looking for new contributors.</a>"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/index.html:21
-msgid "Grow the Community"
+#: i2p2www/pages/site/get-involved/index.html:20
+msgid "Join us on our Gitlab"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/index.html:23
-msgid "Spread the Word!"
+#: i2p2www/pages/site/get-involved/index.html:22
+#: i2p2www/pages/site/get-involved/guides/new-developers.html:64
+msgid "Inside I2P - (http://git.idk.i2p)"
 msgstr ""
 
 #: i2p2www/pages/site/get-involved/index.html:24
+#: i2p2www/pages/site/get-involved/guides/new-developers.html:66
+msgid "Outside I2P - (https://i2pgit.org)"
+msgstr ""
+
+#: i2p2www/pages/site/get-involved/index.html:27
+msgid ""
+"We need help in many areas, and you don't need to know Java to "
+"contribute.\n"
+"Here's a list to help get you started."
+msgstr ""
+
+#: i2p2www/pages/site/get-involved/index.html:31
+msgid "Grow the Community"
+msgstr ""
+
+#: i2p2www/pages/site/get-involved/index.html:33
+msgid "Spread the Word."
+msgstr ""
+
+#: i2p2www/pages/site/get-involved/index.html:34
 msgid ""
 "Tell people about I2P on forums, blogs, and comments to articles. Fix up "
 "the\n"
-"Wikipedia article about I2P in your language. Tell your friends, and more"
-"\n"
-"importantly, use I2P to communicate with your friends! We have many tools"
+"<a href=\"https://wikipedia.org/wiki/I2P\">Wikipedia article about I2P in"
+" your language</a>. Tell your friends, and more\n"
+"importantly, use I2P to communicate with your friends. We have many tools"
 " that\n"
 "can help you keep your private conversations private."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/index.html:30
+#: i2p2www/pages/site/get-involved/index.html:40
 msgid "Translation"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/index.html:31
+#: i2p2www/pages/site/get-involved/index.html:41
 #, python-format
 msgid ""
 "Help translate the website and the software into your language. "
@@ -228,65 +260,43 @@ msgid ""
 "See the <a href=\"%(newtrans)s\">new translator's guide</a> for details."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/index.html:37
+#: i2p2www/pages/site/get-involved/index.html:47
+msgid "Documentation"
+msgstr ""
+
+#: i2p2www/pages/site/get-involved/index.html:48
+msgid ""
+"Suggest changes to the website, or help fix the parts of the website that"
+" you\n"
+"notice are outdated or incomplete. Web Site development has been fully "
+"migrated to\n"
+"git, you can participate by creating an account on our project Gitlab\n"
+"<a href=\"http://git.idk.i2p/i2p-hackers/i2p.www\">inside the I2P network"
+" here</a> or \n"
+"<a href=\"https://i2pgit.org/i2p-hackers/i2p.www\"> on the non-private "
+"internet here</a>. We also always \n"
+"appreciate our wonderful translators, join one of our Transifex teams and"
+" help\n"
+"translate pages into other languages."
+msgstr ""
+
+#: i2p2www/pages/site/get-involved/index.html:57
 msgid "Testing"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/index.html:38
+#: i2p2www/pages/site/get-involved/index.html:58
 #, python-format
 msgid ""
 "Run the latest builds from <a href=\"%(monotone)s\">monotone</a> or a "
 "recent\n"
 "build from the <a href=\"https://github.com/i2p/i2p.i2p\">unofficial "
 "github mirror</a>\n"
-"and report results on #i2p or as bugs on <a "
-"href=\"http://%(trac)s/report/1\">Trac</a>."
-msgstr ""
-
-#: i2p2www/pages/site/get-involved/index.html:44
-msgid "Documentation"
-msgstr ""
-
-#: i2p2www/pages/site/get-involved/index.html:45
-msgid ""
-"Suggest changes to the website, or help fix the parts of the website that"
-" you\n"
-"notice outdated or incomplete. We also always appreciate our wonderful\n"
-"translators, join one of our Transifex teams and help translate pages "
-"into other\n"
-"languages."
-msgstr ""
-
-#: i2p2www/pages/site/get-involved/index.html:51
-msgid "Multimedia"
-msgstr ""
-
-#: i2p2www/pages/site/get-involved/index.html:52
-msgid ""
-"Create promotional materials, infographics, and videos about I2P. Create "
-"guides\n"
-"to setting up your favorite services on I2P, and take screenshots as you "
-"go. If\n"
-"your guide is helpful, we'd love to mirror it on our blog."
-msgstr ""
-
-#: i2p2www/pages/site/get-involved/index.html:57
-msgid "Content"
-msgstr ""
-
-#: i2p2www/pages/site/get-involved/index.html:58
-msgid ""
-"One of I2P's greatest strengths as a peer-to-peer network is that anyone "
-"can\n"
-"run their own website, it's actually a built-in feature. Create an "
-"eepSite,\n"
-"talk about something you're passionate about, or just interested in. It's"
-" easy,\n"
-"and it's getting  easier every single day. Announce it on <a "
-"href=\"https://reddit.com/r/i2p\">r/i2p</a>\n"
-"and <a href=\"http://i2pforum.i2p\">i2pforum.i2p</a>/<a "
-"href=\"https://i2pforum.net\">i2pforum.net</a>\n"
-"you will have visitors in no time."
+"and report results on Gitlab <a href=\"http://git.idk.i2p/i2p-"
+"hackers/i2p.www\">inside the I2P network here</a>\n"
+"or  <a href=\"https://i2pgit.org/i2p-hackers/i2p.www\"> on the non-"
+"private internet here</a>.\n"
+"For existing bugs, <a href=\"http://%(trac)s/report/1\">Trac</a> is still"
+" acceptable."
 msgstr ""
 
 #: i2p2www/pages/site/get-involved/index.html:67
@@ -299,13 +309,14 @@ msgstr ""
 
 #: i2p2www/pages/site/get-involved/index.html:70
 msgid ""
-"Running many kinds of services on eepSites is very easy. You could self-"
-"host\n"
-"almost anything, from an SSH server for yourself to an ActivityPub forum "
-"for\n"
-"everyone and anything in between. Almost anything you can think of can be"
-" made\n"
-"to work with I2P, and your service is valuable to the network."
+"Self-hosting almost anything, from an SSH server for yourself to an "
+"ActivityPub\n"
+"forum for everyone and anything in between, is helpful to the I2P "
+"network,\n"
+"especially if you write down instructions for others. Almost anything you"
+" can\n"
+"think of can be made to work with I2P, and your service is valuable to "
+"the network."
 msgstr ""
 
 #: i2p2www/pages/site/get-involved/index.html:76
@@ -316,36 +327,33 @@ msgstr ""
 #, python-format
 msgid ""
 "Getting new users onto the network is a very important task, and that "
-"task is\n"
-"handled by our reseed servers. The more reseed servers we have, the more\n"
-"de-centralized and redundant our infrastructure is. It's a big "
-"responsibility,\n"
-"but it's pretty easy to set up a reseed server for new routers to "
-"bootstrap\n"
-"from. Detailed instructions are on our <a href=\"%(reseed)s\">reseed "
-"server page</a>."
+"task is handled by our reseed servers. The more reseed servers we have, "
+"the more de-centralized and redundant our infrastructure is. It's a big "
+"responsibility, but it's pretty easy to set up a reseed server for new "
+"routers to bootstrap from. Detailed instructions are on our <a "
+"href=\"%(reseed)s\">reseed server page</a>."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/index.html:86
+#: i2p2www/pages/site/get-involved/index.html:82
 msgid "Develop Software"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/index.html:88
+#: i2p2www/pages/site/get-involved/index.html:84
 msgid "Applications"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/index.html:89
+#: i2p2www/pages/site/get-involved/index.html:85
 #, python-format
 msgid ""
-"Write or port applications for I2P! There's some guidelines and\n"
+"Write or port applications for I2P. There's some guidelines and\n"
 "a list of ideas on the <a href=\"%(apps)s\">applications page</a>."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/index.html:93
+#: i2p2www/pages/site/get-involved/index.html:89
 msgid "Coding"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/index.html:94
+#: i2p2www/pages/site/get-involved/index.html:90
 #, python-format
 msgid ""
 "There's plenty to do if you know Java or are ready to learn.\n"
@@ -355,11 +363,11 @@ msgid ""
 "See the <a href=\"%(newdevs)s\">new developer's guide</a> for details."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/index.html:103
+#: i2p2www/pages/site/get-involved/index.html:99
 msgid "Analysis"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/index.html:104
+#: i2p2www/pages/site/get-involved/index.html:100
 #, python-format
 msgid ""
 "Study or test the code to look for vulnerabilities.\n"
@@ -373,7 +381,7 @@ msgstr ""
 msgid "Roadmap"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/roadmap.html:215
+#: i2p2www/pages/site/get-involved/roadmap.html:309
 #, python-format
 msgid ""
 "Please see the <a href=\"%(todo)s\">TODO</a> list for more detailed info "
@@ -941,7 +949,7 @@ msgid ""
 " \n"
 "I2P specifications. Up to date info and applications that use BOB can be"
 " \n"
-"found at this <a href=\"http://%(boburl)s/\">eepsite</a>."
+"found at this <a href=\"http://%(boburl)s/\">I2P Site</a>."
 msgstr ""
 
 #: i2p2www/pages/site/get-involved/develop/applications.html:216
@@ -1635,7 +1643,7 @@ msgstr ""
 
 #: i2p2www/pages/site/get-involved/develop/signed-keys.html:17
 msgid ""
-"<u>Tip:</u> To find zzz's GPG key, on his eepsite locate the key "
+"<u>Tip:</u> To find zzz's GPG key, on his I2P Site locate the key "
 "`0xA76E0BED`, with\n"
 "the name `zzz@mail.i2p` and the fingerprint `4456 EBBE C805 63FE 57E6 "
 "B310 4155\n"
@@ -1653,8 +1661,8 @@ msgstr ""
 
 #: i2p2www/pages/site/get-involved/develop/signed-keys.html:81
 msgid ""
-"<b>Tip:</b> To find Complication's GPG key, on his eepsite locate the key"
-"\n"
+"<b>Tip:</b> To find Complication's GPG key, on his I2P Site locate the "
+"key\n"
 "`0x79FCCE33`, with the name `complication@mail.i2p` and the fingerprint "
 "`73CF\n"
 "2862 87A7 E7D2 19FF DB66 FA1D FC6B 79FC CE33`."
@@ -1786,9 +1794,9 @@ msgstr ""
 msgid ""
 "Have a basic understanding of distributed source control systems, even if"
 " you haven't\n"
-"used monotone before. Ask for help if you need it.\n"
+"used git before. Ask for help if you need it.\n"
 "Once pushed, checkins are forever, there is no undo. Please be careful.\n"
-"If you have not used monotone before, start with baby steps.\n"
+"If you have not used git before, start with baby steps.\n"
 "Check in some small changes and see how it goes."
 msgstr ""
 
@@ -1796,7 +1804,7 @@ msgstr ""
 msgid ""
 "Test your changes before checking them in.\n"
 "If you prefer the checkin-before-test development model,\n"
-"use your own development branch (e.g. i2p.i2p.yourname.test)\n"
+"use your own development branch\n"
 "and propagate back to i2p.i2p once it is working well.\n"
 "Do not break the build. Do not cause regressions.\n"
 "In case you do (it happens), please do not vanish for a long period after"
@@ -1815,36 +1823,26 @@ msgstr ""
 
 #: i2p2www/pages/site/get-involved/guides/dev-guidelines.html:101
 msgid ""
-"Ensure that you have the latest monotonerc file in _MTN.\n"
-"Do not check in on top of untrusted revisions."
-msgstr ""
-
-#: i2p2www/pages/site/get-involved/guides/dev-guidelines.html:105
-msgid ""
-"Ensure that you 'mtn pull' and 'mtn update' to the latest revision before"
-" you check in and push.\n"
+"Ensure that you 'git pull' to the latest revision before you check in and"
+" push.\n"
 "If you inadvertently diverge, merge and push as soon as possible.\n"
-"Don't routinely make others merge for you.\n"
-"Yes, we know that monotone says you should push and then merge,\n"
-"but in our experience, in-workspace merge works just as well as in-"
-"database merge,\n"
-"without creating a merge revision."
+"Don't routinely make others merge for you."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/dev-guidelines.html:113
+#: i2p2www/pages/site/get-involved/guides/dev-guidelines.html:106
 msgid ""
 "Do not check in major changes into the main i2p.i2p branch late in the "
 "release cycle.\n"
 "If a project will take you more than a couple days, create your own "
-"branch in monotone\n"
+"branch in git\n"
 "and do the development there so you do not block releases."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/dev-guidelines.html:120
+#: i2p2www/pages/site/get-involved/guides/dev-guidelines.html:113
 msgid "Coding Style"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/dev-guidelines.html:122
+#: i2p2www/pages/site/get-involved/guides/dev-guidelines.html:115
 msgid ""
 "Coding style throughout most of the code is 4-spaces for indentation. Do "
 "not use tabs.\n"
@@ -1856,14 +1854,14 @@ msgid ""
 "Use common sense. Emulate the style in the file you are modifying."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/dev-guidelines.html:129
+#: i2p2www/pages/site/get-involved/guides/dev-guidelines.html:122
 msgid ""
 "All new public and package-private classes and methods require Javadocs. "
 "Add @since release-number.\n"
 "Javadocs for new private methods are desirable."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/dev-guidelines.html:133
+#: i2p2www/pages/site/get-involved/guides/dev-guidelines.html:126
 msgid ""
 "For any Javadocs added, there must not be any doclint errors or warnings."
 "\n"
@@ -1874,7 +1872,7 @@ msgid ""
 "errors."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/dev-guidelines.html:139
+#: i2p2www/pages/site/get-involved/guides/dev-guidelines.html:132
 msgid ""
 "Classes in core/ (i2p.jar) and portions of i2ptunnel are part of our "
 "official API.\n"
@@ -1887,7 +1885,7 @@ msgid ""
 "website (i2p.www branch)."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/dev-guidelines.html:147
+#: i2p2www/pages/site/get-involved/guides/dev-guidelines.html:140
 msgid ""
 "Tag strings for translation where appropriate.\n"
 "Don't change existing tagged strings unless really necessary, as it will "
@@ -1897,62 +1895,62 @@ msgid ""
 "translators have a chance to update before the release."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/dev-guidelines.html:153
+#: i2p2www/pages/site/get-involved/guides/dev-guidelines.html:146
 msgid ""
 "Use generics and concurrent classes where possible. I2P is a highly "
 "multi-threaded application."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/dev-guidelines.html:156
+#: i2p2www/pages/site/get-involved/guides/dev-guidelines.html:149
 msgid ""
 "Be familiar with common Java pitfalls that are caught by findbugs.\n"
 "Run 'ant findbugs' to learn more."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/dev-guidelines.html:184
+#: i2p2www/pages/site/get-involved/guides/dev-guidelines.html:177
 msgid ""
 "Explicitly convert between primitive types and classes;\n"
 "don't rely on autoboxing/unboxing."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/dev-guidelines.html:188
+#: i2p2www/pages/site/get-involved/guides/dev-guidelines.html:181
 msgid "Don't use URL. Use URI."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/dev-guidelines.html:191
+#: i2p2www/pages/site/get-involved/guides/dev-guidelines.html:184
 msgid ""
 "Don't catch Exception. Catch RuntimeException and checked exceptions "
 "individually."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/dev-guidelines.html:194
+#: i2p2www/pages/site/get-involved/guides/dev-guidelines.html:187
 msgid ""
 "Don't use String.getBytes() without a UTF-8 charset argument. You may "
 "also use DataHelper.getUTF8() or DataHelper.getASCII()."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/dev-guidelines.html:197
+#: i2p2www/pages/site/get-involved/guides/dev-guidelines.html:190
 msgid ""
 "Always specify a UTF-8 charset when reading or writing files. The "
 "DataHelper utilities may be helpful."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/dev-guidelines.html:200
+#: i2p2www/pages/site/get-involved/guides/dev-guidelines.html:193
 msgid ""
 "Always specify a locale (for example Locale.US) when using "
 "String.toLowerCase() or String.toUpperCase().\n"
 "Do not use String.equalsIgnoreCase(), as a locale cannot be specified."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/dev-guidelines.html:204
+#: i2p2www/pages/site/get-involved/guides/dev-guidelines.html:197
 msgid "Don't use String.split(). Use DataHelper.split()."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/dev-guidelines.html:210
+#: i2p2www/pages/site/get-involved/guides/dev-guidelines.html:203
 msgid "Ensure that InputStreams and OutputStreams are closed in finally blocks."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/dev-guidelines.html:213
+#: i2p2www/pages/site/get-involved/guides/dev-guidelines.html:206
 msgid ""
 "Use {} for all for and while blocks, even if only one line.\n"
 "If you use {} for either the if, else, or if-else block, use it for all "
@@ -1960,25 +1958,25 @@ msgid ""
 "Put \"} else {\" on a single line."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/dev-guidelines.html:218
+#: i2p2www/pages/site/get-involved/guides/dev-guidelines.html:211
 msgid "Specify fields as final wherever possible."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/dev-guidelines.html:221
+#: i2p2www/pages/site/get-involved/guides/dev-guidelines.html:214
 msgid ""
 "Don't store I2PAppContext, RouterContext, Log, or any other references to"
 " router or context items in static fields."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/dev-guidelines.html:224
+#: i2p2www/pages/site/get-involved/guides/dev-guidelines.html:217
 msgid "Don't start threads in constructors. Use I2PAppThread instead of Thread."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/dev-guidelines.html:229
+#: i2p2www/pages/site/get-involved/guides/dev-guidelines.html:222
 msgid "Licenses"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/dev-guidelines.html:231
+#: i2p2www/pages/site/get-involved/guides/dev-guidelines.html:224
 msgid ""
 "Only check in code that you wrote yourself.\n"
 "Before checking in any code or library jars from other sources,\n"
@@ -1987,7 +1985,7 @@ msgid ""
 "and obtain approval from the lead developer."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/dev-guidelines.html:238
+#: i2p2www/pages/site/get-involved/guides/dev-guidelines.html:231
 msgid ""
 "If you do obtain approval to add external code or jars,\n"
 "and binaries are available in any Debian or Ubuntu package,\n"
@@ -1996,18 +1994,18 @@ msgid ""
 "Checklist of files to modify:"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/dev-guidelines.html:246
+#: i2p2www/pages/site/get-involved/guides/dev-guidelines.html:239
 msgid ""
 "For any images checked in from external sources,\n"
 "it is your responsibility to first verify the license is compatible.\n"
 "Include the license and source information in the checkin comment."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/dev-guidelines.html:253
+#: i2p2www/pages/site/get-involved/guides/dev-guidelines.html:246
 msgid "Bugs"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/dev-guidelines.html:255
+#: i2p2www/pages/site/get-involved/guides/dev-guidelines.html:248
 #, python-format
 msgid ""
 "Managing Trac tickets is everybody's job, please help.\n"
@@ -2015,7 +2013,7 @@ msgid ""
 "Assign, categorize, comment on, fix, or close tickets if you can."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/dev-guidelines.html:260
+#: i2p2www/pages/site/get-involved/guides/dev-guidelines.html:253
 msgid ""
 "New developers should start by fixing a bug.\n"
 "Search for bugs with the 'easy' keyword on trac.\n"
@@ -2027,7 +2025,7 @@ msgid ""
 "the normal procedure below."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/dev-guidelines.html:267
+#: i2p2www/pages/site/get-involved/guides/dev-guidelines.html:260
 msgid ""
 "Close a ticket when you think you've fixed it.\n"
 "We don't have a test department to verify and close tickets.\n"
@@ -2107,76 +2105,76 @@ msgstr ""
 msgid "Monotone Guide"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:6
+#: i2p2www/pages/site/get-involved/guides/monotone.html:7
 msgid "Operating a Monotone client"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:8
-#: i2p2www/pages/site/get-involved/guides/monotone.html:61
+#: i2p2www/pages/site/get-involved/guides/monotone.html:9
+#: i2p2www/pages/site/get-involved/guides/monotone.html:64
 msgid "Generating Monotone keys"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:9
+#: i2p2www/pages/site/get-involved/guides/monotone.html:10
 msgid "Trust and initializing your repository"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:10
-#: i2p2www/pages/site/get-involved/guides/monotone.html:194
+#: i2p2www/pages/site/get-involved/guides/monotone.html:11
+#: i2p2www/pages/site/get-involved/guides/monotone.html:197
 msgid "Obtaining and deploying developers' keys"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:11
-#: i2p2www/pages/site/get-involved/guides/monotone.html:225
+#: i2p2www/pages/site/get-involved/guides/monotone.html:12
+#: i2p2www/pages/site/get-involved/guides/monotone.html:228
 msgid "Setting up trust evaluation hooks"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:12
-#: i2p2www/pages/site/get-involved/guides/monotone.html:266
+#: i2p2www/pages/site/get-involved/guides/monotone.html:13
+#: i2p2www/pages/site/get-involved/guides/monotone.html:269
 msgid ""
 "Pulling the <code>i2p.i2p</code>, <code>i2p.www</code> and "
 "<code>i2p.syndie</code> branches"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:13
-#: i2p2www/pages/site/get-involved/guides/monotone.html:312
+#: i2p2www/pages/site/get-involved/guides/monotone.html:14
+#: i2p2www/pages/site/get-involved/guides/monotone.html:315
 msgid "Verifying that trust evaluation works"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:14
-#: i2p2www/pages/site/get-involved/guides/monotone.html:361
+#: i2p2www/pages/site/get-involved/guides/monotone.html:15
+#: i2p2www/pages/site/get-involved/guides/monotone.html:364
 msgid "Checking out a working copy of the latest version"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:15
-#: i2p2www/pages/site/get-involved/guides/monotone.html:388
+#: i2p2www/pages/site/get-involved/guides/monotone.html:16
+#: i2p2www/pages/site/get-involved/guides/monotone.html:391
 msgid "Updating your working copy to the latest version"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:19
-#: i2p2www/pages/site/get-involved/guides/monotone.html:418
+#: i2p2www/pages/site/get-involved/guides/monotone.html:20
+#: i2p2www/pages/site/get-involved/guides/monotone.html:421
 msgid "Operating a Monotone Server"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:21
+#: i2p2www/pages/site/get-involved/guides/monotone.html:22
 msgid "Obtaining and deploying developers’ transport keys"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:22
-#: i2p2www/pages/site/get-involved/guides/monotone.html:428
+#: i2p2www/pages/site/get-involved/guides/monotone.html:23
+#: i2p2www/pages/site/get-involved/guides/monotone.html:431
 msgid "Granting push and pull access"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:23
-#: i2p2www/pages/site/get-involved/guides/monotone.html:473
+#: i2p2www/pages/site/get-involved/guides/monotone.html:24
+#: i2p2www/pages/site/get-involved/guides/monotone.html:476
 msgid "Running Monotone in server mode"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:24
-#: i2p2www/pages/site/get-involved/guides/monotone.html:498
+#: i2p2www/pages/site/get-involved/guides/monotone.html:25
+#: i2p2www/pages/site/get-involved/guides/monotone.html:501
 msgid "Differences under Debian GNU/Linux"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:32
+#: i2p2www/pages/site/get-involved/guides/monotone.html:35
 #, python-format
 msgid ""
 "This is a revised version of <a "
@@ -2186,7 +2184,7 @@ msgid ""
 "guide</a>."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:40
+#: i2p2www/pages/site/get-involved/guides/monotone.html:43
 #, python-format
 msgid ""
 "I2P has a distributed development model. The source code is replicated "
@@ -2200,7 +2198,7 @@ msgid ""
 "  before commit rights are granted)."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:50
+#: i2p2www/pages/site/get-involved/guides/monotone.html:53
 msgid ""
 "Some of Monotone's noteworthy qualities are: distributed\n"
 "  version control, cryptographic authentication, access control, its "
@@ -2210,11 +2208,11 @@ msgid ""
 "  having the ability to resume interrupted synchronization attempts."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:59
+#: i2p2www/pages/site/get-involved/guides/monotone.html:62
 msgid "Operating a Monotone Client"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:64
+#: i2p2www/pages/site/get-involved/guides/monotone.html:67
 msgid ""
 "A transport key grants you the ability to push your changes to a Monotone"
 " repository server.\n"
@@ -2224,7 +2222,7 @@ msgid ""
 "order to read (or pull) the source code."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:72
+#: i2p2www/pages/site/get-involved/guides/monotone.html:75
 msgid ""
 "Without a transport key, one cannot:\n"
 "  <ul>\n"
@@ -2235,7 +2233,7 @@ msgid ""
 "  </ul>"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:83
+#: i2p2www/pages/site/get-involved/guides/monotone.html:86
 msgid ""
 "Without a commit key, one cannot:\n"
 "  <ul>\n"
@@ -2243,7 +2241,7 @@ msgid ""
 "  </ul>"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:92
+#: i2p2www/pages/site/get-involved/guides/monotone.html:95
 msgid ""
 "If you only intend to retrieve code from MTN, feel free to skip to the\n"
 "  <a href=\"#trust-and-initializing-your-repository\">next section</a>. "
@@ -2251,27 +2249,27 @@ msgid ""
 "  to generate keys, read the following."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:100
+#: i2p2www/pages/site/get-involved/guides/monotone.html:103
 msgid ""
 "By convention keys are named like an e-mail addresses, but a "
 "corresponding e-mail\n"
 "  address does not need to exist. For example, your keys might be named:"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:111
+#: i2p2www/pages/site/get-involved/guides/monotone.html:114
 msgid ""
 "Monotone stores keys under <code><b>$HOME/.monotone/keys</b></code> in "
 "text files which\n"
 "  are named identically to the keys. For example:"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:121
+#: i2p2www/pages/site/get-involved/guides/monotone.html:124
 msgid ""
 "To generate transport and commit keys, enter the following commands at a "
 "prompt:"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:131
+#: i2p2www/pages/site/get-involved/guides/monotone.html:134
 msgid ""
 "Monotone will prompt you for a password to protect your keys. You are "
 "very strongly encouraged to set a password\n"
@@ -2280,11 +2278,11 @@ msgid ""
 "  Monotone server."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:139
+#: i2p2www/pages/site/get-involved/guides/monotone.html:142
 msgid "Trust, and initializing your repository"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:143
+#: i2p2www/pages/site/get-involved/guides/monotone.html:146
 msgid ""
 "Monotone's security model helps to ensure that nobody can easily "
 "impersonate a developer without\n"
@@ -2295,13 +2293,13 @@ msgid ""
 "  not replace reading diffs."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:153
+#: i2p2www/pages/site/get-involved/guides/monotone.html:156
 msgid ""
 "A Monotone repository is a single file (a compressed SQLite database) "
 "which contains all of the project's source code and history."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:159
+#: i2p2www/pages/site/get-involved/guides/monotone.html:162
 msgid ""
 "After <a href=\"#obtaining-and-deploying-developers-keys\">importing the "
 "developers' keys into Monotone</a> and\n"
@@ -2314,26 +2312,26 @@ msgid ""
 "  needed due to the push access policies in place."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:169
+#: i2p2www/pages/site/get-involved/guides/monotone.html:172
 msgid ""
 "A repository can hold many branches. For example, our repository holds "
 "the\n"
 "  following main branches:"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:174
+#: i2p2www/pages/site/get-involved/guides/monotone.html:177
 msgid "The I2P router and associated programs"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:175
+#: i2p2www/pages/site/get-involved/guides/monotone.html:178
 msgid "The I2P project website"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:176
+#: i2p2www/pages/site/get-involved/guides/monotone.html:179
 msgid "Syndie, a distributed forums tool"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:181
+#: i2p2www/pages/site/get-involved/guides/monotone.html:184
 msgid ""
 "By convention, the I2P Monotone repository is named <code>i2p.mtn</code>."
 " Before pulling\n"
@@ -2346,7 +2344,7 @@ msgid ""
 "  command:"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:197
+#: i2p2www/pages/site/get-involved/guides/monotone.html:200
 msgid ""
 "Keys which developers use to commit code are essential for trust "
 "evaluation in\n"
@@ -2355,14 +2353,14 @@ msgid ""
 "  "
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:204
+#: i2p2www/pages/site/get-involved/guides/monotone.html:207
 #, python-format
 msgid ""
 "Developers' commit keys are provided GPG-signed <a "
 "href=\"%(signedkeys)s\">on another page</a>."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:210
+#: i2p2www/pages/site/get-involved/guides/monotone.html:213
 #, python-format
 msgid ""
 "To import developers' keys after verifying their authenticity, copy <a "
@@ -2372,20 +2370,20 @@ msgid ""
 " command:"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:220
+#: i2p2www/pages/site/get-involved/guides/monotone.html:223
 msgid ""
 "<b>Note</b>: <i>Never</i> add keys to "
 "<code><b>$HOME/.monotone/keys</b></code> manually."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:228
+#: i2p2www/pages/site/get-involved/guides/monotone.html:231
 msgid ""
 "The default Monotone trust policy is way too lax for our requirements: "
 "every committer is trusted by default.\n"
 "  That is not acceptable for I2P development."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:235
+#: i2p2www/pages/site/get-involved/guides/monotone.html:238
 msgid ""
 "Change into the directory <code><b>$HOME/.monotone</b></code> and open "
 "the file\n"
@@ -2393,14 +2391,14 @@ msgid ""
 "following two functions into this file:"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:244
+#: i2p2www/pages/site/get-involved/guides/monotone.html:247
 msgid ""
 "The first function determines an intersection between two sets, in our "
 "case a\n"
 "  revision's signers and trusted signers."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:251
+#: i2p2www/pages/site/get-involved/guides/monotone.html:254
 msgid ""
 "The second function determines trust in a given revision, by calling the "
 "first\n"
@@ -2411,14 +2409,14 @@ msgid ""
 "  revision is trusted. Otherwise, the revision is not trusted."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:260
+#: i2p2www/pages/site/get-involved/guides/monotone.html:263
 msgid ""
 "More information about Trust Evaluation Hooks can be found in the <a "
 "href=\"http://www.monotone.ca/docs/Hooks.html\">official Monotone "
 "documentation</a>."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:268
+#: i2p2www/pages/site/get-involved/guides/monotone.html:271
 msgid ""
 "I2P is shipped with a pre-configured tunnel pointing to the project "
 "Monotone server. Ensure that the tunnel has been started\n"
@@ -2426,7 +2424,7 @@ msgid ""
 " attempting to pull the source code from 127.0.0.1:8998."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:275
+#: i2p2www/pages/site/get-involved/guides/monotone.html:278
 msgid ""
 "Enter the directory where you initialized <code>i2p.mtn</code>. Depending"
 " on whether you\n"
@@ -2435,21 +2433,21 @@ msgid ""
 "  perform the <code>pull</code> operation in different ways."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:283
+#: i2p2www/pages/site/get-involved/guides/monotone.html:286
 msgid "If you only want I2P sources:"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:292
+#: i2p2www/pages/site/get-involved/guides/monotone.html:295
 msgid "If you want all branches:"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:298
+#: i2p2www/pages/site/get-involved/guides/monotone.html:301
 msgid ""
 "If the transfer aborts before completing sucessfully, simply repeating "
 "the pull command will resume the transfer."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:304
+#: i2p2www/pages/site/get-involved/guides/monotone.html:307
 msgid ""
 "Pulling in the above examples is done anonymously by specifying an empty "
 "transport key.\n"
@@ -2458,21 +2456,21 @@ msgid ""
 "  to selectively provide some people with tampered data."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:315
+#: i2p2www/pages/site/get-involved/guides/monotone.html:318
 msgid "To verify that trust evaluation works:"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:319
+#: i2p2www/pages/site/get-involved/guides/monotone.html:322
 msgid "Make a backup of your <code>monotonerc</code> file."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:320
+#: i2p2www/pages/site/get-involved/guides/monotone.html:323
 msgid ""
 "Modify <code><b>monotonerc</b></code> by setting the trusted_signers "
 "variable in the following way:"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:326
+#: i2p2www/pages/site/get-involved/guides/monotone.html:329
 msgid ""
 "With <code><b>monotonerc</b></code> configured as above, Monotone will no"
 " longer trust any committers. Confirm this by changing into the\n"
@@ -2480,14 +2478,14 @@ msgid ""
 "of the I2P branch:"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:336
+#: i2p2www/pages/site/get-involved/guides/monotone.html:339
 msgid ""
 "A directory named <code>i2p.i2p</code> should <b>not</b> appear. You "
 "should encounter many\n"
 "  error messages like:"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:353
+#: i2p2www/pages/site/get-involved/guides/monotone.html:356
 msgid ""
 "If you are satisfied with results, restore the backup of\n"
 "  <code>monotonerc</code> that was created above. If you didn't create a "
@@ -2496,20 +2494,20 @@ msgid ""
 "hooks\">Setting up trust evaluation hooks</a>."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:364
+#: i2p2www/pages/site/get-involved/guides/monotone.html:367
 msgid ""
 "If you already have a branch checked out, skip to the <a href"
 "=\"#updating-your-working-copy-to-the-latest-version\">next\n"
 "  section</a>."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:371
+#: i2p2www/pages/site/get-involved/guides/monotone.html:374
 msgid ""
 "Change into the directory where <code>i2p.mtn</code> is located. Over "
 "there issue:"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:380
+#: i2p2www/pages/site/get-involved/guides/monotone.html:383
 msgid ""
 "The checkout should complete without error messages and a directory named"
 "\n"
@@ -2518,7 +2516,7 @@ msgid ""
 "  successfully checked out the latest I2P sources, ready to be compiled."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:391
+#: i2p2www/pages/site/get-involved/guides/monotone.html:394
 msgid ""
 "If you haven't done this already, pull fresh code from the server to your"
 " local\n"
@@ -2527,42 +2525,42 @@ msgid ""
 "  <code>i2p.mtn</code> is located and issue:"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:402
+#: i2p2www/pages/site/get-involved/guides/monotone.html:405
 msgid "Now change into your <code>i2p.i2p</code> directory, and over there issue:"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:411
+#: i2p2www/pages/site/get-involved/guides/monotone.html:414
 msgid ""
 "As long as there were no errors&hellip;Congratulations! You have "
 "successfully updated to the latest I2P sources. They\n"
 "  should be ready to compile."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:420
+#: i2p2www/pages/site/get-involved/guides/monotone.html:423
 msgid "Obtaining and deploying developers' transport keys"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:423
+#: i2p2www/pages/site/get-involved/guides/monotone.html:426
 msgid ""
 "As a server operator you may want to grant push access to certain "
 "developers."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:431
+#: i2p2www/pages/site/get-involved/guides/monotone.html:434
 msgid "By default the Monotone server denies all access."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:437
+#: i2p2www/pages/site/get-involved/guides/monotone.html:440
 msgid "To grant pull access to all clients, set the following in"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:449
+#: i2p2www/pages/site/get-involved/guides/monotone.html:452
 msgid ""
 "No one will not be able to push code to your server without permission "
 "being explicitly granted. To grant push access:"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:455
+#: i2p2www/pages/site/get-involved/guides/monotone.html:458
 msgid ""
 "Add the name of the user's transport key to\n"
 "<code>$HOME/.monotone/write-permissions</code>, such as\n"
@@ -2573,7 +2571,7 @@ msgid ""
 "with one key per line."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:466
+#: i2p2www/pages/site/get-involved/guides/monotone.html:469
 msgid ""
 "Import the transport key(s) into your database. The procedure for "
 "importing transport keys is the same as for\n"
@@ -2582,14 +2580,14 @@ msgid ""
 "developers' keys</a>."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:476
+#: i2p2www/pages/site/get-involved/guides/monotone.html:479
 msgid ""
 "A separate database should be used for your Monotone server because "
 "monotone will lock the database while it is served to others.\n"
 "  Make a copy of your development database, then start the server with:"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:483
+#: i2p2www/pages/site/get-involved/guides/monotone.html:486
 msgid ""
 "If your key is protected with a passphrase, Monotone may request the "
 "passphrase\n"
@@ -2598,7 +2596,7 @@ msgid ""
 "  (or by clearing the password for your transport key)."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:491
+#: i2p2www/pages/site/get-involved/guides/monotone.html:494
 msgid ""
 "For your server to be accessible for others over I2P, you will need to "
 "create a\n"
@@ -2606,7 +2604,7 @@ msgid ""
 "profile."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:501
+#: i2p2www/pages/site/get-involved/guides/monotone.html:504
 msgid ""
 "Debian (amongst other distributions) has integrated Monotone into their\n"
 "  framework of daemons/services. Although Monotone servers can still be "
@@ -2615,7 +2613,7 @@ msgid ""
 " be more straightforward."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/monotone.html:509
+#: i2p2www/pages/site/get-involved/guides/monotone.html:512
 msgid ""
 "Permissions are granted by editing the files\n"
 "  <code>/etc/monotone/read-permissions</code> and\n"
@@ -2629,10 +2627,6 @@ msgstr ""
 msgid "New Developer's Guide"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/new-developers.html:3
-msgid "July 2018"
-msgstr ""
-
 #: i2p2www/pages/site/get-involved/guides/new-developers.html:6
 #: i2p2www/pages/site/get-involved/guides/new-developers.html:32
 msgid "Basic study"
@@ -2644,42 +2638,41 @@ msgid "Getting the I2P code"
 msgstr ""
 
 #: i2p2www/pages/site/get-involved/guides/new-developers.html:9
-#: i2p2www/pages/site/get-involved/guides/new-developers.html:53
-msgid "The easy way: Git"
+msgid "The new way: Git"
 msgstr ""
 
 #: i2p2www/pages/site/get-involved/guides/new-developers.html:10
-#: i2p2www/pages/site/get-involved/guides/new-developers.html:73
-msgid "The proper way: Monotone"
+#: i2p2www/pages/site/get-involved/guides/new-developers.html:81
+msgid "The old way: Monotone"
 msgstr ""
 
 #: i2p2www/pages/site/get-involved/guides/new-developers.html:12
-#: i2p2www/pages/site/get-involved/guides/new-developers.html:136
+#: i2p2www/pages/site/get-involved/guides/new-developers.html:145
 msgid "Building I2P"
 msgstr ""
 
 #: i2p2www/pages/site/get-involved/guides/new-developers.html:13
-#: i2p2www/pages/site/get-involved/guides/new-developers.html:157
+#: i2p2www/pages/site/get-involved/guides/new-developers.html:166
 msgid "Development ideas"
 msgstr ""
 
 #: i2p2www/pages/site/get-involved/guides/new-developers.html:14
-#: i2p2www/pages/site/get-involved/guides/new-developers.html:165
+#: i2p2www/pages/site/get-involved/guides/new-developers.html:174
 msgid "Making the results available"
 msgstr ""
 
 #: i2p2www/pages/site/get-involved/guides/new-developers.html:15
-#: i2p2www/pages/site/get-involved/guides/new-developers.html:186
+#: i2p2www/pages/site/get-involved/guides/new-developers.html:196
 msgid "Get to know us!"
 msgstr ""
 
 #: i2p2www/pages/site/get-involved/guides/new-developers.html:16
-#: i2p2www/pages/site/get-involved/guides/new-developers.html:192
+#: i2p2www/pages/site/get-involved/guides/new-developers.html:202
 msgid "Translations"
 msgstr ""
 
 #: i2p2www/pages/site/get-involved/guides/new-developers.html:17
-#: i2p2www/pages/site/get-involved/guides/new-developers.html:198
+#: i2p2www/pages/site/get-involved/guides/new-developers.html:208
 msgid "Tools"
 msgstr ""
 
@@ -2725,34 +2718,30 @@ msgid ""
 "there are two ways to get the source code:"
 msgstr ""
 
+#: i2p2www/pages/site/get-involved/guides/new-developers.html:53
+msgid "The easy way: Git"
+msgstr ""
+
 #: i2p2www/pages/site/get-involved/guides/new-developers.html:55
 #, python-format
-msgid "Install <a href=\"%(git_url)s\">Git</a>."
+msgid ""
+"I2P now has official Git services and accepts contributions via Git at "
+"our own gitlab.\n"
+"For the time being, issues are still being manged on <a "
+"href=\"%(trac)s\">trac</a>."
 msgstr ""
 
 #: i2p2www/pages/site/get-involved/guides/new-developers.html:58
 #, python-format
-msgid "Get the code from <a href=\"%(i2p_git)s\">the GitHub mirror</a>:"
+msgid "Install <a href=\"%(git_url)s\">Git</a>."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/new-developers.html:65
-#: i2p2www/pages/site/get-involved/guides/new-developers.html:120
-msgid "Remarks"
-msgstr ""
-
-#: i2p2www/pages/site/get-involved/guides/new-developers.html:66
+#: i2p2www/pages/site/get-involved/guides/new-developers.html:74
 #, python-format
-msgid ""
-"The Git repository is currently a read-only mirror. If you wish to use it"
-" for\n"
-"development, you will need to submit patches to <a href=\"%(trac)s\">our "
-"issue\n"
-"tracker</a>. We can accept GitHub pull requests, but they must be "
-"processed\n"
-"manually by turning them into patches anyway."
+msgid "<a href=\"%(i2p_git)s\">GitHub mirror</a></strong>:"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/new-developers.html:75
+#: i2p2www/pages/site/get-involved/guides/new-developers.html:84
 msgid ""
 "Install <a href=\"http://www.monotone.ca/\">monotone</a>.\n"
 "Monotone is a version control system.\n"
@@ -2761,40 +2750,40 @@ msgid ""
 "of changes' is the basic idea)."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/new-developers.html:80
+#: i2p2www/pages/site/get-involved/guides/new-developers.html:89
 msgid ""
 "Skim over the <a "
 "href=\"http://www.monotone.ca/docs/Tutorial.html\">monotone tutorial</a>,"
 " to make sure you understand the concepts."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/new-developers.html:84
+#: i2p2www/pages/site/get-involved/guides/new-developers.html:93
 msgid ""
 "If you want to remain anonymous, you need to do an additional step, to "
 "set up a connection to a monotone server over I2P:"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/new-developers.html:87
+#: i2p2www/pages/site/get-involved/guides/new-developers.html:96
 #, python-format
 msgid ""
 "Enable the <a href=\"%(i2ptunnel)s\">i2ptunnel</a> client tunnel on port "
 "8998 pointing to mtn.i2p-projekt.i2p."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/new-developers.html:91
+#: i2p2www/pages/site/get-involved/guides/new-developers.html:100
 msgid ""
 "Pick a directory where you want to put all your I2P files, and create a "
 "monotone database:"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/new-developers.html:94
+#: i2p2www/pages/site/get-involved/guides/new-developers.html:103
 msgid ""
 "Define the trust list by creating <code>~/.monotone/monotonerc</code> (or"
 " <code>_MTN/monotonerc</code> in the i2p.i2p workspace) with the "
 "following contents:"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/new-developers.html:99
+#: i2p2www/pages/site/get-involved/guides/new-developers.html:108
 #, python-format
 msgid ""
 "Copy and paste the <a href=\"%(devkeys)s\">developer's commit keys</a> "
@@ -2803,40 +2792,44 @@ msgid ""
 "with <br><code><pre>      mtn -d i2p.mtn read < keys.txt</pre></code>"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/new-developers.html:103
+#: i2p2www/pages/site/get-involved/guides/new-developers.html:112
 msgid ""
 "Pull the I2P sources to your machine. This may take a long time, "
 "especially if you are doing this over I2P!"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/new-developers.html:105
+#: i2p2www/pages/site/get-involved/guides/new-developers.html:114
 msgid "Anonymously:"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/new-developers.html:108
+#: i2p2www/pages/site/get-involved/guides/new-developers.html:117
 msgid "Non-anonymously:"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/new-developers.html:114
+#: i2p2www/pages/site/get-involved/guides/new-developers.html:123
 msgid ""
 "All the sources are now present on your machine, in the database file. To"
 " make them available in a directory, you need to check them out:"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/new-developers.html:116
+#: i2p2www/pages/site/get-involved/guides/new-developers.html:125
 msgid ""
 "The above command creates a directory i2p.i2p, which contains all of the "
 "I2P sources."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/new-developers.html:121
+#: i2p2www/pages/site/get-involved/guides/new-developers.html:129
+msgid "Remarks"
+msgstr ""
+
+#: i2p2www/pages/site/get-involved/guides/new-developers.html:130
 msgid ""
 "\n"
 "To download the website files instead of the I2P source files, use "
 "'i2p.www' instead of 'i2p.i2p'."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/new-developers.html:124
+#: i2p2www/pages/site/get-involved/guides/new-developers.html:133
 msgid ""
 "The initial pull may take several hours using the tunnel.\n"
 "If it fails after a partial pull, simply rerun it, it will start where it"
@@ -2844,21 +2837,21 @@ msgid ""
 "If you are in a hurry, use the non-anonymous access."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/new-developers.html:129
+#: i2p2www/pages/site/get-involved/guides/new-developers.html:138
 #, python-format
 msgid ""
 "A full list of branches, including i2p.i2p and i2p.www can be found on <a"
 " href=\"%(viewmtn)s\">viewmtn</a>."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/new-developers.html:132
+#: i2p2www/pages/site/get-involved/guides/new-developers.html:141
 #, python-format
 msgid ""
 "A long explanation about using monotone is available on the <a "
 "href=\"%(monotone)s\">monotone page</a>."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/new-developers.html:138
+#: i2p2www/pages/site/get-involved/guides/new-developers.html:147
 #, python-format
 msgid ""
 "To compile the code, you need the Sun Java Development Kit 6 or higher, "
@@ -2870,21 +2863,21 @@ msgid ""
 "directory and run 'ant' to see the build options."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/new-developers.html:146
+#: i2p2www/pages/site/get-involved/guides/new-developers.html:155
 msgid ""
 "To build or work on console translations, you need\n"
 "the xgettext, msgfmt, and msgmerge tools from the\n"
 "<a href=\"http://www.gnu.org/software/gettext/\">GNU gettext package</a>."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/new-developers.html:152
+#: i2p2www/pages/site/get-involved/guides/new-developers.html:161
 #, python-format
 msgid ""
 "For development on new applications,\n"
 "see the <a href=\"%(apps)s\">application development guide</a>."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/new-developers.html:158
+#: i2p2www/pages/site/get-involved/guides/new-developers.html:167
 #, python-format
 msgid ""
 "See <a href=\"http://%(zzz)s/forums/3\">zzz's TODO lists</a>,\n"
@@ -2893,7 +2886,7 @@ msgid ""
 "for ideas."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/new-developers.html:167
+#: i2p2www/pages/site/get-involved/guides/new-developers.html:176
 #, python-format
 msgid ""
 "See the bottom of <a href=\"%(licenses)s#commit\">the licenses page</a> "
@@ -2902,46 +2895,46 @@ msgid ""
 "(not required for the website!)."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/new-developers.html:172
+#: i2p2www/pages/site/get-involved/guides/new-developers.html:181
 msgid "Short version of how to generate and use keys if you plan to commit:"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/new-developers.html:174
+#: i2p2www/pages/site/get-involved/guides/new-developers.html:184
 msgid "use an empty passphrase"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/new-developers.html:175
+#: i2p2www/pages/site/get-involved/guides/new-developers.html:185
 msgid "enter a passphrase"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/new-developers.html:176
+#: i2p2www/pages/site/get-involved/guides/new-developers.html:186
 #, python-format
 msgid ""
 "<a href=\"mailto:%(email)s\">send</a> this to a mtn repo operator to get "
 "push privileges"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/new-developers.html:177
+#: i2p2www/pages/site/get-involved/guides/new-developers.html:187
 #, python-format
 msgid ""
 "send this to <a href=\"mailto:%(email)s\">a release manager</a> to get "
 "commit privileges - not required for website"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/new-developers.html:178
+#: i2p2www/pages/site/get-involved/guides/new-developers.html:188
 msgid "check in with this key"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/new-developers.html:179
+#: i2p2www/pages/site/get-involved/guides/new-developers.html:189
 msgid "push with this key"
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/new-developers.html:181
+#: i2p2www/pages/site/get-involved/guides/new-developers.html:191
 #, python-format
 msgid "Long version: see the <a href=\"%(monotone)s\">monotone page</a>."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/new-developers.html:187
+#: i2p2www/pages/site/get-involved/guides/new-developers.html:197
 #, python-format
 msgid ""
 "The developers hang around on IRC. They can be reached on the Freenode "
@@ -2951,7 +2944,7 @@ msgid ""
 " developers</a>."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/new-developers.html:193
+#: i2p2www/pages/site/get-involved/guides/new-developers.html:203
 #, python-format
 msgid ""
 "Website and router console translators: See the <a "
@@ -2959,7 +2952,7 @@ msgid ""
 "for next steps."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/new-developers.html:199
+#: i2p2www/pages/site/get-involved/guides/new-developers.html:209
 msgid ""
 "I2P is open source software that is mostly developed using open sourced\n"
 "toolkits. The I2P project recently acquired a license for the YourKit "
@@ -2971,7 +2964,7 @@ msgid ""
 "are interested in profiling the I2P codebase."
 msgstr ""
 
-#: i2p2www/pages/site/get-involved/guides/new-developers.html:207
+#: i2p2www/pages/site/get-involved/guides/new-developers.html:217
 #, python-format
 msgid ""
 "YourKit is kindly supporting open source projects with its full-featured "
diff --git a/pots/misc.pot b/pots/misc.pot
index 0ea9fddd..4d78528a 100644
--- a/pots/misc.pot
+++ b/pots/misc.pot
@@ -1,14 +1,14 @@
 # Translations template for I2P.
-# Copyright (C) 2020 ORGANIZATION
+# Copyright (C) 2021 ORGANIZATION
 # This file is distributed under the same license as the I2P project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2020.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2021.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P website\n"
 "Report-Msgid-Bugs-To: http://trac.i2p2.de\n"
-"POT-Creation-Date: 2020-11-16 17:04+0000\n"
+"POT-Creation-Date: 2021-04-26 14:51+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -81,7 +81,7 @@ msgstr ""
 msgid ""
 "After upgrading to the new architecture, you'll have to do a \n"
 "little work to get your old I2PTunnel-driven servers running.  \n"
-"Lets walk through a simple example.  For an eepsite with the \n"
+"Lets walk through a simple example.  For an I2P Site with the \n"
 "old clientApp configuration, you had:"
 msgstr ""
 
@@ -99,11 +99,11 @@ msgid "Click on Add new: [Server tunnel] \"GO\""
 msgstr ""
 
 #: i2p2www/pages/site/misc/i2ptunnel-migration.html:21
-msgid "For the name: <code>\"eepsite\"</code>"
+msgid "For the name: <code>\"I2P Site\"</code>"
 msgstr ""
 
 #: i2p2www/pages/site/misc/i2ptunnel-migration.html:22
-msgid "For the description: <code>\"My eepsite, isn't it pretty?\"</code>"
+msgid "For the description: <code>\"My I2P Site, isn't it pretty?\"</code>"
 msgstr ""
 
 #: i2p2www/pages/site/misc/i2ptunnel-migration.html:23
@@ -159,7 +159,7 @@ msgid "I2PTunnel services"
 msgstr ""
 
 #: i2p2www/pages/site/misc/i2ptunnel-services.html:4
-msgid "Below is quick copy of aum's eepsite deployment guide."
+msgid "Below is quick copy of aum's I2P Site deployment guide."
 msgstr ""
 
 #: i2p2www/pages/site/misc/i2ptunnel-services.html:8
diff --git a/pots/priority.pot b/pots/priority.pot
index b8ad9eaa..5451597c 100644
--- a/pots/priority.pot
+++ b/pots/priority.pot
@@ -1,14 +1,14 @@
 # Translations template for I2P.
-# Copyright (C) 2020 ORGANIZATION
+# Copyright (C) 2021 ORGANIZATION
 # This file is distributed under the same license as the I2P project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2020.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2021.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P website\n"
 "Report-Msgid-Bugs-To: http://trac.i2p2.de\n"
-"POT-Creation-Date: 2020-11-16 17:04+0000\n"
+"POT-Creation-Date: 2021-04-26 14:51+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -27,11 +27,11 @@ msgid "I2P Blog ATOM Feed for Category: %(category)s"
 msgstr ""
 
 #: i2p2www/pages/blog/index.html:2 i2p2www/pages/blog/post.html:3
-#: i2p2www/pages/global/nav.html:179
+#: i2p2www/pages/global/nav.html:193
 msgid "Blog"
 msgstr ""
 
-#: i2p2www/pages/blog/index.html:4 i2p2www/pages/site/index.html:42
+#: i2p2www/pages/blog/index.html:4 i2p2www/pages/site/index.html:43
 msgid "I2P Blog ATOM Feed"
 msgstr ""
 
@@ -363,7 +363,7 @@ msgstr ""
 #: i2p2www/pages/downloads/browser-content.html:160
 msgid ""
 "Filtering is active on these outproxies (for example, mibbit and torrent\n"
-"tracker access is blocked). Eepsites\n"
+"tracker access is blocked). I2P Sites\n"
 "that are accessible via .i2p addresses are also not allowed via the "
 "outproxies.\n"
 "As a convenience, the outproxy blocks ad servers."
@@ -376,7 +376,7 @@ msgid ""
 "outproxy to the Internet."
 msgstr ""
 
-#: i2p2www/pages/downloads/config.html:2
+#: i2p2www/pages/downloads/config.html:2 i2p2www/pages/site/faq.html:19
 msgid "Configuration"
 msgstr ""
 
@@ -648,18 +648,18 @@ msgstr ""
 #: i2p2www/pages/downloads/post-install.html:34
 #, python-format
 msgid ""
-"If you want to reach eepsites via your browser, have a look on the <a "
+"If you want to reach I2P Sites via your browser, have a look on the <a "
 "href=\"%(browserconfig)s\">browser proxy setup</a> page for an easy "
 "howto."
 msgstr ""
 
-#: i2p2www/pages/downloads/firefox.html:5 i2p2www/pages/downloads/list.html:89
+#: i2p2www/pages/downloads/firefox.html:5 i2p2www/pages/downloads/list.html:108
 msgid "I2P Firefox Browser Profile"
 msgstr ""
 
 #: i2p2www/pages/downloads/firefox.html:6
 msgid ""
-"Now that you have joined the I2P network, you will want to see I2P sites "
+"Now that you have joined the I2P network, you will want to see I2P Sites "
 "and and \n"
 "other content that is hosted on the network. The Firefox browser is \n"
 "pre-configured to allow you to access the content available on the "
@@ -684,160 +684,40 @@ msgstr ""
 msgid "select alternate mirror"
 msgstr ""
 
-#: i2p2www/pages/downloads/firefox.html:35 i2p2www/pages/downloads/lab.html:53
+#: i2p2www/pages/downloads/firefox.html:35
 msgid "Download that file and run it."
 msgstr ""
 
-#: i2p2www/pages/downloads/firefox.html:40 i2p2www/pages/downloads/lab.html:59
-#: i2p2www/pages/downloads/list.html:215
+#: i2p2www/pages/downloads/firefox.html:40
+#: i2p2www/pages/downloads/list.html:231
 #, python-format
 msgid ""
 "The files are signed by %(signer)s,\n"
 "<a href=\"%(signingkey)s\">whose key is here</a>."
 msgstr ""
 
-#: i2p2www/pages/downloads/lab.html:5
-msgid "I2P Laboratory"
-msgstr ""
-
-#: i2p2www/pages/downloads/lab.html:7
-msgid ""
-"Welcome to the I2P Laboratory!\n"
-"This is the home of various experimental projects that are not yet ready "
-"to go live.\n"
-"We invite you to look around and give them a try, but we do not offer "
-"support for them.\n"
-"Any of these projects may be discontinued at any time."
-msgstr ""
-
-#: i2p2www/pages/downloads/lab.html:15
-#, python-format
-msgid "We welcome your feedback at the <a href=\"%(forum)s\">I2P Forum</a>."
-msgstr ""
-
-#: i2p2www/pages/downloads/lab.html:22
-msgid "Current Projects"
-msgstr ""
-
-#: i2p2www/pages/downloads/lab.html:24
-msgid "Zero-Dependency installer"
-msgstr ""
-
-#: i2p2www/pages/downloads/lab.html:26
-#, python-format
-msgid ""
-"\n"
-"This is an I2P installer for Windows that does not depend on an existing "
-"Java installation.\n"
-"It includes all required dependencies.\n"
-"<p>This installer is built using the Java 9+ utility JLink which bundles "
-"a minimum JRE and creates an executable.  The source code is in the "
-"monotone branch \"i2p.jlink\".  After that an NSIS script is used to "
-"create the actual installer.  The source code for that script is in the "
-"monotone \"i2p.wininst\" branch.</p>\n"
-"<p>You can report bugs in the <a href=\"%(forum)s\">I2P Lab Forum</a>.</p>"
-msgstr ""
-
-#: i2p2www/pages/downloads/lab.html:33
-msgid ""
-"\n"
-"<p>Status: Proof-Of-Concept</p>\n"
-"<p>Known Bugs And Limitations: plugins that use pack200 compression do "
-"not work.</p>"
-msgstr ""
-
-#: i2p2www/pages/downloads/lab.html:68
-msgid "I2P Browser"
-msgstr ""
-
-#: i2p2www/pages/downloads/lab.html:69
-msgid ""
-"The Invisible Internet browser is a fork of TorBrowser/Mozilla Firefox "
-"ESR that comes preconfigured with proxy settings, NoScript and i2pbutton "
-"which contains some security/privacy improvements like a drag and drop "
-"filter and external app blocker."
-msgstr ""
-
-#: i2p2www/pages/downloads/lab.html:72
-msgid ""
-"Builds for Linux, Windows and Mac OS X are available. Currently we "
-"provide binaries for 64bit systems. 32bit builds for Linux and Windows "
-"are planned."
-msgstr ""
-
-#: i2p2www/pages/downloads/lab.html:75
-msgid ""
-"At this time I2P Browser does not ship with its own I2P router. Ensure "
-"that you have I2P installed and running before you launch the I2P "
-"Browser."
-msgstr ""
-
-#: i2p2www/pages/downloads/lab.html:78
-msgid ""
-"\n"
-"  Status: Beta-4\n"
-"  <ul>\n"
-"    <li><a href=\"https://github.com/mikalv/test-i2p-browser\">Firefox "
-"Branch</a></li>\n"
-"    <li><a href=\"https://github.com/mikalv/i2p-browser-build-"
-"scripts\">Build Scripts</a></li>\n"
-"    <li><a href=\"https://github.com/mikalv/i2pbutton\">Browser "
-"Extension</a></li>\n"
-"  </ul>"
-msgstr ""
-
-#: i2p2www/pages/downloads/lab.html:102 i2p2www/pages/downloads/lab.html:125
-#: i2p2www/pages/downloads/lab.html:148
-msgid ""
-"The default is to download the english version, however it's also built "
-"for some other languages,\n"
-"  please check out the link below\n"
-"  if you want to see if we have the browser in your language."
-msgstr ""
-
-#: i2p2www/pages/downloads/lab.html:158
-msgid "Docker image"
-msgstr ""
-
-#: i2p2www/pages/downloads/lab.html:160
-msgid ""
-"\n"
-"  This is an I2P Docker image for those that prefers containers.\n"
-"  It includes all required dependencies."
-msgstr ""
-
-#: i2p2www/pages/downloads/lab.html:165
-msgid ""
-"\n"
-"  Status: Proof-Of-Concept"
-msgstr ""
-
-#: i2p2www/pages/downloads/lab.html:177
-msgid "Run the command to pull from docker hub."
-msgstr ""
-
 #: i2p2www/pages/downloads/list.html:6 i2p2www/pages/downloads/select.html:15
-#: i2p2www/pages/global/footer.html:3 i2p2www/pages/global/nav.html:3
+#: i2p2www/pages/global/nav.html:3
 msgid "Download"
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:14
+#: i2p2www/pages/downloads/list.html:15
 msgid "Source package"
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:15 i2p2www/pages/downloads/list.html:239
+#: i2p2www/pages/downloads/list.html:16 i2p2www/pages/downloads/list.html:255
 msgid "Automatic updates"
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:16
+#: i2p2www/pages/downloads/list.html:17
 msgid "Manual updates"
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:21
+#: i2p2www/pages/downloads/list.html:22
 msgid "Lab"
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:22
+#: i2p2www/pages/downloads/list.html:23
 #, python-format
 msgid ""
 "\n"
@@ -845,16 +725,30 @@ msgid ""
 "<a href = \"%(lab)s\">I2P Lab</a>\n"
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:25 i2p2www/pages/site/faq.html:18
+#: i2p2www/pages/downloads/list.html:26
 msgid "Getting Started"
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:26
+#: i2p2www/pages/downloads/list.html:27
+msgid "Basic Steps"
+msgstr ""
+
+#: i2p2www/pages/downloads/list.html:28
+msgid ""
+"For most platforms and systems, setting I2P installed and running will\n"
+"consist of up to three steps."
+msgstr ""
+
+#: i2p2www/pages/downloads/list.html:31
+msgid "Install Java: "
+msgstr ""
+
+#: i2p2www/pages/downloads/list.html:31
 #, python-format
 msgid ""
-"\n"
-"In addition to the I2P download, you need to install Java if you do not "
-"have it \n"
+" I2P is written in Java and requires\n"
+"a Java system to be installed to run. In addition to the I2P download, "
+"you need to install Java if you do not have it \n"
 "already installed. I2P requires Java Runtime Version 7 or higher.\n"
 "(<a href=\"%(java)s\">Oracle</a>,\n"
 "<a href=\"%(openjdk)s\">OpenJDK</a>, or\n"
@@ -865,43 +759,100 @@ msgid ""
 "<br />\n"
 "<a href=\"%(detectjre)s\">Determine your installed Java version here</a>\n"
 "or type <tt>java -version</tt> at your command prompt.\n"
+"Only two platforms do not require Java to be installed before I2P is "
+"installed, those platforms are:"
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:45
-msgid "Windows: Java 8 is recommended. Java 9 or higher may not work."
+#: i2p2www/pages/downloads/list.html:50
+msgid "Android: "
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:50 i2p2www/pages/downloads/list.html:52
-msgid "Release Notes"
+#: i2p2www/pages/downloads/list.html:50
+msgid ""
+"Android comes with a Java virtual machine\n"
+"as part of the platform, which I2P for Android uses. Therefore it is not "
+"necessary to install Java to use\n"
+"I2P for Android."
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:54
-msgid "Change Log"
+#: i2p2www/pages/downloads/list.html:53
+msgid "Debian and Ubuntu: "
+msgstr ""
+
+#: i2p2www/pages/downloads/list.html:53
+msgid ""
+"On Debian and Ubuntu when using\n"
+"a .deb package to install, the system will automatically install and "
+"configure a Java environment for you."
 msgstr ""
 
 #: i2p2www/pages/downloads/list.html:56
-msgid "Debian Change Log"
+msgid "Install I2P: "
+msgstr ""
+
+#: i2p2www/pages/downloads/list.html:56
+msgid ""
+"Once you have Java installed, you should\n"
+"run the I2P installer for your platform. This step applies to all systems."
 msgstr ""
 
 #: i2p2www/pages/downloads/list.html:58
-msgid "Android Change Log"
+msgid "Install/Configure a Browser(Optional): "
+msgstr ""
+
+#: i2p2www/pages/downloads/list.html:58
+msgid ""
+"Finally, you'll need to\n"
+"configure applications to use I2P. Many applications can use I2P, but the"
+" first application most people configure is a Web\n"
+"Browser for browsing I2P sites. Detailed instructions are available on the"
+msgstr ""
+
+#: i2p2www/pages/downloads/list.html:61
+msgid "Browser Page"
 msgstr ""
 
 #: i2p2www/pages/downloads/list.html:63
+msgid "Windows: Java 8 is recommended. Java 9 or higher may not work."
+msgstr ""
+
+#: i2p2www/pages/downloads/list.html:70 i2p2www/pages/downloads/list.html:72
+msgid "Release Notes"
+msgstr ""
+
+#: i2p2www/pages/downloads/list.html:74
+msgid "Change Log"
+msgstr ""
+
+#: i2p2www/pages/downloads/list.html:76
+msgid "Debian Change Log"
+msgstr ""
+
+#: i2p2www/pages/downloads/list.html:78
+msgid "Android Change Log"
+msgstr ""
+
+#: i2p2www/pages/downloads/list.html:81
 msgid "Pick your I2P Bundle"
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:82
+#: i2p2www/pages/downloads/list.html:99
+msgid "I2P for Windows"
+msgstr ""
+
+#: i2p2www/pages/downloads/list.html:101
 msgid "Download the file and double-click to run it."
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:86
-msgid ""
-"If you need additional help setting up dependencies and getting I2P "
-"ready, a detailed install guide is available here."
+#: i2p2www/pages/downloads/list.html:105
+msgid "Here is a helpful guide to installing I2P for Windows."
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:93 i2p2www/pages/downloads/list.html:125
+#: i2p2www/pages/downloads/list.html:112
+msgid "I2P for Mac OSX"
+msgstr ""
+
+#: i2p2www/pages/downloads/list.html:114 i2p2www/pages/downloads/list.html:135
 #, python-format
 msgid ""
 "The most reliable way to launch the installer is from a terminal like "
@@ -916,11 +867,11 @@ msgid ""
 "    Unfortunately, this behaviour is difficult to predict."
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:102 i2p2www/pages/downloads/list.html:134
+#: i2p2www/pages/downloads/list.html:123 i2p2www/pages/downloads/list.html:144
 msgid "Command line (headless) install:"
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:103 i2p2www/pages/downloads/list.html:135
+#: i2p2www/pages/downloads/list.html:124 i2p2www/pages/downloads/list.html:145
 #, python-format
 msgid ""
 "I2P can also be installed in a terminal environment, which may be "
@@ -933,24 +884,19 @@ msgid ""
 "    the install procedure in your terminal."
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:113
-msgid ""
-"This is a more familiar drag-and-drop style installer for OSX, which\n"
-"    includes a Dock icon to easily inform you of I2P's status.\n"
-"    Beta."
+#: i2p2www/pages/downloads/list.html:133
+msgid "I2P for Linux"
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:119
-msgid ""
-"Double-click on the file, then drag and drop the launcher into your "
-"Applications folder."
+#: i2p2www/pages/downloads/list.html:154
+msgid "I2P for Debian and Ubuntu"
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:146
+#: i2p2www/pages/downloads/list.html:157
 msgid "Packages for Debian &amp; Ubuntu are available."
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:148
+#: i2p2www/pages/downloads/list.html:159
 msgid ""
 "I2P is available in the official repositories for Ubuntu Bionic and "
 "later, and Debian Buster and Sid.\n"
@@ -961,7 +907,11 @@ msgid ""
 "latest I2P version."
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:158
+#: i2p2www/pages/downloads/list.html:167
+msgid "I2P for Android"
+msgstr ""
+
+#: i2p2www/pages/downloads/list.html:170
 msgid ""
 "Requires Android 4.0 (Ice Cream Sandwich) or higher. If you earlier "
 "installed\n"
@@ -969,11 +919,11 @@ msgid ""
 "force you to uninstall your current installation before installing this."
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:162
+#: i2p2www/pages/downloads/list.html:174
 msgid "512 MB RAM minimum; 1 GB recommended."
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:165
+#: i2p2www/pages/downloads/list.html:177
 msgid ""
 "The releases are not compatible with eachother, as they have different "
 "signatures. Uninstall them\n"
@@ -981,17 +931,21 @@ msgid ""
 "download.i2p2.de are signed by idk."
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:178
+#: i2p2www/pages/downloads/list.html:184
+msgid "I2P for Docker"
+msgstr ""
+
+#: i2p2www/pages/downloads/list.html:194
 msgid ""
 "I2P is now available as a Docker package from the Docker Hub.\n"
 "    You may retrieve the image by running the 'docker pull' command."
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:182
-msgid "docker pull meeh/i2p.i2p"
+#: i2p2www/pages/downloads/list.html:198
+msgid "docker pull geti2p/i2p"
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:194
+#: i2p2www/pages/downloads/list.html:210
 #, python-format
 msgid ""
 "Alternately, you can fetch the source from <a href=\"%(monotoneurl)s"
@@ -1004,7 +958,7 @@ msgid ""
 "    run the GUI installer or headless install as above."
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:204
+#: i2p2www/pages/downloads/list.html:220
 #, python-format
 msgid ""
 "Android source is in <a href=\"%(monotoneurl)s#getting-the-i2p-"
@@ -1015,14 +969,14 @@ msgid ""
 "requirements and instructions."
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:221
+#: i2p2www/pages/downloads/list.html:237
 #, python-format
 msgid ""
 "The Windows installer is signed by %(signer)s,\n"
 "<a href=\"%(signingkey)s\">whose key is here</a>."
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:227
+#: i2p2www/pages/downloads/list.html:243
 #, python-format
 msgid ""
 "The Mac OS X native installer is signed by %(signer)s with his Apple "
@@ -1030,15 +984,15 @@ msgid ""
 "<a href=\"%(signingkey)s\">whose key is here</a>."
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:233
+#: i2p2www/pages/downloads/list.html:249
 msgid "Updates from earlier releases:"
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:235
+#: i2p2www/pages/downloads/list.html:251
 msgid "Both automatic and manual upgrades are available for the release."
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:240
+#: i2p2www/pages/downloads/list.html:256
 msgid ""
 "If you are running 0.7.5 or later, your router should detect the\n"
 "new release. To upgrade simply click the 'Download Update' button on your"
@@ -1046,7 +1000,7 @@ msgid ""
 "when it appears."
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:246
+#: i2p2www/pages/downloads/list.html:262
 msgid ""
 "Since 0.9.23, some releases are signed by str4d, whose signing key has "
 "been in the router\n"
@@ -1055,7 +1009,7 @@ msgid ""
 "and will need to be manually updated using the process below."
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:257
+#: i2p2www/pages/downloads/list.html:273
 msgid ""
 "Download the file to your I2P\n"
 "    installation directory and <b>rename as i2pupdate.zip</b>.\n"
@@ -1065,26 +1019,26 @@ msgid ""
 "    NOT need to unzip the file."
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:266
+#: i2p2www/pages/downloads/list.html:282
 msgid "Click <a href=\"http://localhost:7657/configservice.jsp\">\"Restart\"</a>"
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:271
+#: i2p2www/pages/downloads/list.html:287
 msgid "Grab a cup of coffee and come back in 11 minutes"
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:278
+#: i2p2www/pages/downloads/list.html:294
 #, python-format
 msgid ""
 "The file is signed by %(signer)s,\n"
 "<a href=\"%(signingkey)s\">whose key is here</a>."
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:284
+#: i2p2www/pages/downloads/list.html:300
 msgid "Previous Releases"
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:286
+#: i2p2www/pages/downloads/list.html:302
 #, python-format
 msgid ""
 "Previous releases are available on <a "
@@ -1406,7 +1360,7 @@ msgstr ""
 
 #: i2p2www/pages/downloads/windows.html:172
 msgid ""
-"That's it! You're now ready to use I2P. You can browse I2P sites, "
+"That's it! You're now ready to use I2P. You can browse I2P Sites, "
 "download files, host services,\n"
 "e-mail and chat anonymously. Visit the <a "
 "href=\"https://localhost:7657/home\">router console homepage</a> to\n"
@@ -1435,43 +1389,41 @@ msgstr ""
 msgid "Umm... the server encountered some sort of error."
 msgstr ""
 
-#: i2p2www/pages/global/footer.html:4 i2p2www/pages/global/nav.html:10
-msgid "FAQ"
+#: i2p2www/pages/global/footer.html:3
+msgid "Mastodon"
 msgstr ""
 
-#: i2p2www/pages/global/footer.html:5
+#: i2p2www/pages/global/footer.html:12
+msgid "Official Forums"
+msgstr ""
+
+#: i2p2www/pages/global/footer.html:13 i2p2www/pages/site/contact.html:2
+msgid "Contact"
+msgstr ""
+
+#: i2p2www/pages/global/footer.html:14 i2p2www/pages/global/nav.html:97
+msgid "Impressum"
+msgstr ""
+
+#: i2p2www/pages/global/footer.html:15
 msgid "Documentation"
 msgstr ""
 
-#: i2p2www/pages/global/footer.html:6 i2p2www/pages/global/nav.html:62
-#: i2p2www/pages/global/nav.html:64
+#: i2p2www/pages/global/footer.html:16 i2p2www/pages/global/nav.html:81
+#: i2p2www/pages/global/nav.html:83
 msgid "Research"
 msgstr ""
 
-#: i2p2www/pages/global/footer.html:11 i2p2www/pages/global/nav.html:44
-#: i2p2www/pages/global/nav.html:52
-msgid "Contact us"
-msgstr ""
-
-#: i2p2www/pages/global/footer.html:12 i2p2www/pages/global/nav.html:60
-#: i2p2www/pages/site/contact.html:43
-msgid "Forums"
-msgstr ""
-
-#: i2p2www/pages/global/footer.html:19 i2p2www/pages/global/nav.html:47
-msgid "Get involved!"
-msgstr ""
-
-#: i2p2www/pages/global/footer.html:20 i2p2www/pages/global/nav.html:57
+#: i2p2www/pages/global/footer.html:21 i2p2www/pages/global/nav.html:76
 msgid "Donate"
 msgstr ""
 
-#: i2p2www/pages/global/footer.html:21
-msgid "Metrics"
+#: i2p2www/pages/global/footer.html:22 i2p2www/pages/global/nav.html:55
+msgid "Get involved!"
 msgstr ""
 
-#: i2p2www/pages/global/footer.html:22
-msgid "Papers"
+#: i2p2www/pages/global/footer.html:23 i2p2www/pages/global/nav.html:11
+msgid "FAQ"
 msgstr ""
 
 #: i2p2www/pages/global/layout.html:35
@@ -1527,299 +1479,299 @@ msgstr ""
 msgid "Guide to I2P Software"
 msgstr ""
 
-#: i2p2www/pages/global/nav.html:8
-msgid "Help"
+#: i2p2www/pages/global/nav.html:9
+msgid "What is Included"
 msgstr ""
 
-#: i2p2www/pages/global/nav.html:11
+#: i2p2www/pages/global/nav.html:10
 msgid "How to browse I2P"
 msgstr ""
 
-#: i2p2www/pages/global/nav.html:12 i2p2www/pages/global/nav.html:163
+#: i2p2www/pages/global/nav.html:12 i2p2www/pages/global/nav.html:172
 msgid "Applications"
 msgstr ""
 
 #: i2p2www/pages/global/nav.html:14
-msgid "Supported applications"
-msgstr ""
-
-#: i2p2www/pages/global/nav.html:15
 msgid "Bittorrent"
 msgstr ""
 
-#: i2p2www/pages/global/nav.html:16
+#: i2p2www/pages/global/nav.html:15 i2p2www/pages/global/nav.html:69
 msgid "GitLab"
 msgstr ""
 
-#: i2p2www/pages/global/nav.html:17 i2p2www/pages/global/nav.html:145
+#: i2p2www/pages/global/nav.html:16 i2p2www/pages/global/nav.html:61
 msgid "Git"
 msgstr ""
 
-#: i2p2www/pages/global/nav.html:18
+#: i2p2www/pages/global/nav.html:17
 msgid "git+Bittorrent"
 msgstr ""
 
-#: i2p2www/pages/global/nav.html:19
+#: i2p2www/pages/global/nav.html:18
 msgid "IRC"
 msgstr ""
 
-#: i2p2www/pages/global/nav.html:22
-msgid "References"
-msgstr ""
-
-#: i2p2www/pages/global/nav.html:24
-msgid "Glossary"
+#: i2p2www/pages/global/nav.html:23
+msgid "Help"
 msgstr ""
 
 #: i2p2www/pages/global/nav.html:25
+msgid "Glossary"
+msgstr ""
+
+#: i2p2www/pages/global/nav.html:26
 msgid "Performance"
 msgstr ""
 
-#: i2p2www/pages/global/nav.html:28
-msgid "Verify I2P"
-msgstr ""
-
-#: i2p2www/pages/global/nav.html:30
-msgid "Release signing keys"
-msgstr ""
-
-#: i2p2www/pages/global/nav.html:31
-msgid "Signed keys"
-msgstr ""
-
-#: i2p2www/pages/global/nav.html:32
-msgid "Developers keys"
-msgstr ""
-
-#: i2p2www/pages/global/nav.html:35
+#: i2p2www/pages/global/nav.html:27 i2p2www/pages/global/nav.html:42
 msgid "Comparisons"
 msgstr ""
 
-#: i2p2www/pages/global/nav.html:37
-msgid "Overview of comparisons"
-msgstr ""
-
-#: i2p2www/pages/global/nav.html:41
+#: i2p2www/pages/global/nav.html:32 i2p2www/pages/global/nav.html:47
 msgid "Other anonymous networks"
 msgstr ""
 
-#: i2p2www/pages/global/nav.html:48
-msgid "People"
+#: i2p2www/pages/global/nav.html:35
+msgid "Verify I2P"
 msgstr ""
 
-#: i2p2www/pages/global/nav.html:50
-msgid "Team"
+#: i2p2www/pages/global/nav.html:37
+msgid "Release signing keys"
 msgstr ""
 
-#: i2p2www/pages/global/nav.html:51
-msgid "Hall of Fame"
+#: i2p2www/pages/global/nav.html:38
+msgid "Signed keys"
 msgstr ""
 
-#: i2p2www/pages/global/nav.html:55 i2p2www/pages/site/links.html:2
-msgid "Links"
+#: i2p2www/pages/global/nav.html:39
+msgid "Developers keys"
+msgstr ""
+
+#: i2p2www/pages/global/nav.html:50 i2p2www/pages/global/nav.html:188
+msgid "Contact us"
+msgstr ""
+
+#: i2p2www/pages/global/nav.html:53
+msgid "Contributor Guides"
+msgstr ""
+
+#: i2p2www/pages/global/nav.html:56
+msgid "Develop Software"
 msgstr ""
 
 #: i2p2www/pages/global/nav.html:58
-msgid "Community"
-msgstr ""
-
-#: i2p2www/pages/global/nav.html:66
-msgid "Academic research"
-msgstr ""
-
-#: i2p2www/pages/global/nav.html:67
-msgid "Open research questions"
-msgstr ""
-
-#: i2p2www/pages/global/nav.html:68
-msgid "Vulnerability Response Process"
-msgstr ""
-
-#: i2p2www/pages/global/nav.html:70
-msgid "Academic papers and peer review"
-msgstr ""
-
-#: i2p2www/pages/global/nav.html:72
-msgid "Presentations, tutorials and articles"
-msgstr ""
-
-#: i2p2www/pages/global/nav.html:78
-msgid "Impressum"
-msgstr ""
-
-#: i2p2www/pages/global/nav.html:79
-msgid "I2P Metrics"
-msgstr ""
-
-#: i2p2www/pages/global/nav.html:83
-msgid "Develop"
-msgstr ""
-
-#: i2p2www/pages/global/nav.html:85
-msgid "Docs"
-msgstr ""
-
-#: i2p2www/pages/global/nav.html:87
-msgid "Documentation index"
-msgstr ""
-
-#: i2p2www/pages/global/nav.html:88
-msgid "How does it work?"
-msgstr ""
-
-#: i2p2www/pages/global/nav.html:90
-msgid "Gentle intro"
-msgstr ""
-
-#: i2p2www/pages/global/nav.html:91
-msgid "Tech intro"
-msgstr ""
-
-#: i2p2www/pages/global/nav.html:92
-msgid "Threat model"
-msgstr ""
-
-#: i2p2www/pages/global/nav.html:93
-msgid "Garlic routing"
-msgstr ""
-
-#: i2p2www/pages/global/nav.html:94
-msgid "Network database"
-msgstr ""
-
-#: i2p2www/pages/global/nav.html:95
-msgid "Tunnel routing"
-msgstr ""
-
-#: i2p2www/pages/global/nav.html:96
-msgid "Peer selection"
-msgstr ""
-
-#: i2p2www/pages/global/nav.html:97
-msgid "Cryptography"
-msgstr ""
-
-#: i2p2www/pages/global/nav.html:98
-msgid "ElGamal/AES+SessionTags"
-msgstr ""
-
-#: i2p2www/pages/global/nav.html:101
-msgid "Specifications"
-msgstr ""
-
-#: i2p2www/pages/global/nav.html:102
-msgid "Proposals"
-msgstr ""
-
-#: i2p2www/pages/global/nav.html:103 i2p2www/pages/global/nav.html:150
-msgid "API"
-msgstr ""
-
-#: i2p2www/pages/global/nav.html:109 i2p2www/pages/global/nav.html:156
-msgid "Streaming library"
-msgstr ""
-
-#: i2p2www/pages/global/nav.html:110 i2p2www/pages/global/nav.html:157
-msgid "Datagrams"
-msgstr ""
-
-#: i2p2www/pages/global/nav.html:114
-msgid "Protocols"
-msgstr ""
-
-#: i2p2www/pages/global/nav.html:116
-msgid "Protocol stack"
-msgstr ""
-
-#: i2p2www/pages/global/nav.html:121
-msgid "Transports"
-msgstr ""
-
-#: i2p2www/pages/global/nav.html:123
-msgid "Transport layer overview"
-msgstr ""
-
-#: i2p2www/pages/global/nav.html:128
-msgid "Tunnels"
-msgstr ""
-
-#: i2p2www/pages/global/nav.html:130
-msgid "Tunnel implementation"
-msgstr ""
-
-#: i2p2www/pages/global/nav.html:131
-msgid "Unidirectional tunnels"
-msgstr ""
-
-#: i2p2www/pages/global/nav.html:132
-msgid "Old implementation"
-msgstr ""
-
-#: i2p2www/pages/global/nav.html:135
-msgid "Naming and addressbook"
-msgstr ""
-
-#: i2p2www/pages/global/nav.html:136
-msgid "Plugins"
-msgstr ""
-
-#: i2p2www/pages/global/nav.html:137
-msgid "Reseed"
-msgstr ""
-
-#: i2p2www/pages/global/nav.html:140
-msgid "Guides"
-msgstr ""
-
-#: i2p2www/pages/global/nav.html:142
 msgid "New developers"
 msgstr ""
 
-#: i2p2www/pages/global/nav.html:143
+#: i2p2www/pages/global/nav.html:59
 msgid "Using an IDE with I2P"
 msgstr ""
 
-#: i2p2www/pages/global/nav.html:144
+#: i2p2www/pages/global/nav.html:60
 msgid "Developer guidelines and coding style"
 msgstr ""
 
-#: i2p2www/pages/global/nav.html:146
+#: i2p2www/pages/global/nav.html:62
 msgid "Monotone"
 msgstr ""
 
-#: i2p2www/pages/global/nav.html:147
-msgid "New translators"
+#: i2p2www/pages/global/nav.html:65
+msgid "Translate I2P into more Languages"
 msgstr ""
 
-#: i2p2www/pages/global/nav.html:161
-msgid "License"
+#: i2p2www/pages/global/nav.html:66
+msgid "Hosting Services"
 msgstr ""
 
-#: i2p2www/pages/global/nav.html:164
-msgid "Licenses"
+#: i2p2www/pages/global/nav.html:68
+msgid "Reseed"
 msgstr ""
 
-#: i2p2www/pages/global/nav.html:167
-msgid "Meetings, Roadmap"
+#: i2p2www/pages/global/nav.html:74
+msgid "Contact and Team"
 msgstr ""
 
-#: i2p2www/pages/global/nav.html:169
-msgid "Meeting Logs"
+#: i2p2www/pages/global/nav.html:77
+msgid "Community"
+msgstr ""
+
+#: i2p2www/pages/global/nav.html:79 i2p2www/pages/site/contact.html:23
+msgid "Forums"
+msgstr ""
+
+#: i2p2www/pages/global/nav.html:85
+msgid "Academic research"
+msgstr ""
+
+#: i2p2www/pages/global/nav.html:86
+msgid "Open research questions"
+msgstr ""
+
+#: i2p2www/pages/global/nav.html:87
+msgid "Vulnerability Response Process"
+msgstr ""
+
+#: i2p2www/pages/global/nav.html:89
+msgid "Academic papers and peer review"
+msgstr ""
+
+#: i2p2www/pages/global/nav.html:91
+msgid "Presentations, tutorials and articles"
+msgstr ""
+
+#: i2p2www/pages/global/nav.html:98
+msgid "I2P Metrics"
+msgstr ""
+
+#: i2p2www/pages/global/nav.html:102
+msgid "Develop"
+msgstr ""
+
+#: i2p2www/pages/global/nav.html:104
+msgid "Gitlab"
+msgstr ""
+
+#: i2p2www/pages/global/nav.html:105
+msgid "Docs"
+msgstr ""
+
+#: i2p2www/pages/global/nav.html:107
+msgid "Documentation index"
+msgstr ""
+
+#: i2p2www/pages/global/nav.html:108
+msgid "How does it work?"
+msgstr ""
+
+#: i2p2www/pages/global/nav.html:110
+msgid "Gentle intro"
+msgstr ""
+
+#: i2p2www/pages/global/nav.html:111
+msgid "Tech intro"
+msgstr ""
+
+#: i2p2www/pages/global/nav.html:112
+msgid "Threat model"
+msgstr ""
+
+#: i2p2www/pages/global/nav.html:113
+msgid "Garlic routing"
+msgstr ""
+
+#: i2p2www/pages/global/nav.html:114
+msgid "Network database"
+msgstr ""
+
+#: i2p2www/pages/global/nav.html:115
+msgid "Tunnel routing"
+msgstr ""
+
+#: i2p2www/pages/global/nav.html:116
+msgid "Peer selection"
+msgstr ""
+
+#: i2p2www/pages/global/nav.html:117
+msgid "Cryptography"
+msgstr ""
+
+#: i2p2www/pages/global/nav.html:118
+msgid "ElGamal/AES+SessionTags"
+msgstr ""
+
+#: i2p2www/pages/global/nav.html:121
+msgid "Specifications"
+msgstr ""
+
+#: i2p2www/pages/global/nav.html:122
+msgid "Proposals"
+msgstr ""
+
+#: i2p2www/pages/global/nav.html:123 i2p2www/pages/global/nav.html:159
+msgid "API"
+msgstr ""
+
+#: i2p2www/pages/global/nav.html:129 i2p2www/pages/global/nav.html:165
+msgid "Streaming library"
+msgstr ""
+
+#: i2p2www/pages/global/nav.html:130 i2p2www/pages/global/nav.html:166
+msgid "Datagrams"
+msgstr ""
+
+#: i2p2www/pages/global/nav.html:134
+msgid "Protocols"
+msgstr ""
+
+#: i2p2www/pages/global/nav.html:136
+msgid "Protocol stack"
+msgstr ""
+
+#: i2p2www/pages/global/nav.html:141
+msgid "Transports"
+msgstr ""
+
+#: i2p2www/pages/global/nav.html:143
+msgid "Transport layer overview"
+msgstr ""
+
+#: i2p2www/pages/global/nav.html:148
+msgid "Tunnels"
+msgstr ""
+
+#: i2p2www/pages/global/nav.html:150
+msgid "Tunnel implementation"
+msgstr ""
+
+#: i2p2www/pages/global/nav.html:151
+msgid "Unidirectional tunnels"
+msgstr ""
+
+#: i2p2www/pages/global/nav.html:152
+msgid "Old implementation"
+msgstr ""
+
+#: i2p2www/pages/global/nav.html:155
+msgid "Naming and Address Book"
+msgstr ""
+
+#: i2p2www/pages/global/nav.html:156
+msgid "Plugins"
 msgstr ""
 
 #: i2p2www/pages/global/nav.html:170
+msgid "License"
+msgstr ""
+
+#: i2p2www/pages/global/nav.html:173
+msgid "Licenses"
+msgstr ""
+
+#: i2p2www/pages/global/nav.html:176
+msgid "Meetings, Roadmap"
+msgstr ""
+
+#: i2p2www/pages/global/nav.html:178
+msgid "Meeting Logs"
+msgstr ""
+
+#: i2p2www/pages/global/nav.html:179
 msgid "Project Roadmap"
 msgstr ""
 
-#: i2p2www/pages/global/nav.html:171
+#: i2p2www/pages/global/nav.html:180
 msgid "Task list"
 msgstr ""
 
-#: i2p2www/pages/global/nav.html:174
+#: i2p2www/pages/global/nav.html:183
 msgid "Bug tracker"
 msgstr ""
 
-#: i2p2www/pages/global/nav.html:180
+#: i2p2www/pages/global/nav.html:186
+msgid "People"
+msgstr ""
+
+#: i2p2www/pages/global/nav.html:194
 msgid "Language"
 msgstr ""
 
@@ -1889,10 +1841,6 @@ msgid ""
 "<a href=\"%(anonbib)s\">Free Haven's anonymity bibliography</a>."
 msgstr ""
 
-#: i2p2www/pages/site/contact.html:2
-msgid "Contact"
-msgstr ""
-
 #: i2p2www/pages/site/contact.html:4
 msgid "Email"
 msgstr ""
@@ -1900,11 +1848,45 @@ msgstr ""
 #: i2p2www/pages/site/contact.html:5
 msgid ""
 "Please do not use these email addresses for support requests.\n"
-"These are not public email lists.\n"
-"We do not provide help via email."
+"For contact specific to research, outreach and security please use:"
 msgstr ""
 
-#: i2p2www/pages/site/contact.html:25
+#: i2p2www/pages/site/contact.html:24
+msgid "Please visit our I2P user forum -"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:24
+msgid ""
+"available on non-private internet at https://i2pforum.net and on I2P at "
+"http://i2pforum.i2p"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:26
+#, python-format
+msgid ""
+"Most of the discussion about I2P's development happens on the <a "
+"href=\"http://%(zzz)s\">I2P developer forum</a> (only reachable from "
+"within I2P network). This is usually the best place to start with "
+"inquiries, if the dev IRC channel is inactive."
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:30
+msgid "Social Media"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:32
+msgid ""
+"<ul>\n"
+"  <li><a href=\"https://mastodon.social/@i2p\">Mastodon - "
+"https://mastodon.social/@i2p</a></li>\n"
+"  <li><a href=\"https://twitter.com/GetI2P\">Twitter - "
+"https://twitter.com/GetI2P</a></li>\n"
+"  <li><a href=\"https://old.reddit.com/i2p\">Reddit - "
+"https://old.reddit.com/i2p</a></li>\n"
+"</ul>"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:41
 msgid ""
 "Our primary IRC network is the Irc2P network within I2P; a default tunnel"
 " to this network is set up with new router installs.\n"
@@ -1916,255 +1898,702 @@ msgid ""
 "channels on Irc2P via relay bots."
 msgstr ""
 
-#: i2p2www/pages/site/contact.html:33
+#: i2p2www/pages/site/contact.html:49
 msgid "Channel list:"
 msgstr ""
 
-#: i2p2www/pages/site/contact.html:35
+#: i2p2www/pages/site/contact.html:51
 msgid "General i2p discussion and help channel"
 msgstr ""
 
-#: i2p2www/pages/site/contact.html:36
+#: i2p2www/pages/site/contact.html:52
 msgid "Offtopic"
 msgstr ""
 
-#: i2p2www/pages/site/contact.html:37
+#: i2p2www/pages/site/contact.html:53
 msgid "Development talk"
 msgstr ""
 
-#: i2p2www/pages/site/contact.html:38
-msgid "Purple I2P (I2Pd) Development talk"
-msgstr ""
-
-#: i2p2www/pages/site/contact.html:39
-msgid "Abscond browser bundle discussion and development"
-msgstr ""
-
-#: i2p2www/pages/site/contact.html:44
-msgid ""
-"Please visit our I2P user forum, which is frequented by "
-"developers/contributors too -"
-msgstr ""
-
-#: i2p2www/pages/site/contact.html:44
-msgid ""
-"available on clearnet at https://i2pforum.net and on I2P at "
-"http://i2pforum.i2p"
-msgstr ""
-
-#: i2p2www/pages/site/contact.html:46
-#, python-format
-msgid ""
-"Most of the discussion about I2P's development happens on the <a "
-"href=\"http://%(zzz)s\">I2P developer forum</a> (only reachable from "
-"within I2P network). This is usually the best place to start with "
-"inquiries, if the dev IRC channel is inactive."
-msgstr ""
-
-#: i2p2www/pages/site/contact.html:50
+#: i2p2www/pages/site/contact.html:57
 msgid "Mailing lists"
 msgstr ""
 
-#: i2p2www/pages/site/contact.html:51
-msgid ""
-"I2P has recently reinstated it's mailing lists, and they are primarily "
-"used to discuss I2P Browser development."
-msgstr ""
-
-#: i2p2www/pages/site/contact.html:56
-msgid "Subscribing"
-msgstr ""
-
-#: i2p2www/pages/site/contact.html:57
-msgid ""
-"To subscribe to a mailing list, go to the list information page (linked "
-"below) and fill out the form. I2P-internal email addresses "
-"(foobar@mail.i2p) can be used."
-msgstr ""
-
-#: i2p2www/pages/site/contact.html:61
-msgid "Unsubscribing"
+#: i2p2www/pages/site/contact.html:58
+msgid "I2P has no active mailing lists, however archives can be accessed."
 msgstr ""
 
 #: i2p2www/pages/site/contact.html:62
-msgid ""
-"To unsubscribe from a mailing list or edit your subscription options, go "
-"to the list information page (linked below) and enter your subscription "
-"email address."
-msgstr ""
-
-#: i2p2www/pages/site/contact.html:66
 msgid "Lists"
 msgstr ""
 
-#: i2p2www/pages/site/contact.html:69 i2p2www/pages/site/contact.html:73
-#: i2p2www/pages/site/contact.html:77
+#: i2p2www/pages/site/contact.html:66 i2p2www/pages/site/contact.html:70
+#: i2p2www/pages/site/contact.html:74
 msgid "Archive"
 msgstr ""
 
-#: i2p2www/pages/site/contact.html:70
+#: i2p2www/pages/site/contact.html:67
 msgid "I2P developer discussions - anything related to development of I2P"
 msgstr ""
 
-#: i2p2www/pages/site/contact.html:74 i2p2www/pages/site/contact.html:78
+#: i2p2www/pages/site/contact.html:71 i2p2www/pages/site/contact.html:75
 msgid ""
 "General I2P discussion - anything that doesn't fit in a different list "
 "goes here"
 msgstr ""
 
+#: i2p2www/pages/site/contact.html:80
+msgid "Team"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:83
+msgid "Admin"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:84
+msgid "Project Manager"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:86
+msgid "point of contact of last resort"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:89
+msgid "Donations treasurer"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:91
+msgid "manage donations"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:94
+msgid "PR manager"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:96
+msgid "press contact, manages public relations and affairs"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:99
+msgid "Assistant PR manager"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:101
+msgid "Public speaking, public relations assistance"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:104
+#, python-format
+msgid "<a href=\"http://%(forum)s/\">Forum</a> admin"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:106
+msgid "manage the public user forum"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:109
+msgid "Download mirrors admin"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:111
+msgid "manage the mirrors for the download files"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:114
+msgid "Website mirrors admin"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:115 i2p2www/pages/site/contact.html:160
+#: i2p2www/pages/site/contact.html:235 i2p2www/pages/site/contact.html:262
+#: i2p2www/pages/site/contact.html:310
+msgid "vacant"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:116
+msgid "manage the mirrors for the website"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:119
+#, python-format
+msgid "<a href=\"%(monotone)s\">Monotone</a> guru"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:121
+msgid "manage the public monotone repositories"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:124
+msgid "Packager; Linux"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:126
+msgid "Linux (Debian/Ubuntu) distribution packager"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:129
+msgid "Packager; Windows"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:131
+msgid "Windows installer packager"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:134
+msgid "Packager; OSX"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:136
+msgid "OSX installer packager"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:139
+msgid "Release Manager"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:141
+msgid "Builds and signs the releases"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:144
+msgid "Release Manager Alternates"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:146
+msgid "Backup release managers"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:149
+msgid "CI admin"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:151
+msgid "Maintain the Continuous Integration infrastructure"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:154
+msgid "Reseed admin"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:156
+msgid "Monitors, advises and recruits reseed hosts"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:159
+msgid "Security Researcher"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:161
+msgid "threat model / crypto expert"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:166
+msgid "Manage the project bug tracker"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:171 i2p2www/pages/site/contact.html:196
+msgid "manage the public project webservers"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:174
+msgid "Translation admins"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:179
+msgid "User Advocate"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:181
+msgid "gather, prioritize, advocate for user needs"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:184
+msgid "Product Development"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:186
+msgid "supervises  projects from the early planning stages to project completion"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:189
+msgid "Website Maintainer"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:191
+msgid "manage the public project website content design"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:194
+#, python-format
+msgid "<a href=\"%(website)s\">Webserver</a> admin"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:199
+#, python-format
+msgid "<a href=\"%(website)s\">Website</a> admin"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:201
+msgid "manage the public project website content"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:204
+msgid "News Admin"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:206
+msgid "manage router console news feed"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:209
+msgid "Backup News Admin"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:211
+msgid "manage the backup news feed"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:214
+msgid "Design and Usability"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:216
+msgid "ongoing improvements to user experience for website and software"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:234
+msgid "Director of passion"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:236
+msgid "community motivator"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:240
+msgid "Dev"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:241
+msgid "Core Lead"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:243
+msgid "lead dev for the SDK and router"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:246
+#, python-format
+msgid "<a href=\"http://%(postman)s/\">I2P mail</a> lead"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:248
+msgid "organize and develop the i2p mail system"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:251
+#, python-format
+msgid "<a href=\"http://%(bote)s/\">I2P-Bote</a> lead"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:253
+msgid "I2P-Bote plugin"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:256
+#, python-format
+msgid "<a href=\"http://%(forum)s/viewforum.php?f=12\">I2PSnark</a> lead"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:258
+msgid "Maintains the integrated Bittorrent client"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:261
+#, python-format
+msgid "<a href=\"http://%(forum)s/viewforum.php?f=25\">Syndie</a> lead"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:263
+msgid "Syndie development"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:266
+msgid "Susimail lead"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:268
+msgid "Susimail development"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:271
+msgid "Android lead"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:273
+msgid "Android development"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:276
+msgid "Console"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:277
+msgid "idk, Sadie"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:278
+msgid "Router console HTML/CSS design"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:281
+msgid "SAM"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:283
+msgid "SAM maintainer"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:286
+msgid "Translators"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:287
+msgid "many many people!"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:292
+msgid "Contributors"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:294
+msgid "fire2pe dev, console enhancements"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:298
+msgid "desktopgui, dijjer port"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:302
+msgid "Debian/Ubuntu Packager and PPA maintainer"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:306
+msgid "Routerconsole backend and UI work, website revamp, unit tests work"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:311
+msgid "Help needed on many fronts!"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:315
+msgid "Past contributors"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:317
+msgid "I2PTunnel development, ministreaming library"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:321
+msgid "Project lead, Syndie lead"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:325
+msgid "Project lead, Syndie lead, I2Phex, support guru"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:329
+msgid "iMule lead"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:333 i2p2www/pages/site/contact.html:337
+#: i2p2www/pages/site/contact.html:341
+msgid "I2Phex work"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:345
+msgid "Python SAM library, attack simulations"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:349
+msgid "i2pmail development"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:353
+msgid "Syndie help"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:357
+msgid "i2p mail,susimail and susidns apps"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:361
+msgid "I2Phex (port of Phex to I2P)"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:365
+msgid "addressbook,i2p-bt,syndie client"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:369
+msgid "organize and develop the i2p-bt BitTorrent port"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:373
+msgid "addressbook, i2p-bt, syndie client development"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:377
+msgid "encryption and signature routines, I2PIM"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:381
+msgid "SAM jython code, work on stasher (DHT) and v2v (VoI2P)"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:385
+msgid "installer, systray, bogobot"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:389
+msgid "jbigi development, wiki migration, doc cleanup"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:393
+msgid "java debugging and client development on I2PTunnel and the router console"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:397
+msgid "SAM perl module"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:401
+msgid "i2psnark work"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:405
+msgid "java cleanup"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:409
+msgid "docs. wiki migration"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:413
+msgid "translations into French"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:417
+msgid "C port of jcpuid"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:421
+msgid "C# SAM library, pants, fortuna integration"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:425
+msgid "libSAM"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:429 i2p2www/pages/site/contact.html:433
+msgid "i2p-bt tracker development"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:437
+msgid "Console and website themes"
+msgstr ""
+
+#: i2p2www/pages/site/contact.html:467
+msgid "&hellip; and many others"
+msgstr ""
+
 #: i2p2www/pages/site/faq.html:2
 msgid "Frequently Asked Questions"
 msgstr ""
 
 #: i2p2www/pages/site/faq.html:6
-msgid "General"
+msgid "I2P Router Help"
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:8 i2p2www/pages/site/faq.html:51
+#: i2p2www/pages/site/faq.html:8 i2p2www/pages/site/faq.html:68
 msgid "What systems will I2P run on?"
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:9 i2p2www/pages/site/faq.html:76
+#: i2p2www/pages/site/faq.html:9 i2p2www/pages/site/faq.html:93
 msgid "Is installing Java required to use I2P?"
 msgstr ""
 
 #: i2p2www/pages/site/faq.html:10
-msgid "Whats an \"eepsite\" and how do I configure my browser so I can use them?"
+msgid ""
+"What is an \"I2P Site\" and how do I configure my browser so I can use "
+"them?"
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:11 i2p2www/pages/site/faq.html:92
+#: i2p2www/pages/site/faq.html:11 i2p2www/pages/site/faq.html:109
 msgid "What do the Active x/y numbers mean in the router console?"
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:12
-msgid ""
-"Is my router an \"exit node\"(outproxy) to the regular Internet? I don't "
-"want it to be."
+#: i2p2www/pages/site/faq.html:12 i2p2www/pages/site/faq.html:53
+#: i2p2www/pages/site/faq.html:940
+msgid "My router has very few active peers, is this OK?"
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:13 i2p2www/pages/site/faq.html:114
-msgid ""
-"I see IP addresses of all other I2P nodes in the router console. Does "
-"that mean my IP address is visible by others?"
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:14 i2p2www/pages/site/faq.html:125
-msgid "I can't access regular Internet sites through I2P."
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:15 i2p2www/pages/site/faq.html:136
-msgid "Is using an outproxy safe?"
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:16 i2p2www/pages/site/faq.html:164
+#: i2p2www/pages/site/faq.html:13 i2p2www/pages/site/faq.html:117
 msgid ""
 "I am opposed to certain types of content. How do I keep from "
 "distributing, storing, or accessing them?"
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:20 i2p2www/pages/site/faq.html:204
-msgid "How do I configure my browser?"
+#: i2p2www/pages/site/faq.html:14
+msgid "Is it possible to block I2P?"
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:21 i2p2www/pages/site/faq.html:212
-msgid "How do I connect to IRC within I2P?"
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:22 i2p2www/pages/site/faq.html:227
-msgid "How do I set up my own eepsite?"
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:23 i2p2www/pages/site/faq.html:234
-msgid "What ports does I2P use?"
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:24 i2p2www/pages/site/faq.html:508
-msgid ""
-"I'm missing lots of hosts in my addressbook. What are some good "
-"subscription links?"
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:25 i2p2www/pages/site/faq.html:533
-msgid ""
-"How can I access the web console from my other machines or password "
-"protect it?"
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:26 i2p2www/pages/site/faq.html:597
-msgid "How can I use applications from my other machines?"
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:27 i2p2www/pages/site/faq.html:605
-msgid "Is it possible to use I2P as a SOCKS proxy?"
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:28 i2p2www/pages/site/faq.html:623
-msgid "How do I reseed manually?"
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:29 i2p2www/pages/site/faq.html:694
-msgid ""
-"How do I access IRC, BitTorrent, or other services on the regular "
-"Internet?"
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:30 i2p2www/pages/site/faq.html:706
-msgid "I can't access https:// or ftp:// sites through I2P."
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:32
-msgid "Troubleshooting"
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:34
-msgid "My router is using too much CPU?!?"
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:35 i2p2www/pages/site/faq.html:800
-msgid ""
-"My router has been up for several minutes and has zero or very few "
-"connections"
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:36 i2p2www/pages/site/faq.html:808
-msgid "My router has very few active peers, is this OK?"
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:37 i2p2www/pages/site/faq.html:819
-msgid ""
-"My active peers / known peers / participating tunnels / connections / "
-"bandwidth vary dramatically over time! Is anything wrong?"
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:38 i2p2www/pages/site/faq.html:831
-msgid ""
-"What makes downloads, torrents, web browsing, and everything else slower "
-"on I2P as compared to the regular internet?"
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:39
+#: i2p2www/pages/site/faq.html:15
 msgid ""
 "In <code>wrapper.log</code> I see an error stating <code>Protocol family "
 "unavailable</code> when I2P is loading"
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:40 i2p2www/pages/site/faq.html:932
-msgid "Most of the eepsites within I2P are down?"
+#: i2p2www/pages/site/faq.html:16 i2p2www/pages/site/faq.html:189
+msgid "Most of the I2P Sites within I2P are down?"
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:41
+#: i2p2www/pages/site/faq.html:17
 msgid "Why is I2P listening for connections on port 32000?"
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:42 i2p2www/pages/site/faq.html:954
-msgid "I think I found a bug, where can I report it?"
+#: i2p2www/pages/site/faq.html:21 i2p2www/pages/site/faq.html:213
+msgid "How do I configure my browser?"
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:43 i2p2www/pages/site/faq.html:986
-msgid "I have a question!"
+#: i2p2www/pages/site/faq.html:22 i2p2www/pages/site/faq.html:221
+msgid "How do I connect to IRC within I2P?"
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:23 i2p2www/pages/site/faq.html:236
+msgid "How do I set up my own I2P Site?"
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:24 i2p2www/pages/site/faq.html:242
+msgid ""
+"If I host a website at I2P at home, containing only HTML and CSS, is it "
+"dangerous?"
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:25
+msgid "How Does I2P find \".i2p\" websites?"
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:26
+msgid "How do I add to the Address Book?"
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:27 i2p2www/pages/site/faq.html:259
+msgid "What ports does I2P use?"
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:28 i2p2www/pages/site/faq.html:533
+msgid ""
+"I'm missing lots of hosts in my address book. What are some good "
+"subscription links?"
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:29 i2p2www/pages/site/faq.html:558
+msgid ""
+"How can I access the web console from my other machines or password "
+"protect it?"
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:30 i2p2www/pages/site/faq.html:622
+msgid "How can I use applications from my other machines?"
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:31 i2p2www/pages/site/faq.html:630
+msgid "Is it possible to use I2P as a SOCKS proxy?"
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:32 i2p2www/pages/site/faq.html:648
+msgid ""
+"How do I access IRC, BitTorrent, or other services on the regular "
+"Internet?"
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:34
+msgid "Reseeds"
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:36 i2p2www/pages/site/faq.html:755
+msgid ""
+"My router has been up for several minutes and has zero or very few "
+"connections"
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:37 i2p2www/pages/site/faq.html:763
+msgid "How do I reseed manually?"
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:39
+msgid "Privacy-Safety"
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:41
+msgid ""
+"Is my router an \"exit node\"(outproxy) to the regular Internet? I don't "
+"want it to be."
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:42 i2p2www/pages/site/faq.html:695
+msgid "Is it easy to detect the use of I2P by analyzing network traffic?"
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:43 i2p2www/pages/site/faq.html:675
+msgid "Is using I2P Safe?"
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:44 i2p2www/pages/site/faq.html:685
+msgid ""
+"I see IP addresses of all other I2P nodes in the router console. Does "
+"that mean my IP address is visible by others?"
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:45 i2p2www/pages/site/faq.html:704
+msgid "Is using an outproxy safe?"
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:46 i2p2www/pages/site/faq.html:732
+msgid "What about \"De-Anonymizing\" attacks?"
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:50 i2p2www/pages/site/faq.html:837
+msgid "I can't access regular Internet sites through I2P."
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:51 i2p2www/pages/site/faq.html:848
+msgid "I can't access https:// or ftp:// sites through I2P."
 msgstr ""
 
 #: i2p2www/pages/site/faq.html:52
+msgid "Why is my router using too much CPU?"
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:54 i2p2www/pages/site/faq.html:951
+msgid ""
+"My active peers / known peers / participating tunnels / connections / "
+"bandwidth vary dramatically over time! Is anything wrong?"
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:55 i2p2www/pages/site/faq.html:963
+msgid ""
+"What makes downloads, torrents, web browsing, and everything else slower "
+"on I2P as compared to the regular internet?"
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:59 i2p2www/pages/site/faq.html:1036
+msgid "I think I found a bug, where can I report it?"
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:60 i2p2www/pages/site/faq.html:1068
+msgid "I have a question!"
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:69
 #, python-format
 msgid ""
 "I2P is written in the <a href=\"%(java)s\">Java programming language</a>."
@@ -2173,7 +2602,7 @@ msgid ""
 "An <a href=\"%(android)s\">Android port</a> is also available."
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:59
+#: i2p2www/pages/site/faq.html:76
 msgid ""
 "In terms of memory usage, I2P is configured to use 128 MB of RAM by "
 "default. \n"
@@ -2184,7 +2613,7 @@ msgid ""
 "a higher amount of memory is required."
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:64
+#: i2p2www/pages/site/faq.html:81
 #, python-format
 msgid ""
 "In terms of CPU usage, I2P has been tested to run on modest systems such "
@@ -2197,7 +2626,7 @@ msgid ""
 "processes e.g. Web Browsing)."
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:69
+#: i2p2www/pages/site/faq.html:86
 #, python-format
 msgid ""
 "A comparison of some of the available Java Runtime Environments (JRE) is "
@@ -2207,7 +2636,7 @@ msgid ""
 "Using Sun/Oracle Java or OpenJDK is recommended."
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:78
+#: i2p2www/pages/site/faq.html:95
 #, python-format
 msgid ""
 "While the main I2P client implementation requires Java, there are several"
@@ -2215,20 +2644,23 @@ msgid ""
 "<a href=\"%(alt)s\">alternative clients</a> which don't require Java."
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:84
-msgid "Whats an \"eepsite\"?"
+#: i2p2www/pages/site/faq.html:101
+msgid "What is an \"I2P Site?\""
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:86
+#: i2p2www/pages/site/faq.html:103
+#, python-format
 msgid ""
-"An eepsite is a website that is hosted anonymously, a hidden service "
-"which is accessible through your web browser. \n"
+"Formerly called an eepSite, an I2P Site is a website that is hosted "
+"anonymously, a hidden service which is accessible through your web "
+"browser. \n"
 "It can be accessed by setting your web browser's HTTP proxy to use the "
 "I2P web proxy (typically it listens on localhost port 4444), and browsing"
-" to the site."
+" to the site. Detailed instructions for configuring your browse can be "
+"found on the <a href=\"%(browsers)s\">browser configuration page</a>."
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:94
+#: i2p2www/pages/site/faq.html:111
 msgid ""
 "x is the number of peers you've sent or received a message from "
 "successfully in the last minute, y is the number of peers seen in the "
@@ -2237,13 +2669,646 @@ msgid ""
 "description."
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:100
+#: i2p2www/pages/site/faq.html:119
+msgid ""
+"I2P is an anonymous network - it is designed to withstand attempts at "
+"blocking or censoring of content, thus providing a means for "
+"communication that anyone can use. \n"
+"I2P traffic that transits through your router is encrypted with several "
+"layers of encryption. \n"
+"Except in the case of a serious security vulnerability (of which none are"
+" currently known), \n"
+"it is not possible to know what the contents of the traffic are and thus "
+"not possible to distinguish between traffic which one is opposed to or "
+"not opposed to.  \n"
+"\n"
+" We consider the 3 parts of the question:"
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:129
+msgid ""
+"<b>Distribution</b><br> \n"
+"All traffic on I2P is encrypted in multiple layers. You don't know a "
+"message's contents, source, or destination.\n"
+"All traffic you route is internal to the I2P network, you are not an <a "
+"href=\"#exit\">exit node</a> (referred to as an outproxy in our "
+"documentation).\n"
+"Your only alternative is to refuse to route <i>any</i> traffic, by "
+"setting your share bandwidth or maximum participating tunnels to 0 (see "
+"above).\n"
+"It would be nice if you didn't do this, you should help the network by "
+"routing traffic for others.\n"
+"Over 95&#37; of users route traffic for others."
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:139
+msgid ""
+"<b>Storage</b><br> \n"
+"I2P does not do distributed storage of content, this has to be "
+"specifically installed and configured by the user (with Tahoe-LAFS, for "
+"example). \n"
+"That is a feature of a different anonymous network, <a "
+"href=\"http://freenetproject.org/\">Freenet</a>.\n"
+"By running I2P, you are not storing content for anyone."
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:147
+msgid ""
+"<b>Access</b><br>\n"
+"If there are hidden services which you dislike, you may refrain from "
+"visiting them.\n"
+"Your router will not request any content without your specific "
+"instruction to do so."
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:155
+msgid ""
+"Yes, by far the easiest and most common way is by blocking bootstrap, or "
+"\"Reseed\" servers. Completely blocking all obfuscated traffic\n"
+"would work as well (although it would break many, many other things that "
+"are not I2P and most are not willing to go this far).\n"
+"In the case of reseed blocking, there is a reseed bundle on Github, "
+"blocking it will also block Github.\n"
+"You can reseed over a proxy (many can be found on Internet if you do not "
+"want to use Tor) or share reseed bundles on a friend-to-friend basis "
+"offline."
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:161
+msgid ""
+"In <code>wrapper.log</code> I see an error that states \"<code>Protocol "
+"family unavailable</code>\" when loading the Router Console"
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:163
+msgid ""
+"Often this error will occur with any network enabled java software on "
+"some systems that are configured to use IPv6 by default. There are a few "
+"ways to solve this:"
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:168
+msgid ""
+"On Linux based systems, you can <code>echo 0 > "
+"/proc/sys/net/ipv6/bindv6only</code>"
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:170
+msgid "Look for the following lines in <code>wrapper.config</code>."
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:174
+msgid ""
+"If the lines are there, uncomment them by removing the \"#\"s. If the "
+"lines are not there, add them without the \"#\"s."
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:177
+msgid ""
+"Another option would be to remove the <strong>::1</strong> from "
+"<code>~/.i2p/clients.config</code>"
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:181
+msgid ""
+"<strong>WARNING</strong>: For any changes to <code>wrapper.config</code> "
+"to take effect, you must completely\n"
+"stop the router and the wrapper. Clicking <em>Restart</em> on your\n"
+"router console will NOT reread this file! You must\n"
+"click <em>Shutdown</em>, wait 11 minutes, then start I2P."
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:191
+#, python-format
+msgid ""
+"If you consider every I2P Site that has ever been created, yes, most of "
+"them are down.\n"
+"People and I2P Sites come and go.\n"
+"A good way to get started in I2P is check out a list of I2P Sites that "
+"are currently up.\n"
+"<a href=\"%(eepstatus)s\">%(eepstatus)s</a> tracks active I2P Sites."
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:199
+msgid "Why is I2P listening on port 32000?"
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:201
+msgid ""
+"The Tanuki java service wrapper that we use opens this port &mdash;bound "
+"to localhost&mdash; in order to communicate with software running inside "
+"the JVM. \n"
+"When the JVM is launched it is given a key so it can connect to the "
+"wrapper. \n"
+"After the JVM establishes its connection to the wrapper, the wrapper "
+"refuses any additional connections."
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:206
+msgid ""
+"More information can be found in the <a "
+"href=\"http://wrapper.tanukisoftware.com/doc/english/prop-"
+"port.html\">wrapper documentation</a>."
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:215
+#, python-format
+msgid ""
+"The proxy config for different browsers is on a <a "
+"href=\"%(browserconfig)s\"> separate page</a> with screenshots. \n"
+"More advanced configs with external tools, such as the browser plug-in "
+"FoxyProxy or the proxy server Privoxy, are possible but could introduce "
+"leaks in your setup."
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:223
+msgid ""
+"\n"
+"A tunnel to the main IRC server within I2P, Irc2P, is created when I2P is"
+" installed (see the <a "
+"href=\"http://localhost:7657/i2ptunnel/index.jsp\">I2PTunnel "
+"configuration page</a>), and is automatically started when the I2P router"
+" starts. \n"
+"To connect to it, tell your IRC client to connect to <code>localhost "
+"6668</code>. \n"
+"HexChat-like client users can create a new network with the server "
+"<code>localhost/6668</code> (remember to tick \"Bypass proxy server\" if "
+"you have a proxy server configured).\n"
+"Weechat users can use the following command to add a new network:"
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:238
+msgid ""
+"Click on the <a href=\"http://localhost:7658/\">Website</a> link at the "
+"top of your router console for instructions."
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:243
+msgid ""
+"If you're hosting a personal blog or doing something otherwise non-"
+"sensitive, then you are obviously in little danger.\n"
+"If you have privacy needs that are basically non-specific, you are in "
+"little danger. If you are hosting something sensitive, then\n"
+"your services will go down at the same time that your router goes down. "
+"Someone who observes your downtime and correlates it to\n"
+"real-world events could probably de-anonymize you with enough effort. I2P"
+" has defenses available against this like multihoming or\n"
+"Tahoe-LAFS, but they require additional set up and are only appropriate "
+"for some threat models. There is no magic solution, protecting\n"
+"yourself from a real threat will take real consideration in any case."
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:250
+msgid "How Does I2P find \".i2p\" websites? "
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:253
+msgid "How do I add addresses to the Address Book? "
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:254
+msgid ""
+"You cannot add an address without knowing at least the base32 or base64 "
+"of the site you want to visit. The \"hostname\" which is human-readable "
+"is only an alias for the cryptographic address, which corresponds to the "
+"base32 or base64. Without the cryptographic address, there is no way to "
+"access an I2P Site, this is by design. Distributing the address to people"
+" who do not know it yet is usually the responsibility of the Jump service"
+" provider. Visiting an I2P Site which is unknown will trigger the use of "
+"a Jump service. stats.i2p is the most reliable Jump service."
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:256
+msgid ""
+"If you're hosting a site via i2ptunnel, then it won't have a registration"
+" with a jump service yet. To give it a URL locally, then visit the "
+"configuration page and click the button that says \"Add to Local Address "
+"Book.\" Then go to http://127.0.0.1:7657/dns to look up the addresshelper"
+" URL and share it."
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:261
+msgid "The ports that are used by I2P can be divided into 2 sections:"
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:266
+msgid ""
+"Internet-facing ports, which are used for communication with other I2P "
+"routers"
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:267
+msgid "Local ports, for local connections"
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:270
+msgid "These are described in detail below."
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:275
+msgid ""
+"Internet-facing ports<br> Note: Since release 0.7.8, new installs do not "
+"use port 8887; \n"
+"    a random port between 9000 and 31000 is selected when the program is "
+"run for the first time. \n"
+"    The selected port is shown on the router <a "
+"href=\"http://127.0.0.1:7657/confignet\">configuration page</a>."
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:278
+msgid "OUTBOUND"
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:280
+msgid ""
+"UDP from the random port listed on the <a "
+"href=\"http://127.0.0.1:7657/confignet\">configuration page</a> to "
+"arbitrary remote UDP ports, allowing for replies"
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:281
+msgid "TCP from random high ports to arbitrary remote TCP ports"
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:282
+msgid ""
+"Outbound UDP on port 123, allowing for replies. \n"
+"        This is necessary for I2P's internal time sync (via SNTP - "
+"querying a random SNTP host in pool.ntp.org or another server you "
+"specify)"
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:285
+msgid "INBOUND"
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:287
+msgid ""
+"(Optional, recommended) UDP to the port noted on the <a "
+"href=\"http://127.0.0.1:7657/confignet\">configuration page</a> from "
+"arbitrary locations"
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:288
+msgid ""
+"(Optional, recommended) TCP to the port noted on <a "
+"href=\"http://127.0.0.1:7657/confignet\">configuration page</a> from "
+"arbitrary locations"
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:289
+msgid ""
+"Inbound TCP can be disabled on the <a "
+"href=\"http://127.0.0.1:7657/confignet\">configuration page</a>"
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:292
+msgid ""
+"Local I2P ports, listening only to local connections by default, except "
+"where noted:"
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:296
+msgid "PORT"
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:299
+msgid "PURPOSE"
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:302
+msgid "DESCRIPTION"
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:313
+msgid ""
+"Cannot be changed. Binds to all interfaces. May be disabled on <a "
+"href=\"http://127.0.0.1:7657/confignet\">confignet</a>."
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:324
+msgid ""
+"A higher level socket API for clients. Disabled by default. May be "
+"enabled/disabled on <a "
+"href=\"http://127.0.0.1:7657/configclients\">configclients</a>. \n"
+"          May be changed in the bob.config file."
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:336 i2p2www/pages/site/faq.html:347
+#: i2p2www/pages/site/faq.html:358
+msgid ""
+"May be disabled or changed on the i2ptunnel page in the router console. "
+"May also be configured to be bound to a specific interface or all "
+"interfaces."
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:369
+msgid ""
+"Binds to the LAN address. \n"
+"          May be changed with advanced config "
+"<code>i2np.upnp.HTTPPort=nnnn</code>. \n"
+"          May be disabled on <a "
+"href=\"http://127.0.0.1:7657/confignet\">confignet</a>."
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:382
+msgid ""
+"Binds to the LAN address. \n"
+"          May be changed with advanced config "
+"<code>i2np.upnp.SSDPPort=nnnn</code>. \n"
+"          May be disabled on <a "
+"href=\"http://127.0.0.1:7657/confignet\">confignet</a>."
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:395
+msgid ""
+"Used by client apps. \n"
+"          May be changed to a different port on <a "
+"href=\"http://127.0.0.1:7657/configclients\">configclients</a> but this "
+"is not recommended. \n"
+"          May be to bind to a different interface or all interfaces, or "
+"disabled, on <a "
+"href=\"http://127.0.0.1:7657/configclients\">configclients</a>."
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:408
+msgid ""
+"A higher level socket API for clients Only opened when a SAM V3 client "
+"requests a UDP session. \n"
+"          May be enabled/disabled on <a "
+"href=\"http://127.0.0.1:7657/configclients\">configclients</a>. \n"
+"          May be changed in the <code>clients.config</code> file with the"
+" SAM command line option <code>sam.udp.port=nnnn</code>."
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:421
+msgid ""
+"A higher level socket API for clients Disabled by default for new "
+"installs as of release 0.6.5. \n"
+"          May be enabled/disabled on <a "
+"href=\"http://127.0.0.1:7657/configclients\">configclients</a>. \n"
+"          May be changed in the <code>clients.config</code> file."
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:434
+msgid ""
+"May be disabled in the <code>clients.config</code>file. \n"
+"          May also be configured to be bound to a specific interface or "
+"all interfaces in that file."
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:446
+msgid ""
+"May be disabled in the <code>clients.config</code> file. \n"
+"          May also be configured to be bound to a specific interface or "
+"all interfaces in the <code>jetty.xml</code> file."
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:458 i2p2www/pages/site/faq.html:470
+#: i2p2www/pages/site/faq.html:482
+msgid ""
+"May be disabled or changed on the i2ptunnel page in the router console. \n"
+"          May also be configured to be bound to a specific interface or "
+"all interfaces."
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:494
+msgid ""
+"Outbound to 32000 only, does not listen on this port. \n"
+"          Starts at 31000 and will increment until 31999 looking for a "
+"free port. \n"
+"          To change, see the <a "
+"href=\"http://wrapper.tanukisoftware.com/doc/english/prop-"
+"port.html\">wrapper documentation</a>. \n"
+"          For more information see <a href=\"#port32000\">below</a>."
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:508
+msgid ""
+"To change, see the <a "
+"href=\"http://wrapper.tanukisoftware.com/doc/english/prop-"
+"port.html\">wrapper documentation</a>. \n"
+"          For more information see <a href=\"#port32000\">below</a>."
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:516
+msgid ""
+"The local I2P ports and the I2PTunnel ports do not need to be reachable "
+"from \n"
+"remote machines, but *should* be reachable locally.  You can also create"
+" \n"
+"additional ports for I2PTunnel instances via "
+"http://localhost:7657/i2ptunnel/ \n"
+"(and in turn, would need to get your firewall to allow you local access, "
+"but \n"
+"not remote access, unless desired)."
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:524
+msgid ""
+"So, to summarize, nothing needs to be reachable by unsolicited remote "
+"peers, but\n"
+"if you can configure your NAT/firewall to allow inbound UDP and TCP the "
+"<a href=\"http://localhost:7657/config\">outbound facing port</a>, you'll"
+"\n"
+"get better performance.  You will also need to be able to send outbound "
+"UDP packets\n"
+"to arbitrary remote peers (blocking IPs randomly with something like "
+"PeerGuardian\n"
+"only hurts you - don't do it)."
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:534
+msgid "This question can be answered in 3 parts:"
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:539
+msgid ""
+"My router often displays a message saying \"Website Not Found In Address "
+"Book\", why do I see this message?"
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:540
+msgid ""
+"Human-readable addresses such as <i>http://website.i2p</i> are references"
+" to a long, random string known as a <b>destination</b>. \n"
+"    These references are registered and stored at address book services "
+"such as stats.i2p, which is run by zzz. \n"
+"    You will often encounter a \"b32\" address. A \"b32\" is a hash "
+"(specifically, a <a "
+"href=\"https://en.wikipedia.org/wiki/SHA-2\">SHA256</a> hash) of the \n"
+"    destination. This hash is appended with \".b32.i2p\" and serves as a "
+"convenient way to link to your hidden service, without requiring any "
+"registration on an address book service."
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:544
+msgid ""
+"It is possible to add subscriptions to your router's configuration which "
+"may reduce the frequency of these messages."
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:545
+msgid "What is an address book subscription?"
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:546
+msgid ""
+"This is a list of files hosted on various I2P websites each of which "
+"contain a list of I2P hosts and their associated destinations."
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:547
+msgid ""
+"The address book is located at <a "
+"href=\"http://localhost:7657/dns\">http://localhost:7657/dns</a> where "
+"further information can be found."
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:548
+msgid "What are some good address book subscription links?"
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:549
+msgid "You may try the following:"
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:560
+msgid ""
+"For security purposes, the router's admin console by default only listens"
+" for connections on the local interface.  \n"
+"\n"
+"There are two methods for accessing the console remotely:"
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:566 i2p2www/pages/site/faq.html:572
+msgid "SSH Tunnel"
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:567 i2p2www/pages/site/faq.html:591
+msgid ""
+"Configuring your console to be available on a Public IP address with a "
+"username &amp; password"
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:569
+msgid "These are detailed below:"
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:573
+msgid ""
+"If you are running a Unix-like Operating System, this is the easiest "
+"method for remotely accessing your I2P console. \n"
+"      (Note: SSH server software is available for systems running "
+"Windows, for example <a "
+"href=\"https://github.com/PowerShell/Win32-OpenSSH\">https://github.com/PowerShell/Win32-OpenSSH</a>)"
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:575
+msgid ""
+"Once you have configured SSH access to your system, the '-L' flag is "
+"passed to SSH with appropriate arguments - for example:"
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:593
+msgid "Open <code>~/.i2p/clients.config</code> and replace"
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:607
+msgid ""
+"Go to <a "
+"href=\"http://localhost:7657/configui\">http://localhost:7657/configui</a>"
+" and add a console username and password if desired - \n"
+"        Adding a username &amp; password is highly recommended to secure "
+"your I2P console from tampering, which could lead to de-anonymization."
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:609
+msgid ""
+"Go to <a "
+"href=\"http://localhost:7657/index\">http://localhost:7657/index</a> and "
+"hit \"Graceful restart\", \n"
+"        which restarts the JVM and reloads the client applications"
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:612
+msgid ""
+"After that fires up, you should now be able to reach your console "
+"remotely. \n"
+"      Load the router console at <code>http://(System_IP):7657</code> and"
+" you will be prompted for the username and password you specified in step"
+" 2 above if your browser supports the authentication popup."
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:615
+msgid ""
+"NOTE: You can specify 0.0.0.0 in the above configuration. \n"
+"      This specifies an interface, not a network or netmask. \n"
+"      0.0.0.0 means \"bind to all interfaces\", so it can be reachable on"
+" 127.0.0.1:7657 as well as any LAN/WAN IP. \n"
+"      Be careful when using this option as the console will be available "
+"on ALL addresses configured on your system."
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:624
+msgid ""
+"Please see the previous answer for instructions on using SSH Port "
+"Forwarding, and also see this page in your console: \n"
+"<a "
+"href=\"http://localhost:7657/configi2cp\">http://localhost:7657/configi2cp</a>"
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:632
+msgid ""
+"The SOCKS proxy has been functional since release 0.7.1. SOCKS 4/4a/5 are"
+" supported. \n"
+"I2P does not have a SOCKS outproxy so it is limited to use within I2P "
+"only."
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:636
+msgid ""
+"Many applications leak sensitive information that could identify you on "
+"the Internet and this is a risk that one should be aware of when using "
+"the I2P SOCKS proxy. \n"
+"I2P only filters connection data, but if the program you intend to run "
+"sends this information as content, I2P has no way to protect your "
+"anonymity. \n"
+"For example, some mail applications will send the IP address of the "
+"machine they are running on to a mail server. \n"
+"There is no way for I2P to filter this, thus using I2P to 'socksify' "
+"existing applications is possible, but extremely dangerous."
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:642
+#, python-format
+msgid ""
+"If you would like more information on the socks proxy application anyway,"
+"\n"
+"there are some helpful hints on the <a href=\"%(socks)s\">socks page</a>."
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:650
+msgid ""
+"Unless an outproxy has been specifically set up for the service you want "
+"to connect to, this cannot be done. \n"
+"There are only three types of outproxies running right now: HTTP, HTTPS, "
+"and email. Note that there is no SOCKS outproxy. \n"
+"If this type of service is required, we recommend that you use Tor. \n"
+"\n"
+"Please be aware that the Tor project <a "
+"href=\"https://blog.torproject.org/bittorrent-over-tor-isnt-good-"
+"idea\">recommends against using BitTorrent over Tor</a>, \n"
+"as there are serious anonymity-related issues associated with doing so."
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:662
 msgid ""
 "Is my router an \"exit node\" to the regular Internet? I don't want it to"
 " be."
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:102
+#: i2p2www/pages/site/faq.html:664
 #, python-format
 msgid ""
 "No. Unlike <a href=\"https://www.torproject.org/\">Tor</a>, \"exit "
@@ -2261,14 +3326,28 @@ msgid ""
 "forums, if you would like to learn more about running an outproxy."
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:116
+#: i2p2www/pages/site/faq.html:679
+msgid "I2P strives to be safe in it's default configuration for all users."
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:681
+msgid ""
+" It may be dangerous to use I2P in what the project calls \"Strict "
+"Countries\" where the law may not be clear on anonymizing software and "
+"where risks are judged to be fairly high. Most I2P peers are not in those"
+" strict countries and the ones that are, are placed in \"Hidden Mode\" "
+"where they interact with the rest of the network in more limited ways, so"
+" that they are less visible to network observers.\n"
+msgstr ""
+
+#: i2p2www/pages/site/faq.html:687
 msgid ""
 "Yes, and 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."
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:120
+#: i2p2www/pages/site/faq.html:691
 msgid ""
 "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 "
@@ -2276,24 +3355,23 @@ msgid ""
 "to contribute bandwidth to the project."
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:127
+#: i2p2www/pages/site/faq.html:696
 msgid ""
-"I2P is primarily not intended, nor designed, to be used as a proxy to the"
-" regular internet. \n"
-"With that said, there are services which are provided by volunteers that "
-"act as proxies to clearnet based content - these are referred to as "
-"\"outproxies\" on the I2P network. \n"
-"There is an outproxy configured by default in I2P's HTTP client tunnel - "
-"false.i2p. \n"
-"While this service does currently exist, there is no guarantee that it "
-"will always be there as it is not an official service provided by the I2P"
-" project. \n"
-"If your main requirement from an anonymous network is the ability to "
-"access clearnet resources, we would recommend using <a "
-"href=\"https://www.torproject.org/\">Tor</a>."
+"It can be deduced that somebody is using the I2P network with some "
+"reliability, but it is a little difficult to know for sure.\n"
+"The most reliable way to know for sure would be to have a computer with a"
+" fairly stable IP address that you suspect is an I2P user, and a\n"
+"bunch of computers you control on different networks all running I2P. "
+"When one of them connects to your suspected computer, you will be able\n"
+"to see their I2P router in the netDB. This might take time, and it might "
+"never happen. You could also try blocking all obfuscated traffic\n"
+"on a particular network until you're sure every I2P router on that "
+"network has lost all of it's peers. At that point, they'll reach out\n"
+"to reseed servers to get more peers, which a network administrator can "
+"probably observe."
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:138
+#: i2p2www/pages/site/faq.html:706
 msgid ""
 "I2P does not encrypt the Internet, neither does Tor - for example, "
 "through <a "
@@ -2309,7 +3387,7 @@ msgid ""
 "any traffic that will be handled by the outproxy is encrypted with TLS."
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:146
+#: i2p2www/pages/site/faq.html:714
 msgid ""
 "For more information, you may read the Tor FAQ's answer to this question:"
 "\n"
@@ -2317,7 +3395,7 @@ msgid ""
 "href=\"https://www.torproject.org/docs/faq#CanExitNodesEavesdrop\">https://www.torproject.org/docs/faq#CanExitNodesEavesdrop</a>"
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:151
+#: i2p2www/pages/site/faq.html:719
 #, python-format
 msgid ""
 "In addition, you may be vulnerable to collusion between the outproxy "
@@ -2330,7 +3408,7 @@ msgid ""
 "forums</a> as well."
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:158
+#: i2p2www/pages/site/faq.html:726
 #, python-format
 msgid ""
 "\n"
@@ -2340,502 +3418,57 @@ msgid ""
 "choose to trust the outproxy operator."
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:166
+#: i2p2www/pages/site/faq.html:734
 msgid ""
-"I2P is an anonymous network - it is designed to withstand attempts at "
-"blocking or censoring of content, thus providing a means for "
-"communication that anyone can use. \n"
-"I2P traffic that transits through your router is encrypted with several "
-"layers of encryption. \n"
-"Except in the case of a serious security vulnerability (of which none are"
-" currently known), \n"
-"it is not possible to know what the contents of the traffic are and thus "
-"not possible to distinguish between traffic which one is opposed to or "
-"not opposed to.  \n"
-"\n"
-" We consider the 3 parts of the question:"
+"Reducing anonymity is typically done by A) identifying characteristics "
+"that are consistent across anonymous identities or\n"
+"B) identifying ephemeral characteristics of repeated connections. We say "
+"\"reducing\" anonymity because many of these characteristics\n"
+"are shared by many of our users, making these anonymity \"sets,\" the "
+"smaller the anonymity set and the more small sets you belong to,\n"
+"the more brittle your anonymity."
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:176
+#: i2p2www/pages/site/faq.html:741
 msgid ""
-"<b>Distribution</b><br> \n"
-"All traffic on I2P is encrypted in multiple layers. You don't know a "
-"message's contents, source, or destination.\n"
-"All traffic you route is internal to the I2P network, you are not an <a "
-"href=\"#exit\">exit node</a> (referred to as an outproxy in our "
-"documentation).\n"
-"Your only alternative is to refuse to route <i>any</i> traffic, by "
-"setting your share bandwidth or maximum participating tunnels to 0 (see "
-"above).\n"
-"It would be nice if you didn't do this, you should help the network by "
-"routing traffic for others.\n"
-"Over 95&#37; of users route traffic for others."
+"Attacks on I2P in the past have relied on correlating NetDB storage and "
+"verification, by randomizing \n"
+"the delay between storage and verification, we reduce the consistency "
+"with which that verification can be linked to I2P activity,\n"
+"thereby limiting the utility of that data point."
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:186
+#: i2p2www/pages/site/faq.html:746
 msgid ""
-"<b>Storage</b><br> \n"
-"I2P does not do distributed storage of content, this has to be "
-"specifically installed and configured by the user (with Tahoe-LAFS, for "
-"example). \n"
-"That is a feature of a different anonymous network, <a "
-"href=\"http://freenetproject.org/\">Freenet</a>.\n"
-"By running I2P, you are not storing content for anyone."
+"Attacks on software configured to work with I2P are out of scope for I2P "
+"to solve. When browsing I2P or hosting\n"
+"I2P services, it's is the responsibility of the user to consider their "
+"threat model. Browsers are particularly problematic\n"
+"due to fingerprinting attacks, and the wide variety of information that "
+"can be gleaned from them. Using a standardized browsing\n"
+"profile is thought to help mitigate the impact of fingerprinting."
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:194
+#: i2p2www/pages/site/faq.html:757
 msgid ""
-"<b>Access</b><br>\n"
-"If there are hidden services which you dislike, you may refrain from "
-"visiting them.\n"
-"Your router will not request any content without your specific "
-"instruction to do so."
+"New installations of I2P carry out the reseeding process automatically, "
+"as well as when the number of known peers falls to a drastically low "
+"value. \n"
+"If you need to carry out a reseed of your router, please see the <a "
+"href=\"#manual_reseed\">reseed instructions</a>."
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:206
-#, python-format
-msgid ""
-"The proxy config for different browsers is on a <a "
-"href=\"%(browserconfig)s\"> separate page</a> with screenshots. \n"
-"More advanced configs with external tools, such as the browser plug-in "
-"FoxyProxy or the proxy server Privoxy, are possible but could introduce "
-"leaks in your setup."
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:214
-msgid ""
-"\n"
-"A tunnel to the main IRC server within I2P, Irc2P, is created when I2P is"
-" installed (see the <a "
-"href=\"http://localhost:7657/i2ptunnel/index.jsp\">I2PTunnel "
-"configuration page</a>), and is automatically started when the I2P router"
-" starts. \n"
-"To connect to it, tell your IRC client to connect to <code>localhost "
-"6668</code>. \n"
-"HexChat-like client users can create a new network with the server "
-"<code>localhost/6668</code> (remember to tick \"Bypass proxy server\" if "
-"you have a proxy server configured).\n"
-"Weechat users can use the following command to add a new network:"
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:229
-msgid ""
-"Click on the <a href=\"http://localhost:7658/\">Website</a> link at the "
-"top of your router console for instructions."
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:236
-msgid "The ports that are used by I2P can be divided into 2 sections:"
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:241
-msgid ""
-"Internet-facing ports, which are used for communication with other I2P "
-"routers"
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:242
-msgid "Local ports, for local connections"
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:245
-msgid "These are described in detail below."
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:250
-msgid ""
-"Internet-facing ports<br> Note: Since release 0.7.8, new installs do not "
-"use port 8887; \n"
-"    a random port between 9000 and 31000 is selected when the program is "
-"run for the first time. \n"
-"    The selected port is shown on the router <a "
-"href=\"http://127.0.0.1:7657/confignet\">configuration page</a>."
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:253
-msgid "OUTBOUND"
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:255
-msgid ""
-"UDP from the random port listed on the <a "
-"href=\"http://127.0.0.1:7657/confignet\">configuration page</a> to "
-"arbitrary remote UDP ports, allowing for replies"
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:256
-msgid "TCP from random high ports to arbitrary remote TCP ports"
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:257
-msgid ""
-"Outbound UDP on port 123, allowing for replies. \n"
-"        This is necessary for I2P's internal time sync (via SNTP - "
-"querying a random SNTP host in pool.ntp.org or another server you "
-"specify)"
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:260
-msgid "INBOUND"
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:262
-msgid ""
-"(Optional, recommended) UDP to the port noted on the <a "
-"href=\"http://127.0.0.1:7657/confignet\">configuration page</a> from "
-"arbitrary locations"
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:263
-msgid ""
-"(Optional, recommended) TCP to the port noted on <a "
-"href=\"http://127.0.0.1:7657/confignet\">configuration page</a> from "
-"arbitrary locations"
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:264
-msgid ""
-"Inbound TCP can be disabled on the <a "
-"href=\"http://127.0.0.1:7657/confignet\">configuration page</a>"
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:267
-msgid ""
-"Local I2P ports, listening only to local connections by default, except "
-"where noted:"
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:271
-msgid "PORT"
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:274
-msgid "PURPOSE"
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:277
-msgid "DESCRIPTION"
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:288
-msgid ""
-"Cannot be changed. Binds to all interfaces. May be disabled on <a "
-"href=\"http://127.0.0.1:7657/confignet\">confignet</a>."
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:299
-msgid ""
-"A higher level socket API for clients. Disabled by default. May be "
-"enabled/disabled on <a "
-"href=\"http://127.0.0.1:7657/configclients\">configclients</a>. \n"
-"          May be changed in the bob.config file."
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:311 i2p2www/pages/site/faq.html:322
-#: i2p2www/pages/site/faq.html:333
-msgid ""
-"May be disabled or changed on the i2ptunnel page in the router console. "
-"May also be configured to be bound to a specific interface or all "
-"interfaces."
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:344
-msgid ""
-"Binds to the LAN address. \n"
-"          May be changed with advanced config "
-"<code>i2np.upnp.HTTPPort=nnnn</code>. \n"
-"          May be disabled on <a "
-"href=\"http://127.0.0.1:7657/confignet\">confignet</a>."
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:357
-msgid ""
-"Binds to the LAN address. \n"
-"          May be changed with advanced config "
-"<code>i2np.upnp.SSDPPort=nnnn</code>. \n"
-"          May be disabled on <a "
-"href=\"http://127.0.0.1:7657/confignet\">confignet</a>."
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:370
-msgid ""
-"Used by client apps. \n"
-"          May be changed to a different port on <a "
-"href=\"http://127.0.0.1:7657/configclients\">configclients</a> but this "
-"is not recommended. \n"
-"          May be to bind to a different interface or all interfaces, or "
-"disabled, on <a "
-"href=\"http://127.0.0.1:7657/configclients\">configclients</a>."
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:383
-msgid ""
-"A higher level socket API for clients Only opened when a SAM V3 client "
-"requests a UDP session. \n"
-"          May be enabled/disabled on <a "
-"href=\"http://127.0.0.1:7657/configclients\">configclients</a>. \n"
-"          May be changed in the <code>clients.config</code> file with the"
-" SAM command line option <code>sam.udp.port=nnnn</code>."
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:396
-msgid ""
-"A higher level socket API for clients Disabled by default for new "
-"installs as of release 0.6.5. \n"
-"          May be enabled/disabled on <a "
-"href=\"http://127.0.0.1:7657/configclients\">configclients</a>. \n"
-"          May be changed in the <code>clients.config</code> file."
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:409
-msgid ""
-"May be disabled in the <code>clients.config</code>file. \n"
-"          May also be configured to be bound to a specific interface or "
-"all interfaces in that file."
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:421
-msgid ""
-"May be disabled in the <code>clients.config</code> file. \n"
-"          May also be configured to be bound to a specific interface or "
-"all interfaces in the <code>jetty.xml</code> file."
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:433 i2p2www/pages/site/faq.html:445
-#: i2p2www/pages/site/faq.html:457
-msgid ""
-"May be disabled or changed on the i2ptunnel page in the router console. \n"
-"          May also be configured to be bound to a specific interface or "
-"all interfaces."
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:469
-msgid ""
-"Outbound to 32000 only, does not listen on this port. \n"
-"          Starts at 31000 and will increment until 31999 looking for a "
-"free port. \n"
-"          To change, see the <a "
-"href=\"http://wrapper.tanukisoftware.com/doc/english/prop-"
-"port.html\">wrapper documentation</a>. \n"
-"          For more information see <a href=\"#port32000\">below</a>."
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:483
-msgid ""
-"To change, see the <a "
-"href=\"http://wrapper.tanukisoftware.com/doc/english/prop-"
-"port.html\">wrapper documentation</a>. \n"
-"          For more information see <a href=\"#port32000\">below</a>."
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:491
-msgid ""
-"The local I2P ports and the I2PTunnel ports do not need to be reachable "
-"from \n"
-"remote machines, but *should* be reachable locally.  You can also create"
-" \n"
-"additional ports for I2PTunnel instances via "
-"http://localhost:7657/i2ptunnel/ \n"
-"(and in turn, would need to get your firewall to allow you local access, "
-"but \n"
-"not remote access, unless desired)."
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:499
-msgid ""
-"So, to summarize, nothing needs to be reachable by unsolicited remote "
-"peers, but\n"
-"if you can configure your NAT/firewall to allow inbound UDP and TCP the "
-"<a href=\"http://localhost:7657/config\">outbound facing port</a>, you'll"
-"\n"
-"get better performance.  You will also need to be able to send outbound "
-"UDP packets\n"
-"to arbitrary remote peers (blocking IPs randomly with something like "
-"PeerGuardian\n"
-"only hurts you - don't do it)."
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:509
-msgid "This question can be answered in 3 parts:"
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:514
-msgid ""
-"My router often displays a message saying \"Website Not Found In "
-"Addressbook\", why do I see this message?"
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:515
-msgid ""
-"Human-readable addresses such as <i>http://website.i2p</i> are references"
-" to a long, random string known as a <b>destination</b>. \n"
-"    These references are registered and stored at addressbook services "
-"such as stats.i2p, which is run by zzz. \n"
-"    You will often encounter a \"b32\" address. A \"b32\" is a hash "
-"(specifically, a <a "
-"href=\"https://en.wikipedia.org/wiki/SHA-2\">SHA256</a> hash) of the \n"
-"    destination. This hash is appended with \".b32.i2p\" and serves as a "
-"convenient way to link to your hidden service, without requiring any "
-"registration on an addressbook service."
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:519
-msgid ""
-"It is possible to add subscriptions to your router's configuration which "
-"may reduce the frequency of these messages."
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:520
-msgid "What is an addressbook subscription?"
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:521
-msgid ""
-"This is a list of files hosted on various I2P websites each of which "
-"contain a list of I2P hosts and their associated destinations."
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:522
-msgid ""
-"The addressbook is located at <a "
-"href=\"http://localhost:7657/dns\">http://localhost:7657/dns</a> where "
-"further information can be found."
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:523
-msgid "What are some good addressbook subscription links?"
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:524
-msgid "You may try the following:"
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:535
-msgid ""
-"For security purposes, the router's admin console by default only listens"
-" for connections on the local interface.  \n"
-"\n"
-"There are two methods for accessing the console remotely:"
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:541 i2p2www/pages/site/faq.html:547
-msgid "SSH Tunnel"
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:542 i2p2www/pages/site/faq.html:566
-msgid ""
-"Configuring your console to be available on a Public IP address with a "
-"username &amp; password"
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:544
-msgid "These are detailed below:"
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:548
-msgid ""
-"If you are running a Unix-like Operating System, this is the easiest "
-"method for remotely accessing your I2P console. \n"
-"      (Note: SSH server software is available for systems running "
-"Windows, for example <a "
-"href=\"https://github.com/PowerShell/Win32-OpenSSH\">https://github.com/PowerShell/Win32-OpenSSH</a>)"
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:550
-msgid ""
-"Once you have configured SSH access to your system, the '-L' flag is "
-"passed to SSH with appropriate arguments - for example:"
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:568
-msgid "Open <code>~/.i2p/clients.config</code> and replace"
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:582
-msgid ""
-"Go to <a "
-"href=\"http://localhost:7657/configui\">http://localhost:7657/configui</a>"
-" and add a console username and password if desired - \n"
-"        Adding a username &amp; password is highly recommended to secure "
-"your I2P console from tampering, which could lead to de-anonymization."
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:584
-msgid ""
-"Go to <a "
-"href=\"http://localhost:7657/index\">http://localhost:7657/index</a> and "
-"hit \"Graceful restart\", \n"
-"        which restarts the JVM and reloads the client applications"
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:587
-msgid ""
-"After that fires up, you should now be able to reach your console "
-"remotely. \n"
-"      Load the router console at <code>http://(System_IP):7657</code> and"
-" you will be prompted for the username and password you specified in step"
-" 2 above if your browser supports the authentication popup."
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:590
-msgid ""
-"NOTE: You can specify 0.0.0.0 in the above configuration. \n"
-"      This specifies an interface, not a network or netmask. \n"
-"      0.0.0.0 means \"bind to all interfaces\", so it can be reachable on"
-" 127.0.0.1:7657 as well as any LAN/WAN IP. \n"
-"      Be careful when using this option as the console will be available "
-"on ALL addresses configured on your system."
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:599
-msgid ""
-"Please see the previous answer for instructions on using SSH Port "
-"Forwarding, and also see this page in your console: \n"
-"<a "
-"href=\"http://localhost:7657/configi2cp\">http://localhost:7657/configi2cp</a>"
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:607
-msgid ""
-"The SOCKS proxy has been functional since release 0.7.1. SOCKS 4/4a/5 are"
-" supported. \n"
-"I2P does not have a SOCKS outproxy so it is limited to use within I2P "
-"only."
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:611
-msgid ""
-"Many applications leak sensitive information that could identify you on "
-"the Internet and this is a risk that one should be aware of when using "
-"the I2P SOCKS proxy. \n"
-"I2P only filters connection data, but if the program you intend to run "
-"sends this information as content, I2P has no way to protect your "
-"anonymity. \n"
-"For example, some mail applications will send the IP address of the "
-"machine they are running on to a mail server. \n"
-"There is no way for I2P to filter this, thus using I2P to 'socksify' "
-"existing applications is possible, but extremely dangerous."
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:617
-#, python-format
-msgid ""
-"If you would like more information on the socks proxy application anyway,"
-"\n"
-"there are some helpful hints on the <a href=\"%(socks)s\">socks page</a>."
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:625
+#: i2p2www/pages/site/faq.html:765
 msgid ""
 "An I2P router only needs to be seeded once, to join the network for the "
 "first\n"
 "time. Reseeding involves fetching multiple \"RouterInfo\" files (bundled "
 "into a\n"
 "signed zip-file) from at least two predefined server URLs picked from a\n"
-"volunteer-run group of clearnet HTTPS servers."
+"volunteer-run group of non-private internet HTTPS servers."
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:632
+#: i2p2www/pages/site/faq.html:772
 msgid ""
 "A typical symptom of a failed reseed is the \"Known\" indicator (on the "
 "left\n"
@@ -2847,14 +3480,14 @@ msgid ""
 "entirely."
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:639
+#: i2p2www/pages/site/faq.html:779
 msgid ""
 "If you are stuck behind an ISP firewall or filter, you can use the "
 "following\n"
 "manual method (non-automated technical solution) to join the I2P network."
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:644
+#: i2p2www/pages/site/faq.html:784
 #, python-format
 msgid ""
 "\n"
@@ -2864,11 +3497,11 @@ msgid ""
 "hostname, and port."
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:649
+#: i2p2www/pages/site/faq.html:789
 msgid "Joining the I2P Network using a reseed file"
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:650
+#: i2p2www/pages/site/faq.html:790
 msgid ""
 "Please contact a known trustworthy friend who has a running I2P router, "
 "and ask\n"
@@ -2885,54 +3518,54 @@ msgid ""
 "a reseed file if you can not verify its source."
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:660
+#: i2p2www/pages/site/faq.html:800
 #, python-format
 msgid "To import the received %(filename)s file into your local I2P router:"
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:662 i2p2www/pages/site/faq.html:674
+#: i2p2www/pages/site/faq.html:802 i2p2www/pages/site/faq.html:814
 #, python-format
 msgid "Go to <a href=\"%(url)s\">%(url)s</a>"
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:663
+#: i2p2www/pages/site/faq.html:803
 msgid "Under \"Manual Reseed from File\" click \"Browse...\""
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:664
+#: i2p2www/pages/site/faq.html:804
 #, python-format
 msgid "Select the %(filename)s file"
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:665
+#: i2p2www/pages/site/faq.html:805
 msgid "Click \"Reseed from File\""
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:667
+#: i2p2www/pages/site/faq.html:807
 #, python-format
 msgid "Check the <a href=\"%(url)s\">log</a> for the following message:"
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:671
+#: i2p2www/pages/site/faq.html:811
 msgid "Sharing a reseed file"
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:672
+#: i2p2www/pages/site/faq.html:812
 msgid ""
 "For trusted friends you can use your local I2P router to give them a jump"
 " start:"
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:675
+#: i2p2www/pages/site/faq.html:815
 msgid "Under \"Create Reseed File\" click \"Create reseed file\""
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:676
+#: i2p2www/pages/site/faq.html:816
 #, python-format
 msgid "Securely send the %(filename)s file to your friend"
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:678
+#: i2p2www/pages/site/faq.html:818
 msgid ""
 "Do not reveal this file in any case to unknown users, since it contains\n"
 "sensitive private data (100 RouterInfo) from your own I2P router! In "
@@ -2944,39 +3577,42 @@ msgid ""
 "sparingly (< 2 per week)."
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:686
+#: i2p2www/pages/site/faq.html:826
 msgid " General guidelines for manual reseeding of I2P "
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:688
+#: i2p2www/pages/site/faq.html:828
 msgid ""
 "Do not publicly publish the reseed file or share these files with a "
 "friend of a friend!"
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:689
+#: i2p2www/pages/site/faq.html:829
 msgid "This file should be used only for a very limited number of friends (< 3)!"
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:690
+#: i2p2www/pages/site/faq.html:830
 msgid "The file is valid only a few days (< 20)!"
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:696
+#: i2p2www/pages/site/faq.html:839
 msgid ""
-"Unless an outproxy has been specifically set up for the service you want "
-"to connect to, this cannot be done. \n"
-"There are only three types of outproxies running right now: HTTP, HTTPS, "
-"and email. Note that there is no SOCKS outproxy. \n"
-"If this type of service is required, we recommend that you use Tor. \n"
-"\n"
-"Please be aware that the Tor project <a "
-"href=\"https://blog.torproject.org/bittorrent-over-tor-isnt-good-"
-"idea\">recommends against using BitTorrent over Tor</a>, \n"
-"as there are serious anonymity-related issues associated with doing so."
+"I2P is primarily not intended, nor designed, to be used as a proxy to the"
+" regular internet. \n"
+"With that said, there are services which are provided by volunteers that "
+"act as proxies to non-private internet based content - these are referred"
+" to as \"outproxies\" on the I2P network. \n"
+"There is an outproxy configured by default in I2P's HTTP client tunnel - "
+"false.i2p. \n"
+"While this service does currently exist, there is no guarantee that it "
+"will always be there as it is not an official service provided by the I2P"
+" project. \n"
+"If your main requirement from an anonymous network is the ability to "
+"access non-private internet resources, we would recommend using <a "
+"href=\"https://www.torproject.org/\">Tor</a>."
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:710
+#: i2p2www/pages/site/faq.html:852
 msgid ""
 "Within I2P, there is no requirement to use HTTPS. \n"
 "    All traffic is encrypted end-to-end, any further encryption, e.g. "
@@ -2990,7 +3626,7 @@ msgid ""
 "enable HTTPS access."
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:719
+#: i2p2www/pages/site/faq.html:861
 msgid ""
 "FTP is not supported for technical reasons.\n"
 "\n"
@@ -3009,19 +3645,19 @@ msgid ""
 "operational at any given time."
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:736
+#: i2p2www/pages/site/faq.html:876
 msgid "My router is using a large amount of CPU, what can I do about this?"
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:737
+#: i2p2www/pages/site/faq.html:877
 msgid "There are many possible causes of high CPU usage. Here is a checklist:"
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:742
+#: i2p2www/pages/site/faq.html:882
 msgid "Java Runtime Environment"
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:743
+#: i2p2www/pages/site/faq.html:883
 msgid ""
 "Try to use either OpenJDK or Sun/Oracle Java if it's available for your "
 "system. \n"
@@ -3030,22 +3666,22 @@ msgid ""
 "Performance tends to suffer with other implementations of java."
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:748
+#: i2p2www/pages/site/faq.html:888
 msgid "File sharing applications, e.g. BitTorrent"
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:749
+#: i2p2www/pages/site/faq.html:889
 msgid ""
 "Are you running a BitTorrent client over I2P? Try reducing the number of "
 "torrents, the bandwidth limits,\n"
 "or try turning it off completely to see if that helps."
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:755
+#: i2p2www/pages/site/faq.html:895
 msgid "High bandwidth settings"
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:756
+#: i2p2www/pages/site/faq.html:896
 msgid ""
 "Are your bandwidth limits set too high? It is possible that too much "
 "traffic is going through your I2P router and it is overloaded. \n"
@@ -3053,21 +3689,21 @@ msgid ""
 "<a href=\"http://localhost:7657/config\">configuration</a> page."
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:761
+#: i2p2www/pages/site/faq.html:901
 msgid "I2P Version"
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:762
+#: i2p2www/pages/site/faq.html:902
 msgid ""
 "Make sure that you're running the latest version of I2P to get the "
 "benefits of increased performance and bug fixes."
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:767
+#: i2p2www/pages/site/faq.html:907
 msgid "Memory allocation"
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:768
+#: i2p2www/pages/site/faq.html:908
 msgid ""
 "Has enough memory been set aside for use by I2P? Look at the memory graph"
 " on <a href=\"http://localhost:7657/graphs\">the graphs page</a> \n"
@@ -3077,23 +3713,23 @@ msgid ""
 "<code>wrapper.config</code>."
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:775
+#: i2p2www/pages/site/faq.html:915
 #, python-format
 msgid "Bursts of high-usage vs. constant 100% usage"
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:776
+#: i2p2www/pages/site/faq.html:916
 msgid ""
 "Is the CPU usage simply higher than you would like, or is it pegged at "
 "100&#37; for a long time?\n"
 "If it is pegged, this could be a bug. Look in the logs for clues."
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:782
+#: i2p2www/pages/site/faq.html:922
 msgid "Java-related"
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:783
+#: i2p2www/pages/site/faq.html:923
 #, python-format
 msgid ""
 "You may be using the Java-based BigInteger library instead of the native "
@@ -3103,11 +3739,11 @@ msgid ""
 "diagnosing, building, and testing methods."
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:789
+#: i2p2www/pages/site/faq.html:929
 msgid "Participating tunnels"
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:790
+#: i2p2www/pages/site/faq.html:930
 msgid ""
 "If your native jbigi library is working fine, the biggest user of CPU may"
 " be routing traffic for participating tunnels. \n"
@@ -3120,16 +3756,7 @@ msgid ""
 "page."
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:802
-msgid ""
-"New installations of I2P carry out the reseeding process automatically, "
-"as well as when the number of known peers falls to a drastically low "
-"value. \n"
-"If you need to carry out a reseed of your router, please see the <a "
-"href=\"#manual_reseed\">reseed instructions</a>."
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:810
+#: i2p2www/pages/site/faq.html:942
 msgid ""
 "If your router has 10 or more active peers, everything is fine. \n"
 "The router should maintain connections to a few peers at all times. \n"
@@ -3141,7 +3768,7 @@ msgid ""
 "href=\"http://localhost:7657/config\">http://localhost:7657/config</a>"
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:821
+#: i2p2www/pages/site/faq.html:953
 msgid ""
 "No, there isn't anything wrong. \n"
 "This is normal behavior. \n"
@@ -3155,7 +3782,7 @@ msgid ""
 " may or may not be rebuilt through your router."
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:833
+#: i2p2www/pages/site/faq.html:965
 msgid ""
 "The encryption and routing within the I2P network adds a substantial "
 "amount of overhead and limits bandwidth. \n"
@@ -3163,7 +3790,7 @@ msgid ""
 "We can try to clarify this with the aid of a diagram:"
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:841
+#: i2p2www/pages/site/faq.html:973
 msgid ""
 "In this diagram, the path that some I2P traffic takes as it travels "
 "through the network is traced. \n"
@@ -3175,7 +3802,7 @@ msgid ""
 "'Q_1', 'R'_1, 'X_1', 'Y_1' and 'Z_1'."
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:847
+#: i2p2www/pages/site/faq.html:979
 msgid ""
 "The boxes labelled 'P', 'Q' and 'R' represent an outbound tunnel for A "
 "while the boxes labelled 'X_1', 'Y_1', 'Z_1' represent an outbound tunnel"
@@ -3188,7 +3815,7 @@ msgid ""
 " a pair of hops as well as example latencies."
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:854
+#: i2p2www/pages/site/faq.html:986
 msgid ""
 "When both client and server are using 3-hop tunnels throughout, a total "
 "of 12 other I2P routers are involved in relaying traffic. \n"
@@ -3198,7 +3825,7 @@ msgid ""
 "Similarly, 6 peers relay traffic from the server to back to the client."
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:860
+#: i2p2www/pages/site/faq.html:992
 msgid ""
 "First, we can consider latency - the time that it takes for a request "
 "from a client to traverse the I2P network, reach the the server and "
@@ -3206,14 +3833,14 @@ msgid ""
 "Adding up all latencies we see that:"
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:874
+#: i2p2www/pages/site/faq.html:1006
 msgid ""
 "The total round-trip time in our example adds up to 740 ms - certainly "
 "much higher than what one would normally see while browsing regular "
 "internet websites."
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:878
+#: i2p2www/pages/site/faq.html:1010
 msgid ""
 "Second, we can consider available bandwidth. \n"
 "This is determined through the slowest link between hops from the client "
@@ -3230,7 +3857,7 @@ msgid ""
 " 'X_1' and 'Q_1' &amp; 'P_1'."
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:886
+#: i2p2www/pages/site/faq.html:1018
 msgid ""
 "We recommend increasing your bandwidth limits. \n"
 "This helps the network by increasing the amount of available bandwidth "
@@ -3242,7 +3869,7 @@ msgid ""
 "your ISP, and adjust your settings accordingly."
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:893
+#: i2p2www/pages/site/faq.html:1025
 msgid ""
 "We also recommend setting a sufficient amount of shared bandwidth - this "
 "allows for participating tunnels to be routed through your I2P router. \n"
@@ -3250,7 +3877,7 @@ msgid ""
 "network and improves your transfer speeds."
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:898
+#: i2p2www/pages/site/faq.html:1030
 #, python-format
 msgid ""
 "I2P is a work in progress. Lots of improvements and fixes are being "
@@ -3260,112 +3887,35 @@ msgid ""
 "release</a>."
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:904
-msgid ""
-"In <code>wrapper.log</code> I see an error that states \"<code>Protocol "
-"family unavailable</code>\" when loading the Router Console"
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:906
-msgid ""
-"Often this error will occur with any network enabled java software on "
-"some systems that are configured to use IPv6 by default. There are a few "
-"ways to solve this:"
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:911
-msgid ""
-"On Linux based systems, you can <code>echo 0 > "
-"/proc/sys/net/ipv6/bindv6only</code>"
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:913
-msgid "Look for the following lines in <code>wrapper.config</code>."
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:917
-msgid ""
-"If the lines are there, uncomment them by removing the \"#\"s. If the "
-"lines are not there, add them without the \"#\"s."
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:920
-msgid ""
-"Another option would be to remove the <strong>::1</strong> from "
-"<code>~/.i2p/clients.config</code>"
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:924
-msgid ""
-"<strong>WARNING</strong>: For any changes to <code>wrapper.config</code> "
-"to take effect, you must completely\n"
-"stop the router and the wrapper. Clicking <em>Restart</em> on your\n"
-"router console will NOT reread this file! You must\n"
-"click <em>Shutdown</em>, wait 11 minutes, then start I2P."
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:934
-#, python-format
-msgid ""
-"If you consider every eepsite that has ever been created, yes, most of "
-"them are down.\n"
-"People and eepsites come and go.\n"
-"A good way to get started in I2P is check out a list of eepsites that are"
-" currently up.\n"
-"<a href=\"%(eepstatus)s\">%(eepstatus)s</a> tracks active eepsites."
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:942
-msgid "Why is I2P listening on port 32000?"
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:944
-msgid ""
-"The Tanuki java service wrapper that we use opens this port &mdash;bound "
-"to localhost&mdash; in order to communicate with software running inside "
-"the JVM. \n"
-"When the JVM is launched it is given a key so it can connect to the "
-"wrapper. \n"
-"After the JVM establishes its connection to the wrapper, the wrapper "
-"refuses any additional connections."
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:949
-msgid ""
-"More information can be found in the <a "
-"href=\"http://wrapper.tanukisoftware.com/doc/english/prop-"
-"port.html\">wrapper documentation</a>."
-msgstr ""
-
-#: i2p2www/pages/site/faq.html:956
+#: i2p2www/pages/site/faq.html:1038
 msgid ""
 "You may report any bugs/issues that you encounter on our bugtracker, "
-"which is available over both clearnet and I2P. \n"
-"We have a discussion forum, also available on I2P and clearnet. You can "
-"join our IRC channel as well: \n"
+"which is available over both non-private internet and I2P. \n"
+"We have a discussion forum, also available on I2P and non-private "
+"internet. You can join our IRC channel as well: \n"
 "either through our IRC network, IRC2P, or on Freenode."
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:962
+#: i2p2www/pages/site/faq.html:1044
 msgid "Our Bugtracker:"
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:964
-msgid "Clearnet:"
+#: i2p2www/pages/site/faq.html:1046
+msgid "Non-private internet:"
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:965
+#: i2p2www/pages/site/faq.html:1047
 msgid "On I2P:"
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:967
+#: i2p2www/pages/site/faq.html:1049
 msgid "Our forums:"
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:968
+#: i2p2www/pages/site/faq.html:1050
 msgid ""
-"You may paste any interesting logs to a paste service such as the "
-"clearnet services listed on the \n"
+"You may paste any interesting logs to a paste service such as the non-"
+"private internet services listed on the \n"
 "  <a href=\"https://github.com/PrivateBin/PrivateBin/wiki/PrivateBin-"
 "Directory\">PrivateBin Wiki</a>, or an I2P paste service such as this \n"
 "  <a href=\"http://paste.crypthost.i2p\">PrivateBin instance</a> or this"
@@ -3374,11 +3924,11 @@ msgid ""
 " follow up on IRC in #i2p<"
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:972
+#: i2p2www/pages/site/faq.html:1054
 msgid "Join #i2p-dev Discuss with the developers on IRC"
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:976
+#: i2p2www/pages/site/faq.html:1058
 msgid ""
 "Please include relevant information from the router logs page which is "
 "available at: \n"
@@ -3389,7 +3939,7 @@ msgid ""
 "displayed on the page."
 msgstr ""
 
-#: i2p2www/pages/site/faq.html:988
+#: i2p2www/pages/site/faq.html:1070
 #, python-format
 msgid ""
 "Great! Find us on IRC:\n"
@@ -3417,73 +3967,105 @@ msgid ""
 msgstr ""
 
 #: i2p2www/pages/site/index.html:8
-msgid "What does I2P do for you?"
+msgid "Welcome to the Invisible Internet"
 msgstr ""
 
 #: i2p2www/pages/site/index.html:9
 msgid ""
-"The I2P network provides strong privacy protections for\n"
-"    communication over the Internet. Many activities that would risk your"
-"\n"
-"    privacy on the public Internet can be conducted anonymously inside "
-"I2P.\n"
+"The Invisible Internet is a privacy by design, people-powered network. It"
+" is a truly free and anonymizing Internet alternative. Get I2P.\n"
 "  "
 msgstr ""
 
-#: i2p2www/pages/site/index.html:13
+#: i2p2www/pages/site/index.html:11
 #, python-format
 msgid "Get I2P %(version)s"
 msgstr ""
 
-#: i2p2www/pages/site/index.html:17
+#: i2p2www/pages/site/index.html:15
 msgid "What is I2P?"
 msgstr ""
 
-#: i2p2www/pages/site/index.html:19
+#: i2p2www/pages/site/index.html:17
 msgid ""
-"I2P is an anonymous network built on top of the internet.\n"
-"        It allows users to create and access content and build online\n"
-"        communities on a network that is both distributed and dynamic. It"
-" is\n"
-"        intended to protect communication and resist monitoring by third "
-"parties\n"
-"        such as ISPs.\n"
-"      "
+"\n"
+"        The Invisible Internet Project (I2P) is a fully encrypted private"
+" network layer.\n"
+"        It protects your activity and location. Every day people use the "
+"network to connect\n"
+"        with people without worry of being tracked or their data being "
+"collected. In some\n"
+"        cases people rely on the network when they need to be discrete or"
+" are doing sensitive work."
+msgstr ""
+
+#: i2p2www/pages/site/index.html:23
+msgid "I2P Cares About Privacy"
 msgstr ""
 
 #: i2p2www/pages/site/index.html:25
 msgid ""
-"Aside from anonymizing traffic within the network, I2P\n"
-"        functions with the same capabilities as the Internet, however its"
-" design\n"
-"        and decentralization create a censorship resistant environment "
-"for the\n"
-"        free-flow of information.\n"
-"      "
+"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. 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."
 msgstr ""
 
-#: i2p2www/pages/site/index.html:30
-msgid ""
-"Mirrored sites hosted on the network allow access to news\n"
-"        outlets and other resources in areas where information is being "
-"filtered\n"
-"        or denied. Online communities wishing to organize in\n"
-"        restrictive environments can do so anonymously to mitigate "
-"political\n"
-"        threat and protect each other.\n"
-"      "
-msgstr ""
-
-#: i2p2www/pages/site/index.html:37
+#: i2p2www/pages/site/index.html:27
 msgid "Read more&hellip;"
 msgstr ""
 
-#: i2p2www/pages/site/index.html:43
+#: i2p2www/pages/site/index.html:32
+msgid "Peer-to-Peer"
+msgstr ""
+
+#: i2p2www/pages/site/index.html:33
+msgid ""
+"The network is people powered . Peers make a portion of their resources, "
+"particularly bandwidth, available to other network participants. This "
+"allows the network to function with relying on centralized servers."
+msgstr ""
+
+#: i2p2www/pages/site/index.html:33
+msgid "Learn more about the Protocol Stack"
+msgstr ""
+
+#: i2p2www/pages/site/index.html:35
+msgid "Privacy and Security By Design"
+msgstr ""
+
+#: i2p2www/pages/site/index.html:36
+msgid ""
+"I2P has created transport protocols that resist DPI censorship, and "
+"continuously improves its end to end encryption."
+msgstr ""
+
+#: i2p2www/pages/site/index.html:37
+msgid "Read the I2P Transport Overview"
+msgstr ""
+
+#: i2p2www/pages/site/index.html:39
+msgid "Built For Communication"
+msgstr ""
+
+#: i2p2www/pages/site/index.html:40
+msgid "I2P has an application layer with easy to use "
+msgstr ""
+
+#: i2p2www/pages/site/index.html:40
+msgid "APIs for creating your own privacy - aware apps."
+msgstr ""
+
+#: i2p2www/pages/site/index.html:44
 msgid "News &amp; Updates"
 msgstr ""
 
-#: i2p2www/pages/site/index.html:47
-msgid "Conferences Calendar 2020"
+#: i2p2www/pages/site/links.html:2
+msgid "Links"
 msgstr ""
 
 #: i2p2www/pages/site/links.html:4
diff --git a/pots/research.pot b/pots/research.pot
index e21655d0..30cfcb0d 100644
--- a/pots/research.pot
+++ b/pots/research.pot
@@ -1,14 +1,14 @@
 # Translations template for I2P.
-# Copyright (C) 2020 ORGANIZATION
+# Copyright (C) 2021 ORGANIZATION
 # This file is distributed under the same license as the I2P project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2020.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2021.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P website\n"
 "Report-Msgid-Bugs-To: http://trac.i2p2.de\n"
-"POT-Creation-Date: 2020-11-16 17:04+0000\n"
+"POT-Creation-Date: 2021-04-26 14:51+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -346,8 +346,8 @@ msgstr ""
 #: i2p2www/pages/site/research/vrp.html:15
 msgid ""
 "As i2p is an open-source community, many volunteers and development team "
-"members run their own EepSites as well as public (“clearnet”) domains. "
-"These\n"
+"members run their own I2P Sites as well as public (“non-private "
+"internet”) domains. These\n"
 "sites/servers are NOT in the scope of the vulnerability assessment / "
 "response process, only the underlying code of i2p is."
 msgstr ""