From 18b1ea8fc1b50a663f8c58529cb26064623c8e4b Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Fri, 18 Jan 2013 03:42:02 +0000
Subject: [PATCH] Fixed URLs and added translation tags to blog, downloads and
 meetings pages

---
 i2p2www/pages/blog/index.html       |   6 +-
 i2p2www/pages/blog/latest.html      |   4 +-
 i2p2www/pages/blog/post.html        |   2 +-
 i2p2www/pages/downloads/debian.html | 211 ++++++++++++++++++++--------
 i2p2www/pages/downloads/list.html   | 186 +++++++++++++++---------
 i2p2www/pages/downloads/select.html |  10 +-
 i2p2www/pages/meetings/index.html   |  19 ++-
 i2p2www/pages/meetings/show.html    |   4 +-
 8 files changed, 298 insertions(+), 144 deletions(-)

diff --git a/i2p2www/pages/blog/index.html b/i2p2www/pages/blog/index.html
index 8fdca6c3..4cc0bb5f 100644
--- a/i2p2www/pages/blog/index.html
+++ b/i2p2www/pages/blog/index.html
@@ -1,7 +1,7 @@
 {% extends "global/layout.html" %}
-{% block title %}Blog Index{% endblock %}
+{% block title %}{% trans %}Blog Index{% endtrans %}{% endblock %}
 {% block headextra %}
-    <link href="{{ url_for('blog_atom', lang=g.lang) }}" type="application/atom+xml" rel="alternate" title="I2P Blog ATOM Feed" />
+    <link href="{{ get_url('blog_atom') }}" type="application/atom+xml" rel="alternate" title="{% trans %}I2P Blog ATOM Feed{% endtrans %}" />
 {%- endblock %}
 {% block content %}
 <ul id="posts">
@@ -9,7 +9,7 @@
   <li>
     <article>
       <header>
-        <a href="{{ url_for('blog_post', slug=slug) }}">{{ post.title }}</a>
+        <a href="{{ get_url('blog_post', slug=slug) }}">{{ post.title }}</a>
       </header>
       {%- if post.excerpt %}
       <p>{{ post.excerpt }}</p>
diff --git a/i2p2www/pages/blog/latest.html b/i2p2www/pages/blog/latest.html
index a6c2b72f..d028cc13 100644
--- a/i2p2www/pages/blog/latest.html
+++ b/i2p2www/pages/blog/latest.html
@@ -1,6 +1,6 @@
       <ul>
       {% for slug, post in blog_posts -%}
-        <li>{{ post.date }} - <a href="{{ url_for('blog_post', slug=slug) }}">{{ post.title }}</a></li>
+        <li>{{ post.date }} - <a href="{{ get_url('blog_post', slug=slug) }}">{{ post.title }}</a></li>
       {%- endfor %}
-        <li><a href="{{ url_for('blog_index', lang=g.lang) }}"><em>More blog posts&hellip;</em></a></li>
+        <li><a href="{{ get_url('blog_index') }}"><em>{% trans %}More blog posts&hellip;{% endtrans %}</em></a></li>
       </ul>
diff --git a/i2p2www/pages/blog/post.html b/i2p2www/pages/blog/post.html
index 3a3b8948..92739112 100644
--- a/i2p2www/pages/blog/post.html
+++ b/i2p2www/pages/blog/post.html
@@ -1,5 +1,5 @@
 {% extends "global/layout.html" %}
-{% block title %}{{ title }} - Blog{% endblock %}
+{% block title %}{{ title }} - {% trans %}Blog{% endtrans %}{% endblock %}
 {% block content %}
 <ul id="post-info">
   <li class="date">{{ meta.date }}</li>
diff --git a/i2p2www/pages/downloads/debian.html b/i2p2www/pages/downloads/debian.html
index 2ab9f960..86d3b5fa 100644
--- a/i2p2www/pages/downloads/debian.html
+++ b/i2p2www/pages/downloads/debian.html
@@ -1,113 +1,204 @@
 {% extends "global/layout.html" %}
 {% block title %}Debian/Ubuntu{% endblock %}
 {% block content %}
-<h1>Debian I2P Packages</h1>
+<h1>{% trans %}Debian I2P Packages{% endtrans %}</h1>
 
+{% trans -%}
 The packages hosted on <a href="https://launchpad.net/%7Ei2p-maintainers/+archive/i2p">the I2P Launchpad site</a>
-have been tested and <span style="font-style: italic;">should </span>work on x86/x86_64 platforms running
+have been tested and <em>should </em>work on x86/x86_64 platforms running:
+{%- endtrans %}
 <ul>
-  <li><a href="#ubuntu">Ubuntu</a> (Hardy <span style="font-style: italic;">8.04</span> and newer)</li>
-  <li><a href="#ubuntu">Mint</a> <span style="font-style: italic;">11</span></li>
-  <li><a href="#debian">Debian Linux</a> (Lenny and newer) &amp; <a href="#nonlinux">kFreeBSD</a> (Wheezy)</li>
+  <li>{% trans %}<a href="#ubuntu">Ubuntu</a> (Hardy <em>8.04</em> and newer){% endtrans %}</li>
+  <li><a href="#ubuntu">Mint</a> <em>11</em></li>
+  <li>{% trans %}<a href="#debian">Debian Linux</a> (Lenny and newer) &amp; <a href="#nonlinux">kFreeBSD</a> (Wheezy){% endtrans %}</li>
   <li><a href="#debian">Knoppix</a></li>
