--- a/templates/sat_website/overview.html	Tue Oct 29 15:34:04 2013 +0100
+++ b/templates/sat_website/overview.html	Thu Jun 26 09:07:11 2014 +0200
@@ -33,7 +33,7 @@
 		<div class="row">
 			<div class="span6">
 				<h1>{% trans "Multi-frontends" %}</h1>
-				{% blocktrans with frontends_prefix="<a href=\"frontends.html\">" frontends_suffix="</a>"%}SàT can be used with {{ frontends_prefix }}different interfaces{{ frontends_suffix }}, the heart of the software is independent. That mean that you can use SàT:{% endblocktrans %}
+				{% blocktrans with frontends_prefix="<a href=\"frontends.html\">" frontends_suffix="</a>"%}SàT can be used with {{ frontends_prefix }}different interfaces{{ frontends_suffix }}, the heart of the software is independent. That means that you can use SàT:{% endblocktrans %}
 				<ul>
 					<li>{% blocktrans %}with a browser though the <strong>web</strong> interface{% endblocktrans %}</li>
 					<li>{% blocktrans %}on your <strong>desktop</strong>, with the power of a native, integrated application{% endblocktrans %}</li>
@@ -52,27 +52,27 @@
 					<li>{% blocktrans %}Games{% endblocktrans %}</li>
 					<li>{% blocktrans %}Interaction with other networks: talk to your friends on IRC, StatusNet, other XMPP networks, or potentially any network{% endblocktrans %}</li>
 					<li>{% blocktrans with mua="<abbr title=\"Mail User Agent\">MUA</abbr>" %}Email client access: connect directly with any email client ({{ mua }}) like KMail or Thunderbird, and send message on any supported network{% endblocktrans %}</li>
-					<li>{% blocktrans %}and many, many other features (it's extensible !){% endblocktrans %}</li>
+					<li>{% blocktrans %}and many, many other features (it's extensible!){% endblocktrans %}</li>
 				</ul>
 			</div>
 		</div>
 		<div class="row">
 			<div class="span3">
 				<h1>{% trans "Libre" %}</h1>
-				{% blocktrans %}Salut à Toi is Libre (free as in freedom), that means that it follow the free software philosophy, not only because it's the best way to develop a software, but also for the share and freedom spirit.{% endblocktrans %}<br>
-				{% blocktrans %}In addition, Salut à Toi follow a <strong>social contract</strong>: a moral engagment with the user.{% endblocktrans %} 
+				{% blocktrans %}Salut à Toi is Libre (free as in freedom), that means that it follows the free software philosophy, not only because it's the best way to develop a software, but also for the share and freedom spirit.{% endblocktrans %}<br>
+				{% blocktrans %}In addition, Salut à Toi follows a <strong>social contract</strong>: a moral engagment with the user.{% endblocktrans %} 
 			</div>
 			<div class="span3">
 				<h1>{% trans "Decentralised" %}</h1>
-				{% blocktrans with xmpp="<abbr title=\"eXtensible Messaging and Presence Protocol\">XMPP</abbr>" %}By being based on {{ xmpp }} SàT is naturally decentralised. That mean that there is not one big server somewhere where all the data are staying. That's the only good way to fight against censorship, and to keep control of your data (you don't want to have your private pictures or intimate messages to be in the hands of an untrusted commercial company, do you ?).{% endblocktrans %}
+				{% blocktrans with xmpp="<abbr title=\"eXtensible Messaging and Presence Protocol\">XMPP</abbr>" %}By being based on {{ xmpp }}, SàT is naturally decentralised. That means that there is not one big server somewhere where all the data are stored. That's the only good way to fight against censorship, and to keep control of your data (you don't want to have your private pictures or intimate messages to be in the hands of an untrusted commercial company, do you?).{% endblocktrans %}
 			</div>
 			<div class="span3">
 				<h1>{% trans "Standard" %}</h1>
-				{% blocktrans with xsf="<abbr title=\"XMPP Standards Foundation\">XSF</abbr>" xmpp="<abbr title=\"eXtensible Messaging and Presence Protocol\">XMPP</abbr>" %}Using a standard protocol is a key point: it's robust, widely used and tested, well documented. Every change is discussed publicly, there are debates on the best way to do things, and the {{ xsf }} is the guarantor of the evolution and stability of the protocol. That means that SàT can communicate easily with other {{xmpp}} projects: the way it "talk" to others is fully documented.{% endblocktrans %}
+				{% blocktrans with xsf="<abbr title=\"XMPP Standards Foundation\">XSF</abbr>" xmpp="<abbr title=\"eXtensible Messaging and Presence Protocol\">XMPP</abbr>" %}Using a standard protocol is a key point: it's robust, widely used and tested, well documented. Every change is discussed publicly, there are debates on the best way to do things, and the {{ xsf }} is the guarantor of the evolution and stability of the protocol. That means that SàT can communicate easily with other {{xmpp}} projects: the way it "talks" to others is fully documented.{% endblocktrans %}
 			</div>
 			<div class="span3">
 				<h1>{% trans "Federated" %}</h1>
-				{% blocktrans %}Federation means that SàT is open to the world: it can communicate on the global Jabber network. You can of course make your own private network if you wants, but with SàT you have the ability to send messages to somebody on an other server, using a different client. That's at the opposite of some proprietary and commercial networks which tend to lock their users up. Open your borders&nbsp;!{% endblocktrans %} 
+				{% blocktrans %}Federation means that SàT is open to the world: it can communicate on the global Jabber network. You can of course make your own private network if you wants, but with SàT you have the ability to send messages to somebody on an other server, using a different client. That's at the opposite of some proprietary and commercial networks which tend to lock their users up. Open your borders!{% endblocktrans %} 
 			</div>
 		</div>
 	</div>