Merge branch 'i2p:master' into master

Dockerfile

@@ -2,15 +2,16 @@ FROM debian:buster
 ENV SERVERNAME=geti2p.net
 ENV SERVERMAIL=example@geti2p.net
 
-ADD . /var/www/i2p.www
-
 WORKDIR /var/www/i2p.www
 
     ## Install the dependencies
 RUN apt-get update && \
-    apt-get -y install apache2 apache2-utils libapache2-mod-wsgi python2-dev python-pip patch python-virtualenv git python-polib && \
+    apt-get -y install apache2 apache2-utils libapache2-mod-wsgi python2-dev python-pip patch python-virtualenv git python-polib
+
+ADD . /var/www/i2p.www
+
     ## Start setting up the site
-    rm -rfv env && \
+RUN rm -rfv env && \
     virtualenv --distribute env                && \  
     . env/bin/activate                          && \
     pip install -r etc/reqs.txt                 && \

i2p2www/pages/site/about/software.html

@@ -3,7 +3,7 @@
 {% block content %}
 <h1>{{ _('The I2P Software') }} (I2P)</h1>      
 
-<p>{% trans %The I2P Java distribution is the first I2P software gateway and 
+<p>{% trans %}The I2P Java distribution is the first I2P software gateway and 
 has been actively developed since 2003. It includes a router, applications, and the ability to manage and customize your own connection with the I2P network using a built in Hidden Services manager{%- endtrans %}</p>
 <p>{% trans %}Applications are made available through a webUI that listens at 
 127.0.0.1:7657. The main page is called the “Router Console,” 

i2p2www/pages/site/contact.html

@@ -434,7 +434,7 @@ GPG Key fingerprint: <tt>EA27 06D6 14F5 28DB 764B  F47E CFCD C461 75E6 694A</tt>
 	<td valign="top" colspan="2">{% trans %}&hellip; and many others{% endtrans %}</td>
 </tr>
 <tr>
-	<td>{% trans website=site_url(about/hall-of-fame) %}<a href="{{ website }}">Hall of Fame!</a></td>
+	<td>{% trans website=site_url('about/hall-of-fame') %}<a href="{{ website }}">Hall of Fame!</a>{% endtrans %}</td>
 </tr>
 </table>