-  <li><a href="#debian">Simply MEPIS</a> <span style="font-style: italic;">8.5.03-rel1</span></li>
-  <li><a href="#ubuntu">Trisque</a>l <span style="font-style: italic;">4.5.1</span></li>
-  <li><a href="#debian">gNewSense</a> <span style="font-style: italic;">2.3</span></li>
-  <li><a href="#nonlinux">Nexenta</a> <span style="font-style: italic;">3.0.1</span></li>
+  <li><a href="#debian">Simply MEPIS</a> <em>8.5.03-rel1</em></li>
+  <li><a href="#ubuntu">Trisque</a>l <em>4.5.1</em></li>
+  <li><a href="#debian">gNewSense</a> <em>2.3</em></li>
+  <li><a href="#nonlinux">Nexenta</a> <em>3.0.1</em></li>
 </ul>
-The I2P packages <span style="font-style: italic;">may</span> work on systems not listed above. Please report any issues with these packages on <a href="http://{{ i2pconv('trac.i2p2.i2p') }}/">Trac</a> at <a href="http://{{ i2pconv('trac.i2p2.i2p') }}/">http://{{ i2pconv('trac.i2p2.i2p') }}</a>.
+
+{% trans trac=i2pconv('trac.i2p2.i2p') -%}
+The I2P packages <em>may</em> work on systems not listed above. Please report any issues
+with these packages on <a href="http://{{ trac }}">Trac</a> at
+<a href="http://{{ trac }}">http://{{ trac }}</a>.
+{%- endtrans %}
 <ul>
