diff --git a/i2p2www/pages/site/about/performance/history.html b/i2p2www/pages/site/about/performance/history.html
index 59f92ba91ad368faddd1e52a4e012fdcba32283b..d919c51a6fcd1c707f338c0ff968fb50218664f1 100644
--- a/i2p2www/pages/site/about/performance/history.html
+++ b/i2p2www/pages/site/about/performance/history.html
@@ -24,7 +24,7 @@ Rather than try to tune this method, we'll call out to
 ugha and duck are working on the C/JNI glue code, and the existing java code
 is already deployed with hooks for that whenever its ready.  Preliminary results
 look fantastic - running the router with the native GMP modPow is providing over
-a 800% speedup in encryption performance, and the load was cut in half.  This
+a 800% speedup in encryption performance, and the load was cut in half.  This
 was just on one user's machine, and things are nowhere near ready for packaging
 and deployment, yet.
 {%- endtrans %}</p>
@@ -54,7 +54,7 @@ have to do the network database lookup.
 <p>{% trans -%}
 For unpublished LeaseSets such as "shared clients", this is the only way to
 get the LeaseSet to Bob. Unfortunately this bundling every time adds
-almost 100% overhead to a high-bandwidth connection, and much more to
+almost 100&#37; overhead to a high-bandwidth connection, and much more to
 a connection with smaller messages.
 {%- endtrans %}</p>
 <p>{% trans -%}
diff --git a/i2p2www/pages/site/docs/api/i2ptunnel.html b/i2p2www/pages/site/docs/api/i2ptunnel.html
index 608ab1708cea4a7f392026d48b170b459a065d13..f06536cd05d70681b3c547436964f71d3b464047 100644
--- a/i2p2www/pages/site/docs/api/i2ptunnel.html
+++ b/i2p2www/pages/site/docs/api/i2ptunnel.html
@@ -40,8 +40,8 @@ A HTTP proxy used for browsing I2P and the regular internet anonymously through
 Browsing internet through I2P uses a random proxy specified by the "Outproxies:" option.
 {%- endtrans %}</li>
 <li><b>Irc2P</b> - <i>localhost:6668</i> - {% trans %}An IRC tunnel to the default anonymous IRC network, Irc2P.{% endtrans %}</li>
-<li><b>mtn.i2p2.i2p</b> - <i>localhost:8998</i> - {% trans -%}
-The anonymous <a href="http://en.wikipedia.org/wiki/Monotone_%28software%29">monotone</a>
+<li><b>mtn.i2p2.i2p</b> - <i>localhost:8998</i> - {% trans monotone='http://en.wikipedia.org/wiki/Monotone_%28software%29' -%}
+The anonymous <a href="{{ monotone }}">monotone</a>
 sourcecode repository for I2P
 {%- endtrans %}</li>
 <li><b>smtp.postman.i2p</b> - <i>localhost:7659</i> - {% trans postman=i2pconv('hq.postman.i2p') -%}
diff --git a/i2p2www/pages/site/docs/applications/bittorrent.html b/i2p2www/pages/site/docs/applications/bittorrent.html
index 7932085697975a3a6a9f130624ac81f19443a382..86744fa01a7aa180ba598edf1ade95788521d08d 100644
--- a/i2p2www/pages/site/docs/applications/bittorrent.html
+++ b/i2p2www/pages/site/docs/applications/bittorrent.html
@@ -108,7 +108,7 @@ The peers key may be absent, or the peers value may be zero-length.
 
 <p>{% trans -%}
 While compact response support is optional for both clients and trackers, it is highly
-recommended as it reduces the nominal response size by over 90%.
+recommended as it reduces the nominal response size by over 90&#37;.
 {%- endtrans %}</p>
 
 
diff --git a/i2p2www/pages/site/docs/discussions/ntcp.html b/i2p2www/pages/site/docs/discussions/ntcp.html
index 5040969570d39770ea485567f5f51155293c693c..f5bf132e14020f55c20d7d23dc6cd8821cb559de 100644
--- a/i2p2www/pages/site/docs/discussions/ntcp.html
+++ b/i2p2www/pages/site/docs/discussions/ntcp.html
@@ -144,10 +144,10 @@ Posted to new Syndie, 2007-03-27
 <p>
 On the whole, I'm open to experimenting with this, though remember why NTCP is 
 there in the first place - SSU failed in a congestion collapse. NTCP "just 
-works", and while 2-10% retransmission rates can be handled in normal 
-single-hop networks, that gives us a 40% retransmission rate with 2 hop 
+works", and while 2-10&#37; retransmission rates can be handled in normal 
+single-hop networks, that gives us a 40&#37; retransmission rate with 2 hop 
 tunnels. If you loop in some of the measured SSU retransmission rates we saw 
-back before NTCP was implemented (10-30+%), that gives us an 83% retransmission 
+back before NTCP was implemented (10-30+&#37;), that gives us an 83&#37; retransmission 
 rate. Perhaps those rates were caused by the low 10 second timeout, but 
 increasing that much would bite us (remember, multiply by 5 and you've got half 
 the journey).
@@ -333,7 +333,7 @@ stream timeout. TCP in practice has retransmission timeouts orders of magnitude
 less, though yes, can get to 60s on links running through exposed wires or 
 satellite transmissions ;) If we increase the streaming lib retransmission 
 timeout to e.g. 75 seconds, we could go get a beer before a web page loads 
