Use {{ _('') }} instead of {% trans %}{% endtrans %} for short strings and headings

i2p2www/pages/blog/index.html

 {% extends "global/layout.html" %}
-{% block title %}{% trans %}Blog Index{% endtrans %}{% endblock %}
+{% block title %}{{ _('Blog Index') }}}{% endblock %}
 {% block headextra %}
-    <link href="{{ get_url('blog_atom') }}" type="application/atom+xml" rel="alternate" title="{% trans %}I2P Blog ATOM Feed{% endtrans %}" />
+    <link href="{{ get_url('blog_atom') }}" type="application/atom+xml" rel="alternate" title="{{ _('I2P Blog ATOM Feed') }}" />
 {%- endblock %}
 {% block content %}
 <ul id="posts">

i2p2www/pages/blog/latest.html

@@ -2,5 +2,5 @@
       {% for slug, post in blog_posts -%}
         <li>{{ post.date }} - <a href="{{ get_url('blog_post', slug=slug) }}">{{ post.title }}</a></li>
       {%- endfor %}
-        <li><a href="{{ get_url('blog_index') }}"><em>{% trans %}More blog posts&hellip;{% endtrans %}</em></a></li>
+        <li><a href="{{ get_url('blog_index') }}"><em>{{ _('More blog posts&hellip;') }}</em></a></li>
       </ul>

i2p2www/pages/blog/post.html

 {% extends "global/layout.html" %}
-{% block title %}{{ title }} - {% trans %}Blog{% endtrans %}{% endblock %}
+{% block title %}{{ title }} - {{ _('Blog') }}{% endblock %}
 {% block content %}
 <ul id="post-info">
   <li class="date">{{ meta.date }}</li>

i2p2www/pages/downloads/debian.html

 {% extends "global/layout.html" %}
 {% block title %}Debian/Ubuntu{% endblock %}
 {% block content %}
-<h1>{% trans %}Debian I2P Packages{% endtrans %}</h1>
+<h1>{{ _('Debian I2P Packages') }}</h1>
 
 {% trans -%}
 The packages hosted on <a href="https://launchpad.net/%7Ei2p-maintainers/+archive/i2p">the I2P Launchpad site</a>
@@ -29,8 +29,8 @@ with these packages on <a href="http://{{ trac }}">Trac</a> at
   <li>{% trans %}Option 3: <a href="#nonlinux">Non-Linux</a> (and possibly Non-x86 architectures){% endtrans %}</li>
 </ul>
 
-<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>
+<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>
 <ol>
   <li>
     {% trans %}Open a terminal and enter:{% endtrans %}<br />
@@ -54,7 +54,7 @@ was added with the earlier command.
     <code>&nbsp;&nbsp;&nbsp;&nbsp;sudo apt-get install i2p</code></li>
 </ol>
 
-<h5>{% trans %}Adding the PPA Using Synaptic{% endtrans %}</h5>
+<h5>{{ _('Adding the PPA Using Synaptic') }}</h5>
 <ol>
   <li>
     {% trans -%}