-  <li>Option 1: <a href="#ubuntu">Recent versions</a> of Ubuntu and its derivatives (<span style="font-style: italic;">Try this if you're not using Debian)</span></li>
-  <li>Option 2: <a href="#debian">Debian</a> (including systems based on Debian and older versions of Ubuntu)</li>
-  <li>Option 3: <a href="#nonlinux">Non-Linux</a> (and possibly Non-x86 architectures)</li>
+  <li>{% trans %}Option 1: <a href="#ubuntu">Recent versions</a> of Ubuntu and its derivatives (<em>Try this if you're not using Debian)</em>{% endtrans %}</li>
+  <li>{% trans %}Option 2: <a href="#debian">Debian</a> (including systems based on Debian and older versions of Ubuntu){% endtrans %}</li>
+  <li>{% trans %}Option 3: <a href="#nonlinux">Non-Linux</a> (and possibly Non-x86 architectures){% endtrans %}</li>
 </ul>
-<h2 id="ubuntu">Instructions for Ubuntu Lucid Lynx (and newer) and derivatives like Linux Mint &amp; Trisquel</h2>
-<h5>Adding the PPA via the command line and installing I2P</h5>
+
+<h2 id="ubuntu">{% trans %}Instructions for Ubuntu Lucid Lynx (and newer) and derivatives like Linux Mint &amp; Trisquel{% endtrans %}</h2>
+<h5>{% trans %}Adding the PPA via the command line and installing I2P{% endtrans %}</h5>
 <ol>
-  <li>Open a terminal and enter: <br />
+  <li>
+    {% trans %}Open a terminal and enter:{% endtrans %}<br />
     <code>&nbsp;&nbsp;&nbsp; sudo apt-add-repository ppa:i2p-maintainers/i2p</code><br />
+{% trans -%}
 This command will add the PPA to /etc/apt/sources.list.d and fetch the
 gpg key that the repository has been signed with. The GPG key ensures
-that the packages have not been tampered with since being built.</li>
-  <li>Notify your package manager of the new PPA by entering<br />
+that the packages have not been tampered with since being built.
+{%- endtrans %}
+  </li>
+  <li>
+    {% trans %}Notify your package manager of the new PPA by entering:{% endtrans %}<br />
     <code>&nbsp;&nbsp;&nbsp; sudo apt-get update</code><br />
+{% trans -%}
 This command will retrieve the latest list of software from each
 repository that is enabled on your system, including the I2P PPA that
-was added with the earlier command.</li>
-  <li>You are now ready to install I2P! <br />
+was added with the earlier command.
+{%- endtrans %}
+  </li>
+  <li>{% trans %}You are now ready to install I2P!{% endtrans %}<br />
     <code>&nbsp;&nbsp;&nbsp;&nbsp;sudo apt-get install i2p</code></li>
 </ol>
-<h5>Adding the PPA Using Synaptic</h5>
+
+<h5>{% trans %}Adding the PPA Using Synaptic{% endtrans %}</h5>
 <ol>
-<li>Open Synaptic (System -> Administration -> Synaptic Package Manager).</li>
-<li>Once Synaptic opens, select <span style="font-style: italic;">Repositories</span> from the <span style="font-style: italic;">Settings</span> menu.</li>
-<li>Click the <span style="font-style: italic;">Other Sources</span> tab and click <span style="font-style: italic;">Add</span>. Paste <code>ppa:i2p-maintainers/i2p</code> into the APT-line field and click <span style="font-style: italic;">Add Source</span>. Click the <span style="font-style: italic;">Close</span> button then <span style="font-style: italic;">Reload</span>.</li>
-<li>In the Quick Filter box, type in <code>i2p</code> and press enter. When <code>i2p</code> is returned in the results list, right click <code>i2p</code> and select <span style="font-style: italic;">Mark for Installation</span>. After doing so you may see a <span style="font-style: italic;">Mark additional required changes?</span> popup. If so, click <span style="font-style: italic;">Mark</span> then <span style="font-style: italic;">Apply</span>.</li>
+  <li>
+    {% trans -%}
+    Open Synaptic (System -&gt; Administration -&gt; Synaptic Package Manager).
+    {%- endtrans %}
+  </li>
+  <li>
+    {% trans -%}
+    Once Synaptic opens, select <em>Repositories</em> from the <em>Settings</em> menu.
+    {%- endtrans %}
+  </li>
+  <li>
+    {% trans -%}
+    Click the <em>Other Sources</em> tab and click <em>Add</em>. Paste <code>ppa:i2p-maintainers/i2p</code> into the APT-line field and click <em>Add Source</em>. Click the <em>Close</em> button then <em>Reload</em>.
+    {%- endtrans %}
+  </li>
+  <li>
+    {% trans -%}
+    In the Quick Filter box, type in <code>i2p</code> and press enter. When <code>i2p</code> is returned in the results list, right click <code>i2p</code> and select <em>Mark for Installation</em>. After doing so you may see a <em>Mark additional required changes?</em> popup. If so, click <em>Mark</em> then <em>Apply</em>.
+    {%- endtrans %}
+  </li>
 </ol> 
 
+{% trans -%}
 After the installation process completes you can move on to the next
 part of <a href="#Post-install_work">starting I2P</a> and configuring it for your system.
+{%- endtrans %}
 
-<h2 id="debian">Instructions for Debian Lenny and newer</h2>
+<h2 id="debian">{% trans %}Instructions for Debian Lenny and newer{% endtrans %}</h2>
+
+{% trans -%}
 The steps below should be performed with root access (i.e., switching
 user to root with "su" or by prefixing each command with "sudo").
+{%- endtrans %}
 <ol>
-  <li>Add the GPG key that signs the repository with the following command:<br />
-&nbsp;&nbsp;&nbsp; <code>apt-key adv --keyserver keyserver.ubuntu.com --recv-keys <a href="http://keyserver.ubuntu.com:11371/pks/lookup?search=0x474BC46576FAE76E97C1A1A1AB9660B9EB2CC88B&amp;op=index">EB2CC88B</a></code><br />
-You'll have output like the following if the command was successful: <br />
-&nbsp;&nbsp;&nbsp;&nbsp;<img src="{{ url_for('static', filename='images/add-key-terminal.png') }}" alt="" /></li>
-  <li>For Debian Oldstable (Lenny) and Stable (Squeeze): Add the following entries to <code>/etc/apt/sources.list.d/i2p.list</code><br />
+  <li>
+    {% trans %}Add the GPG key that signs the repository with the following command:{% endtrans %}<br />
+    <code>&nbsp;&nbsp;&nbsp; apt-key adv --keyserver keyserver.ubuntu.com --recv-keys <a href="http://keyserver.ubuntu.com:11371/pks/lookup?search=0x474BC46576FAE76E97C1A1A1AB9660B9EB2CC88B&amp;op=index">EB2CC88B</a></code><br />
+{% trans %}You'll have output like the following if the command was successful:{% endtrans %}<br />
+&nbsp;&nbsp;&nbsp;&nbsp;<img src="{{ url_for('static', filename='images/add-key-terminal.png') }}" alt="" />
+  </li>
+  <li>
+    {% trans %}For Debian Oldstable (Lenny) and Stable (Squeeze): Add the following entries to <code>/etc/apt/sources.list.d/i2p.list</code>{% endtrans %}<br />
     <code>&nbsp;&nbsp;&nbsp; deb http://ppa.launchpad.net/i2p-maintainers/i2p/ubuntu natty main <br />
 &nbsp;&nbsp;&nbsp; deb-src http://ppa.launchpad.net/i2p-maintainers/i2p/ubuntu natty main </code><br />
 <br />
-For Debian Testing (Wheezy) or Unstable (Sid), use the following: <br />
+{% trans %}For Debian Testing (Wheezy) or Unstable (Sid), use the following:{% endtrans %}<br />
     <code>&nbsp;&nbsp;&nbsp; deb http://ppa.launchpad.net/i2p-maintainers/i2p/ubuntu precise main <br />
-&nbsp;&nbsp;&nbsp; deb-src http://ppa.launchpad.net/i2p-maintainers/i2p/ubuntu precise main </code><br /></li>
-  <li>Notify your package manager of the new PPA by entering<br />
+&nbsp;&nbsp;&nbsp; deb-src http://ppa.launchpad.net/i2p-maintainers/i2p/ubuntu precise main </code><br />
+  </li>
+  <li>
+    {% trans %}Notify your package manager of the new PPA by entering{% endtrans %}<br />
     <code>&nbsp;&nbsp;&nbsp; apt-get update</code><br />
+{% trans -%}
 This command will retrieve the latest list of software from every
 repository enabled on your system, including the I2P PPA added in step
-1.</li>
-  <li>You are now ready to install I2P! <br />
+1.
+{%- endtrans %}
+  </li>
+  <li>
+    {% trans %}You are now ready to install I2P!{% endtrans %}<br />
     <code>&nbsp;&nbsp;&nbsp; apt-get install i2p</code></li>
 </ol>
+
+{% trans -%}
 After the installation process completes you can move on to the next part of <a href="#Post-install_work">starting I2P</a> and configuring it for your system.
-<h2 id="nonlinux">Instructions for Non-Linux / Non-x86</h2>
+{%- endtrans %}
+
+<h2 id="nonlinux">{% trans %}Instructions for Non-Linux / Non-x86{% endtrans %}</h2>
+
+{% trans -%}
 The steps below should be performed with root access (i.e., switching
-user to root with "<code>su</code>" or by prefixing each command with "<code>sudo</code>").<br />
+user to root with "<code>su</code>" or by prefixing each command with "<code>sudo</code>").
+{%- endtrans %}<br />
 <ol>
-  <li>Download the <a href="http://ppa.launchpad.net/i2p-maintainers/i2p/ubuntu/pool/main/i/i2p/">i2p-router</a> package from the <a href="http://ppa.launchpad.net/i2p-maintainers/i2p/ubuntu/pool/main/i/i2p/">PPA</a>.</li>
-  <li>Make sure that you have Java installed. Running <span style="font-style: italic;"><code>apt-get install default-jre</code></span> should be sufficient.<br />
-You are now ready to install I2P! <br />
-    <code>&nbsp;&nbsp;&nbsp; dpkg -i i2p-router_*.deb</code></li>
-  <li>It is recommended to compile <a href="/jbigi">jbigi</a> for your system to achieve better performance. Instructions are available <a href="/jbigi">here</a>.</li>
+  <li>
+    {% trans -%}
+    Download the <a href="http://ppa.launchpad.net/i2p-maintainers/i2p/ubuntu/pool/main/i/i2p/">i2p-router</a> package from the <a href="http://ppa.launchpad.net/i2p-maintainers/i2p/ubuntu/pool/main/i/i2p/">PPA</a>.
+    {%- endtrans %}
+  </li>
+  <li>
+    {% trans -%}
+    Make sure that you have Java installed. Running <em><code>apt-get install default-jre</code></em> should be sufficient.{% endtrans %}<br />
+{% trans %}You are now ready to install I2P!{% endtrans %}<br />
+    <code>&nbsp;&nbsp;&nbsp; dpkg -i i2p-router_*.deb</code>
+  </li>
+  <li>
+    {% trans jbigi=site_url('misc/jbigi') -%}
+    It is recommended to compile <a href="{{ jbigi }}">jbigi</a> for your system to achieve better performance. Instructions are available <a href="{{ jbigi }}">here</a>.
+    {%- endtrans %}
+</li>
 </ol>
+
+{% trans -%}
 After the installation process completes you can move on to the next part of <a href="#Post-install_work">starting I2P</a> and configuring it for your system.
-<h2 id="Post-install_work">Post-install work</h2>
+{%- endtrans %}
+
+<h2 id="Post-install_work">{% trans %}Post-install work{% endtrans %}</h2>
+
+
+{% trans -%}
 Using these I2P packages the I2P router can be started in the following
 three ways:
+{%- endtrans %}
 <ul>
-  <li>"on demand" using the i2prouter script. Simply run &quot;<code>i2prouter
-start</code>&quot; from a command prompt. (Note: Do <span style="font-weight: bold; text-decoration: underline;">not</span> use
-sudo or run it as root!)</li>
-  <li>"on demand" without the <a href="http://wrapper.tanukisoftware.com/">java service wrapper</a>
+  <li>
+    {% trans -%}
+    &quot;on demand&quot; using the i2prouter script. Simply run &quot;<code>i2prouter
+start</code>&quot; from a command prompt. (Note: Do <strong><u>not</u></strong> use
+sudo or run it as root!)
+    {%- endtrans %}
+  </li>
+  <li>
+    {% trans -%}
+    &quot;on demand&quot; without the <a href="http://wrapper.tanukisoftware.com/">java service wrapper</a>
 (needed on non-Linux/non-x86 systems) by running "<code>i2prouter-nowrapper</code>".
-(Note: Do <span style="font-weight: bold; text-decoration: underline;">not</span>
-use sudo or run it as root!)</li>
-  <li>as a service that automatically runs when your system boots, even
+(Note: Do <strong><u>not</u></strong>
+use sudo or run it as root!)
+    {%- endtrans %}
+  </li>
+  <li>
+    {% trans -%}
+    as a service that automatically runs when your system boots, even
 before logging in. The service can be enabled with "<code>dpkg-reconfigure
-i2p</code>" as root or using sudo. This is the recommended means of operation.</li>
+i2p</code>" as root or using sudo. This is the recommended means of operation.
+    {%- endtrans %}
+  </li>
 </ul>
-<p>When installing for the first time, please remember to <b>adjust
-your NAT/firewall</b>
+
+<p>{% trans -%}
+When installing for the first time, please remember to <b>adjust your NAT/firewall</b>
 if you can. The ports to forward can be found on the <a href="http://127.0.0.1:7657/confignet">
-	network configuration page</a> in the router console. If guidance with respect to forwarding ports is needed,
+network configuration page</a> in the router console. If guidance with respect to forwarding ports is needed,
 you may <a href="http://www.portforward.com">portforward.com</a> to be helpful.
-</p>
-<p>Please review and <b>adjust the bandwidth settings</b> on the
+{%- endtrans %}</p>
+
+<p>{% trans -%}
+Please review and <b>adjust the bandwidth settings</b> on the
 <a href="http://127.0.0.1:7657/config.jsp">configuration page</a>,
 as the default settings of 96 KB/s down / 40 KB/s up are fairly conservative.
-</p>
-<p>
-If you want to reach eepsites via your browser, have a look on the <a href="{{ site_url('support/htproxyports') }}">browser proxy setup</a> page for an easy howto.</p>
+{%- endtrans %}</p>
+
+<p>{% trans browserconfig=site_url('about/browser-config') -%}
+If you want to reach eepsites via your browser, have a look on the <a href="{{ browserconfig }}">browser proxy setup</a> page for an easy howto.
+{%- endtrans %}</p>
+
 {% endblock %}
diff --git a/i2p2www/pages/downloads/list.html b/i2p2www/pages/downloads/list.html
index fa75a034..d6aa6ea2 100644
--- a/i2p2www/pages/downloads/list.html
+++ b/i2p2www/pages/downloads/list.html
@@ -1,8 +1,10 @@
 {% extends "global/layout.html" %}
-{% block title %}Download{% endblock %}
+{% block title %}{% trans %}Download{% endtrans %}{% endblock %}
 {% block content %}
-<h1>Download I2P</h1>
+<h1>{% trans %}Download I2P{% endtrans %}</h1>
+
 <h3>Dependency</h3>
+<p>{% trans %}
 Java Runtime 1.5 or higher.
 (<a href="http://java.com/download/">Oracle/Sun Java Version 6</a>,
 <a href="http://openjdk.java.net/install/">OpenJDK 6</a>, or
@@ -11,78 +13,92 @@ Java Runtime 1.5 or higher.
 <br />
 <a href="http://java.com/en/download/installed.jsp?detect=jre&amp;try=1">Determine your installed Java version here</a>
 or type <tt>java -version</tt> at your command prompt.
-<h3>Clean installs</h3>
+{% endtrans %}</p>
+
+<h3>{% trans %}Clean installs{% endtrans %}</h3>
 <div class="downloadlist">
 
 <div class="package">
   <h1>Windows</h1>
   <div class="file">
-    <a href="{{ url_for('downloads_select', file=ver('i2pinstall_%s_windows.exe')) }}">i2pinstall_{{ ver() }}_windows.exe</a>
+    <a href="{{ get_url('downloads_select', file=ver('i2pinstall_%s_windows.exe')) }}">i2pinstall_{{ ver() }}_windows.exe</a>
     <div class="sig">
       (SHA256
 c76bea15a6b7d98227466cc8025b1eb9069997e40e9d71ff49e55b2c8ac0b995
-      <a href="{{ url_for('downloads_select', file=ver('i2pinstall_%s_windows.exe.sig')) }}">sig</a>)
+      <a href="{{ get_url('downloads_select', file=ver('i2pinstall_%s_windows.exe.sig')) }}">sig</a>)
     </div>
   </div>
   <div class="details">
+    {% trans -%}
     Download that file and run it.
+    {%- endtrans %}
   </div>
 </div>
 
 <div class="package">
   <h1>Mac OS X</h1>
   <div class="file">
-    <a href="{{ url_for('downloads_select', file='i2pinstall_0.9.4-1_osx.jar') }}">i2pinstall_0.9.4-1_osx.jar</a>
+    <a href="{{ get_url('downloads_select', file='i2pinstall_0.9.4-1_osx.jar') }}">i2pinstall_0.9.4-1_osx.jar</a>
     <div class="sig">
     (SHA256
 9b652bfccae644a4f3aaa7917b656a914ba120b0f6e114f1d2d5520d0b0c01ff
-      <a href="{{ url_for('downloads_select', file='i2pinstall_0.9.4-1_osx.jar.sig') }}">sig</a>)
+      <a href="{{ get_url('downloads_select', file='i2pinstall_0.9.4-1_osx.jar.sig') }}">sig</a>)
     </div>
   </div>
   <div class="details">