-(especially assuming less than a 98% reliable transport). That's one reason we 
+(especially assuming less than a 98&#37; reliable transport). That's one reason we 
 prefer NTCP.
 </p>
 
@@ -399,7 +399,7 @@ more often on NTCP, but maybe that's a hint on why NTCP performs worse.
 Posted to new Syndie, 2007-03-31
 <p>
 measured SSU retransmission rates we saw back before NTCP was implemented 
-(10-30+%)
+(10-30+&#37;)
 </p><p>
 
 Can the router itself measure this? If so, could a transport be selected based 
@@ -463,7 +463,7 @@ while still somewhat bothering to carry TCP streams.
 On that background, a small diversity of transports (as many as needed, but not 
 more) appears sensible in either case. Which should be the main transport, 
 depends on their performance-wise. I've seen nasty stuff on my line when I 
-tried to use its full capacity with UDP. Packet losses on the level of 35%.
+tried to use its full capacity with UDP. Packet losses on the level of 35&#37;.
 </p><p>
 
 We could definitely try playing with UDP versus TCP priorities, but I'd urge 
@@ -502,7 +502,7 @@ build messages).
 On that background, a small diversity of transports (as many as needed, but 
 not more) appears sensible in either case. Which should be the main transport, 
 depends on their performance-wise. I've seen nasty stuff on my line when I 
-tried to use its full capacity with UDP. Packet losses on the level of 35%.
+tried to use its full capacity with UDP. Packet losses on the level of 35&#37;.
 
 </i>
 </p><p>
diff --git a/i2p2www/pages/site/docs/how/network-database.html b/i2p2www/pages/site/docs/how/network-database.html
index 136fc04457b449b7834e57e06ee19dbf36d21a21..bd948a8e84e15a6988cbfe0f2f752114d0dd677f 100644
--- a/i2p2www/pages/site/docs/how/network-database.html
+++ b/i2p2www/pages/site/docs/how/network-database.html
@@ -279,7 +279,7 @@ automatically enabled.
 {%- endtrans %}</p>
 
 <p>{% trans -%}
-With the current rules for automatic opt-in, approximately 6% of
+With the current rules for automatic opt-in, approximately 6&#37; of
 the routers in the network are floodfill routers.
 {%- endtrans %}</p>
 
@@ -810,7 +810,7 @@ more correlative. Of course, a larger network makes a Sybil attack that much har
 <p>{% trans threatmodel=site_url('docs/how/threat-model') -%}
 However, the general issue of DHT information leakage in I2P needs further investigation.
 The floodfill routers are in a position to observe queries and gather information.
-Certainly, at a level of <i>f</i> = 0.2 (20% malicious nodes, as specifed in the paper)
+Certainly, at a level of <i>f</i> = 0.2 (20&#37; malicious nodes, as specifed in the paper)
 we expect that many of the Sybil threats we describe
 (<a href="{{ threatmodel }}#sybil">here</a>,
 <a href="#sybil">here</a> and
diff --git a/i2p2www/pages/site/docs/how/peer-selection.html b/i2p2www/pages/site/docs/how/peer-selection.html
index fd26f0613e7523dd8eaf5b7f89356eabead3c79d..5922d8b4e10d16b0e37586e776edf7468c7b7f87 100644
--- a/i2p2www/pages/site/docs/how/peer-selection.html
+++ b/i2p2www/pages/site/docs/how/peer-selection.html
@@ -237,7 +237,7 @@ To prevent some simple attacks, and for performance, there are the following res
 Two peers from the same /16 IP space may not be in the same tunnel.
 {%- endtrans %}</li>
 <li>{% trans -%}
-A peer may participate in a maximum of 33% of all tunnels created by the router.
+A peer may participate in a maximum of 33&#37; of all tunnels created by the router.
 {%- endtrans %}</li>
 <li>{% trans -%}
 Peers with extremely low bandwidth are not used.
diff --git a/i2p2www/pages/site/docs/how/threat-model.html b/i2p2www/pages/site/docs/how/threat-model.html
index 33f1cd35a62d0751c5f4251bea47a08a2d368e33..1fd3b026fd9ecf27512d1a92ec6c039b63a14b1a 100644
--- a/i2p2www/pages/site/docs/how/threat-model.html
+++ b/i2p2www/pages/site/docs/how/threat-model.html
@@ -312,7 +312,7 @@ willing to contribute. The defense against this is:
 Set defaults so that most users provide resources to the network.
 In I2P, users route traffic by default. In sharp distinction to
 <a href="{{ comparisons }}">other networks</a>,
-over 95% of I2P users relay traffic for others.
+over 95&#37; of I2P users relay traffic for others.
 {%- endtrans %}</li>
   <li>{% trans -%}
 Provide easy configuration options so that users may increase their
@@ -585,7 +585,7 @@ Reference: <a href="{{ pdf }}">Breaking and Improving Protocol Obfuscation</a>
 Sybil describes a category of attacks where the adversary creates arbitrarily
 large numbers of colluding nodes and uses the increased numbers to help 
 mounting other attacks.  For instance, if an attacker is in a network where peers
-are selected randomly and they want an 80% chance to be one of those peers, they
+are selected randomly and they want an 80&#37; chance to be one of those peers, they
 simply create five times the number of nodes that are in the network and roll 
 the dice.  When identity is free, Sybil can be a very potent technique for a 
 powerful adversary.  The primary technique to address this is simply to make 
@@ -640,7 +640,7 @@ This is somewhat mitigated by our
 <a href="{{ peerselection }}">peer profiling</a> methods used to monitor the performance
 of peers.
 However, this is a powerful attack as the number of routers approaches
-<i>f</i> = 0.2, or 20% malicious nodes, as specifed in the paper.
+<i>f</i> = 0.2, or 20&#37; malicious nodes, as specifed in the paper.
 The malicous routers could also maintain connections to the target router and provide
 excellent forwarding bandwidth for traffic over those connections, in an attempt
 to manipulate the profiles managed by the target and appear attractive.
diff --git a/i2p2www/pages/site/docs/spec/blockfile.html b/i2p2www/pages/site/docs/spec/blockfile.html
index f9ed39589151633062f8ce7ce4dca1d80dfc9016..88ace4cd8aa5fa7ab18e730731831015143c0796 100644
--- a/i2p2www/pages/site/docs/spec/blockfile.html
+++ b/i2p2www/pages/site/docs/spec/blockfile.html
@@ -169,8 +169,8 @@ The maximum number of entries per span is 16.
 {%- endtrans %}</p>
 
 <h4>{% trans %}Properties Skiplist{% endtrans %}</h4>
-<p>{% trans -%}
-"%%__INFO__%%" is the master database skiplist with String/Properties key/value entries containing only one entry:
+<p>{% trans INFO='"%%__INFO__%%"' -%}
+{{ INFO }} is the master database skiplist with String/Properties key/value entries containing only one entry:
 {%- endtrans %}</p>
 <pre>
     "info": a Properties (UTF-8 String/String Map), serialized as a <a href="{{ site_url('docs/spec/common-structures') }}#type_Mapping">Mapping</a>:
@@ -182,8 +182,8 @@ The maximum number of entries per span is 16.
 </pre>
 
 <h4>{% trans %}Reverse Lookup Skiplist{% endtrans %}</h4>
-<p>{% trans -%}
-"%%__REVERSE__%%" is the reverse lookup skiplist with Integer/Properties key/value entries
+<p>{% trans REVERSE='"%%__REVERSE__%%"' -%}
+{{ REVERSE }} is the reverse lookup skiplist with Integer/Properties key/value entries
     (as of database version 2):
 {%- endtrans %}</p>
 <pre>
diff --git a/i2p2www/pages/site/docs/spec/plugin.html b/i2p2www/pages/site/docs/spec/plugin.html
index 406d833e8b1bee45899b112075526e895ecfcff3..8526379b528878aec829f2e063c506460c979cbf 100644
--- a/i2p2www/pages/site/docs/spec/plugin.html
+++ b/i2p2www/pages/site/docs/spec/plugin.html
@@ -321,7 +321,7 @@ Other plugin guidelines
 <li>
 See i2p.scripts branch or any of the sample plugins on zzz's page for a xpi2p file generator to make it easy.
 <li>
-Pack200 of jars and wars is strongly recommended for plugins, it generally shrinks plugins by 60-65%.
+Pack200 of jars and wars is strongly recommended for plugins, it generally shrinks plugins by 60-65&#37;.
 See any of the sample plugins on zzz's page for an example.
 Pack200 unpacking is supported on routers 0.7.11-5 or higher, which is essentially all routers that
 support plugins at all.
diff --git a/i2p2www/pages/site/docs/spec/updates.html b/i2p2www/pages/site/docs/spec/updates.html
index 76781107b9eda8337a64bee144d81e7ac15203b4..a851aa9bb235cc388edf63319caea3bac498c7b6 100644
--- a/i2p2www/pages/site/docs/spec/updates.html
+++ b/i2p2www/pages/site/docs/spec/updates.html
@@ -99,7 +99,7 @@ As of release 0.7.12, the router supports Pack200 decompression.
 Files inside the zip archive with a .jar.pack or .war.pack suffix
 are transparently decompressed to a .jar or .war file.
 Update files containing .pack files are traditionally named with a '.su2' suffix.
-Pack200 shrinks the update files by about 60%.
+Pack200 shrinks the update files by about 60&#37;.
 {%- endtrans %}</p>
 
 <p>{% trans -%}
diff --git a/i2p2www/pages/site/docs/transport/ssu.html b/i2p2www/pages/site/docs/transport/ssu.html
index d846503c5a52c0fd881a1e6eb38a57c30204eb28..6d475bdc7861612d6d696b02dcd31fa98682caa4 100644
--- a/i2p2www/pages/site/docs/transport/ssu.html
+++ b/i2p2www/pages/site/docs/transport/ssu.html
@@ -81,7 +81,7 @@ The MTU value is adjusted based on the percentage of packets that are retransmit
 {%- endtrans %}</p>
 
 <p>{% trans -%}
-For both MTU values, it is desirable that (MTU % 16) == 12, so that
+For both MTU values, it is desirable that (MTU &#37; 16) == 12, so that
 the payload portion after the 28-byte IP/UDP header is a multiple of
 16 bytes, for encryption purposes.
 {%- endtrans %}</p>
@@ -118,7 +118,7 @@ honor that when a connection is established.
 
 <p>{% trans -%}
 For IPv6, the minimum MTU is 1280. The IPv6 IP/UDP header is 48 bytes,
-so we use an MTU where (MTN % 16 == 0), which is true for 1280.
+so we use an MTU where (MTN &#37; 16 == 0), which is true for 1280.
 {%- endtrans %}</p>
 
 <h3><a name="max">{% trans %}Message Size Limits{% endtrans %}</a></h3>
diff --git a/i2p2www/pages/site/faq.html b/i2p2www/pages/site/faq.html
index f0e8ac46ee3a6b1444d0ed944e70479e708e1acb..3f9e727b476277732091539d1dc37cf0c395f688 100644
--- a/i2p2www/pages/site/faq.html
+++ b/i2p2www/pages/site/faq.html
@@ -159,7 +159,7 @@ garbage collection. Increase the setting <code>wrapper.java.maxmemory</code> in
 </li>
 <li>
 {% trans -%}
-Is the CPU usage simply higher than you would like, or is it pegged at 100% for a long time?
+Is the CPU usage simply higher than you would like, or is it pegged at 100&#37; for a long time?
 If it's pegged, this could be a bug. Look in the logs for clues.
 {%- endtrans %}
 </li>
@@ -203,7 +203,7 @@ All traffic you route is internal to the I2P network, you are not an <a href="#e
 Your only alternative is to refuse to route
 <i>any</i> traffic, by setting your share bandwidth or maximum participating tunnels to 0 (see above).
 It would be nice if you didn't do this, you should help the network by routing traffic for others.
-Over 95% of users route traffic for others.
+Over 95&#37; of users route traffic for others.
 {%- endtrans %}
 </li>
 <li>
diff --git a/i2p2www/pages/site/get-involved/bounties/unit-tests.html b/i2p2www/pages/site/get-involved/bounties/unit-tests.html
index 9a14fe2cbab56a20b11607f0a0d166dfdb1b936b..6e61930a7c7e06adb8d015b6670ecb21b563ae16 100644
--- a/i2p2www/pages/site/get-involved/bounties/unit-tests.html
+++ b/i2p2www/pages/site/get-involved/bounties/unit-tests.html
@@ -93,7 +93,7 @@ To collect this bounty, the automated unit tests of the router
 
 <p>{% trans -%}
 To collect this bounty, a new set of unit tests must meet a 
-measured code coverage of 90% of the streaming lib 
+measured code coverage of 90&#37; of the streaming lib 
 (i2p/apps/ministreaming/ and i2p/apps/streaming/).
 {%- endtrans %}</p>
 <br />
@@ -104,7 +104,7 @@ measured code coverage of 90% of the streaming lib
 {%- endtrans %}</b><br />
 
 <p>{% trans -%}
-To collect this bounty, all above unit tests must meet the 100%
+To collect this bounty, all above unit tests must meet the 100&#37;
 coverage marker (except for log statements).
 {%- endtrans %}</p>
 <br />
diff --git a/i2p2www/pages/site/misc/benchmarks.html b/i2p2www/pages/site/misc/benchmarks.html
index cfad236b76373a2df6d64628912a5cc858d003de..6ff72db71597dd06953c2d24412c64769b2f28e8 100644
--- a/i2p2www/pages/site/misc/benchmarks.html
+++ b/i2p2www/pages/site/misc/benchmarks.html
@@ -248,7 +248,7 @@ speeds because time is needed to transfer data to and from memory.
 For the ciphers that specify big endian byte order, the timing data 
 listed include time needed to convert to and from little endian
 order.  For some ciphers (WAKE and SHA) this is a large fraction (up
-to 25%) of the total time.
+to 25&#37;) of the total time.
 <LI>
 The RSA, RW, DH, MQV, and elliptic curve schemes come from the IEEE P1363
 standard. For more info see <A HREF="http://grouper.ieee.org/groups/1363/index.html">
diff --git a/i2p2www/pages/site/misc/jbigi.html b/i2p2www/pages/site/misc/jbigi.html
index caa4123f8a7957163de3bc734c23a49436ebecaa..487691331982ed1e9cd952d7fa4c003731f07b2b 100644
--- a/i2p2www/pages/site/misc/jbigi.html
+++ b/i2p2www/pages/site/misc/jbigi.html
@@ -123,7 +123,7 @@ info, it will be something like this:
 {%- endtrans %}<pre>
 native run time:  5842ms ( 57ms each)
 java run time:   41072ms (406ms each)
-native = 14.223802103622907% of pure java time
+native = 14.223802103622907&#37; of pure java time
 </pre>
 {% trans %}If the native is indeed 5-7x faster (or more) then it looks all good. If not, please report.{% endtrans %}</li>
 <li>{% trans %}Copy <code>libjbigi.so</code> to your i2p directory{% endtrans %}</li>
diff --git a/i2p2www/translations/de/LC_MESSAGES/about.po b/i2p2www/translations/de/LC_MESSAGES/about.po
index be96aa5445fd5f53fde4b58bf5f9d41855e67abf..1a68b0b1d440465b41c7419826d922cbe3d82131 100644
--- a/i2p2www/translations/de/LC_MESSAGES/about.po
+++ b/i2p2www/translations/de/LC_MESSAGES/about.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  I2P\n"
 "Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
-"POT-Creation-Date: 2013-08-12 10:29+0000\n"
+"POT-Creation-Date: 2013-08-15 21:25+0000\n"
 "PO-Revision-Date: 2013-07-04 16:33+0000\n"
 "Last-Translator: D.A. Loader\n"
 "Language-Team: German "
@@ -1815,7 +1815,6 @@ msgid ""
 msgstr ""
 
 #: i2p2www/pages/site/about/performance/history.html:23
-#, python-format
 msgid ""
 "\n"
 "ugha and duck are working on the C/JNI glue code, and the existing java "
@@ -1824,8 +1823,8 @@ msgid ""
 "results\n"
 "look fantastic - running the router with the native GMP modPow is "
 "providing over\n"
-"a 800% speedup in encryption performance, and the load was cut in half.  "
-"This\n"
+"a 800&#37; speedup in encryption performance, and the load was cut in "
+"half.  This\n"
 "was just on one user's machine, and things are nowhere near ready for "
 "packaging\n"
 "and deployment, yet."
@@ -1876,12 +1875,12 @@ msgid ""
 msgstr ""
 
 #: i2p2www/pages/site/about/performance/history.html:54
-#, python-format
 msgid ""
 "For unpublished LeaseSets such as \"shared clients\", this is the only "
 "way to\n"
 "get the LeaseSet to Bob. Unfortunately this bundling every time adds\n"
-"almost 100% overhead to a high-bandwidth connection, and much more to\n"
+"almost 100&#37; overhead to a high-bandwidth connection, and much more to"
+"\n"
 "a connection with smaller messages."
 msgstr ""
 
diff --git a/i2p2www/translations/de/LC_MESSAGES/blog.po b/i2p2www/translations/de/LC_MESSAGES/blog.po
index d24bbb0365f52da1d867fd3462b967a0ec5b8d26..44057ff2e910b2f7c99a4879db525f85aa1bcc53 100644
--- a/i2p2www/translations/de/LC_MESSAGES/blog.po
+++ b/i2p2www/translations/de/LC_MESSAGES/blog.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  I2P\n"
 "Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
-"POT-Creation-Date: 2013-08-12 10:29+0000\n"
+"POT-Creation-Date: 2013-08-15 21:25+0000\n"
 "PO-Revision-Date: 2013-08-12 10:32+0000\n"
 "Last-Translator: str4d <str4d@i2pmail.org>\n"
 "Language-Team: German "
diff --git a/i2p2www/translations/de/LC_MESSAGES/comparison.po b/i2p2www/translations/de/LC_MESSAGES/comparison.po
index 9521b5efc4de05a24cac6a61ea300b1e5f93ecd5..90835920de4d2563421f2fc1776a5e7546a42d50 100644
--- a/i2p2www/translations/de/LC_MESSAGES/comparison.po
+++ b/i2p2www/translations/de/LC_MESSAGES/comparison.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  I2P\n"
 "Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
-"POT-Creation-Date: 2013-08-12 10:29+0000\n"
+"POT-Creation-Date: 2013-08-15 21:25+0000\n"
 "PO-Revision-Date: 2013-07-04 16:33+0000\n"
 "Last-Translator: D.A. Loader\n"
 "Language-Team: German "
diff --git a/i2p2www/translations/de/LC_MESSAGES/docs.po b/i2p2www/translations/de/LC_MESSAGES/docs.po
index 9ca4e123c22285342e6eb012535093f7f4cc1d97..10d75411caf8c0c4c3fbfc1d08718ef5f364f2b0 100644
--- a/i2p2www/translations/de/LC_MESSAGES/docs.po
+++ b/i2p2www/translations/de/LC_MESSAGES/docs.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  I2P\n"
 "Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
-"POT-Creation-Date: 2013-08-12 10:29+0000\n"
+"POT-Creation-Date: 2013-08-15 21:25+0000\n"
 "PO-Revision-Date: 2013-08-12 10:33+0000\n"
 "Last-Translator: str4d <str4d@i2pmail.org>\n"
 "Language-Team: German "
@@ -2415,9 +2415,7 @@ msgstr ""
 #: i2p2www/pages/site/docs/api/i2ptunnel.html:43
 #, python-format
 msgid ""
-"The anonymous <a "
-"href=\"http://en.wikipedia.org/wiki/Monotone_%28software%29\">monotone</a>"
-"\n"
+"The anonymous <a href=\"%(monotone)s\">monotone</a>\n"
 "sourcecode repository for I2P"
 msgstr ""
 
@@ -3543,7 +3541,7 @@ msgstr ""
 msgid ""
 "While compact response support is optional for both clients and trackers,"
 " it is highly\n"
-"recommended as it reduces the nominal response size by over 90%."
+"recommended as it reduces the nominal response size by over 90&#37;."
 msgstr ""
 
 #: i2p2www/pages/site/docs/applications/bittorrent.html:116
@@ -7104,9 +7102,8 @@ msgid ""
 msgstr ""
 
 #: i2p2www/pages/site/docs/how/network-database.html:281
-#, python-format
 msgid ""
-"With the current rules for automatic opt-in, approximately 6% of\n"
+"With the current rules for automatic opt-in, approximately 6&#37; of\n"
 "the routers in the network are floodfill routers."
 msgstr ""
 
@@ -7932,7 +7929,7 @@ msgid ""
 "further investigation.\n"
 "The floodfill routers are in a position to observe queries and gather "
 "information.\n"
-"Certainly, at a level of <i>f</i> = 0.2 (20%% malicious nodes, as "
+"Certainly, at a level of <i>f</i> = 0.2 (20&#37; malicious nodes, as "
 "specifed in the paper)\n"
 "we expect that many of the Sybil threats we describe\n"
 "(<a href=\"%(threatmodel)s#sybil\">here</a>,\n"
@@ -8313,10 +8310,9 @@ msgid "Two peers from the same /16 IP space may not be in the same tunnel."
 msgstr ""
 
 #: i2p2www/pages/site/docs/how/peer-selection.html:239
-#, python-format
 msgid ""
-"A peer may participate in a maximum of 33% of all tunnels created by the "
-"router."
+"A peer may participate in a maximum of 33&#37; of all tunnels created by "
+"the router."
 msgstr ""
 
 #: i2p2www/pages/site/docs/how/peer-selection.html:242
@@ -10687,7 +10683,7 @@ msgid ""
 "Set defaults so that most users provide resources to the network.\n"
 "In I2P, users route traffic by default. In sharp distinction to\n"
 "<a href=\"%(comparisons)s\">other networks</a>,\n"
-"over 95%% of I2P users relay traffic for others."
+"over 95&#37; of I2P users relay traffic for others."
 msgstr ""
 
 #: i2p2www/pages/site/docs/how/threat-model.html:317
@@ -11089,14 +11085,13 @@ msgid ""
 msgstr ""
 
 #: i2p2www/pages/site/docs/how/threat-model.html:584
-#, python-format
 msgid ""
 "Sybil describes a category of attacks where the adversary creates "
 "arbitrarily\n"
 "large numbers of colluding nodes and uses the increased numbers to help \n"
 "mounting other attacks.  For instance, if an attacker is in a network "
 "where peers\n"
-"are selected randomly and they want an 80% chance to be one of those "
+"are selected randomly and they want an 80&#37; chance to be one of those "
 "peers, they\n"
 "simply create five times the number of nodes that are in the network and "
 "roll \n"
@@ -11173,7 +11168,7 @@ msgid ""
 "the performance\n"
 "of peers.\n"
 "However, this is a powerful attack as the number of routers approaches\n"
-"<i>f</i> = 0.2, or 20%% malicious nodes, as specifed in the paper.\n"
+"<i>f</i> = 0.2, or 20&#37; malicious nodes, as specifed in the paper.\n"
 "The malicous routers could also maintain connections to the target router"
 " and provide\n"
 "excellent forwarding bandwidth for traffic over those connections, in an "
@@ -13195,8 +13190,8 @@ msgstr ""
 #: i2p2www/pages/site/docs/spec/blockfile.html:172
 #, python-format
 msgid ""
-"\"%%__INFO__%%\" is the master database skiplist with String/Properties "
-"key/value entries containing only one entry:"
+"%(INFO)s is the master database skiplist with String/Properties key/value"
+" entries containing only one entry:"
 msgstr ""
 
 #: i2p2www/pages/site/docs/spec/blockfile.html:184
@@ -13206,8 +13201,8 @@ msgstr ""
 #: i2p2www/pages/site/docs/spec/blockfile.html:185
 #, python-format
 msgid ""
-"\"%%__REVERSE__%%\" is the reverse lookup skiplist with "
-"Integer/Properties key/value entries\n"
+"%(REVERSE)s is the reverse lookup skiplist with Integer/Properties "
+"key/value entries\n"
 "    (as of database version 2):"
 msgstr ""
 
@@ -14134,7 +14129,7 @@ msgid ""
 "are transparently decompressed to a .jar or .war file.\n"
 "Update files containing .pack files are traditionally named with a '.su2'"
 " suffix.\n"
-"Pack200 shrinks the update files by about 60%."
+"Pack200 shrinks the update files by about 60&#37;."
 msgstr ""
 
 #: i2p2www/pages/site/docs/spec/updates.html:105
@@ -15180,7 +15175,7 @@ msgstr ""
 
 #: i2p2www/pages/site/docs/transport/ssu.html:83
 msgid ""
-"For both MTU values, it is desirable that (MTU % 16) == 12, so that\n"
+"For both MTU values, it is desirable that (MTU &#37; 16) == 12, so that\n"
 "the payload portion after the 28-byte IP/UDP header is a multiple of\n"
 "16 bytes, for encryption purposes."
 msgstr ""
@@ -15226,7 +15221,7 @@ msgstr ""
 #: i2p2www/pages/site/docs/transport/ssu.html:119
 msgid ""
 "For IPv6, the minimum MTU is 1280. The IPv6 IP/UDP header is 48 bytes,\n"
-"so we use an MTU where (MTN % 16 == 0), which is true for 1280."
+"so we use an MTU where (MTN &#37; 16 == 0), which is true for 1280."
 msgstr ""
 
 #: i2p2www/pages/site/docs/transport/ssu.html:124
diff --git a/i2p2www/translations/de/LC_MESSAGES/get-involved.po b/i2p2www/translations/de/LC_MESSAGES/get-involved.po
index f6df94ad88d7d30dd30071af90896d93124e25f3..124f85fcb5fc0e1d2f8fcb8c1075aaf8ce08192f 100644
--- a/i2p2www/translations/de/LC_MESSAGES/get-involved.po
+++ b/i2p2www/translations/de/LC_MESSAGES/get-involved.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  I2P\n"
 "Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
-"POT-Creation-Date: 2013-08-12 10:29+0000\n"
+"POT-Creation-Date: 2013-08-15 21:25+0000\n"
 "PO-Revision-Date: 2013-07-04 16:33+0000\n"
 "Last-Translator: D.A. Loader\n"
 "Language-Team: German "
@@ -1562,10 +1562,9 @@ msgid "Streaming lib tests"
 msgstr ""
 
 #: i2p2www/pages/site/get-involved/bounties/unit-tests.html:94
-#, python-format
 msgid ""
 "To collect this bounty, a new set of unit tests must meet a \n"
-"measured code coverage of 90% of the streaming lib \n"
+"measured code coverage of 90&#37; of the streaming lib \n"
 "(i2p/apps/ministreaming/ and i2p/apps/streaming/)."
 msgstr ""
 
@@ -1575,7 +1574,7 @@ msgstr ""
 
 #: i2p2www/pages/site/get-involved/bounties/unit-tests.html:106
 msgid ""
-"To collect this bounty, all above unit tests must meet the 100%\n"
+"To collect this bounty, all above unit tests must meet the 100&#37;\n"
 "coverage marker (except for log statements)."
 msgstr ""
 
diff --git a/i2p2www/translations/de/LC_MESSAGES/misc.po b/i2p2www/translations/de/LC_MESSAGES/misc.po
index e5a5c1d480263ad629be7480845135eb4100e1ae..7fadee6c92af791747e4393672b3e1eea7cf4d16 100644
--- a/i2p2www/translations/de/LC_MESSAGES/misc.po
+++ b/i2p2www/translations/de/LC_MESSAGES/misc.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  I2P\n"
 "Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
-"POT-Creation-Date: 2013-08-12 10:29+0000\n"
+"POT-Creation-Date: 2013-08-15 21:25+0000\n"
 "PO-Revision-Date: 2013-07-04 16:33+0000\n"
 "Last-Translator: D.A. Loader\n"
 "Language-Team: German "
diff --git a/i2p2www/translations/de/LC_MESSAGES/priority.po b/i2p2www/translations/de/LC_MESSAGES/priority.po
index 3d916fd1569416833af8b9e24f872728f1be8c93..d4ab9dbe6c9e265a3ae18c5f57065aa7dc207d73 100644
--- a/i2p2www/translations/de/LC_MESSAGES/priority.po
+++ b/i2p2www/translations/de/LC_MESSAGES/priority.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  I2P\n"
 "Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
-"POT-Creation-Date: 2013-08-12 10:29+0000\n"
+"POT-Creation-Date: 2013-08-15 21:25+0000\n"
 "PO-Revision-Date: 2013-08-12 10:34+0000\n"
 "Last-Translator: str4d <str4d@i2pmail.org>\n"
 "Language-Team: German "
@@ -336,15 +336,15 @@ msgstr ""
 msgid "Download"
 msgstr "Download"
 
-#: i2p2www/pages/downloads/list.html:4
+#: i2p2www/pages/downloads/list.html:9
 msgid "Download I2P"
 msgstr "Download I2P"
 
-#: i2p2www/pages/downloads/list.html:6
+#: i2p2www/pages/downloads/list.html:11
 msgid "Dependency"
 msgstr "Abhängigkeit"
 
-#: i2p2www/pages/downloads/list.html:7
+#: i2p2www/pages/downloads/list.html:12
 #, python-format
 msgid ""
 "\n"
@@ -360,21 +360,21 @@ msgid ""
 "or type <tt>java -version</tt> at your command prompt.\n"
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:20
+#: i2p2www/pages/downloads/list.html:25
 msgid "Clean installs"
 msgstr "saubere Installationen"
 
-#: i2p2www/pages/downloads/list.html:27 i2p2www/pages/downloads/list.html:45
-#: i2p2www/pages/downloads/list.html:73 i2p2www/pages/downloads/list.html:135
+#: i2p2www/pages/downloads/list.html:32 i2p2www/pages/downloads/list.html:49
+#: i2p2www/pages/downloads/list.html:76 i2p2www/pages/downloads/list.html:136
 #: i2p2www/pages/downloads/list.html:265
 msgid "select alternate link"
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:35
+#: i2p2www/pages/downloads/list.html:39
 msgid "Download that file and run it."
 msgstr "Lade die Datei herunter und führe sie aus."
 
-#: i2p2www/pages/downloads/list.html:53
+#: i2p2www/pages/downloads/list.html:56
 #, python-format
 msgid ""
 "Download that file and double-click it (if that works) or\n"
@@ -385,11 +385,11 @@ msgid ""
 "    &quot;Open with Java&quot;."
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:61 i2p2www/pages/downloads/list.html:89
+#: i2p2www/pages/downloads/list.html:64 i2p2www/pages/downloads/list.html:91
 msgid "Command line (headless) install:"
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:62
+#: i2p2www/pages/downloads/list.html:65
 #, python-format
 msgid ""
 "Download the %(i2pversion)s OSX graphical installer file above and\n"
@@ -397,7 +397,7 @@ msgid ""
 "from the command line."
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:81
+#: i2p2www/pages/downloads/list.html:83
 #, python-format
 msgid ""
 "Download that file and double-click it (if that works) or\n"
@@ -408,7 +408,7 @@ msgid ""
 "    &quot;Open with Java&quot;."
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:90
+#: i2p2www/pages/downloads/list.html:92
 #, python-format
 msgid ""
 "Download the graphical installer file above and\n"
@@ -416,11 +416,11 @@ msgid ""
 "from the command line."
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:100
+#: i2p2www/pages/downloads/list.html:102
 msgid "Packages for Debian &amp; Ubuntu are available."
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:115
+#: i2p2www/pages/downloads/list.html:116
 #, python-format
 msgid ""
 "The above file is the current release build.\n"
@@ -430,7 +430,7 @@ msgid ""
 "    scan or click the QR code."
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:122
+#: i2p2www/pages/downloads/list.html:123
 msgid ""
 "The release and dev versions of the I2P APK are not compatible, as they\n"
 "      are signed by zzz and sponge respectively. Uninstall one before "
@@ -438,7 +438,7 @@ msgid ""
 "      the other."
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:132
+#: i2p2www/pages/downloads/list.html:133
 msgid "Source package"
 msgstr "Quell Pakete"
 
@@ -584,7 +584,7 @@ msgstr ""
 msgid "Manual updates"
 msgstr "manuelle Updates"
 
-#: i2p2www/pages/downloads/list.html:275
+#: i2p2www/pages/downloads/list.html:274
 msgid ""
 "Download that file to your I2P\n"
 "    installation directory and <b>rename as i2pupdate.zip</b>.\n"
@@ -595,26 +595,26 @@ msgid ""
 "    NOT need to unzip that file."
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:284
+#: i2p2www/pages/downloads/list.html:283
 msgid "Click <a href=\"http://localhost:7657/configservice.jsp\">\"Restart\"</a>"
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:289
+#: i2p2www/pages/downloads/list.html:288
 msgid "Grab a cup of coffee and come back in 11 minutes"
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:297
+#: i2p2www/pages/downloads/list.html:296
 #, python-format
 msgid ""
 "The file is signed by zzz,\n"
 "<a href=\"%(signingkey)s\">whose key is here</a>."
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:302
+#: i2p2www/pages/downloads/list.html:301
 msgid "Previous Releases"
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:304
+#: i2p2www/pages/downloads/list.html:303
 #, python-format
 msgid ""
 "Previous releases are available on <a "
@@ -678,7 +678,7 @@ msgstr ""
 msgid "Mirrors"
 msgstr "Mirrors"
 
-#: i2p2www/pages/global/footer.html:10
+#: i2p2www/pages/global/footer.html:9
 msgid "Secure"
 msgstr "Sicher"
 
@@ -1524,10 +1524,9 @@ msgid ""
 msgstr ""
 
 #: i2p2www/pages/site/faq.html:161
-#, python-format
 msgid ""
 "Is the CPU usage simply higher than you would like, or is it pegged at "
-"100% for a long time?\n"
+"100&#37; for a long time?\n"
 "If it's pegged, this could be a bug. Look in the logs for clues."
 msgstr ""
 
@@ -1574,7 +1573,6 @@ msgstr ""
 "Frage in 3 Teilen beantworten:"
 
 #: i2p2www/pages/site/faq.html:199
-#, python-format
 msgid ""
 "<b>Distribution</b> - All traffic on I2P is encrypted in multiple layers."
 " You don't know\n"
@@ -1586,7 +1584,7 @@ msgid ""
 "participating tunnels to 0 (see above).\n"
 "It would be nice if you didn't do this, you should help the network by "
 "routing traffic for others.\n"
-"Over 95% of users route traffic for others."
+"Over 95&#37; of users route traffic for others."
 msgstr ""
 
 #: i2p2www/pages/site/faq.html:210
diff --git a/i2p2www/translations/de/LC_MESSAGES/research.po b/i2p2www/translations/de/LC_MESSAGES/research.po
index 7fe5d4ea5e43aaa088a4d7c03811504439c4848f..ea13f1669cf8d41cab1d7a908a73d265e7db42ec 100644
--- a/i2p2www/translations/de/LC_MESSAGES/research.po
+++ b/i2p2www/translations/de/LC_MESSAGES/research.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  I2P\n"
 "Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
-"POT-Creation-Date: 2013-08-12 10:29+0000\n"
+"POT-Creation-Date: 2013-08-15 21:25+0000\n"
 "PO-Revision-Date: 2013-07-04 16:33+0000\n"
 "Last-Translator: D.A. Loader\n"
 "Language-Team: German "
diff --git a/i2p2www/translations/es/LC_MESSAGES/about.po b/i2p2www/translations/es/LC_MESSAGES/about.po
index 7aac8db56df35885da1bffb766d38dadfc8c2e18..5c79c99ae460df8bfc3a97b198f3511e75859a5d 100644
--- a/i2p2www/translations/es/LC_MESSAGES/about.po
+++ b/i2p2www/translations/es/LC_MESSAGES/about.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  I2P\n"
 "Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
-"POT-Creation-Date: 2013-08-12 10:29+0000\n"
+"POT-Creation-Date: 2013-08-15 21:25+0000\n"
 "PO-Revision-Date: 2013-07-22 10:38+0000\n"
 "Last-Translator: trolly\n"
 "Language-Team: Spanish "
@@ -2158,7 +2158,6 @@ msgstr ""
 "cryptography</a></i>)"
 
 #: i2p2www/pages/site/about/performance/history.html:23
-#, python-format
 msgid ""
 "\n"
 "ugha and duck are working on the C/JNI glue code, and the existing java "
@@ -2167,20 +2166,12 @@ msgid ""
 "results\n"
 "look fantastic - running the router with the native GMP modPow is "
 "providing over\n"
-"a 800% speedup in encryption performance, and the load was cut in half.  "
-"This\n"
+"a 800&#37; speedup in encryption performance, and the load was cut in "
+"half.  This\n"
 "was just on one user's machine, and things are nowhere near ready for "
 "packaging\n"
 "and deployment, yet."
 msgstr ""
-"\n"
-"ugha y duck están trabajando en el código de C/JNI, y el código java "
-"actual se usa ya con varios parches con mejoras cuando es posible. Los "
-"resultados preliminares parecen fantásticos - ejecutando el ruter con el "
-"modPos GMP nativo proporciona mas del 800% s de velocidad en el "
-"rendimiento de los cifrados, y la carga de la CPU es ahora la mitad. Esto"
-" es sólo en la máquina de un solo usuario, y esto no está ni siquiera "
-"cerca de poder ser empaquetado y distribuído, todavía."
 
 #: i2p2www/pages/site/about/performance/history.html:32
 msgid "Garlic wrapping a \"reply\" LeaseSet"
@@ -2244,12 +2235,13 @@ msgstr ""
 "destinatario no necesita hacer la búsqueda en la base de datos de la red."
 
 #: i2p2www/pages/site/about/performance/history.html:54
-#, python-format
+#, fuzzy
 msgid ""
 "For unpublished LeaseSets such as \"shared clients\", this is the only "
 "way to\n"
 "get the LeaseSet to Bob. Unfortunately this bundling every time adds\n"
-"almost 100% overhead to a high-bandwidth connection, and much more to\n"
+"almost 100&#37; overhead to a high-bandwidth connection, and much more to"
+"\n"
 "a connection with smaller messages."
 msgstr ""
 "Para los LeaseSets no publicados como en los \"clientes compartidos\", "
diff --git a/i2p2www/translations/es/LC_MESSAGES/blog.po b/i2p2www/translations/es/LC_MESSAGES/blog.po
index c8d9a192465c25d635c524b1ae8f757d31386bc2..e8e7d16cbaf651ca078063ccc99bcc23162907c1 100644
--- a/i2p2www/translations/es/LC_MESSAGES/blog.po
+++ b/i2p2www/translations/es/LC_MESSAGES/blog.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  I2P\n"
 "Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
-"POT-Creation-Date: 2013-08-12 10:29+0000\n"
+"POT-Creation-Date: 2013-08-15 21:25+0000\n"
 "PO-Revision-Date: 2013-08-12 10:32+0000\n"
 "Last-Translator: str4d <str4d@i2pmail.org>\n"
 "Language-Team: Spanish "
diff --git a/i2p2www/translations/es/LC_MESSAGES/comparison.po b/i2p2www/translations/es/LC_MESSAGES/comparison.po
index 344ab01c7deebea81098b3fb51770ada58f0be41..95dc679ab2f9d7fac0ae2d2bba6453538accffcb 100644
--- a/i2p2www/translations/es/LC_MESSAGES/comparison.po
+++ b/i2p2www/translations/es/LC_MESSAGES/comparison.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  I2P\n"
 "Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
-"POT-Creation-Date: 2013-08-12 10:29+0000\n"
+"POT-Creation-Date: 2013-08-15 21:25+0000\n"
 "PO-Revision-Date: 2013-07-11 10:13+0000\n"
 "Last-Translator: trolly\n"
 "Language-Team: Spanish "
diff --git a/i2p2www/translations/es/LC_MESSAGES/docs.po b/i2p2www/translations/es/LC_MESSAGES/docs.po
index 48cd340cd7b6fa7bab19e275636955fe27cad1f1..c25fd90f0e336708c687660c22a096d66b67924a 100644
--- a/i2p2www/translations/es/LC_MESSAGES/docs.po
+++ b/i2p2www/translations/es/LC_MESSAGES/docs.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  I2P\n"
 "Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
-"POT-Creation-Date: 2013-08-12 10:29+0000\n"
+"POT-Creation-Date: 2013-08-15 21:25+0000\n"
 "PO-Revision-Date: 2013-08-12 10:33+0000\n"
 "Last-Translator: str4d <str4d@i2pmail.org>\n"
 "Language-Team: Spanish "
@@ -2417,9 +2417,7 @@ msgstr ""
 #: i2p2www/pages/site/docs/api/i2ptunnel.html:43
 #, python-format
 msgid ""
-"The anonymous <a "
-"href=\"http://en.wikipedia.org/wiki/Monotone_%28software%29\">monotone</a>"
-"\n"
+"The anonymous <a href=\"%(monotone)s\">monotone</a>\n"
 "sourcecode repository for I2P"
 msgstr ""
 
@@ -3545,7 +3543,7 @@ msgstr ""
 msgid ""
 "While compact response support is optional for both clients and trackers,"
 " it is highly\n"
-"recommended as it reduces the nominal response size by over 90%."
+"recommended as it reduces the nominal response size by over 90&#37;."
 msgstr ""
 
 #: i2p2www/pages/site/docs/applications/bittorrent.html:116
@@ -7598,9 +7596,9 @@ msgstr ""
 "trabajos, etc) antes de que se active automáticamente como un floodfill."
 
 #: i2p2www/pages/site/docs/how/network-database.html:281
-#, python-format
+#, fuzzy
 msgid ""
-"With the current rules for automatic opt-in, approximately 6% of\n"
+"With the current rules for automatic opt-in, approximately 6&#37; of\n"
 "the routers in the network are floodfill routers."
 msgstr ""
 "Con las normas actuales para llegar a ser floodfill automáticamente, "
@@ -8472,7 +8470,7 @@ msgid ""
 "further investigation.\n"
 "The floodfill routers are in a position to observe queries and gather "
 "information.\n"
-"Certainly, at a level of <i>f</i> = 0.2 (20%% malicious nodes, as "
+"Certainly, at a level of <i>f</i> = 0.2 (20&#37; malicious nodes, as "
 "specifed in the paper)\n"
 "we expect that many of the Sybil threats we describe\n"
 "(<a href=\"%(threatmodel)s#sybil\">here</a>,\n"
@@ -8853,10 +8851,9 @@ msgid "Two peers from the same /16 IP space may not be in the same tunnel."
 msgstr ""
 
 #: i2p2www/pages/site/docs/how/peer-selection.html:239
-#, python-format
 msgid ""
-"A peer may participate in a maximum of 33% of all tunnels created by the "
-"router."
+"A peer may participate in a maximum of 33&#37; of all tunnels created by "
+"the router."
 msgstr ""
 
 #: i2p2www/pages/site/docs/how/peer-selection.html:242
@@ -12193,12 +12190,12 @@ msgstr ""
 " defensa contra este ataque es:"
 
 #: i2p2www/pages/site/docs/how/threat-model.html:311
-#, python-format
+#, fuzzy, python-format
 msgid ""
 "Set defaults so that most users provide resources to the network.\n"
 "In I2P, users route traffic by default. In sharp distinction to\n"
 "<a href=\"%(comparisons)s\">other networks</a>,\n"
-"over 95%% of I2P users relay traffic for others."
+"over 95&#37; of I2P users relay traffic for others."
 msgstr ""
 "Configurar por defecto para que la mayoría de los usuarios compartan "
 "recursos con la red. En I2P los usuarios rutean tráfico por defecto. A "
@@ -12785,14 +12782,14 @@ msgstr ""
 "Obfuscation</a>"
 
 #: i2p2www/pages/site/docs/how/threat-model.html:584
-#, python-format
+#, fuzzy
 msgid ""
 "Sybil describes a category of attacks where the adversary creates "
 "arbitrarily\n"
 "large numbers of colluding nodes and uses the increased numbers to help \n"
 "mounting other attacks.  For instance, if an attacker is in a network "
 "where peers\n"
-"are selected randomly and they want an 80% chance to be one of those "
+"are selected randomly and they want an 80&#37; chance to be one of those "
 "peers, they\n"
 "simply create five times the number of nodes that are in the network and "
 "roll \n"
@@ -12881,7 +12878,7 @@ msgstr ""
 "Lookup</a> Sección 5.2)"
 
 #: i2p2www/pages/site/docs/how/threat-model.html:634
-#, python-format
+#, fuzzy, python-format
 msgid ""
 "By refusing to accept or forward tunnel build requests, except to a "
 "colluding peer, a router could ensure\n"
@@ -12894,7 +12891,7 @@ msgid ""
 "the performance\n"
 "of peers.\n"
 "However, this is a powerful attack as the number of routers approaches\n"
-"<i>f</i> = 0.2, or 20%% malicious nodes, as specifed in the paper.\n"
+"<i>f</i> = 0.2, or 20&#37; malicious nodes, as specifed in the paper.\n"
 "The malicous routers could also maintain connections to the target router"
 " and provide\n"
 "excellent forwarding bandwidth for traffic over those connections, in an "
@@ -15094,8 +15091,8 @@ msgstr ""
 #: i2p2www/pages/site/docs/spec/blockfile.html:172
 #, python-format
 msgid ""
-"\"%%__INFO__%%\" is the master database skiplist with String/Properties "
-"key/value entries containing only one entry:"
+"%(INFO)s is the master database skiplist with String/Properties key/value"
+" entries containing only one entry:"
 msgstr ""
 
 #: i2p2www/pages/site/docs/spec/blockfile.html:184
@@ -15105,8 +15102,8 @@ msgstr ""
 #: i2p2www/pages/site/docs/spec/blockfile.html:185
 #, python-format
 msgid ""
-"\"%%__REVERSE__%%\" is the reverse lookup skiplist with "
-"Integer/Properties key/value entries\n"
+"%(REVERSE)s is the reverse lookup skiplist with Integer/Properties "
+"key/value entries\n"
 "    (as of database version 2):"
 msgstr ""
 
@@ -16033,7 +16030,7 @@ msgid ""
 "are transparently decompressed to a .jar or .war file.\n"
 "Update files containing .pack files are traditionally named with a '.su2'"
 " suffix.\n"
-"Pack200 shrinks the update files by about 60%."
+"Pack200 shrinks the update files by about 60&#37;."
 msgstr ""
 
 #: i2p2www/pages/site/docs/spec/updates.html:105
@@ -17079,7 +17076,7 @@ msgstr ""
 
 #: i2p2www/pages/site/docs/transport/ssu.html:83
 msgid ""
-"For both MTU values, it is desirable that (MTU % 16) == 12, so that\n"
+"For both MTU values, it is desirable that (MTU &#37; 16) == 12, so that\n"
 "the payload portion after the 28-byte IP/UDP header is a multiple of\n"
 "16 bytes, for encryption purposes."
 msgstr ""
@@ -17125,7 +17122,7 @@ msgstr ""
 #: i2p2www/pages/site/docs/transport/ssu.html:119
 msgid ""
 "For IPv6, the minimum MTU is 1280. The IPv6 IP/UDP header is 48 bytes,\n"
-"so we use an MTU where (MTN % 16 == 0), which is true for 1280."
+"so we use an MTU where (MTN &#37; 16 == 0), which is true for 1280."
 msgstr ""
 
 #: i2p2www/pages/site/docs/transport/ssu.html:124
diff --git a/i2p2www/translations/es/LC_MESSAGES/get-involved.po b/i2p2www/translations/es/LC_MESSAGES/get-involved.po
index e57b449d1766f8258c536724f1106862410d8c4c..647e942c5f197f3703f7f71e60a5300d04f021fc 100644
--- a/i2p2www/translations/es/LC_MESSAGES/get-involved.po
+++ b/i2p2www/translations/es/LC_MESSAGES/get-involved.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  I2P\n"
 "Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
-"POT-Creation-Date: 2013-08-12 10:29+0000\n"
+"POT-Creation-Date: 2013-08-15 21:25+0000\n"
 "PO-Revision-Date: 2013-07-11 10:13+0000\n"
 "Last-Translator: trolly\n"
 "Language-Team: Spanish "
@@ -1953,10 +1953,9 @@ msgid "Streaming lib tests"
 msgstr ""
 
 #: i2p2www/pages/site/get-involved/bounties/unit-tests.html:94
-#, python-format
 msgid ""
 "To collect this bounty, a new set of unit tests must meet a \n"
-"measured code coverage of 90% of the streaming lib \n"
+"measured code coverage of 90&#37; of the streaming lib \n"
 "(i2p/apps/ministreaming/ and i2p/apps/streaming/)."
 msgstr ""
 
@@ -1966,7 +1965,7 @@ msgstr ""
 
 #: i2p2www/pages/site/get-involved/bounties/unit-tests.html:106
 msgid ""
-"To collect this bounty, all above unit tests must meet the 100%\n"
+"To collect this bounty, all above unit tests must meet the 100&#37;\n"
 "coverage marker (except for log statements)."
 msgstr ""
 
diff --git a/i2p2www/translations/es/LC_MESSAGES/misc.po b/i2p2www/translations/es/LC_MESSAGES/misc.po
index 6d877acc2a80e6cdd9679c5f293771b3e6360901..38177de4db55c66f2a8e78971e9ebb9578e3b03a 100644
--- a/i2p2www/translations/es/LC_MESSAGES/misc.po
+++ b/i2p2www/translations/es/LC_MESSAGES/misc.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  I2P\n"
 "Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
-"POT-Creation-Date: 2013-08-12 10:29+0000\n"
+"POT-Creation-Date: 2013-08-15 21:25+0000\n"
 "PO-Revision-Date: 2013-08-12 09:33+0000\n"
 "Last-Translator: trolly\n"
 "Language-Team: Spanish "
diff --git a/i2p2www/translations/es/LC_MESSAGES/priority.po b/i2p2www/translations/es/LC_MESSAGES/priority.po
index 82ddd7cf52ab4f5f319b4590ee5489ebd8a92a98..692127427d7895fcfc823cc819186d50dcb74090 100644
--- a/i2p2www/translations/es/LC_MESSAGES/priority.po
+++ b/i2p2www/translations/es/LC_MESSAGES/priority.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  I2P\n"
 "Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
-"POT-Creation-Date: 2013-08-12 10:29+0000\n"
+"POT-Creation-Date: 2013-08-15 21:25+0000\n"
 "PO-Revision-Date: 2013-08-12 10:34+0000\n"
 "Last-Translator: str4d <str4d@i2pmail.org>\n"
 "Language-Team: Spanish "
@@ -425,15 +425,15 @@ msgstr ""
 msgid "Download"
 msgstr "Descargas"
 
-#: i2p2www/pages/downloads/list.html:4
+#: i2p2www/pages/downloads/list.html:9
 msgid "Download I2P"
 msgstr "Descarga I2P"
 
-#: i2p2www/pages/downloads/list.html:6
+#: i2p2www/pages/downloads/list.html:11
 msgid "Dependency"
 msgstr "Dependencias"
 
-#: i2p2www/pages/downloads/list.html:7
+#: i2p2www/pages/downloads/list.html:12
 #, python-format
 msgid ""
 "\n"
@@ -458,21 +458,21 @@ msgstr ""
 "Determine aquí su versión de java</a> o ejecute <tt>java -version</tt> en"
 " la terminal.\n"
 
-#: i2p2www/pages/downloads/list.html:20
+#: i2p2www/pages/downloads/list.html:25
 msgid "Clean installs"
 msgstr "Instalación"
 
-#: i2p2www/pages/downloads/list.html:27 i2p2www/pages/downloads/list.html:45
-#: i2p2www/pages/downloads/list.html:73 i2p2www/pages/downloads/list.html:135
+#: i2p2www/pages/downloads/list.html:32 i2p2www/pages/downloads/list.html:49
+#: i2p2www/pages/downloads/list.html:76 i2p2www/pages/downloads/list.html:136
 #: i2p2www/pages/downloads/list.html:265
 msgid "select alternate link"
 msgstr "seleccione un enlace alternativo"
 
-#: i2p2www/pages/downloads/list.html:35
+#: i2p2www/pages/downloads/list.html:39
 msgid "Download that file and run it."
 msgstr "Descargue este archivo y ejecútelo."
 
-#: i2p2www/pages/downloads/list.html:53
+#: i2p2www/pages/downloads/list.html:56
 #, python-format
 msgid ""
 "Download that file and double-click it (if that works) or\n"
@@ -487,11 +487,11 @@ msgstr ""
 "terminal para iniciar el instalador. Puede ser que pueda pulsar botón "
 "derecho y seleccionar &quot;Abrir con Java&quot;."
 
-#: i2p2www/pages/downloads/list.html:61 i2p2www/pages/downloads/list.html:89
+#: i2p2www/pages/downloads/list.html:64 i2p2www/pages/downloads/list.html:91
 msgid "Command line (headless) install:"
 msgstr "Comando de instalación (headless):"
 
-#: i2p2www/pages/downloads/list.html:62
+#: i2p2www/pages/downloads/list.html:65
 #, python-format
 msgid ""
 "Download the %(i2pversion)s OSX graphical installer file above and\n"
@@ -502,7 +502,7 @@ msgstr ""
 "<code>java -jar i2pinstall_%(i2pversion)s.jar -console</code> en la "
 "terminal."
 
-#: i2p2www/pages/downloads/list.html:81
+#: i2p2www/pages/downloads/list.html:83
 #, python-format
 msgid ""
 "Download that file and double-click it (if that works) or\n"
@@ -520,7 +520,7 @@ msgstr ""
 "archivo y seleccionar\n"
 "    &quot;Abrir con Java&quot;."
 
-#: i2p2www/pages/downloads/list.html:90
+#: i2p2www/pages/downloads/list.html:92
 #, python-format
 msgid ""
 "Download the graphical installer file above and\n"
@@ -530,11 +530,11 @@ msgstr ""
 "Descargue el instalador gráfico y ejecute <code>java -jar "
 "i2pinstall_%(i2pversion)s.jar -console</code> en una terminal."
 
-#: i2p2www/pages/downloads/list.html:100
+#: i2p2www/pages/downloads/list.html:102
 msgid "Packages for Debian &amp; Ubuntu are available."
 msgstr "Hay disponibles paquetes para Debian &amp; Ubuntu."
 
-#: i2p2www/pages/downloads/list.html:115
+#: i2p2www/pages/downloads/list.html:116
 #, python-format
 msgid ""
 "The above file is the current release build.\n"
@@ -544,7 +544,7 @@ msgid ""
 "    scan or click the QR code."
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:122
+#: i2p2www/pages/downloads/list.html:123
 msgid ""
 "The release and dev versions of the I2P APK are not compatible, as they\n"
 "      are signed by zzz and sponge respectively. Uninstall one before "
@@ -557,7 +557,7 @@ msgstr ""
 "una antes de \n"
 "    instalar la otra."
 
-#: i2p2www/pages/downloads/list.html:132
+#: i2p2www/pages/downloads/list.html:133
 msgid "Source package"
 msgstr "Archivo con el código fuente "
 
@@ -770,7 +770,7 @@ msgstr "De otra forma puede usar el método manual especificado mas abajo."
 msgid "Manual updates"
 msgstr "Actualizaciones manuales"
 
-#: i2p2www/pages/downloads/list.html:275
+#: i2p2www/pages/downloads/list.html:274
 msgid ""
 "Download that file to your I2P\n"
 "    installation directory and <b>rename as i2pupdate.zip</b>.\n"
@@ -786,17 +786,17 @@ msgstr ""
 "archivo resultante i2pupdate.zip a la carpeta de instalación de I2P).  NO"
 " necesita descomprimir este archivo .zip."
 
-#: i2p2www/pages/downloads/list.html:284
+#: i2p2www/pages/downloads/list.html:283
 msgid "Click <a href=\"http://localhost:7657/configservice.jsp\">\"Restart\"</a>"
 msgstr ""
 "Pulse <a "
 "href=\"http://localhost:7657/configservice.jsp\">\"Reiniciar\"</a>"
 
-#: i2p2www/pages/downloads/list.html:289
+#: i2p2www/pages/downloads/list.html:288
 msgid "Grab a cup of coffee and come back in 11 minutes"
 msgstr "Vaya a por una taza de horchata/café/mate y vuelva en 11 minutos."
 
-#: i2p2www/pages/downloads/list.html:297
+#: i2p2www/pages/downloads/list.html:296
 #, python-format
 msgid ""
 "The file is signed by zzz,\n"
@@ -805,11 +805,11 @@ msgstr ""
 "El archivo está firmado por zzz,\n"
 "<a href=\"%(signingkey)s\">cuya clave está aquí</a>."
 
-#: i2p2www/pages/downloads/list.html:302
+#: i2p2www/pages/downloads/list.html:301
 msgid "Previous Releases"
 msgstr "Versiones Anteriores"
 
-#: i2p2www/pages/downloads/list.html:304
+#: i2p2www/pages/downloads/list.html:303
 #, python-format
 msgid ""
 "Previous releases are available on <a "
@@ -884,7 +884,7 @@ msgstr "Humm... el servidor ha encontrado algún problema."
 msgid "Mirrors"
 msgstr "Mirrors"
 
-#: i2p2www/pages/global/footer.html:10
+#: i2p2www/pages/global/footer.html:9
 msgid "Secure"
 msgstr "Seguro"
 
@@ -1825,10 +1825,10 @@ msgstr ""
 "<code>wrapper.config</code>."
 
 #: i2p2www/pages/site/faq.html:161
-#, python-format
+#, fuzzy
 msgid ""
 "Is the CPU usage simply higher than you would like, or is it pegged at "
-"100% for a long time?\n"
+"100&#37; for a long time?\n"
 "If it's pegged, this could be a bug. Look in the logs for clues."
 msgstr ""
 "¿El uso de l aCPU es mayor de lo que le gustaría o está fijo al 100%f por"
@@ -1889,7 +1889,7 @@ msgstr ""
 "costes.Pero respondamos su pregunta en tres partes:"
 
 #: i2p2www/pages/site/faq.html:199
-#, python-format
+#, fuzzy
 msgid ""
 "<b>Distribution</b> - All traffic on I2P is encrypted in multiple layers."
 " You don't know\n"
@@ -1901,7 +1901,7 @@ msgid ""
 "participating tunnels to 0 (see above).\n"
 "It would be nice if you didn't do this, you should help the network by "
 "routing traffic for others.\n"
-"Over 95% of users route traffic for others."
+"Over 95&#37; of users route traffic for others."
 msgstr ""
 "<b>Distribución</b> - Todo el tráfico en I2P es cifrado en varias capas. "
 "Usted no puede conocer el contenido, origen o destinación de un mensaje. "
diff --git a/i2p2www/translations/es/LC_MESSAGES/research.po b/i2p2www/translations/es/LC_MESSAGES/research.po
index 88d174ab1319f47784234338c5e7c004b38ead4b..893cd0a95e704b8376b6f8e4cc6a2e271af15db3 100644
--- a/i2p2www/translations/es/LC_MESSAGES/research.po
+++ b/i2p2www/translations/es/LC_MESSAGES/research.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  I2P\n"
 "Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
-"POT-Creation-Date: 2013-08-12 10:29+0000\n"
+"POT-Creation-Date: 2013-08-15 21:25+0000\n"
 "PO-Revision-Date: 2013-07-25 09:42+0000\n"
 "Last-Translator: trolly\n"
 "Language-Team: Spanish "
diff --git a/i2p2www/translations/fr/LC_MESSAGES/about.po b/i2p2www/translations/fr/LC_MESSAGES/about.po
index 39ae984ad3abbdc67ee26b2db6e9dd6dbab298fd..13314d16571894410d6e24503343ce17820399f4 100644
--- a/i2p2www/translations/fr/LC_MESSAGES/about.po
+++ b/i2p2www/translations/fr/LC_MESSAGES/about.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  I2P\n"
 "Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
-"POT-Creation-Date: 2013-08-12 10:29+0000\n"
+"POT-Creation-Date: 2013-08-15 21:25+0000\n"
 "PO-Revision-Date: 2013-08-11 16:29+0000\n"
 "Last-Translator: Boxoa590\n"
 "Language-Team: French "
@@ -1895,7 +1895,6 @@ msgid ""
 msgstr ""
 
 #: i2p2www/pages/site/about/performance/history.html:23
-#, python-format
 msgid ""
 "\n"
 "ugha and duck are working on the C/JNI glue code, and the existing java "
@@ -1904,8 +1903,8 @@ msgid ""
 "results\n"
 "look fantastic - running the router with the native GMP modPow is "
 "providing over\n"
-"a 800% speedup in encryption performance, and the load was cut in half.  "
-"This\n"
+"a 800&#37; speedup in encryption performance, and the load was cut in "
+"half.  This\n"
 "was just on one user's machine, and things are nowhere near ready for "
 "packaging\n"
 "and deployment, yet."
@@ -1956,12 +1955,12 @@ msgid ""
 msgstr ""
 
 #: i2p2www/pages/site/about/performance/history.html:54
-#, python-format
 msgid ""
 "For unpublished LeaseSets such as \"shared clients\", this is the only "
 "way to\n"
 "get the LeaseSet to Bob. Unfortunately this bundling every time adds\n"
-"almost 100% overhead to a high-bandwidth connection, and much more to\n"
+"almost 100&#37; overhead to a high-bandwidth connection, and much more to"
+"\n"
 "a connection with smaller messages."
 msgstr ""
 
diff --git a/i2p2www/translations/fr/LC_MESSAGES/blog.po b/i2p2www/translations/fr/LC_MESSAGES/blog.po
index 53512fc5292a46092e9538767e239b3130782995..b753f37015dbb58e9fce5f0e6fd7942bb44b18a7 100644
--- a/i2p2www/translations/fr/LC_MESSAGES/blog.po
+++ b/i2p2www/translations/fr/LC_MESSAGES/blog.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  I2P\n"
 "Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
-"POT-Creation-Date: 2013-08-12 10:29+0000\n"
+"POT-Creation-Date: 2013-08-15 21:25+0000\n"
 "PO-Revision-Date: 2013-08-12 10:32+0000\n"
 "Last-Translator: str4d <str4d@i2pmail.org>\n"
 "Language-Team: French "
diff --git a/i2p2www/translations/fr/LC_MESSAGES/comparison.po b/i2p2www/translations/fr/LC_MESSAGES/comparison.po
index 8eecb7e02fdd154203b2e5ecc2fe9c83f9c131c2..089ba83d2b0d23d2ad765ad67de5b4acb03aead4 100644
--- a/i2p2www/translations/fr/LC_MESSAGES/comparison.po
+++ b/i2p2www/translations/fr/LC_MESSAGES/comparison.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  I2P\n"
 "Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
-"POT-Creation-Date: 2013-08-12 10:29+0000\n"
+"POT-Creation-Date: 2013-08-15 21:25+0000\n"
 "PO-Revision-Date: 2013-06-29 11:32+0000\n"
 "Last-Translator: Boxoa590\n"
 "Language-Team: French "
diff --git a/i2p2www/translations/fr/LC_MESSAGES/docs.po b/i2p2www/translations/fr/LC_MESSAGES/docs.po
index 8bbd531a609024bea235a8b91a642bd1cf0fde11..e533ed4e7b2cb144ccbf77164c37ca5342d2cef9 100644
--- a/i2p2www/translations/fr/LC_MESSAGES/docs.po
+++ b/i2p2www/translations/fr/LC_MESSAGES/docs.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  I2P\n"
 "Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
-"POT-Creation-Date: 2013-08-12 10:29+0000\n"
+"POT-Creation-Date: 2013-08-15 21:25+0000\n"
 "PO-Revision-Date: 2013-08-12 10:33+0000\n"
 "Last-Translator: str4d <str4d@i2pmail.org>\n"
 "Language-Team: French "
@@ -2417,9 +2417,7 @@ msgstr ""
 #: i2p2www/pages/site/docs/api/i2ptunnel.html:43
 #, python-format
 msgid ""
-"The anonymous <a "
-"href=\"http://en.wikipedia.org/wiki/Monotone_%28software%29\">monotone</a>"
-"\n"
+"The anonymous <a href=\"%(monotone)s\">monotone</a>\n"
 "sourcecode repository for I2P"
 msgstr ""
 
@@ -3545,7 +3543,7 @@ msgstr ""
 msgid ""
 "While compact response support is optional for both clients and trackers,"
 " it is highly\n"
-"recommended as it reduces the nominal response size by over 90%."
+"recommended as it reduces the nominal response size by over 90&#37;."
 msgstr ""
 
 #: i2p2www/pages/site/docs/applications/bittorrent.html:116
@@ -7112,9 +7110,8 @@ msgid ""
 msgstr ""
 
 #: i2p2www/pages/site/docs/how/network-database.html:281
-#, python-format
 msgid ""
-"With the current rules for automatic opt-in, approximately 6% of\n"
+"With the current rules for automatic opt-in, approximately 6&#37; of\n"
 "the routers in the network are floodfill routers."
 msgstr ""
 
@@ -7940,7 +7937,7 @@ msgid ""
 "further investigation.\n"
 "The floodfill routers are in a position to observe queries and gather "
 "information.\n"
-"Certainly, at a level of <i>f</i> = 0.2 (20%% malicious nodes, as "
+"Certainly, at a level of <i>f</i> = 0.2 (20&#37; malicious nodes, as "
 "specifed in the paper)\n"
 "we expect that many of the Sybil threats we describe\n"
 "(<a href=\"%(threatmodel)s#sybil\">here</a>,\n"
@@ -8321,10 +8318,9 @@ msgid "Two peers from the same /16 IP space may not be in the same tunnel."
 msgstr ""
 
 #: i2p2www/pages/site/docs/how/peer-selection.html:239
-#, python-format
 msgid ""
-"A peer may participate in a maximum of 33% of all tunnels created by the "
-"router."
+"A peer may participate in a maximum of 33&#37; of all tunnels created by "
+"the router."
 msgstr ""
 
 #: i2p2www/pages/site/docs/how/peer-selection.html:242
@@ -10695,7 +10691,7 @@ msgid ""
 "Set defaults so that most users provide resources to the network.\n"
 "In I2P, users route traffic by default. In sharp distinction to\n"
 "<a href=\"%(comparisons)s\">other networks</a>,\n"
-"over 95%% of I2P users relay traffic for others."
+"over 95&#37; of I2P users relay traffic for others."
 msgstr ""
 
 #: i2p2www/pages/site/docs/how/threat-model.html:317
@@ -11097,14 +11093,13 @@ msgid ""
 msgstr ""
 
 #: i2p2www/pages/site/docs/how/threat-model.html:584
-#, python-format
 msgid ""
 "Sybil describes a category of attacks where the adversary creates "
 "arbitrarily\n"
 "large numbers of colluding nodes and uses the increased numbers to help \n"
 "mounting other attacks.  For instance, if an attacker is in a network "
 "where peers\n"
-"are selected randomly and they want an 80% chance to be one of those "
+"are selected randomly and they want an 80&#37; chance to be one of those "
 "peers, they\n"
 "simply create five times the number of nodes that are in the network and "
 "roll \n"
@@ -11181,7 +11176,7 @@ msgid ""
 "the performance\n"
 "of peers.\n"
 "However, this is a powerful attack as the number of routers approaches\n"
-"<i>f</i> = 0.2, or 20%% malicious nodes, as specifed in the paper.\n"
+"<i>f</i> = 0.2, or 20&#37; malicious nodes, as specifed in the paper.\n"
 "The malicous routers could also maintain connections to the target router"
 " and provide\n"
 "excellent forwarding bandwidth for traffic over those connections, in an "
@@ -13203,8 +13198,8 @@ msgstr ""
 #: i2p2www/pages/site/docs/spec/blockfile.html:172
 #, python-format
 msgid ""
-"\"%%__INFO__%%\" is the master database skiplist with String/Properties "
-"key/value entries containing only one entry:"
+"%(INFO)s is the master database skiplist with String/Properties key/value"
+" entries containing only one entry:"
 msgstr ""
 
 #: i2p2www/pages/site/docs/spec/blockfile.html:184
@@ -13214,8 +13209,8 @@ msgstr ""
 #: i2p2www/pages/site/docs/spec/blockfile.html:185
 #, python-format
 msgid ""
-"\"%%__REVERSE__%%\" is the reverse lookup skiplist with "
-"Integer/Properties key/value entries\n"
+"%(REVERSE)s is the reverse lookup skiplist with Integer/Properties "
+"key/value entries\n"
 "    (as of database version 2):"
 msgstr ""
 
@@ -14142,7 +14137,7 @@ msgid ""
 "are transparently decompressed to a .jar or .war file.\n"
 "Update files containing .pack files are traditionally named with a '.su2'"
 " suffix.\n"
-"Pack200 shrinks the update files by about 60%."
+"Pack200 shrinks the update files by about 60&#37;."
 msgstr ""
 
 #: i2p2www/pages/site/docs/spec/updates.html:105
@@ -15188,7 +15183,7 @@ msgstr ""
 
 #: i2p2www/pages/site/docs/transport/ssu.html:83
 msgid ""
-"For both MTU values, it is desirable that (MTU % 16) == 12, so that\n"
+"For both MTU values, it is desirable that (MTU &#37; 16) == 12, so that\n"
 "the payload portion after the 28-byte IP/UDP header is a multiple of\n"
 "16 bytes, for encryption purposes."
 msgstr ""
@@ -15234,7 +15229,7 @@ msgstr ""
 #: i2p2www/pages/site/docs/transport/ssu.html:119
 msgid ""
 "For IPv6, the minimum MTU is 1280. The IPv6 IP/UDP header is 48 bytes,\n"
-"so we use an MTU where (MTN % 16 == 0), which is true for 1280."
+"so we use an MTU where (MTN &#37; 16 == 0), which is true for 1280."
 msgstr ""
 
 #: i2p2www/pages/site/docs/transport/ssu.html:124
diff --git a/i2p2www/translations/fr/LC_MESSAGES/get-involved.po b/i2p2www/translations/fr/LC_MESSAGES/get-involved.po
index 286fe934ed0ae00e329f33e5d439f783179d2b53..6595eda20f93fbb6b7aa158eba5b04b24373d4df 100644
--- a/i2p2www/translations/fr/LC_MESSAGES/get-involved.po
+++ b/i2p2www/translations/fr/LC_MESSAGES/get-involved.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  I2P\n"
 "Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
-"POT-Creation-Date: 2013-08-12 10:29+0000\n"
+"POT-Creation-Date: 2013-08-15 21:25+0000\n"
 "PO-Revision-Date: 2013-08-11 15:29+0000\n"
 "Last-Translator: Boxoa590\n"
 "Language-Team: French "
@@ -1602,10 +1602,9 @@ msgid "Streaming lib tests"
 msgstr ""
 
 #: i2p2www/pages/site/get-involved/bounties/unit-tests.html:94
-#, python-format
 msgid ""
 "To collect this bounty, a new set of unit tests must meet a \n"
-"measured code coverage of 90% of the streaming lib \n"
+"measured code coverage of 90&#37; of the streaming lib \n"
 "(i2p/apps/ministreaming/ and i2p/apps/streaming/)."
 msgstr ""
 
@@ -1615,7 +1614,7 @@ msgstr ""
 
 #: i2p2www/pages/site/get-involved/bounties/unit-tests.html:106
 msgid ""
-"To collect this bounty, all above unit tests must meet the 100%\n"
+"To collect this bounty, all above unit tests must meet the 100&#37;\n"
 "coverage marker (except for log statements)."
 msgstr ""
 
diff --git a/i2p2www/translations/fr/LC_MESSAGES/misc.po b/i2p2www/translations/fr/LC_MESSAGES/misc.po
index cc36b42aefa145cb8dae61e67ad3c6db8c4cb27e..f8a26f63a367865e185174c553702314ce0caa73 100644
--- a/i2p2www/translations/fr/LC_MESSAGES/misc.po
+++ b/i2p2www/translations/fr/LC_MESSAGES/misc.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  I2P\n"
 "Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
-"POT-Creation-Date: 2013-08-12 10:29+0000\n"
+"POT-Creation-Date: 2013-08-15 21:25+0000\n"
 "PO-Revision-Date: 2013-06-29 11:32+0000\n"
 "Last-Translator: Boxoa590\n"
 "Language-Team: French "
diff --git a/i2p2www/translations/fr/LC_MESSAGES/priority.po b/i2p2www/translations/fr/LC_MESSAGES/priority.po
index da474b1ef04e5fd6ffdb4b1ed11ac7db86d2d84b..736b46f8f83edc041ff41fe68cfb1d81388f3d38 100644
--- a/i2p2www/translations/fr/LC_MESSAGES/priority.po
+++ b/i2p2www/translations/fr/LC_MESSAGES/priority.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  I2P\n"
 "Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
-"POT-Creation-Date: 2013-08-12 10:29+0000\n"
+"POT-Creation-Date: 2013-08-15 21:25+0000\n"
 "PO-Revision-Date: 2013-08-12 10:34+0000\n"
 "Last-Translator: str4d <str4d@i2pmail.org>\n"
 "Language-Team: French "
@@ -420,15 +420,15 @@ msgstr ""
 msgid "Download"
 msgstr "Télécharger"
 
-#: i2p2www/pages/downloads/list.html:4
+#: i2p2www/pages/downloads/list.html:9
 msgid "Download I2P"
 msgstr "Télécharger I2P"
 
-#: i2p2www/pages/downloads/list.html:6
+#: i2p2www/pages/downloads/list.html:11
 msgid "Dependency"
 msgstr "Dépendance"
 
-#: i2p2www/pages/downloads/list.html:7
+#: i2p2www/pages/downloads/list.html:12
 #, python-format
 msgid ""
 "\n"
@@ -455,21 +455,21 @@ msgstr ""
 " içi la version de votre Java installé</a>⏎\n"
 " ou tapez <tt>java -version</tt> à votre invite de commande.\n"
 
-#: i2p2www/pages/downloads/list.html:20
+#: i2p2www/pages/downloads/list.html:25
 msgid "Clean installs"
 msgstr "Installations propres"
 
-#: i2p2www/pages/downloads/list.html:27 i2p2www/pages/downloads/list.html:45
-#: i2p2www/pages/downloads/list.html:73 i2p2www/pages/downloads/list.html:135
+#: i2p2www/pages/downloads/list.html:32 i2p2www/pages/downloads/list.html:49
+#: i2p2www/pages/downloads/list.html:76 i2p2www/pages/downloads/list.html:136
 #: i2p2www/pages/downloads/list.html:265
 msgid "select alternate link"
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:35
+#: i2p2www/pages/downloads/list.html:39
 msgid "Download that file and run it."
 msgstr "Télécharger ce fichier et l'exécuter."
 
-#: i2p2www/pages/downloads/list.html:53
+#: i2p2www/pages/downloads/list.html:56
 #, python-format
 msgid ""
 "Download that file and double-click it (if that works) or\n"
@@ -480,11 +480,11 @@ msgid ""
 "    &quot;Open with Java&quot;."
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:61 i2p2www/pages/downloads/list.html:89
+#: i2p2www/pages/downloads/list.html:64 i2p2www/pages/downloads/list.html:91
 msgid "Command line (headless) install:"
 msgstr "Installation en ligne de commande (headless) :"
 
-#: i2p2www/pages/downloads/list.html:62
+#: i2p2www/pages/downloads/list.html:65
 #, python-format
 msgid ""
 "Download the %(i2pversion)s OSX graphical installer file above and\n"
@@ -492,7 +492,7 @@ msgid ""
 "from the command line."
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:81
+#: i2p2www/pages/downloads/list.html:83
 #, python-format
 msgid ""
 "Download that file and double-click it (if that works) or\n"
@@ -510,7 +510,7 @@ msgstr ""
 "sélectionner⏎\n"
 " &quot;Open with Java&quot;."
 
-#: i2p2www/pages/downloads/list.html:90
+#: i2p2www/pages/downloads/list.html:92
 #, python-format
 msgid ""
 "Download the graphical installer file above and\n"
@@ -521,11 +521,11 @@ msgstr ""
 "lancez <code>java -jar i2pinstall_%(i2pversion)s.jar -console</code> "
 "depuis la ligne de commande."
 
-#: i2p2www/pages/downloads/list.html:100
+#: i2p2www/pages/downloads/list.html:102
 msgid "Packages for Debian &amp; Ubuntu are available."
 msgstr "Des packages pour Debian &amp; Ubuntu sont disponibles."
 
-#: i2p2www/pages/downloads/list.html:115
+#: i2p2www/pages/downloads/list.html:116
 #, python-format
 msgid ""
 "The above file is the current release build.\n"
@@ -535,7 +535,7 @@ msgid ""
 "    scan or click the QR code."
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:122
+#: i2p2www/pages/downloads/list.html:123
 msgid ""
 "The release and dev versions of the I2P APK are not compatible, as they\n"
 "      are signed by zzz and sponge respectively. Uninstall one before "
@@ -548,7 +548,7 @@ msgstr ""
 "d'installer⏎\n"
 "l'autre."
 
-#: i2p2www/pages/downloads/list.html:132
+#: i2p2www/pages/downloads/list.html:133
 msgid "Source package"
 msgstr "À partir des sources:"
 
@@ -757,7 +757,7 @@ msgstr ""
 msgid "Manual updates"
 msgstr "Mises à jour manuelles"
 
-#: i2p2www/pages/downloads/list.html:275
+#: i2p2www/pages/downloads/list.html:274
 msgid ""
 "Download that file to your I2P\n"
 "    installation directory and <b>rename as i2pupdate.zip</b>.\n"
@@ -768,17 +768,17 @@ msgid ""
 "    NOT need to unzip that file."
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:284
+#: i2p2www/pages/downloads/list.html:283
 msgid "Click <a href=\"http://localhost:7657/configservice.jsp\">\"Restart\"</a>"
 msgstr ""
 "Cliquez <a "
 "href=\"http://localhost:7657/configservice.jsp\">\"Redémarrer\"</a>"
 
-#: i2p2www/pages/downloads/list.html:289
+#: i2p2www/pages/downloads/list.html:288
 msgid "Grab a cup of coffee and come back in 11 minutes"
 msgstr "Prenez une tasse de café et revenez dans 11 minutes"
 
-#: i2p2www/pages/downloads/list.html:297
+#: i2p2www/pages/downloads/list.html:296
 #, python-format
 msgid ""
 "The file is signed by zzz,\n"
@@ -787,11 +787,11 @@ msgstr ""
 "Le fichier est signé par zzz,⏎\n"
 "<a href=\"%(signingkey)s\">dont la clé est içi</a>."
 
-#: i2p2www/pages/downloads/list.html:302
+#: i2p2www/pages/downloads/list.html:301
 msgid "Previous Releases"
 msgstr "Précédentes releases"
 
-#: i2p2www/pages/downloads/list.html:304
+#: i2p2www/pages/downloads/list.html:303
 #, python-format
 msgid ""
 "Previous releases are available on <a "
@@ -872,7 +872,7 @@ msgstr "Hum... le serveur a rencontré une sorte d'erreur."
 msgid "Mirrors"
 msgstr "Miroirs"
 
-#: i2p2www/pages/global/footer.html:10
+#: i2p2www/pages/global/footer.html:9
 msgid "Secure"
 msgstr "Sécurisé"
 
@@ -1835,10 +1835,9 @@ msgstr ""
 "<code>wrapper.java.maxmemory</code> dans <code>wrapper.config </code>."
 
 #: i2p2www/pages/site/faq.html:161
-#, python-format
 msgid ""
 "Is the CPU usage simply higher than you would like, or is it pegged at "
-"100% for a long time?\n"
+"100&#37; for a long time?\n"
 "If it's pegged, this could be a bug. Look in the logs for clues."
 msgstr ""
 
@@ -1905,7 +1904,6 @@ msgstr ""
 "Mais nous allons répondre à votre question en trois parties :"
 
 #: i2p2www/pages/site/faq.html:199
-#, python-format
 msgid ""
 "<b>Distribution</b> - All traffic on I2P is encrypted in multiple layers."
 " You don't know\n"
@@ -1917,7 +1915,7 @@ msgid ""
 "participating tunnels to 0 (see above).\n"
 "It would be nice if you didn't do this, you should help the network by "
 "routing traffic for others.\n"
-"Over 95% of users route traffic for others."
+"Over 95&#37; of users route traffic for others."
 msgstr ""
 
 #: i2p2www/pages/site/faq.html:210
diff --git a/i2p2www/translations/fr/LC_MESSAGES/research.po b/i2p2www/translations/fr/LC_MESSAGES/research.po
index b693b1edf3460b0435fabbcddbc4a986758ba81d..8b5b1c9ae6bc998cb2229ceaae61c2652b5e53e5 100644
--- a/i2p2www/translations/fr/LC_MESSAGES/research.po
+++ b/i2p2www/translations/fr/LC_MESSAGES/research.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  I2P\n"
 "Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
-"POT-Creation-Date: 2013-08-12 10:29+0000\n"
+"POT-Creation-Date: 2013-08-15 21:25+0000\n"
 "PO-Revision-Date: 2013-08-11 14:55+0000\n"
 "Last-Translator: Boxoa590\n"
 "Language-Team: French "
diff --git a/i2p2www/translations/pt/LC_MESSAGES/priority.po b/i2p2www/translations/pt/LC_MESSAGES/priority.po
index 9ec913eb883cf85d3eddcf8802092560c4ff01c2..a8323b61aa24103ec63d349979d5d387da7bf797 100644
--- a/i2p2www/translations/pt/LC_MESSAGES/priority.po
+++ b/i2p2www/translations/pt/LC_MESSAGES/priority.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  I2P\n"
 "Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
-"POT-Creation-Date: 2013-08-12 10:29+0000\n"
+"POT-Creation-Date: 2013-08-15 21:25+0000\n"
 "PO-Revision-Date: 2013-08-12 10:34+0000\n"
 "Last-Translator: str4d <str4d@i2pmail.org>\n"
 "Language-Team: Portuguese "
@@ -413,15 +413,15 @@ msgstr ""
 msgid "Download"
 msgstr "Baixar"
 
-#: i2p2www/pages/downloads/list.html:4
+#: i2p2www/pages/downloads/list.html:9
 msgid "Download I2P"
 msgstr "Baixar I2P"
 
-#: i2p2www/pages/downloads/list.html:6
+#: i2p2www/pages/downloads/list.html:11
 msgid "Dependency"
 msgstr "Dependências"
 
-#: i2p2www/pages/downloads/list.html:7
+#: i2p2www/pages/downloads/list.html:12
 #, python-format
 msgid ""
 "\n"
@@ -437,21 +437,21 @@ msgid ""
 "or type <tt>java -version</tt> at your command prompt.\n"
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:20
+#: i2p2www/pages/downloads/list.html:25
 msgid "Clean installs"
 msgstr "Instalações feitas a partir do zero"
 
-#: i2p2www/pages/downloads/list.html:27 i2p2www/pages/downloads/list.html:45
-#: i2p2www/pages/downloads/list.html:73 i2p2www/pages/downloads/list.html:135
+#: i2p2www/pages/downloads/list.html:32 i2p2www/pages/downloads/list.html:49
+#: i2p2www/pages/downloads/list.html:76 i2p2www/pages/downloads/list.html:136
 #: i2p2www/pages/downloads/list.html:265
 msgid "select alternate link"
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:35
+#: i2p2www/pages/downloads/list.html:39
 msgid "Download that file and run it."
 msgstr "Baixe o arquivo e rode-o."
 
-#: i2p2www/pages/downloads/list.html:53
+#: i2p2www/pages/downloads/list.html:56
 #, python-format
 msgid ""
 "Download that file and double-click it (if that works) or\n"
@@ -462,11 +462,11 @@ msgid ""
 "    &quot;Open with Java&quot;."
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:61 i2p2www/pages/downloads/list.html:89
+#: i2p2www/pages/downloads/list.html:64 i2p2www/pages/downloads/list.html:91
 msgid "Command line (headless) install:"
 msgstr "Instalação pelo prompt de comando:"
 
-#: i2p2www/pages/downloads/list.html:62
+#: i2p2www/pages/downloads/list.html:65
 #, python-format
 msgid ""
 "Download the %(i2pversion)s OSX graphical installer file above and\n"
@@ -474,7 +474,7 @@ msgid ""
 "from the command line."
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:81
+#: i2p2www/pages/downloads/list.html:83
 #, python-format
 msgid ""
 "Download that file and double-click it (if that works) or\n"
@@ -492,7 +492,7 @@ msgstr ""
 " e selecionando\n"
 "    &quot;Abrir com Java&quot;."
 
-#: i2p2www/pages/downloads/list.html:90
+#: i2p2www/pages/downloads/list.html:92
 #, python-format
 msgid ""
 "Download the graphical installer file above and\n"
@@ -503,11 +503,11 @@ msgstr ""
 "    rode <code>java -jar i2pinstall_%(i2pversion)s.jar -console</code> "
 "pela linha de comando."
 
-#: i2p2www/pages/downloads/list.html:100
+#: i2p2www/pages/downloads/list.html:102
 msgid "Packages for Debian &amp; Ubuntu are available."
 msgstr "Pacotes para Debian &amp; Ubuntu estão disponíveis."
 
-#: i2p2www/pages/downloads/list.html:115
+#: i2p2www/pages/downloads/list.html:116
 #, python-format
 msgid ""
 "The above file is the current release build.\n"
@@ -517,7 +517,7 @@ msgid ""
 "    scan or click the QR code."
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:122
+#: i2p2www/pages/downloads/list.html:123
 msgid ""
 "The release and dev versions of the I2P APK are not compatible, as they\n"
 "      are signed by zzz and sponge respectively. Uninstall one before "
@@ -530,7 +530,7 @@ msgstr ""
 "uma antes de instalar\n"
 "      outra."
 
-#: i2p2www/pages/downloads/list.html:132
+#: i2p2www/pages/downloads/list.html:133
 msgid "Source package"
 msgstr "Pacote originário"
 
@@ -740,7 +740,7 @@ msgstr "Alternativamente, você pode usar o método manual explicado abaixo."
 msgid "Manual updates"
 msgstr "Atualizações manuais"
 
-#: i2p2www/pages/downloads/list.html:275
+#: i2p2www/pages/downloads/list.html:274
 msgid ""
 "Download that file to your I2P\n"
 "    installation directory and <b>rename as i2pupdate.zip</b>.\n"
@@ -758,17 +758,17 @@ msgstr ""
 "Você NÃO \n"
 "    precisa descompactar esse arquivo."
 
-#: i2p2www/pages/downloads/list.html:284
+#: i2p2www/pages/downloads/list.html:283
 msgid "Click <a href=\"http://localhost:7657/configservice.jsp\">\"Restart\"</a>"
 msgstr ""
 "Clique em <a "
 "href=\"http://localhost:7657/configservice.jsp\">\"Reiniciar\"</a>"
 
-#: i2p2www/pages/downloads/list.html:289
+#: i2p2www/pages/downloads/list.html:288
 msgid "Grab a cup of coffee and come back in 11 minutes"
 msgstr "Pegue um copo de café e volte em 11 minutos"
 
-#: i2p2www/pages/downloads/list.html:297
+#: i2p2www/pages/downloads/list.html:296
 #, python-format
 msgid ""
 "The file is signed by zzz,\n"
@@ -777,11 +777,11 @@ msgstr ""
 "O arquivo é assinado pelo zzz,\n"
 "<a href=\"%(signingkey)s\">cuja chave está aqui</a>."
 
-#: i2p2www/pages/downloads/list.html:302
+#: i2p2www/pages/downloads/list.html:301
 msgid "Previous Releases"
 msgstr "Versões anteriores"
 
-#: i2p2www/pages/downloads/list.html:304
+#: i2p2www/pages/downloads/list.html:303
 #, python-format
 msgid ""
 "Previous releases are available on <a "
@@ -852,7 +852,7 @@ msgstr "Hmm...  o servidor encontrou um tipo de erro."
 msgid "Mirrors"
 msgstr "Espelhos"
 
-#: i2p2www/pages/global/footer.html:10
+#: i2p2www/pages/global/footer.html:9
 msgid "Secure"
 msgstr "Seguro"
 
@@ -1693,10 +1693,9 @@ msgid ""
 msgstr ""
 
 #: i2p2www/pages/site/faq.html:161
-#, python-format
 msgid ""
 "Is the CPU usage simply higher than you would like, or is it pegged at "
-"100% for a long time?\n"
+"100&#37; for a long time?\n"
 "If it's pegged, this could be a bug. Look in the logs for clues."
 msgstr ""
 
@@ -1736,7 +1735,6 @@ msgid ""
 msgstr ""
 
 #: i2p2www/pages/site/faq.html:199
-#, python-format
 msgid ""
 "<b>Distribution</b> - All traffic on I2P is encrypted in multiple layers."
 " You don't know\n"
@@ -1748,7 +1746,7 @@ msgid ""
 "participating tunnels to 0 (see above).\n"
 "It would be nice if you didn't do this, you should help the network by "
 "routing traffic for others.\n"
-"Over 95% of users route traffic for others."
+"Over 95&#37; of users route traffic for others."
 msgstr ""
 
 #: i2p2www/pages/site/faq.html:210
diff --git a/i2p2www/translations/sv_SE/LC_MESSAGES/about.po b/i2p2www/translations/sv_SE/LC_MESSAGES/about.po
index f39fe65802d06a330bb4cc7c51efe66d8a884ad0..9f774840fec19288bd7e7febcb8b9bd18d13b40b 100644
--- a/i2p2www/translations/sv_SE/LC_MESSAGES/about.po
+++ b/i2p2www/translations/sv_SE/LC_MESSAGES/about.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  I2P\n"
 "Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
-"POT-Creation-Date: 2013-08-12 10:29+0000\n"
+"POT-Creation-Date: 2013-08-15 21:25+0000\n"
 "PO-Revision-Date: 2013-04-27 23:10+0000\n"
 "Last-Translator: Martin Svensson <digitalmannen@gmail.com>\n"
 "Language-Team: Swedish (Sweden) "
@@ -1813,7 +1813,6 @@ msgid ""
 msgstr ""
 
 #: i2p2www/pages/site/about/performance/history.html:23
-#, python-format
 msgid ""
 "\n"
 "ugha and duck are working on the C/JNI glue code, and the existing java "
@@ -1822,8 +1821,8 @@ msgid ""
 "results\n"
 "look fantastic - running the router with the native GMP modPow is "
 "providing over\n"
-"a 800% speedup in encryption performance, and the load was cut in half.  "
-"This\n"
+"a 800&#37; speedup in encryption performance, and the load was cut in "
+"half.  This\n"
 "was just on one user's machine, and things are nowhere near ready for "
 "packaging\n"
 "and deployment, yet."
@@ -1874,12 +1873,12 @@ msgid ""
 msgstr ""
 
 #: i2p2www/pages/site/about/performance/history.html:54
-#, python-format
 msgid ""
 "For unpublished LeaseSets such as \"shared clients\", this is the only "
 "way to\n"
 "get the LeaseSet to Bob. Unfortunately this bundling every time adds\n"
-"almost 100% overhead to a high-bandwidth connection, and much more to\n"
+"almost 100&#37; overhead to a high-bandwidth connection, and much more to"
+"\n"
 "a connection with smaller messages."
 msgstr ""
 
diff --git a/i2p2www/translations/sv_SE/LC_MESSAGES/blog.po b/i2p2www/translations/sv_SE/LC_MESSAGES/blog.po
index 716d6aeb92d2513b0c1214add2f786a21eff7f5b..1519e530886dd74e7b31a77d03760263aae528ed 100644
--- a/i2p2www/translations/sv_SE/LC_MESSAGES/blog.po
+++ b/i2p2www/translations/sv_SE/LC_MESSAGES/blog.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  I2P\n"
 "Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
-"POT-Creation-Date: 2013-08-12 10:29+0000\n"
+"POT-Creation-Date: 2013-08-15 21:25+0000\n"
 "PO-Revision-Date: 2013-08-12 10:32+0000\n"
 "Last-Translator: str4d <str4d@i2pmail.org>\n"
 "Language-Team: Swedish (Sweden) "
diff --git a/i2p2www/translations/sv_SE/LC_MESSAGES/comparison.po b/i2p2www/translations/sv_SE/LC_MESSAGES/comparison.po
index 3d83e64096ca440d2d2e2936ad41e87d9b23ec0d..582c8e1d389edeb01b511f447f361e7592376a4a 100644
--- a/i2p2www/translations/sv_SE/LC_MESSAGES/comparison.po
+++ b/i2p2www/translations/sv_SE/LC_MESSAGES/comparison.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  I2P\n"
 "Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
-"POT-Creation-Date: 2013-08-12 10:29+0000\n"
+"POT-Creation-Date: 2013-08-15 21:25+0000\n"
 "PO-Revision-Date: 2013-04-27 23:10+0000\n"
 "Last-Translator: Martin Svensson <digitalmannen@gmail.com>\n"
 "Language-Team: Swedish (Sweden) "
diff --git a/i2p2www/translations/sv_SE/LC_MESSAGES/docs.po b/i2p2www/translations/sv_SE/LC_MESSAGES/docs.po
index 6e9ad41fd6cc88dded5bd9cbe3a4baa420d76e33..85c17a86d2b83331957386eaf42573bacbbc0199 100644
--- a/i2p2www/translations/sv_SE/LC_MESSAGES/docs.po
+++ b/i2p2www/translations/sv_SE/LC_MESSAGES/docs.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  I2P\n"
 "Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
-"POT-Creation-Date: 2013-08-12 10:29+0000\n"
+"POT-Creation-Date: 2013-08-15 21:25+0000\n"
 "PO-Revision-Date: 2013-04-27 23:10+0000\n"
 "Last-Translator: Martin Svensson <digitalmannen@gmail.com>\n"
 "Language-Team: Swedish (Sweden) "
@@ -2413,9 +2413,7 @@ msgstr ""
 #: i2p2www/pages/site/docs/api/i2ptunnel.html:43
 #, python-format
 msgid ""
-"The anonymous <a "
-"href=\"http://en.wikipedia.org/wiki/Monotone_%28software%29\">monotone</a>"
-"\n"
+"The anonymous <a href=\"%(monotone)s\">monotone</a>\n"
 "sourcecode repository for I2P"
 msgstr ""
 
@@ -3541,7 +3539,7 @@ msgstr ""
 msgid ""
 "While compact response support is optional for both clients and trackers,"
 " it is highly\n"
-"recommended as it reduces the nominal response size by over 90%."
+"recommended as it reduces the nominal response size by over 90&#37;."
 msgstr ""
 
 #: i2p2www/pages/site/docs/applications/bittorrent.html:116
@@ -6913,9 +6911,8 @@ msgid ""
 msgstr ""
 
 #: i2p2www/pages/site/docs/how/network-database.html:281
-#, python-format
 msgid ""
-"With the current rules for automatic opt-in, approximately 6% of\n"
+"With the current rules for automatic opt-in, approximately 6&#37; of\n"
 "the routers in the network are floodfill routers."
 msgstr ""
 
@@ -7741,7 +7738,7 @@ msgid ""
 "further investigation.\n"
 "The floodfill routers are in a position to observe queries and gather "
 "information.\n"
-"Certainly, at a level of <i>f</i> = 0.2 (20%% malicious nodes, as "
+"Certainly, at a level of <i>f</i> = 0.2 (20&#37; malicious nodes, as "
 "specifed in the paper)\n"
 "we expect that many of the Sybil threats we describe\n"
 "(<a href=\"%(threatmodel)s#sybil\">here</a>,\n"
@@ -8122,10 +8119,9 @@ msgid "Two peers from the same /16 IP space may not be in the same tunnel."
 msgstr ""
 
 #: i2p2www/pages/site/docs/how/peer-selection.html:239
-#, python-format
 msgid ""
-"A peer may participate in a maximum of 33% of all tunnels created by the "
-"router."
+"A peer may participate in a maximum of 33&#37; of all tunnels created by "
+"the router."
 msgstr ""
 
 #: i2p2www/pages/site/docs/how/peer-selection.html:242
@@ -10496,7 +10492,7 @@ msgid ""
 "Set defaults so that most users provide resources to the network.\n"
 "In I2P, users route traffic by default. In sharp distinction to\n"
 "<a href=\"%(comparisons)s\">other networks</a>,\n"
-"over 95%% of I2P users relay traffic for others."
+"over 95&#37; of I2P users relay traffic for others."
 msgstr ""
 
 #: i2p2www/pages/site/docs/how/threat-model.html:317
@@ -10898,14 +10894,13 @@ msgid ""
 msgstr ""
 
 #: i2p2www/pages/site/docs/how/threat-model.html:584
-#, python-format
 msgid ""
 "Sybil describes a category of attacks where the adversary creates "
 "arbitrarily\n"
 "large numbers of colluding nodes and uses the increased numbers to help \n"
 "mounting other attacks.  For instance, if an attacker is in a network "
 "where peers\n"
-"are selected randomly and they want an 80% chance to be one of those "
+"are selected randomly and they want an 80&#37; chance to be one of those "
 "peers, they\n"
 "simply create five times the number of nodes that are in the network and "
 "roll \n"
@@ -10982,7 +10977,7 @@ msgid ""
 "the performance\n"
 "of peers.\n"
 "However, this is a powerful attack as the number of routers approaches\n"
-"<i>f</i> = 0.2, or 20%% malicious nodes, as specifed in the paper.\n"
+"<i>f</i> = 0.2, or 20&#37; malicious nodes, as specifed in the paper.\n"
 "The malicous routers could also maintain connections to the target router"
 " and provide\n"
 "excellent forwarding bandwidth for traffic over those connections, in an "
@@ -13004,8 +12999,8 @@ msgstr ""
 #: i2p2www/pages/site/docs/spec/blockfile.html:172
 #, python-format
 msgid ""
-"\"%%__INFO__%%\" is the master database skiplist with String/Properties "
-"key/value entries containing only one entry:"
+"%(INFO)s is the master database skiplist with String/Properties key/value"
+" entries containing only one entry:"
 msgstr ""
 
 #: i2p2www/pages/site/docs/spec/blockfile.html:184
@@ -13015,8 +13010,8 @@ msgstr ""
 #: i2p2www/pages/site/docs/spec/blockfile.html:185
 #, python-format
 msgid ""
-"\"%%__REVERSE__%%\" is the reverse lookup skiplist with "
-"Integer/Properties key/value entries\n"
+"%(REVERSE)s is the reverse lookup skiplist with Integer/Properties "
+"key/value entries\n"
 "    (as of database version 2):"
 msgstr ""
 
@@ -13943,7 +13938,7 @@ msgid ""
 "are transparently decompressed to a .jar or .war file.\n"
 "Update files containing .pack files are traditionally named with a '.su2'"
 " suffix.\n"
-"Pack200 shrinks the update files by about 60%."
+"Pack200 shrinks the update files by about 60&#37;."
 msgstr ""
 
 #: i2p2www/pages/site/docs/spec/updates.html:105
@@ -14989,7 +14984,7 @@ msgstr ""
 
 #: i2p2www/pages/site/docs/transport/ssu.html:83
 msgid ""
-"For both MTU values, it is desirable that (MTU % 16) == 12, so that\n"
+"For both MTU values, it is desirable that (MTU &#37; 16) == 12, so that\n"
 "the payload portion after the 28-byte IP/UDP header is a multiple of\n"
 "16 bytes, for encryption purposes."
 msgstr ""
@@ -15035,7 +15030,7 @@ msgstr ""
 #: i2p2www/pages/site/docs/transport/ssu.html:119
 msgid ""
 "For IPv6, the minimum MTU is 1280. The IPv6 IP/UDP header is 48 bytes,\n"
-"so we use an MTU where (MTN % 16 == 0), which is true for 1280."
+"so we use an MTU where (MTN &#37; 16 == 0), which is true for 1280."
 msgstr ""
 
 #: i2p2www/pages/site/docs/transport/ssu.html:124
diff --git a/i2p2www/translations/sv_SE/LC_MESSAGES/get-involved.po b/i2p2www/translations/sv_SE/LC_MESSAGES/get-involved.po
index c3a974d7838513c4561b66a73f2d55db0fb1a3e4..687765110c1d93e2f8ad65528270157ac27c3015 100644
--- a/i2p2www/translations/sv_SE/LC_MESSAGES/get-involved.po
+++ b/i2p2www/translations/sv_SE/LC_MESSAGES/get-involved.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  I2P\n"
 "Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
-"POT-Creation-Date: 2013-08-12 10:29+0000\n"
+"POT-Creation-Date: 2013-08-15 21:25+0000\n"
 "PO-Revision-Date: 2013-04-27 23:10+0000\n"
 "Last-Translator: Martin Svensson <digitalmannen@gmail.com>\n"
 "Language-Team: Swedish (Sweden) "
@@ -1560,10 +1560,9 @@ msgid "Streaming lib tests"
 msgstr ""
 
 #: i2p2www/pages/site/get-involved/bounties/unit-tests.html:94
-#, python-format
 msgid ""
 "To collect this bounty, a new set of unit tests must meet a \n"
-"measured code coverage of 90% of the streaming lib \n"
+"measured code coverage of 90&#37; of the streaming lib \n"
 "(i2p/apps/ministreaming/ and i2p/apps/streaming/)."
 msgstr ""
 
@@ -1573,7 +1572,7 @@ msgstr ""
 
 #: i2p2www/pages/site/get-involved/bounties/unit-tests.html:106
 msgid ""
-"To collect this bounty, all above unit tests must meet the 100%\n"
+"To collect this bounty, all above unit tests must meet the 100&#37;\n"
 "coverage marker (except for log statements)."
 msgstr ""
 
diff --git a/i2p2www/translations/sv_SE/LC_MESSAGES/misc.po b/i2p2www/translations/sv_SE/LC_MESSAGES/misc.po
index c95ccae776766ec941554b6ebc95e7980803c92d..2c9cdb129000e39ca2f5aa07a43d14911a08efd1 100644
--- a/i2p2www/translations/sv_SE/LC_MESSAGES/misc.po
+++ b/i2p2www/translations/sv_SE/LC_MESSAGES/misc.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  I2P\n"
 "Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
-"POT-Creation-Date: 2013-08-12 10:29+0000\n"
+"POT-Creation-Date: 2013-08-15 21:25+0000\n"
 "PO-Revision-Date: 2013-04-27 23:10+0000\n"
 "Last-Translator: Martin Svensson <digitalmannen@gmail.com>\n"
 "Language-Team: Swedish (Sweden) "
diff --git a/i2p2www/translations/sv_SE/LC_MESSAGES/priority.po b/i2p2www/translations/sv_SE/LC_MESSAGES/priority.po
index e036416ac9e57a9faed74c6dad159918bbb0e686..aaab33fd0fb098a596b8812f3d245ced41230370 100644
--- a/i2p2www/translations/sv_SE/LC_MESSAGES/priority.po
+++ b/i2p2www/translations/sv_SE/LC_MESSAGES/priority.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  I2P\n"
 "Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
-"POT-Creation-Date: 2013-08-12 10:29+0000\n"
+"POT-Creation-Date: 2013-08-15 21:25+0000\n"
 "PO-Revision-Date: 2013-04-27 23:10+0000\n"
 "Last-Translator: Martin Svensson <digitalmannen@gmail.com>\n"
 "Language-Team: Swedish (Sweden) "
@@ -334,15 +334,15 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:4
+#: i2p2www/pages/downloads/list.html:9
 msgid "Download I2P"
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:6
+#: i2p2www/pages/downloads/list.html:11
 msgid "Dependency"
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:7
+#: i2p2www/pages/downloads/list.html:12
 #, python-format
 msgid ""
 "\n"
@@ -358,21 +358,21 @@ msgid ""
 "or type <tt>java -version</tt> at your command prompt.\n"
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:20
+#: i2p2www/pages/downloads/list.html:25
 msgid "Clean installs"
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:27 i2p2www/pages/downloads/list.html:45
-#: i2p2www/pages/downloads/list.html:73 i2p2www/pages/downloads/list.html:135
+#: i2p2www/pages/downloads/list.html:32 i2p2www/pages/downloads/list.html:49
+#: i2p2www/pages/downloads/list.html:76 i2p2www/pages/downloads/list.html:136
 #: i2p2www/pages/downloads/list.html:265
 msgid "select alternate link"
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:35
+#: i2p2www/pages/downloads/list.html:39
 msgid "Download that file and run it."
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:53
+#: i2p2www/pages/downloads/list.html:56
 #, python-format
 msgid ""
 "Download that file and double-click it (if that works) or\n"
@@ -383,11 +383,11 @@ msgid ""
 "    &quot;Open with Java&quot;."
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:61 i2p2www/pages/downloads/list.html:89
+#: i2p2www/pages/downloads/list.html:64 i2p2www/pages/downloads/list.html:91
 msgid "Command line (headless) install:"
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:62
+#: i2p2www/pages/downloads/list.html:65
 #, python-format
 msgid ""
 "Download the %(i2pversion)s OSX graphical installer file above and\n"
@@ -395,7 +395,7 @@ msgid ""
 "from the command line."
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:81
+#: i2p2www/pages/downloads/list.html:83
 #, python-format
 msgid ""
 "Download that file and double-click it (if that works) or\n"
@@ -406,7 +406,7 @@ msgid ""
 "    &quot;Open with Java&quot;."
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:90
+#: i2p2www/pages/downloads/list.html:92
 #, python-format
 msgid ""
 "Download the graphical installer file above and\n"
@@ -414,11 +414,11 @@ msgid ""
 "from the command line."
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:100
+#: i2p2www/pages/downloads/list.html:102
 msgid "Packages for Debian &amp; Ubuntu are available."
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:115
+#: i2p2www/pages/downloads/list.html:116
 #, python-format
 msgid ""
 "The above file is the current release build.\n"
@@ -428,7 +428,7 @@ msgid ""
 "    scan or click the QR code."
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:122
+#: i2p2www/pages/downloads/list.html:123
 msgid ""
 "The release and dev versions of the I2P APK are not compatible, as they\n"
 "      are signed by zzz and sponge respectively. Uninstall one before "
@@ -436,7 +436,7 @@ msgid ""
 "      the other."
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:132
+#: i2p2www/pages/downloads/list.html:133
 msgid "Source package"
 msgstr ""
 
@@ -582,7 +582,7 @@ msgstr ""
 msgid "Manual updates"
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:275
+#: i2p2www/pages/downloads/list.html:274
 msgid ""
 "Download that file to your I2P\n"
 "    installation directory and <b>rename as i2pupdate.zip</b>.\n"
@@ -593,26 +593,26 @@ msgid ""
 "    NOT need to unzip that file."
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:284
+#: i2p2www/pages/downloads/list.html:283
 msgid "Click <a href=\"http://localhost:7657/configservice.jsp\">\"Restart\"</a>"
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:289
+#: i2p2www/pages/downloads/list.html:288
 msgid "Grab a cup of coffee and come back in 11 minutes"
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:297
+#: i2p2www/pages/downloads/list.html:296
 #, python-format
 msgid ""
 "The file is signed by zzz,\n"
 "<a href=\"%(signingkey)s\">whose key is here</a>."
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:302
+#: i2p2www/pages/downloads/list.html:301
 msgid "Previous Releases"
 msgstr ""
 
-#: i2p2www/pages/downloads/list.html:304
+#: i2p2www/pages/downloads/list.html:303
 #, python-format
 msgid ""
 "Previous releases are available on <a "
@@ -676,7 +676,7 @@ msgstr ""
 msgid "Mirrors"
 msgstr ""
 
-#: i2p2www/pages/global/footer.html:10
+#: i2p2www/pages/global/footer.html:9
 msgid "Secure"
 msgstr ""
 
@@ -1515,10 +1515,9 @@ msgid ""
 msgstr ""
 
 #: i2p2www/pages/site/faq.html:161
-#, python-format
 msgid ""
 "Is the CPU usage simply higher than you would like, or is it pegged at "
-"100% for a long time?\n"
+"100&#37; for a long time?\n"
 "If it's pegged, this could be a bug. Look in the logs for clues."
 msgstr ""
 
@@ -1558,7 +1557,6 @@ msgid ""
 msgstr ""
 
 #: i2p2www/pages/site/faq.html:199
-#, python-format
 msgid ""
 "<b>Distribution</b> - All traffic on I2P is encrypted in multiple layers."
 " You don't know\n"
@@ -1570,7 +1568,7 @@ msgid ""
 "participating tunnels to 0 (see above).\n"
 "It would be nice if you didn't do this, you should help the network by "
 "routing traffic for others.\n"
-"Over 95% of users route traffic for others."
+"Over 95&#37; of users route traffic for others."
 msgstr ""
 
 #: i2p2www/pages/site/faq.html:210
diff --git a/i2p2www/translations/sv_SE/LC_MESSAGES/research.po b/i2p2www/translations/sv_SE/LC_MESSAGES/research.po
index f8b602737998418208fbc92ef0e25d2b90c0f0d2..4fc3402a48d41d6ac50c6d10e8d6d2b9403ed860 100644
--- a/i2p2www/translations/sv_SE/LC_MESSAGES/research.po
+++ b/i2p2www/translations/sv_SE/LC_MESSAGES/research.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  I2P\n"
 "Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
-"POT-Creation-Date: 2013-08-12 10:29+0000\n"
+"POT-Creation-Date: 2013-08-15 21:25+0000\n"
 "PO-Revision-Date: 2013-04-27 23:10+0000\n"
 "Last-Translator: Martin Svensson <digitalmannen@gmail.com>\n"
 "Language-Team: Swedish (Sweden) "