Fixed comparison/other-networks

i2p2www/pages/site/comparison/other-networks.html

@@ -18,7 +18,7 @@ Most of the following sections are fairly old, and may not be accurate.
 For an overview of available comparisons, see the
 <a href="{{ comparison }}">main network comparisons page</a>.
 You may contribute an analysis by entering a
-<a href="{{ trac }}">new ticket on trac.i2p2.de</a>.
+<a href="{{ trac }}">new ticket on Trac</a>.
 {%- endtrans %}</p>
 
 
@@ -150,13 +150,11 @@ comparison of Tarzan, Crowds, Onion Routing (OR), and I2P:</p>
 <i><a href="http://mixminion.net/">[Mixminion]</a> 
    <a href="http://mixmaster.sourceforge.net/">[Mixmaster]</a></i>
 
-<p>{% trans %}
+<p>{% trans syndie='http://syndie.i2p2.de/' %}
 Mixminion and Mixmaster are networks to support anonymous email against a very
 powerful adversary.
 High-latency messaging applications running on top of I2P
-(for example
-<a href="http://syndie.i2p2.de/">Syndie</a> or
-I2PBote)
+(for example <a href="{{ syndie }}">Syndie</a> or I2PBote)
 may perhaps prove adequate to meet the threat
 model of those adversaries, while running in parallel along side the needs of low latency users, to provide
 a significantly larger anonymity set.
@@ -219,10 +217,10 @@ particular issues can be addressed.
 {%- endtrans %}</p>
 
 <h2>Haystack</h2>
-<p>{% trans docs=site_url('docs') -%}
+<p>{% trans torpost='http://blog.torproject.org/blog/ten-things-look-circumvention-tool',
+docs=site_url('docs') -%}
 This was a closed-source network targeted at Iranian users.
-Tor did a
-<a href="http://blog.torproject.org/blog/ten-things-look-circumvention-tool">good writeup on what to look for in a circumvention tool</a>.
+Tor did a <a href="{{ torpost }}">good writeup on what to look for in a circumvention tool</a>.
 Suffice it to say that being closed source and publicly targeting a specific country are not good ideas.
 I2P is, of course, open source. However, that source, and our
 <a href="{{ docs }}">technical documentation</a>, need much more review.
@@ -231,13 +229,13 @@ I2P is, of course, open source. However, that source, and our
 <h2>{{ _('Paid VPN Services') }}</h2>
 <p>{% trans trac='https://trac.i2p2.de/report/1' -%}
 You may contribute an analysis by entering a
-<a href="{{ trac }}">new ticket on trac.i2p2.de</a>.
-</p>
+<a href="{{ trac }}">new ticket on Trac</a>.
+{%- endtrans %}</p>
 
 <h2>{{ _('Others') }}</h2>
 <p>{% trans trac='https://trac.i2p2.de/report/1' -%}
 You may contribute an analysis by entering a
-<a href="{{ trac }}">new ticket on trac.i2p2.de</a>.
+<a href="{{ trac }}">new ticket on Trac</a>.
 {%- endtrans %}</p>