+    {% trans -%}
     Download that file and double-click it (if that works) or
     type <code>java -jar i2pinstall_0.9.4-1_osx.jar</code> in a terminal to run the
     installer.
     You may be able to right-click and select
     &quot;Open with Java&quot;.
+    {%- endtrans %}
     <div class="warning">
-      Due to <a href="http://{{ i2pconv('trac.i2p2.i2p') }}/ticket/826">a wrapper bug</a>, the 0.9.4 installer
+      {% trans buglink='http://'+i2pconv('trac.i2p2.i2p')+'/ticket/826' -%}
+      Due to <a href="{{ buglink }}">a wrapper bug</a>, the 0.9.4 installer
       will <b>NOT</b> work on OS X. Use the fixed 0.9.4-1 OSX installer above.
+      {%- endtrans %}
     </div>
 
-    <h2>Command line (headless) install:</h2>
+    <h2>{% trans %}Command line (headless) install:{% endtrans %}</h2>
+    {% trans -%}
     Download the 0.9.4-1 OSX graphical installer file above and
     run <code>java -jar i2pinstall_0.9.4-1_osx.jar -console</code> from the command line.
+    {%- endtrans %}
   </div>
 </div>
 
 <div class="package">
   <h1>GNU/Linux / BSD / Solaris</h1>
   <div class="file">