@@ -83,7 +83,7 @@ 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">{% trans %}Instructions for Debian Lenny and newer{% endtrans %}</h2>
+<h2 id="debian">{{ _('Instructions for Debian Lenny and newer') }}</h2>
 
 {% trans -%}
 The steps below should be performed with root access (i.e., switching
@@ -123,7 +123,7 @@ repository enabled on your system, including the I2P PPA added in step
 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="nonlinux">{% trans %}Instructions for Non-Linux / Non-x86{% endtrans %}</h2>
+<h2 id="nonlinux">{{ _('Instructions for Non-Linux / Non-x86') }}</h2>
 
 {% trans -%}
 The steps below should be performed with root access (i.e., switching
@@ -152,7 +152,7 @@ user to root with "<code>su</code>" or by prefixing each command with "<code>sud
 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="Post-install_work">{% trans %}Post-install work{% endtrans %}</h2>
+<h2 id="Post-install_work">{{ _('Post-install work') }}</h2>
 
 
 {% trans -%}

i2p2www/pages/downloads/list.html

 {% extends "global/layout.html" %}
-{% block title %}{% trans %}Download{% endtrans %}{% endblock %}
+{% block title %}{{ _('Download') }}{% endblock %}
 {% block content %}
-<h1>{% trans %}Download I2P{% endtrans %}</h1>
+<h1>{{ _('Download I2P') }}</h1>
 
-<h3>Dependency</h3>
+<h3>{{ _('Dependency') }}</h3>
 <p>{% trans %}
 Java Runtime 1.5 or higher.
 (<a href="http://java.com/download/">Oracle/Sun Java Version 6</a>,
@@ -15,7 +15,7 @@ Java Runtime 1.5 or higher.
 or type <tt>java -version</tt> at your command prompt.
 {% endtrans %}</p>
 
-<h3>{% trans %}Clean installs{% endtrans %}</h3>
+<h3>{{ _('Clean installs') }}</h3>
 <div class="downloadlist">
 
 <div class="package">
@@ -130,7 +130,7 @@ c76bea15a6b7d98227466cc8025b1eb9069997e40e9d71ff49e55b2c8ac0b995
 </div>
 
 <div class="package">
-  <h1>{% trans %}Source package{% endtrans %}</h1>
+  <h1>{{ _('Source package') }}</h1>
   <div class="file">
     <a href="{{ get_url('downloads_select', file=ver('i2psource_%s.tar.bz2')) }}">i2psource_{{ ver() }}.tar.bz2</a>
     <div class="sig">
@@ -160,7 +160,7 @@ The files are signed by zzz,
 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>
+<h3>{{ _('Post-install work') }}</h3>
 
 <p>{% trans -%}
 After running the installer on windows, simply click on the "Start I2P" button
@@ -197,14 +197,14 @@ as the default settings of 96 KBps down / 40 KBps up are fairly slow.
 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>{% trans %}Updates from earlier releases:{% endtrans %}</h3>
+<h3>{{ _('Updates from earlier releases:') }}</h3>
 
 <p>{% trans -%}
 Both automatic and manual upgrades are available for the release.
 {%- endtrans %}</p>
 
 <div class="package">
-  <h1>{% trans %}Automatic updates{% endtrans %}</h1>
+  <h1>{{ _('Automatic updates') }}</h1>
   <div class="details">
 <p>{% trans -%}
 If you are running 0.7.5 or later, your router should detect the
@@ -255,7 +255,7 @@ receive the release.
 </div>
 
 <div class="package">
-  <h1>{% trans %}Manual updates{% endtrans %}</h1>
+  <h1>{{ _('Manual updates') }}</h1>
   <div class="file">
     <a href="{{ get_url('downloads_select', file=ver('i2pupdate_%s.zip')) }}">i2pupdate_{{ ver() }}.zip</a>
     <div class="sig">
@@ -294,7 +294,7 @@ The file is signed by zzz,
 <a href="{{ signingkey }}">whose key is here</a>.
 {%- endtrans %}
 
-<h3>{% trans %}Previous Releases{% endtrans %}</h3>
+<h3>{{ _('Previous Releases') }}</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>

i2p2www/pages/downloads/select.html

 {% extends "global/layout.html" %}
-{% block title %}{% trans %}Mirror selection{% endtrans %}{% endblock %}
+{% block title %}{{ _('Mirror selection') }}{% endblock %}
 {% block content %}
-<h1>{% trans %}Mirror selection{% endtrans %}</h1>
-<h2>{% trans %}File:{% endtrans %} /{{ file }}</h2>
+<h1>{{ _('Mirror selection') }}</h1>
+<h2>{{ _('File:') }} /{{ 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) }}">{% trans %}Any mirror{% endtrans %}</a></li>
+    <li><a href="{{ url_for('downloads_redirect', protocol=protocol.name, file=file) }}">{{ _('Any mirror') }}</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) }}">[{% trans %}Download{% endtrans %}]</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) }}">[{{ _('Download') }}]</a></li>
     {%- endfor %}
   </ul>
 </div>

i2p2www/pages/meetings/index.html

 {% extends "global/layout.html" %}
-{% block title %}{% trans %}Meetings{% endtrans %}{% endblock %}
+{% block title %}{{ _('Meetings') }}{% endblock %}
 {% block headextra %}
-    <link href="{{ get_url('meetings_atom') }}" type="application/atom+xml" rel="alternate" title="{% trans %}I2P Meetings ATOM Feed{% endtrans %}" />
+    <link href="{{ get_url('meetings_atom') }}" type="application/atom+xml" rel="alternate" title="{{ _('I2P Meetings ATOM Feed') }}" />
 {%- endblock %}
 {% block content %}
-<h1>{% trans %}Logs of past I2P meetings{% endtrans %}</h1>
+<h1>{{ _('Logs of past I2P meetings') }}</h1>
 
 <p>{% trans blogindex=get_url('blog_index') -%}
 If you have something to discuss, please find the developers on IRC in #i2p-dev.

i2p2www/pages/meetings/show.html

@@ -7,7 +7,7 @@
 {% endif %}
 {% endautoescape %}
 <div class="irclog">
-<h1>{% trans %}Full IRC Log{% endtrans %}</h1>
+<h1>{{ _('Full IRC Log') }}</h1>
 <pre>
 {{ log|escape }}
 {# TODO: pygments #}