merge of '459d4593daf39a70c6aa4e80b31a4ec76fb5835c'

and 'df587b340fce758d80d018ff1e4dfc9cc2b10d30'

i2p2www/pages/site/browser/intro.html

@@ -56,7 +56,7 @@ applications, and no configuration.{% endtrans %}
 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-proxy.png') }}" />
+<img class="screenshot" src="{{ url_for('static', filename='images/browser/screenshots/2-outproxy.png') }}" />
 
 <h2 id="privacy">
   <span class="permalink">
@@ -71,7 +71,6 @@ 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') }}" />
-<img class="screenshot" src="{{ url_for('static', filename='images/browser/screenshots/2-outproxy.png') }}" />
 
 <h2 id="bittorrent">
   <span class="permalink">
@@ -89,7 +88,6 @@ private, safe Peer-to-Peer filesharing is at the user's fingertips.{% endtrans %
 {% trans bname=browser_name() %}By using I2P, a whole world of private file-sharing options will
 become available to you.{% endtrans %}
 </p>
-<img class="screenshot" src="{{ url_for('static', filename='images/browser/screenshots/3-copy.png') }}" />
 
 <p>
 {% trans bname=browser_name() %}Using Peer-to-Peer to distribute data means more people can help

i2p2www/pages/site/browser/roadmap.html

@@ -86,9 +86,9 @@
   <li>Research Peer-to-Peer messaging support compatible with BiglyBT</li>
 </ol>
 
-<h3 id="1h2019">
+<h3 id="1h2020">
   <span class="permalink">
-    <a href="#1h2019">{% trans %}First Half, 2019 tasks{% endtrans %}</a>
+    <a href="#1h2020">{% trans %}First Half, 2020 tasks{% endtrans %}</a>
   </span>
 </h3>