-    <a href="{{ url_for('downloads_select', file=ver('i2pinstall_%s.jar')) }}">i2pinstall_{{ ver() }}.jar</a>
+    <a href="{{ get_url('downloads_select', file=ver('i2pinstall_%s.jar')) }}">i2pinstall_{{ ver() }}.jar</a>
     <div class="sig">
       (SHA256
 8e670ba26c04176ace9246d91a09951975e2965b89628f620f5a3dff917298e4
-      <a href="{{ url_for('downloads_select', file=ver('i2pinstall_%s.jar.sig')) }}">sig</a>)
+      <a href="{{ get_url('downloads_select', file=ver('i2pinstall_%s.jar.sig')) }}">sig</a>)
     </div>
   </div>
   <div class="details">
+    {% trans i2pversion=ver() -%}
     Download that file and double-click it (if that works) or
-    type <code>java -jar i2pinstall_{{ ver() }}.jar</code> in a terminal to run the
+    type <code>java -jar i2pinstall_{{ i2pversion }}.jar</code> in a terminal to run the
     installer.
     On some platforms you may be able to right-click and select
     &quot;Open with Java&quot;.
+    {%- endtrans %}
 
-    <h2>Command line (headless) install:</h2>
+    <h2>{% trans %}Command line (headless) install:{% endtrans %}</h2>
+    {% trans i2pversion=ver() -%}
     Download the graphical installer file above and
-    run <code>java -jar i2pinstall_{{ ver() }}.jar -console</code> from the command line.
+    run <code>java -jar i2pinstall_{{ i2pversion }}.jar -console</code> from the command line.
+    {%- endtrans %}
   </div>
 </div>
 
 <div class="package">
   <h1>Debian / Ubuntu</h1>
   <div class="details">
