diff --git a/i2p2www/pages/site/browser/_front.html b/i2p2www/pages/site/browser/_front.html
deleted file mode 100644
index 847d9712a5a18b091cc1f1bac3396f0b3136fd0a..0000000000000000000000000000000000000000
--- a/i2p2www/pages/site/browser/_front.html
+++ /dev/null
@@ -1,112 +0,0 @@
-{% extends "global/layout.html" %}
-{% block title %}{% trans bname=browser_name(), bsuff=browser_postname()%}{{ bname }} {{ bsuff }} {% endtrans %}{% endblock %}
-{% block content_nav %}
-<ol>
-<li style="list-style: none; display: inline">
-<h4>{{ _('Navigation') }}</h4>
-</li>
-<li style="list-style: none;">{% trans intro=get_url('browser_intro') %}<a href="{{ intro }}">About</a>{% endtrans %}</li>
-<li style="list-style: none;">{% trans download=get_url('browser_download') %}<a href="{{ download }}">Download</a>{% endtrans %}</li>
-<!--<li style="list-style: none;">{% trans troubleshooting=get_url('browser_troubleshooting') %}<a href="{{ troubleshooting }}">Troubleshooting</a>{% endtrans %}</li>-->
-<!--<li style="list-style: none;">{% trans known_issues=get_url('browser_known_issues') %}<a href="{{ known_issues }}">Known Issues</a>{% endtrans %}</li>-->
-<li style="list-style: none;">{% trans releasenotes=get_url('browser_releasenotes') %}<a href="{{ releasenotes }}">Release Notes</a>{% endtrans %}</li>
-<li style="list-style: none;">{% trans roadmap=get_url('browser_roadmap') %}<a href="{{ roadmap }}">Road Map</a>{% endtrans %}</li>
-<li style="list-style: none;">{% trans develop=get_url('browser_develop') %}<a href="{{ develop }}">Get Involved</a>{% endtrans %}</li>
-<li style="list-style: none;">{% trans donate=site_url('get-involved/donate') %}<a href="{{ donate }}">Donate</a>{% endtrans %}</li>
-
-</ol>
-{% endblock %}
-
-
-{% macro browser_download(name, icon, dlink) -%}
-<div class="browser-front-download">
- <div class="download-details">
- <!--<img class="browser-clip-circle" src="{{ url_for('static', filename=icon) }}" alt="{{ name }}" title="{{ name }}" />-->
- <a class="get-i2p-browser" href="{{ dlink }}">{{ caller() }}</a>
-
- {% trans download=get_url('browser_download'), bname=browser_name() %}<a href="{{ download }}">Click here to download {{ bname }} in another language or platform</a>{% endtrans %}
- </div>
-</div>
-{%- endmacro %}
-
-
-{% block content %}
-<section class="browser-front-wrapper">
- <h1>{% trans bname=browser_name(), bsuff=browser_postname()%}{{ bname }} {{ bsuff }}{% endtrans %}</h1>
-</section>
-
-<section class="browser-onboarding">
- <div class="row">
- <div class="row-image">
- <img src="{{ url_for('static', filename='images/browser/routing.svg') }}" />
- </div>
- <div class="row-text">
- <h4>{% trans bname=browser_name() %} {{ bname }} {% endtrans %}</h4>
- <p>
- <strong>{% trans bname=browser_name(), bsuff=browser_postname() %}{{ bname }} {{ bsuff }} is on hiatus for the
- next six months.</strong> I2P Browser was originally a 6 month project, which we have brought as far as we can
- without reevaluating the resources required to take it further. The project roadmap goals for the next
- 6 months will focus on modernizing the applications that were highlighted in the I2P Browser once the
- router was bundled. Browser development will potentially resume mid year. This page will be left up for
- informational purposes.{% endtrans %}
- </p>
- <p>
- {% trans %}Thank you to everyone who tested the Beta releases - it is obvious that there is a need for this product. We encourage everyone
- to continue with feedback for the I2P Browser.{% endtrans %}
- </p>
- {% trans %}You may want to consider one of the following alternatives:{% endtrans %}
- </p>
- <ul>
- <li> <strong><a href="/firefox">{% trans %}I2P Firefox Profile for Windows:{% endtrans %}</a></strong>
- {% trans %} If you are using Windows, the recommended way of accessing I2P is using the Firefox profile.{% endtrans %}
- </li>
- <li> <strong><a href="placeholder">{% trans %}I2P in Private Browsing Mode for Firefox:{% endtrans %}</a></strong>
- {% trans %} This cross-platform webextension configures an isolated contextual identity for using I2P and for
- each I2P application. It was designed to work with or without I2P Browser.{% endtrans %}
- </li>
- </ul>
- <p>
- {% trans bname=browser_name(), bsuff=browser_postname() %}Old versions of {{ bname }} {{ bsuff }} are
- still available from the link below. <strong>They should be regarded as unsafe to use, and are only here for
- historical and experimental purposes.</strong>
- {% endtrans %}
- </p>
- </div>
- </div>
-</section>
-
-<section class="browser-front-wrapper">
-{%- if detected_os == 'windows' -%}
- {%- set version = browser_version() -%}
- {%- set bname = browser_name()-%}
- {%- set name = 'Windows' -%}
- {%- set icon = 'images/browser/garlic.svg' -%}
- {%- set link = 'https://download.i2p2.de/experimental/i2pbrowser-'+version+'/windows64/i2pbrowser-install-win64-2.0-'+''+version+''+'_en-US.exe' -%}
- {% call browser_download(name, icon, link) %}
- Get {{ bname }} for Windows
- {% endcall %}
-
-{%- elif detected_os == 'macosx' -%}
- {%- set version = browser_version() -%}
- {%- set bname = browser_name()-%}
- {%- set name = 'Mac OS X' -%}
- {%- set icon = 'images/browser/garlic.svg' -%}
- {%- set link = 'https://download.i2p2.de/experimental/i2pbrowser-'+version+'/macosx64/I2PBrowser-2.0-'+version+'-osx64_en-US.dmg' -%}
- {% call browser_download(name, icon, link) %}
- Get {{ bname }} for Mac OS X
- {% endcall %}
-
-{%- elif detected_os == 'linux' -%}
- {%- set version = browser_version() -%}
- {%- set bname = browser_name()-%}
- {%- set name = 'Linux' -%}
- {%- set icon = 'images/browser/garlic.svg' -%}
- {%- set link = 'https://download.i2p2.de/experimental/i2pbrowser-'+version+'/linux64/i2p-browser-linux64-2.0-'+version+'_en-US.tar.xz' -%}
- {% call browser_download(name, icon, link) %}
- Get {{ bname }} for Linux x64
- {% endcall %}
-
-{%- endif -%}
-</section>
-
-{% endblock %}
diff --git a/i2p2www/pages/site/browser/develop.html b/i2p2www/pages/site/browser/develop.html
deleted file mode 100644
index 1c41d49806cd9b38a43315cb72b71c61bbe5b62f..0000000000000000000000000000000000000000
--- a/i2p2www/pages/site/browser/develop.html
+++ /dev/null
@@ -1,76 +0,0 @@
-{% extends "global/layout.html" %}
-{% block title %}{% trans bname=browser_name()%}{{ bname }}: Get Involved {% endtrans %}{% endblock %}
-{% block content_nav %}
-<ol>
-<li style="list-style: none; display: inline">
-<h4>{{ _('Navigation') }}</h4>
-</li>
-<li style="list-style: none;">{% trans browser_main=get_url('browser_frontpage') %}<a href="{{ browser_main }}">Back to browser front page</a>{% endtrans %}</li>
-</ol>
-{% endblock %}
-
-
-{% block content %}
-
-<h1>{% trans %}Get Involved{% endtrans %}</h1>
-
-{% trans bname=browser_name() %}
-<p>
-<strong>I2P Browser is on a 6-month hiatus, to re-evaluate the resources required
-to sustain it.</strong> The code is available to the community, and those of us
-who can will help community members who ask, but we are not working on it
-officially at this time.
-
-Like other browsers, {{ bname }} is actually built from a group of tools that
-work together to start and stop applications, configure settings, and secure the
-user against attacks.
-</p>
-{% endtrans %}
-
-<h2>{% trans %}Source Code{% endtrans %}</h2>
-
-<ul>
- <li>
- <a href="https://github.com/mikalv/i2p-browser-build-scripts">{% trans %}Build Scripts(Github):{% endtrans %}</a>
- {% trans %}Start here to build from source. This is the collection of build scripts that
- gathers the source code for all the components and executes each step of the
- build process.{% endtrans %}
- </li>
- <li>
- <a href="https://github.com/i2p/i2p-browser">{% trans %}Firefox Source Code(Github):{% endtrans %}</a>
- {% trans %}This is the source code of our fork of Firefox LTS, which is in turn based on the
- work of the Tor Browser team and modified for use with I2P.{% endtrans%}
- </li>
- <li>
- <a href="https://github.com/i2p/i2pbutton">{% trans %}I2PButton Browser Extension(Github):{% endtrans %}</a>
- {% trans %} Start here to experiment with your changes. Many of our essential features
- are facilitated by this plugin.
- {% endtrans %}
- </li>
-</ul>
-
-<h2>{% trans %}Essential Documentation{% endtrans %}</h2>
-
-<ul>
- <li>
- <a href="http://{{ i2pconv('trac.i2p2.i2p') }}//wiki/I2P_Browser_develop_n_hacks">{% trans bname=browser_name() %}{{ bname }} Development:{% endtrans %}</a>
- {% trans bname=browser_name() %}Meeh's notes on developing and porting features to the {{ bname }}{% endtrans %}.
- </li>
-</ul>
-
-<h2>{% trans %}Contact Us{% endtrans %}</h2>
-
-<ul>
- <li>
- <a href="http://{{ i2pconv('trac.i2p2.i2p') }}">{% trans %}Bug Tracker{% endtrans %}</a>
- {% trans %}Should you wish to communicate with us on a service other than Github,
- you may contact us via the I2P Bug Tracker.{% endtrans %}
- </li>
- <li>
- <a href="http://{{ i2pconv('lists.i2p') }}/hyperkitty/list/i2p-browser-dev@lists.i2p.email/2019/8/">{% trans %}Mailing List{% endtrans %}</a>
- {% trans bname=browser_name() %} We also have a public mailing list for discussion of the {{ bname }}.{% endtrans %}
- </li>
-</ul>
-
-{% endblock %}
-
diff --git a/i2p2www/pages/site/browser/donate.html b/i2p2www/pages/site/browser/donate.html
deleted file mode 100644
index 3c727fca409caea2d174d7cf562b04cd40064704..0000000000000000000000000000000000000000
--- a/i2p2www/pages/site/browser/donate.html
+++ /dev/null
@@ -1,21 +0,0 @@
-{% extends "global/layout.html" %}
-{% block title %}{{ _('The I2P Browser') }}{% endblock %}
-{% block content_nav %}
-<ol>
-<li style="list-style: none; display: inline">
-<h4>{{ _('Navigation') }}</h4>
-</li>
-<li style="list-style: none;">{% trans browser_main=get_url('browser_frontpage') %}<a href="{{ browser_main }}">Back to browser front page</a>{% endtrans %}</li>
-</ol>
-{% endblock %}
-
-
-{% block content %}
-
-<h1>{% trans %}Donate{% endtrans %}</h1>
-
-<a href="{{ site_url('get-involved/donate') }}">You can support all I2P development {{ _('here') }}
-BTC, LTC, ETH, ANC, XMR and PayPal are accepted.</a>
-
-{% endblock %}
-
diff --git a/i2p2www/pages/site/browser/download.html b/i2p2www/pages/site/browser/download.html
deleted file mode 100644
index 86ef753c4e50d4def0518b9ecc08b3ed959990bc..0000000000000000000000000000000000000000
--- a/i2p2www/pages/site/browser/download.html
+++ /dev/null
@@ -1,129 +0,0 @@
-{% extends "global/layout.html" %}
-{%- from "downloads/macros" import package_outer with context -%}
-{% block title %}{% trans bname=browser_name() %}{{ bname }} Downloads {% endtrans %}{% endblock %}
-
-{% block content_nav %}
-<ol>
- <li style="list-style: none; display: inline">
- <h4>{{ _('Navigation') }}</h4>
- </li>
- <li style="list-style: none;">{% trans browser_main=get_url('browser_frontpage') %}<a href="{{ browser_main }}">Back to browser front page</a>{% endtrans %}</li>
- <li style="list-style: none; display: inline">
- <h4>{{ _('Platforms') }}</h4>
- </li>
- <li style="list-style: none;"><a href="#windows">{% trans %}Windows{% endtrans %}</a></li>
- <li style="list-style: none;"><a href="#macosx">{% trans %}Mac OS X{% endtrans %}</a></li>
- <li style="list-style: none;"><a href="#linux">{% trans %}Linux{% endtrans %}</a></li>
-</ol>
-{% endblock %}
-
-
-{% block content %}
-
-
-<section id="download">
- <h1>{% trans bname=browser_name() %}{{ bname }} Downloads {% endtrans %}</h1>
-
-
- <p>{% trans bname=browser_name(), bsuff=browser_postname(), bvers=browser_version() -%}
- <strong> The {{ bname }} {{ bsuff }} is on hiatus for the next six months while the resources
- required to maintain it are re-evaluated.</strong> Downloads are still available for
- archival and testing purposes.
- {%- endtrans %}</p>
- <p>{% trans bname=browser_name(), bsuff=browser_postname(), bvers=browser_version() -%}
- The {{ bname }} {{ bsuff }} is a fork of TorBrowser/Mozilla Firefox ESR
- that comes preconfigured to use I2P securely.
- {%- endtrans %}</p>
- <p>{% trans -%}
- Builds for Linux, Windows and Mac OS X are available. We provide
- binaries for 64bit systems.
- {%- endtrans %}</p>
- {% trans bname=browser_name(), bsuff=browser_postname(), bvers=browser_version() %}
- Status: {{ bvers }} {% endtrans %}
- <ul>
- <li><a href="https://github.com/i2p/i2p-browser">Firefox Branch</a></li>
- <li><a href="https://github.com/mikalv/i2p-browser-build-scripts">Build Scripts</a></li>
- <li><a href="https://github.com/i2p/i2pbutton">Browser Extension</a></li>
- </ul>
-
- {%- set version = browser_version() -%}
- {%- set name = 'Windows' -%}
- {%- set icon = 'images/download/windows.png' -%}
- {%- set filename = 'i2pbrowser-install-win64-2.0-{{ version }}_en-US.exe' -%}
- {%- set filename = browser_filename('win64','2.0',version,'en-US','.exe') -%}
- {%- set hash = '71f2baad93c1309ee744951e5296b2eb17f0fcc92d45a3149cae5393527ebea3' -%}
- {% call package_outer('windows', name, icon) %}
- <div class="file">
- <h3 id="windows">Windows</h3>
- <a class="default"
- href="https://download.i2p2.de/experimental/i2pbrowser-{{ version }}/windows64/i2pbrowser-install-win64-2.0-{{ version }}_en-US.exe">
- <span class="name">{{ filename }}</span>
- </a>
- </div>
- <div class="meta">
- <div class="hash">
- <code>{{ hash }}</code>
- </div>
- </div>
- <p>{% trans -%}
- The default is to download the English version, however it's also built for some other languages,
- please check out the link below if you want to see if we have the browser in your language.
- {%- endtrans %}</p>
- <a
- href="https://download.i2p2.de/experimental/i2pbrowser-{{ version }}/windows64/">https://download.i2p2.de/experimental/i2pbrowser-{{ version }}/windows64/</a>
- {% endcall %}
-
- {%- set version = browser_version() -%}
- {%- set name = 'Mac OS X' -%}
- {%- set icon = 'images/download/mac-osx.png' -%}
- {%- set filename = browser_filename('osx64','2.0',version,'en-US','.dmg') -%}
- {%- set hash = '99b2a9b917fb8f66e192b4950116f63f6b386fe76f68d78b014ade2f05d18e7f' -%}
- {% call package_outer('mac-osx', name, icon) %}
- <div class="file">
- <h3 id="macosx">Mac OS X</h3>
- <a class="default"
- href="https://download.i2p2.de/experimental/i2pbrowser-{{ version }}/macosx64/I2PBrowser-2.0-{{ version }}-osx64_en-US.dmg">
- <span class="name">{{ filename }}</span>
- </a>
- </div>
- <div class="meta">
- <div class="hash">
- <code>{{ hash }}</code>
- </div>
- </div>
- <p>{% trans -%}
- The default is to download the English version, however it's also built for some other languages,
- please check out the link below if you want to see if we have the browser in your language.
- {%- endtrans %}</p>
- <a
- href="https://download.i2p2.de/experimental/i2pbrowser-{{ version }}/macosx64/">https://download.i2p2.de/experimental/i2pbrowser-{{ version }}/macosx64/</a>
- {% endcall %}
-
- {%- set version = browser_version() -%}
- {%- set name = 'Linux' -%}
- {%- set icon = 'images/download/freebsd-tux.png' -%}
- {%- set filename = browser_filename('linux64','2.0',version,'en-US','.tar.gz') -%}
- {%- set hash = '67664d298216450921c5c9638d2c6b9ce0c69aaeb2d177be23440d33e98fdbcf' -%}
- {% call package_outer('freebsd-tux', name, icon) %}
- <div class="file">
- <h3 id="linux">Linux</h3>
- <a class="default"
- href="https://download.i2p2.de/experimental/i2pbrowser-{{ version }}/linux64/i2p-browser-linux64-2.0-{{ version }}_en-US.tar.xz">
- <span class="name">{{ filename }}</span>
- </a>
- </div>
- <div class="meta">
- <div class="hash">
- <code>{{ hash }}</code>
- </div>
- </div>
- <p>{% trans -%}
- The default is to download the English version, however it's also built for some other languages,
- please check out the link below if you want to see if we have the browser in your language.
- {%- endtrans %}</p>
- <a
- href="https://download.i2p2.de/experimental/i2pbrowser-{{ version }}/linux64">https://download.i2p2.de/experimental/i2pbrowser-{{ version }}/linux64</a>
- {% endcall %}
-</section>
-
-{% endblock %}
diff --git a/i2p2www/pages/site/browser/faq.html b/i2p2www/pages/site/browser/faq.html
deleted file mode 100644
index 3d9215e306a067f2e2b573456ce1f11cf0a0a9fb..0000000000000000000000000000000000000000
--- a/i2p2www/pages/site/browser/faq.html
+++ /dev/null
@@ -1,134 +0,0 @@
-{% extends "global/layout.html" %}
-{% block title %}{% trans bname=browser_name() %}{{ bname }} Downloads {% endtrans %}{% endblock %}
-{% block content_nav %}
-<ol>
-
- <li style="list-style: none; display: inline">
- <h4>{{ _('Navigation') }}</h4>
- </li>
- <li style="list-style: none;">{% trans browser_main=get_url('browser_frontpage') %}<a href="{{ browser_main }}">Back to browser front page</a>{% endtrans %}</li>
- <li style="list-style: none; display: inline">
- <h4>{{ _('Browser FAQs') }}</h4>
- </li>
- <li><a href="#what">{% trans %}What is it and how does it work?{% endtrans %}</a></li>
- <li><a href="#why">{% trans %}Why did we make it?{% endtrans %}</a></li>
- <li><a href="#the-problem">{% trans %}Who is it for, what problem does it solve?{% endtrans %}</a></li>
- <li><a href="#spec-requirements">{% trans %}What are the requirements/ specs to use it?{% endtrans %}</a></li>
- <li><a href="#development-help">{% trans %}How can I help out with development?{% endtrans %}</a></li>
- <li><a href="#keeping-up-to-date">{% trans %}Where can I keep up to date with what is going on/ where is the conversation?{% endtrans %}</a></li>
- <li><a href="#funding">{% trans %}How can fund development?{% endtrans %}</a></li>
-</ol>
-{% endblock %}
-
-
-{% block content %}
-<h2>Browser FAQs</h2>
-
-
-<h3 id="what">
- <span class="permalink">
- <a href="#what">{% trans %}What is it and how does it work?{% endtrans %}</a>
- </span>
-</h3>
-
-<p>{% trans bname=browser_name() %}It’s a web browser, like all others it enables you to browse and search the web. {{ bname }} is however
- very focused on the privacy rights of the user and does not favour a company’s income in trade of the users privacy.
- As of the writing moment {{ bname }} is made to work with I2P, but with some adjustments it should just as well work
- with Tor or on the internet.{% endtrans %}
-</p>
-<p>{% trans %}When you connect to a website, it is not only the operators of that website who can record information
- about your visit.{% endtrans %}
-</p>
-<p>{% trans bname=browser_name() %}Most websites now use numerous third-party services, including social networking “Like†buttons,
- analytics trackers, and advertising beacons, all of which can link your activity across different sites. And because
- of that, the {{ bname }} is designed to prevent websites from “fingerprinting†or identifying you based on your
- browser configuration. By default, {{ bname }} does not keep any browsing history. Cookies are only valid for a single
- session (until {{ bname }} is exited or a New Identity is requested).{% endtrans %}
-</p>
-
-<p>{% trans bname=browser_name() %}A key feature is that {{ bname }} will block browser plugins such as Flash, RealPlayer, Quicktime,
- and others: they can be manipulated into revealing your IP address. We do not recommend installing additional
- add-ons or plugins into {{ bname }} even the user is free to do so. Plugins or addons may bypass I2P or compromise
- your privacy. {{ bname }} already comes with NoScript, and other patches to protect your privacy and security.{% endtrans %}
-</p>
-
-
-<h3 id="why">
- <span class="permalink">
- <a href="#why">{% trans %}Why did we make it?{% endtrans %}</a>
- </span>
-</h3>
-
-<p>{% trans bname=browser_name() -%}The main reason we made it is because as any other very technical project it can be hard for mr smith in
- the street to get himself into this and figure out how to benefit from it. The {{ bname }} was therefore made to
- extend the user base of I2P to non-super technical people and make it a worthy alternative to Tor.{%- endtrans %}</p>
-
-<p>{% trans %}We wish to enable all people to defend themself against tracking and surveillance.
- And for people in some countries, circumvent censorship.{% endtrans %}</p>
-
-
-<h3 id="the-problem">
- <span class="permalink">
- <a href="#the-problem">{% trans %}Who is it for, what problem does it solve?{% endtrans %}</a>
- </span>
-</h3>
-
-<p>{% trans -%}It’s for both technical and non technical people who wish to protect their privacy either because of
- preferences or safety, no matter who they are and where they are. It should make a lot of potential dangers harmless
- for these people that they will encounter on the internet. For example stop spying software that’s targeted or not. It
- also per default disables a lot of features which are questionable in terms of security and privacy
- concerns.{%- endtrans %}</p>
-
-
-<h3 id="spec-requirements">
- <span class="permalink">
- <a href="#spec-requirements">{% trans %}What are the requirements/ specs to use it?{% endtrans %}</a>
- </span>
-</h3>
-
-<p>{% trans %}Any Linux, Windows or Mac OS X with 64bit support will work. For Linux the builds are usually tested on Debian and Arch Linux, but it should work with all distros.{% endtrans %}</p>
-
-
-<h3 id="development-help">
- <span class="permalink">
- <a href="#development-help">{% trans %}How can I help out with development?{% endtrans %}</a>
- </span>
-</h3>
-
-<p>{% trans -%}The development happens on github, anyone can create a github account and make a pull request for either
- some bug they have discovered, or a trac ticket they found and wanted to solve, translations and so on.{%- endtrans %}
-</p>
-
-
-
-<h3 id="keeping-up-to-date">
- <span class="permalink">
- <a href="#keeping-up-to-date">{% trans %}Where can I keep up to date with what is going on/ where is the conversation?{% endtrans %}</a>
- </span>
-</h3>
-
-<p>{% trans -%}For the moment it’s only on trac - but we plan to start using mailing lists found at our mailing lists website:{%- endtrans %}
-{%- if is_i2p_internal == True -%}
-<a href="https://lists.i2p.email/">https://lists.i2p.email/</a>.
-{% trans -%}Trac is located at:{%- endtrans %} <a href="https://trac.i2p2.de">https://trac.i2p2.de</a>.
-{%- else -%}
-<a href="http://lists.i2p/">http://lists.i2p/</a>.
-{% trans -%}Trac is located at:{%- endtrans %} <a href="http://trac.i2p2.i2p">http://trac.i2p2.i2p</a>.
-{%- endif -%}
-</p>
-
-
-<h3 id="funding">
- <span class="permalink">
- <a href="#funding">{% trans %}How can fund development?{% endtrans %}</a>
- </span>
-</h3>
-
-<p>{% trans -%}Per today the way to fund it is to fund I2P itself, we consider to upgrade our donation program to enable
- donators to specify which parts of the I2P project they wish to fund, if it’s the router core, the console, the
- browser or any other component that can be seen as a sub project of I2P.{%- endtrans %}</p>
-
-<p>{% trans %}You can find our donation page <a href="/en/get-involved/donate">here</a>.{% endtrans %}</p>
-
-
-{% endblock %}
\ No newline at end of file
diff --git a/i2p2www/pages/site/browser/intro.html b/i2p2www/pages/site/browser/intro.html
deleted file mode 100644
index f624c6f1c95e76b7f6083e535fe5374036060d34..0000000000000000000000000000000000000000
--- a/i2p2www/pages/site/browser/intro.html
+++ /dev/null
@@ -1,111 +0,0 @@
-{% extends "global/layout.html" %}
-{% block title %}{% trans bname=browser_name(), bsuff=browser_postname()%}{{ bname }} {{ bsuff }} {% endtrans %}{% endblock %}
-{% block content_nav %}
-<ol>
-<li style="list-style: none; display: inline">
-<h4>{{ _('Navigation') }}</h4>
-</li>
-<li style="list-style: none;">{% trans browser_main=get_url('browser_frontpage') %}<a href="{{ browser_main }}">Back to browser front page</a>{% endtrans %}</li>
-<li style="list-style: none;">{% trans bname=browser_name() %}About {{ bname }}{% endtrans %}</li>
-<li style="list-style: none;"><a href="#safeguard">{% trans %}Introduction{% endtrans %}</a></li>
-<li style="list-style: none;"><a href="#landing">{% trans %}Landing Page{% endtrans %}</a></li>
-<li style="list-style: none;"><a href="#browsing">{% trans %}Web Browsing{% endtrans %}</a></li>
-<li style="list-style: none;"><a href="#privacy">{% trans %}Privacy{% endtrans %}</a></li>
-<li style="list-style: none;"><a href="#bittorrent">{% trans %}File Sharing{% endtrans %}</a></li>
-<li style="list-style: none;"><a href="#email">{% trans %}Private E-Mail{% endtrans %}</a></li>
-</ol>
-{% endblock %}
-
-
-{% block content %}
-
-<h1>{% trans bname=browser_name(), bsuff=browser_postname() %}{{ bname }} {{ bsuff }}{% endtrans %}</h1>
-
-<h2 id="safeguard">
- <span class="permalink">
- <a href="#safeguard">{% trans bname=browser_name() %}About {{ bname }}{% endtrans %}</a>
- </span>
-</h2>
-<p>
-{% trans bname=browser_name(), bsuff=browser_postname() %}{{ bname }} {{ bsuff }} is an easy-to-use bundle
-that provides a streamlined way to use I2P applications and to browse I2P Sites.
-Although it can provide access to the regular internet via an outproxy, it also
-integrates secure decentralized browsing, file sharing, and e-mail.{% endtrans %}
-</p>
-<img class="screenshot" src="{{ url_for('static', filename='images/browser/screenshots/2-I2P Site.png') }}" />
-
-<h2 id="landing">
- <span class="permalink">
- <a href="#landing">{% trans %}Access Panel{% endtrans %}</a>
- </span>
-</h2>
-<p>
-{% trans bname=browser_name() %}{{ bname }} changes the ways that you access I2P, streamlining the
-process for new users. Just the information you need, direct access to
-applications, and no configuration.{% endtrans %}
-</p>
-<img class="screenshot" src="{{ url_for('static', filename='images/browser/screenshots/1-home.png') }}" />
-
-<h2 id="browsing">
- <span class="permalink">
- <a href="#browsing">{% trans %}Web Browsing{% endtrans %}</a>
- </span>
-</h2>
-<p>
-{% trans bname=browser_name() %}Like other browsers, {{ bname }} enables you to browse and search the
-internet. {{ bname }} also employs a variety of security enhancements to protect
-your privacy while you browse the web.{% endtrans %}
-</p>
-<img class="screenshot" src="{{ url_for('static', filename='images/browser/screenshots/2-outproxy.png') }}" />
-
-<h2 id="privacy">
- <span class="permalink">
- <a href="#privacy">{% trans %}Privacy{% endtrans %}</a>
- </span>
-</h2>
-<p>
-{% trans bname=browser_name() %}Most websites now use numerous third-party trackers, all of which can
-link your activity across different sites. Besides blocking third-party
-trackers, {{ bname }} avoids caching unnecessary data, enforces boundaries
-between sites and applications, and hides your connection from un-authorized
-observers.{% endtrans %}
-</p>
-<img class="screenshot" src="{{ url_for('static', filename='images/browser/screenshots/2-settings.png') }}" />
-
-<h2 id="bittorrent">
- <span class="permalink">
- <a href="#bittorrent">{% trans %}File Sharing{% endtrans %}</a>
- </span>
-</h2>
-<p>
-{% trans bname=browser_name() %}I2P has always been capable of Peer-to-Peer file sharing and {{ bname }}
-is no exception. By integrating the I2PSnark BitTorrent client,
-private, safe Peer-to-Peer filesharing is at the user's fingertips.{% endtrans %}
-</p>
-<img class="screenshot" src="{{ url_for('static', filename='images/browser/screenshots/3-snark.png') }}" />
-
-<p>
-{% trans bname=browser_name() %}By using I2P, a whole world of private file-sharing options will
-become available to you.{% endtrans %}
-</p>
-
-<p>
-{% trans bname=browser_name() %}Using Peer-to-Peer to distribute data means more people can help
-you find it, which gets it to you more quickly and reliably.{% endtrans %}
-</p>
-<img class="screenshot" src="{{ url_for('static', filename='images/browser/screenshots/3-add.png') }}" />
-<img class="screenshot" src="{{ url_for('static', filename='images/browser/screenshots/3-proof.png') }}" />
-
-<h2 id="email">
- <span class="permalink">
- <a href="#email">{% trans %}Private E-Mail{% endtrans %}</a>
- </span>
-</h2>
-<p>
-{% trans bname=browser_name() %}E-Mail service is available from providers within the I2P network
-that are capable of relaying e-mail to all e-mail addresses. {{ bname }} is
-pre-configured to access these services and set you up with an account.{% endtrans %}
-</p>
-<img class="screenshot" src="{{ url_for('static', filename='images/browser/screenshots/4-email.png') }}" />
-{% endblock %}
-
diff --git a/i2p2www/pages/site/browser/releasenotes.html b/i2p2www/pages/site/browser/releasenotes.html
deleted file mode 100644
index 0e315b0a5d5a22ce7e51f2eef4b7dcf86ca61b83..0000000000000000000000000000000000000000
--- a/i2p2www/pages/site/browser/releasenotes.html
+++ /dev/null
@@ -1,127 +0,0 @@
-{% extends "global/layout.html" %}
-{% block title %}{% trans bname=browser_name()%}{{ bname }} Release Notes {% endtrans %}{% endblock %}
-{% block content_nav %}
-<ol>
-<li style="list-style: none; display: inline">
-<h4>{{ _('Navigation') }}</h4>
-</li>
-<li style="list-style: none;">{% trans browser_main=get_url('browser_frontpage') %}<a href="{{ browser_main }}">Back to browser front page</a>{% endtrans %}</li>
-<li style="list-style: none;">{% trans %}Release Notes{% endtrans %}</li>
-<li style="list-style: none;"><a href="#r20b7">{% trans %}Version 2.0 Beta 7{% endtrans %}</a></li>
-<li style="list-style: none;"><a href="#r20b6">{% trans %}Version 2.0 Beta 6{% endtrans %}</a></li>
-<li style="list-style: none;"><a href="#r20b5">{% trans %}Version 2.0 Beta 5{% endtrans %}</a></li>
-<li style="list-style: none;"><a href="#r20b4">{% trans %}Version 2.0 Beta 4{% endtrans %}</a></li>
-<li style="list-style: none;"><a href="#r20b3">{% trans %}Version 2.0 Beta 3{% endtrans %}</a></li>
-<li style="list-style: none;"><a href="#r20b2">{% trans %}Version 2.0 Beta 2{% endtrans %}</a></li>
-<li style="list-style: none;"><a href="#r20b1">{% trans %}Version 2.0 Beta 1{% endtrans %}</a></li>
-</ol>
-{% endblock %}
-
-{% block content %}
-
-<h1>{% trans %}Release Notes{% endtrans %}</h1>
-
-<h3 id="r20b7">
- <span class="permalink">
- <a href="#r20b7">{% trans %}2.0 Beta 7 (Nov 4 2019){% endtrans %}</a>
- </span>
-</h3>
-
-<ol style="list-style-type: square;">
- <li>Fix NoScript Bug</li>
- <li>JSON-RPC2 client for router communication</li>
- <li>Delay the user dialog</li>
- <li>Implement continuous integration</li>
-</ol>
-
-<h3 id="r20b6">
- <span class="permalink">
- <a href="#r20b6">{% trans %}2.0 Beta 6 (Sep 16 2019){% endtrans %}</a>
- </span>
-</h3>
-
-<ol style="list-style-type: square;">
- <li>Bug fixes for browser/router integration</li>
- <li>Use better ports for router configuration</li>
-</ol>
-
-<h3 id="r20b5">
- <span class="permalink">
- <a href="#r20b5">{% trans %}2.0 Beta 5 (Sep 12 2019){% endtrans %}</a>
- </span>
-</h3>
-
-<ol style="list-style-type: square;">
- <li>New browser icon/graphic</li>
- <li>Disable enterprise policies for the browser</li>
- <li>Bundle id is now unique on Mac OS X</li>
- <li>Improvements of default preferences</li>
- <li>about:i2p text updates</li>
- <li>Onboarding improvements</li>
- <li>Improvements for NoScript integration</li>
- <li>Improvements for cookie control</li>
- <li>Default ports changed to not crash with already installed routers</li>
- <li>The browser now ships with the router on Linux</li>
- <li>The browser now ships with the router on Windows</li>
- <li>The browser now ships with the router on Mac OS X</li>
-</ol>
-
-<h3 id="r20b4">
- <span class="permalink">
- <a href="#r20b4">{% trans %}2.0 Beta 4 (Jun 27 2019){% endtrans %}</a>
- </span>
-</h3>
-
-<ol style="list-style-type: square;">
- <li>Security fix for CVE-2019-11707.</li>
- <li>Added garlic addressbar icon. Ticket #2539</li>
- <li>Don't allow enterprise policies in the browser.</li>
- <li>Implemented network.dns.blockDotI2P preference option.</li>
- <li>Disable WebGL readPixel() for web content. See Tor ticket #30541</li>
-</ol>
-
-<h3 id="r20b3">
- <span class="permalink">
- <a href="#r20b3">{% trans %}2.0 Beta 3 (Jun 10 2019){% endtrans %}</a>
- </span>
-</h3>
-
-<ol style="list-style-type: square;">
- <li>Feature: New Identity - which would reset your browser profile. Behaves about the same as TorBrowser's equal.</li>
- <li>New/updated plugin: noscript.</li>
- <li>New plugin: i2pbutton.</li>
- <li>.i2p sites are now shown as secure in the addressbar.</li>
- <li>A about:i2p page with some info & router health check status.</li>
- <li>Itoopie in the toolbar via i2pbutton.</li>
- <li>Issue with proxy settings corrected.</li>
-</ol>
-
-<h3 id="r20b2">
- <span class="permalink">
- <a href="#r20b2">{% trans %}2.0 Beta 2 (May 28 2019){% endtrans %}</a>
- </span>
-</h3>
-
-<ol style="list-style-type: square;">
- <li>Bugfixes.</li>
- <li>Graphics updates.</li>
- <li>Rebranding.</li>
-</ol>
-
-<h3 id="r20b1">
- <span class="permalink">
- <a href="#r20b1">{% trans %}2.0 Beta 1 (Mar 6 2019){% endtrans %}</a>
- </span>
-</h3>
-
-<p>Initial release based upon Firefox ESR 60.7 and Tor Browser Bundle.</p>
-
-<h3 id="r10b1">
- <span class="permalink">
- <a href="#r10b1">{% trans %}1.0 Beta 1 (2014){% endtrans %}</a>
- </span>
-</h3>
-
-<p>Lost in history, was labeled "Abscond Browser" at the time.</p>
-
-{% endblock %}
diff --git a/i2p2www/pages/site/browser/roadmap.html b/i2p2www/pages/site/browser/roadmap.html
deleted file mode 100644
index 15b6cd1d30d2bb13a8a53e1212f6a5f97de4dfd2..0000000000000000000000000000000000000000
--- a/i2p2www/pages/site/browser/roadmap.html
+++ /dev/null
@@ -1,58 +0,0 @@
-{% extends "global/layout.html" %}
-{% block title %}{% trans bname=browser_name()%}{{ bname }} Roadmap {% endtrans %}{% endblock %}
-{% block content_nav %}
-<ol>
-<li style="list-style: none; display: inline">
-<h4>{{ _('Navigation') }}</h4>
-</li>
-<li style="list-style: none;">{% trans browser_main=get_url('browser_frontpage') %}<a href="{{ browser_main }}">Back to browser front page</a>{% endtrans %}</li>
-<li style="list-style: none;"><a href="#roadmap">{% trans %}Roadmap{% endtrans %}</li>
-<li style="list-style: none;"><a href="#r20b8">{% trans %}Version 2.0 Beta 8{% endtrans %}</a></li>
-<li style="list-style: none;"><a href="#r30b9">{% trans %}Version 3.0 Beta 9{% endtrans %}</a></li>
-<li style="list-style: none;"><a href="#r30b10">{% trans %}Version 3.0 Beta 10{% endtrans %}</a></li>
-</ol>
-{% endblock %}
-
-
-{% block content %}
-
-<h1 id="roadmap">{% trans %}Roadmap{% endtrans %}</h1>
-
-<h3 id="r20b8">
- <span class="permalink">
- <a href="#r20b8">{% trans %}2.0 Beta 8 (Nov 2019){% endtrans %}</a>
- </span>
-</h3>
-
-<ol style="list-style-type: square;">
- <li>Cancelled</li>
-</ol>
-
-<h3 id="r30b9">
- <span class="permalink">
- <a href="#r30b9">{% trans %}3.0 Beta 9 (Dec 2019){% endtrans %}</a>
- </span>
-</h3>
-
-<ol style="list-style-type: square;">
- <li>Release using ESR 68, deprecate ESR 60</li>
- <li>Replace Tor/Firefox onboarding slideshow completely with something self-contained</li>
- <li>Move JSON-RPC and I2PControl to web extension, simplify I2Pbutton</li>
- <li>Protocol Handlers for Router Console and Mailto</li>
- <li>Dynamic Themes/Contextual Identities</li>
- <li>Donation Call-to-Action</li>
- <li>Smart Landing Page improvements</li>
-</ol>
-
-<h3 id="r30b10">
- <span class="permalink">
- <a href="#r30b10">{% trans %}3.0 Beta 10 (Jan 2019){% endtrans %}</a>
- </span>
-</h3>
-
-<ol style="list-style-type: square;">
- <li>Research I2P Plugins Support</li>
- <li>Research Peer-to-Peer messaging support compatible with BiglyBT</li>
-</ol>
-
-{% endblock %}
diff --git a/i2p2www/pages/site/browser/updating.html b/i2p2www/pages/site/browser/updating.html
deleted file mode 100644
index 5507e21b68f48b0c41fb5ba9ec6eadf138e229f0..0000000000000000000000000000000000000000
--- a/i2p2www/pages/site/browser/updating.html
+++ /dev/null
@@ -1,23 +0,0 @@
-{% extends "global/layout.html" %}
-{% block title %}{{ _('The I2P Browser') }}{% endblock %}
-{% block content_nav %}
-<ol>
-<li style="list-style: none; display: inline">
-<h4>{{ _('Navigation') }}</h4>
-</li>
-<li style="list-style: none;">{% trans browser_main=get_url('browser_frontpage') %}<a href="{{ browser_main }}">Back to browser front page</a>{% endtrans %}</li>
-</ol>
-{% endblock %}
-
-
-{% block content %}
-
-<h1>{% trans %}Updating the browser{% endtrans %}</h1>
-
-
-
-
-TBA.
-
-{% endblock %}
-
diff --git a/i2p2www/pages/site/get-involved/bounties.html b/i2p2www/pages/site/get-involved/bounties.html
deleted file mode 100644
index 733a24adb27850d04b504e95d7e41baeac55d5f0..0000000000000000000000000000000000000000
--- a/i2p2www/pages/site/get-involved/bounties.html
+++ /dev/null
@@ -1,12 +0,0 @@
-{% extends "global/layout.html" %}
-{% block title %}{{ _('Bounties') }}{% endblock %}
-{% block content %}
-<p>{% trans -%}
-Thank you for your interest in contributing to I2P!<br>
-<br>
-Currently there is no bounty system available.
-<br>
-{%- endtrans %}</p>
-{% endblock %}
-
-
diff --git a/i2p2www/pages/site/get-involved/index.html b/i2p2www/pages/site/get-involved/index.html
index 6e343076f728045a72dd3e2d12a840f1d2119ec7..8598cf082c3e8fdb6ce1db77d898cfcc27d91658 100644
--- a/i2p2www/pages/site/get-involved/index.html
+++ b/i2p2www/pages/site/get-involved/index.html
@@ -26,57 +26,47 @@ Here's a list to help get you started.
<li><b>{% trans %}Spread the Word.{% endtrans %}</b> —
{% trans -%}
Tell people about I2P on forums, blogs, and comments to articles. Fix up the
-Wikipedia article about I2P in your language. Tell your friends, and more
+<a href="https://wikipedia.org/wiki/I2P">Wikipedia article about I2P in your language</a>. Tell your friends, and more
importantly, use I2P to communicate with your friends. We have many tools that
can help you keep your private conversations private.
{%- endtrans %}
-</li><li><b>{{ _('Translation') }}</b> —
+</li><li><b><a href="{{ newtrans }}">{{ _('Translation') }}</a></b> —
{% trans newtrans=site_url('get-involved/guides/new-translators') -%}
Help translate the website and the software into your language. Translators are
a very important part of this decentralized project and your work is always
appreciated.
See the <a href="{{ newtrans }}">new translator's guide</a> for details.
{%- endtrans %}
+</li><li><b><a href="https://i2pgit.org/i2p-hackers/i2p.www">{{ _('Documentation') }}</a></b> —
+{% trans -%}
+Suggest changes to the website, or help fix the parts of the website that you
+notice are outdated or incomplete. Web Site development has been fully migrated to
+git, you can participate by creating an account on our project Gitlab
+<a href="http://git.idk.i2p/i2p-hackers/i2p.www">inside the I2P network here</a> or
+<a href="https://i2pgit.org/i2p-hackers/i2p.www"> on the non-private internet here</a>. We also always
+appreciate our wonderful translators, join one of our Transifex teams and help
+translate pages into other languages.
+{%- endtrans %}
</li><li><b>{{ _('Testing') }}</b> —
{% trans monotone=site_url('get-involved/guides/monotone'),
trac=i2pconv('trac.i2p2.i2p') -%}
Run the latest builds from <a href="{{ monotone }}">monotone</a> or a recent
build from the <a href="https://github.com/i2p/i2p.i2p">unofficial github mirror</a>
-and report results on #i2p or as bugs on <a href="http://{{ trac }}/report/1">Trac</a>.
-{%- endtrans %}
-</li><li><b>{{ _('Documentation') }}</b> —
-{% trans -%}
-Suggest changes to the website, or help fix the parts of the website that you
-notice outdated or incomplete. We also always appreciate our wonderful
-translators, join one of our Transifex teams and help translate pages into other
-languages.
-{%- endtrans %}
-</li><li><b>{{ _('Multimedia') }}</b> —
-{% trans -%}
-Create promotional materials, infographics, and videos about I2P. Create guides
-to setting up your favorite services on I2P, and take screenshots as you go. If
-your guide is helpful, we'd love to mirror it on our blog.
-{%- endtrans %}
-</li><li><b>{{ _('Content') }}</b> —
-{% trans -%}
-One of I2P's greatest strengths as a peer-to-peer network is that anyone can
-run their own website, it's actually a built-in feature. Create an I2P Site,
-talk about something you're passionate about, or just interested in. It's easy,
-and it's getting easier every single day. Announce it on <a href="https://reddit.com/r/i2p">r/i2p</a>
-and <a href="http://i2pforum.i2p">i2pforum.i2p</a>/<a href="https://i2pforum.net">i2pforum.net</a>
-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>
+or <a href="https://i2pgit.org/i2p-hackers/i2p.www"> on the non-private internet here</a>.
+For existing bugs, <a href="http://{{ trac }}/report/1">Trac</a> is still acceptable.
{%- endtrans %}
</li></ul>
<h3>{% trans %}Host Services for Yourself and Others{% endtrans %}</h3>
<ul>
-<li><b>{{ _('Services') }}</b> —
+<li><b><a href="{{ site_url('/about/software') }}">{{ _('Services') }}</a></b> —
{% trans -%}
Self-hosting almost anything, from an SSH server for yourself to an ActivityPub
forum for everyone and anything in between, is helpful to the I2P network,
especially if you write down instructions for others. Almost anything you can
think of can be made to work with I2P, and your service is valuable to the network.
{%- endtrans %}
-</li><li><b>{{ _('Reseeding') }}</b> —
+</li><li><b><a href="{{ reseed }}">{{ _('Reseeding') }}</a></b> —
{% trans reseed=site_url('get-involved/guides/reseed') -%}
Getting new users onto the network is a very important task, and that 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 }}">reseed server page</a>.
{%- endtrans %}
@@ -84,12 +74,12 @@ Getting new users onto the network is a very important task, and that task is ha
</ul>
<h3>{% trans %}Develop Software{% endtrans %}</h3>
<ul>
-<li><b>{{ _('Applications') }}</b> —
+<li><b><a href="{{ site_url('/get-involved/guides/dev-guidelines') }}">{{ _('Applications') }}</a></b> —
{% trans apps=site_url('get-involved/develop/applications') -%}
Write or port applications for I2P. There's some guidelines and
a list of ideas on the <a href="{{ apps }}">applications page</a>.
{%- endtrans %}
-</li><li><b>{{ _('Coding') }}</b> —
+</li><li><a href="{{ site_url('/get-involved/guides/new-developers') }}"><b>{{ _('Coding') }}</a></b> —
{% trans trac=i2pconv('trac.i2p2.i2p'),
zzz=i2pconv('zzz.i2p'),
newdevs=site_url('get-involved/guides/new-developers') -%}
@@ -99,7 +89,7 @@ or the TODO list on <a href="http://{{ zzz }}">{{ zzz }}</a> for
some ideas on where to start.
See the <a href="{{ newdevs }}">new developer's guide</a> for details.
{%- endtrans %}
-</li><li><b>{{ _('Analysis') }}</b> —
+</li><li><b><a href="{{ site_url('research/index') }}">{{ _('Analysis') }}</b> —
{% trans threatmodel=site_url('docs/how/threat-model') -%}
Study or test the code to look for vulnerabilities.
Both anonymity vulnerabilities from the various
@@ -107,7 +97,7 @@ Both anonymity vulnerabilities from the various
to security holes, benefit from ongoing research.
{%- endtrans %}
</li></ul>
-<h3>{% trans %}Donate{% endtrans %}</h3>
+<h3><a href="{{ site_url('get-involved/donate') }}">{% trans %}Donate{% endtrans %}</a></h3>
<ul><li><b>
<a href="{{ site_url('get-involved/donate') }}">{{ _('Donate') }}</a>: I2P is FOSS - Free Open-Source
Software, which is supported by volunteers and by donations. If you use the network, please consider