-    <a href="{{ url_for('downloads_select', lang=g.lang, file='debian') }}">Packages for Debian &amp; Ubuntu are available.</a>
+    <a href="{{ get_url('downloads_select', file='debian') }}">{% trans %}Packages for Debian &amp; Ubuntu are available.{% endtrans %}</a>
   </div>
 </div>
 
@@ -97,48 +113,63 @@ c76bea15a6b7d98227466cc8025b1eb9069997e40e9d71ff49e55b2c8ac0b995
     </div>
   </div>
   <div class="details">
+    {% trans spongeurl='http://'+i2pconv('sponge.i2p') -%}
     The Android version of I2P is being actively developed.
     The latest dev build is version 0.9.3-5_b2-API8, and is available from
-    <a href="http://{{ i2pconv('sponge.i2p') }}/">sponge's eepsite</a> -
+    <a href="{{ spongeurl }}">sponge's eepsite</a> -
     scan or click the QR code.
+    {%- endtrans %}
     <div class="warning">
+      {% trans -%}
       The release and dev versions of the I2P APK are not compatible, as they
       are signed by zzz and sponge respectively. Uninstall one before installing
       the other.
+      {%- endtrans %}
     </div>
   </div>
 </div>
 
 <div class="package">
-  <h1>Source package</h1>
+  <h1>{% trans %}Source package{% endtrans %}</h1>
   <div class="file">
-    <a href="{{ url_for('downloads_select', file=ver('i2psource_%s.tar.bz2')) }}">i2psource_{{ ver() }}.tar.bz2</a>
+    <a href="{{ get_url('downloads_select', file=ver('i2psource_%s.tar.bz2')) }}">i2psource_{{ ver() }}.tar.bz2</a>
     <div class="sig">
       (SHA256
 1b7d9695555ed42142b04ad6bcda083cd1a064f6354b639ad2aef4d9cd474e06
-       <a href="{{ url_for('downloads_select', file=ver('i2psource_%s.tar.bz2.sig')) }}">sig</a>)
+       <a href="{{ get_url('downloads_select', file=ver('i2psource_%s.tar.bz2.sig')) }}">sig</a>)
     </div>
   </div>
   <div class="details">
-    Alternately, you can fetch the source from <a href="{{ site_url('volunteer/guides/newdevelopers') }}#getting-the-i2p-code">monotone</a>.
+    {% trans monotoneurl=site_url('get-involved/guides/new-developers'), i2pversion=ver() -%}
+    Alternately, you can fetch the source from <a href="{{ monotoneurl }}#getting-the-i2p-code">monotone</a>.
     <br />
-    Run <code>(tar xjvf i2psource_{{ ver() }}.tar.bz2 ; cd i2p-{{ ver() }} ; ant pkg)</code> then either
+    Run <code>(tar xjvf i2psource_{{ i2pversion }}.tar.bz2 ; cd i2p-{{ i2pversion }} ; ant pkg)</code> then either
     run the GUI installer or headless install as above.
+    {%- endtrans %}
   </div>
 </div>
 
 </div>
 
+{% trans signingkey=site_url('get-involved/develop/release-signing-key') -%}
 The files are signed by zzz,
-<a href="release-signing-key.html">whose key is here</a>.
-<p>I2P can also be downloaded from our project pages on <a href="https://launchpad.net/i2p/trunk">Launchpad</a> and <a href="http://code.google.com/p/i2p/">Google Code</a>.</p>
-<h3>Post-install work</h3>
+<a href="{{ signingkey }}">whose key is here</a>.
+{%- endtrans %}
 
-<p>After running the installer on windows, simply click on the "Start I2P" button
+<p>{% trans -%}
+I2P can also be downloaded from our project pages on <a href="https://launchpad.net/i2p/trunk">Launchpad</a> and <a href="http://code.google.com/p/i2p/">Google Code</a>.
+{%- endtrans %}</p>
+
+<h3>{% trans %}Post-install work{% endtrans %}</h3>
+
+<p>{% trans -%}
+After running the installer on windows, simply click on the "Start I2P" button
 which will bring up the <a href="http://localhost:7657/index.jsp">router console</a>,
-which has further instructions.</p>
+which has further instructions.
+{%- endtrans %}</p>
 
-<p>On Unix-like systems, I2P can be started as a service
+<p>{% trans -%}
+On Unix-like systems, I2P can be started as a service
 using the "i2prouter" script, located in the directory you selected for I2P.
 Changing to that directory in a console and issuing "sh i2prouter status"
 should tell you the router's status. The arguments "start", "stop" and "restart"
@@ -146,102 +177,129 @@ control the service. The <a href="http://localhost:7657/index.jsp">router consol
 can be accessed at its usual location.
 For users on OpenSolaris and other systems for which the wrapper (i2psvc) is not supported,
 start the router with "sh runplain.sh" instead.
-</p>
+{%- endtrans %}</p>
 
-<p>When installing for the first time, please remember to <b>adjust your NAT/firewall</b>
+<p>{% trans faq=site_url('faq') -%}
+When installing for the first time, please remember to <b>adjust your NAT/firewall</b>
 if you can, bearing in mind the Internet-facing ports I2P uses,
-<a href="{{ site_url('support/faq') }}#ports">described here</a> among other ports.
+<a href="{{ faq }}#ports">described here</a> among other ports.
 If you have successfully opened your port to inbound TCP, also enable inbound TCP on the
 <a href="http://localhost:7657/confignet.jsp">configuration page</a>.
-</p>
+{%- endtrans %}</p>
 
-<p>Also, please review and <b>adjust the bandwidth settings</b> on the
+<p>{% trans -%}
+Also, please review and <b>adjust the bandwidth settings</b> on the
 <a href="http://localhost:7657/config.jsp">configuration page</a>,
 as the default settings of 96 KBps down / 40 KBps up are fairly slow.
-</p>
+{%- endtrans %}</p>
 
-<p>
-If you want to reach eepsites via your browser, have a look on the <a href="{{ site_url('support/htproxyports') }}">browser proxy setup</a> page for an easy howto.
-</p>
+<p>{% trans browserconfig=site_url('about/browser-config') -%}
+If you want to reach eepsites via your browser, have a look on the <a href="{{ browserconfig }}">browser proxy setup</a> page for an easy howto.
+{%- endtrans %}</p>
 
-<h3>Updates from earlier releases:</h3>
-<p>
+<h3>{% trans %}Updates from earlier releases:{% endtrans %}</h3>
+
+<p>{% trans -%}
 Both automatic and manual upgrades are available for the release.
-</p>
+{%- endtrans %}</p>
 
 <div class="package">
-  <h1>Automatic updates</h1>
+  <h1>{% trans %}Automatic updates{% endtrans %}</h1>
   <div class="details">
-<p>
+<p>{% trans -%}
 If you are running 0.7.5 or later, your router should detect the
 new release. To upgrade simply click the 'Download Update' button on your router console
 when it appears.
-</p>
+{%- endtrans %}</p>
     <div class="warning">
-<p>
+<p>{% trans -%}
 Due to a bug in release 0.7.6, those whose first I2P installation was that version
 and have not upgraded manually
 may get a "downloaded version is not greater than current version" error,
 and should use the manual update method below.
-</p>
+{%- endtrans %}</p>
     </div>
     <div class="warning">
-<p>
+<p>{% trans blogpost=get_url('blog_post', slug='2009/06/29/0.7.5-Release') -%}
 If you are running 0.7.4 or earlier, please see
-<a href="{{ url_for('blog_post', slug='2009/06/29/I2P_0.7.5_released') }}">the 0.7.5 release notes</a>
+<a href="{{ blogpost }}">the 0.7.5 release notes</a>
 for important information about how to configure your router to automatically
 receive the release.
-</p>
+{%- endtrans %}</p>
     </div>
     <div class="warning">
-<p>
+<p>{% trans instructions=site_url('misc/upgrade-0.6.1.30') -%}
 If you are running 0.6.1.30 or earlier, please see
-<a href="upgrade-0.6.1.30.html">instructions</a>
+<a href="{{ instructions }}">instructions</a>
 for important information about how to configure your router to automatically
 receive the release.
-</p>
+{%- endtrans %}</p>
 
 <ol>
-<li>If you have reconfigured your router following the <a href="upgrade-0.6.1.30.html">instructions</a>, you should see a link on your 
+<li>
+    {% trans instructions=site_url('misc/upgrade-0.6.1.30') -%}
+    If you have reconfigured your router following the <a href="{{ instructions }}">instructions</a>, you should see a link on your 
     <a href="http://localhost:7657/index.jsp">router console</a> allowing
     you to download and install the new release by just clicking on that
-    link.</li>
-<li>Alternately, you can use the manual method specified below.</li>
+    link.
+    {%- endtrans %}
+</li>
+<li>
+    {% trans -%}
+    Alternately, you can use the manual method specified below.
+    {%- endtrans %}
+</li>
 </ol>
     </div>
   </div>
 </div>
 
 <div class="package">
-  <h1>Manual updates</h1>
+  <h1>{% trans %}Manual updates{% endtrans %}</h1>
   <div class="file">
-    <a href="{{ url_for('downloads_select', file=ver('i2pupdate_%s.zip')) }}">i2pupdate_{{ ver() }}.zip</a>
+    <a href="{{ get_url('downloads_select', file=ver('i2pupdate_%s.zip')) }}">i2pupdate_{{ ver() }}.zip</a>
     <div class="sig">
       (SHA256
 0f369d9b85793f157ec67c4d59723a2ad0c1de2a0902d35e11c26a2c74add824
-      <a href="{{ url_for('downloads_select', file=ver('i2pupdate_%s.zip.sig')) }}">sig</a>)
+      <a href="{{ get_url('downloads_select', file=ver('i2pupdate_%s.zip.sig')) }}">sig</a>)
     </div>
   </div>
   <div class="details">
 <ol>
-<li>Download that file to your I2P
+<li>
+    {% trans -%}
+    Download that file to your I2P
     installation directory and <b>rename as i2pupdate.zip</b>.
     (alternately, you can get the source as above and run "ant updater", then copy the
     resulting i2pupdate.zip to your I2P installation directory).  You do 
-    NOT need to unzip that file.</li>
-<li>Click <a href="http://localhost:7657/configservice.jsp">"Restart"</a></li>
-<li>Grab a cup of coffee and come back in 11 minutes</li>
+    NOT need to unzip that file.
+    {%- endtrans %}
+</li>
+<li>
+    {% trans -%}
+    Click <a href="http://localhost:7657/configservice.jsp">"Restart"</a>
+    {%- endtrans %}
+</li>
+<li>
+    {% trans -%}
+    Grab a cup of coffee and come back in 11 minutes
+    {%- endtrans %}
+</li>
 </ol>
   </div>
 </div>
 
+{% trans signingkey=site_url('get-involved/develop/release-signing-key') -%}
 The file is signed by zzz,
-<a href="{{ site_url('volunteer/develop/release-signing-key') }}">whose key is here</a>.
+<a href="{{ signingkey }}">whose key is here</a>.
+{%- endtrans %}
 
-<h3>Previous Releases</h3>
+<h3>{% trans %}Previous Releases{% endtrans %}</h3>
+
+{% trans echelon=i2pconv('echelon.i2p') -%}
 Previous releases are available on <a href="http://code.google.com/p/i2p/downloads/list?can=1">Google Code</a>
 and <a href="https://launchpad.net/i2p/trunk">Launchpad</a>
-and within the I2P network on <a href="http://{{ i2pconv('echelon.i2p') }}/">{{ i2pconv('echelon.i2p') }}</a>.
-
+and within the I2P network on <a href="http://{{ echelon }}/">{{ echelon }}</a>.
+{%- endtrans %}
 
 {% endblock %}
diff --git a/i2p2www/pages/downloads/select.html b/i2p2www/pages/downloads/select.html
index 2745a2b2..fbe8c40d 100644
--- a/i2p2www/pages/downloads/select.html
+++ b/i2p2www/pages/downloads/select.html
@@ -1,15 +1,15 @@
 {% extends "global/layout.html" %}
-{% block title %}Mirror selection{% endblock %}
+{% block title %}{% trans %}Mirror selection{% endtrans %}{% endblock %}
 {% block content %}
-<h1>Mirror selection</h1>
-<h2>File: /{{ file }}</h2>
+<h1>{% trans %}Mirror selection{% endtrans %}</h1>
+<h2>{% trans %}File:{% endtrans %} /{{ file }}</h2>
 {% for protocol in mirrors -%}
 <div class="protocol">
   <h3>{{ protocol.name | upper }}</h3>
   <ul>
-    <li><a href="{{ url_for('downloads_redirect', protocol=protocol.name, file=file) }}">Any mirror</a></li>
+    <li><a href="{{ url_for('downloads_redirect', protocol=protocol.name, file=file) }}">{% trans %}Any mirror{% endtrans %}</a></li>
     {% for mirror in protocol.mirrors -%}
-    <li><img src="{{ url_for('static', filename='images/flags/'+mirror.country+'.png') }}" />&nbsp;{% if mirror.org_url %}<a href="{{ mirror.org_url }}">{% endif %}{{ mirror.org }}{% if mirror.org_url %}</a>{% endif %} <a href="{{ url_for('downloads_redirect', protocol=protocol.name, file=file, mirror=loop.index-1) }}">[Download]</a></li>
+    <li><img src="{{ url_for('static', filename='images/flags/'+mirror.country+'.png') }}" />&nbsp;{% if mirror.org_url %}<a href="{{ mirror.org_url }}">{% endif %}{{ mirror.org }}{% if mirror.org_url %}</a>{% endif %} <a href="{{ url_for('downloads_redirect', protocol=protocol.name, file=file, mirror=loop.index-1) }}">[{% trans %}Download{% endtrans %}]</a></li>
     {%- endfor %}
   </ul>
 </div>
diff --git a/i2p2www/pages/meetings/index.html b/i2p2www/pages/meetings/index.html
index 70a30559..18a0f308 100644
--- a/i2p2www/pages/meetings/index.html
+++ b/i2p2www/pages/meetings/index.html
@@ -1,15 +1,20 @@
 {% extends "global/layout.html" %}
-{% block title %}Meetings{% endblock %}
+{% block title %}{% trans %}Meetings{% endtrans %}{% endblock %}
 {% block headextra %}
-    <link href="{{ url_for('meetings_atom', lang=g.lang) }}" type="application/atom+xml" rel="alternate" title="I2P Meetings ATOM Feed" />
+    <link href="{{ get_url('meetings_atom') }}" type="application/atom+xml" rel="alternate" title="{% trans %}I2P Meetings ATOM Feed{% endtrans %}" />
 {%- endblock %}
 {% block content %}
-<h1>Logs of past I2P meetings</h1>
-<p>If you have something to discuss, please find the developers on IRC in #i2p-dev.
-<a href="{{ url_for('blog_index', lang=g.lang) }}">Status updates</a> from developers are also available.
-</p><div class="underline"></div>
+<h1>{% trans %}Logs of past I2P meetings{% endtrans %}</h1>
+
+<p>{% trans blogindex=get_url('blog_index') -%}
+If you have something to discuss, please find the developers on IRC in #i2p-dev.
+<a href="{{ blogindex }}">Status updates</a> from developers are also available.
+{%- endtrans %}</p>
+
+<div class="underline"></div>
+
 <ul class="infolist">
-{%- macro meeting_url(m_id) -%}{{ url_for('meetings_show', lang=g.lang, id=m_id) }}{%- endmacro %}
+{%- macro meeting_url(m_id) -%}{{ get_url('meetings_show', id=m_id) }}{%- endmacro %}
 {% for meeting in meetings %}
 <li><a href="{{ meeting_url(meeting['id']) }}">Meeting {{ meeting['id'] }}</a>{% if meeting['date'] %} - {{ meeting['date'].strftime("%B %d, %Y") }}{% endif %}</li>
 {% endfor %}
diff --git a/i2p2www/pages/meetings/show.html b/i2p2www/pages/meetings/show.html
index 7c00ddd9..235d1210 100644
--- a/i2p2www/pages/meetings/show.html
+++ b/i2p2www/pages/meetings/show.html
@@ -1,5 +1,5 @@
 {% extends "global/layout.html" %}
-{% block title %}I2P Development Meeting {{ id }}{% endblock %}
+{% block title %}{% trans %}I2P Development Meeting {{ id }}{% endtrans %}{% endblock %}
 {% block content %}
 {% autoescape false %}
 {% if header %}
@@ -7,7 +7,7 @@
 {% endif %}
 {% endautoescape %}
 <div class="irclog">
-<h1>Full IRC Log</h1>
+<h1>{% trans %}Full IRC Log{% endtrans %}</h1>
 <pre>
 {{ log|escape }}
 {# TODO: pygments #}