Mercurial > sat_legacy_website

changeset 21:8cfc33e4d435

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add video showing the ad-hoc commands + fix some English
author souliane <souliane@mailoo.org>
date Thu, 26 Jun 2014 09:07:11 +0200
parents 50f8d50cb508
children 9bab976241dc
files locale/fr/LC_MESSAGES/django.po sat_website/screenshots.py static/images/screenshots/libervia/libervia_mix.png static/videos/screencasts/présentation_SàT_7_télécommande_universelle.webm templates/sat_website/features.html templates/sat_website/frontends.html templates/sat_website/overview.html
diffstat 7 files changed, 84 insertions(+), 51 deletions(-) [+]
line wrap: on
line diff
--- a/locale/fr/LC_MESSAGES/django.po	Tue Oct 29 15:34:04 2013 +0100
+++ b/locale/fr/LC_MESSAGES/django.po	Thu Jun 26 09:07:11 2014 +0200
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-25 21:14+0100\n"
+"POT-Creation-Date: 2014-06-25 17:11+0200\n"
 "PO-Revision-Date: 2013-02-25 21:17+0100\n"
 "Last-Translator: Jérôme Poisson <goffi@goffi.org>\n"
 "Language-Team: français <goffi@goffi.org>\n"
@@ -68,6 +68,12 @@
 msgstr ""
 "Export de commande: un client FTP est exporté à un contact utilisant Gajim"
 
+#: sat_website/screenshots.py:45
+msgid "Use ad-hoc commands to control a VLC player from Libervia"
+msgstr ""
+"Utilisation des commandes ad-hoc pour contrôler un lecteur VLC depuis "
+"Libervia"
+
 #: sat_website/views.py:30
 msgid "Features"
 msgstr "Fonctionnalités"
@@ -88,7 +94,7 @@
 msgid "Developers corner"
 msgstr "Coin des développeurs"
 
-#: sat_website/views.py:35 templates/sat_website/features.html:135
+#: sat_website/views.py:35 templates/sat_website/features.html:143
 msgid "Social contract"
 msgstr "Contrat social"
 
@@ -268,8 +274,8 @@
 #: templates/sat_website/features.html:34
 msgid ""
 "SàT is multi-frontends: the heart of the software is independant from its "
-"view, that mean that you can have differents interfaces adapted to specifics "
-"usages."
+"display, that means that you can have different interfaces adapted to "
+"specific usages."
 msgstr ""
 "SàT est multi-interfaces: le cœur du logiciel est indépendant de sa vue, c-à-"
 "d que vous pouvez avoir différentes interfaces adaptées à des cas "
@@ -281,7 +287,7 @@
 
 #: templates/sat_website/features.html:42
 msgid ""
-"Share your thought either publicly and privatly (see below), thanks to the "
+"Share your thought either publicly or privately (see below), thanks to the "
 "microblogging feature. With the decentralised nature of XMPP, you don't have "
 "to rely on one specific server, so you can stay master of your data, and "
 "avoir censorship."
@@ -297,7 +303,7 @@
 
 #: templates/sat_website/features.html:50
 msgid ""
-"Keep access to private data only for the people you choose. SàT use groups "
+"Keep access to private data only for the people you choose. SàT uses groups "
 "to manage your permissions, and avoid your coworker to see your party "
 "pictures."
 msgstr ""
@@ -311,9 +317,9 @@
 
 #: templates/sat_website/features.html:58
 msgid ""
-"XMPP is one of the best (and probably the best) instant messaging protocole "
+"XMPP is one of the best (and probably the best) instant messaging protocol "
 "ever made. There are plenty of things you can do, far too much to detail "
-"everything here. In addition, you can join muli-user room, and discuss with "
+"everything here. In addition, you can join muli-user rooms, and discuss with "
 "tons of people."
 msgstr ""
 "XMPP est un des meilleurs (et sûrement le meilleur) protocole de messagerie "
@@ -329,12 +335,13 @@
 msgid ""
 "With XMPP, you are not limited to chat or short messages: you have no size "
 "limit, and if you want to write essays or to highly detail your last "
-"holidays, you can."
+"holidays, you can. SàT also handles rich text syntaxes like XHTML and "
+"Markdown."
 msgstr ""
 "Avec XMPP, vous n'êtes pas limité à la messagerie instantanée ou aux micro "
 "messages: vous n'avez aucune limite de taille, et si vous voulez écrire une "
 "thèse, ou raconter vos dernières vacances dans les moindres détails, vous "
-"pouvez."
+"pouvez. SàT gère aussi les syntaxes de texte riche comme XHTML et Markdown."
 
 #: templates/sat_website/features.html:71
 msgid "Gateways"
@@ -342,7 +349,7 @@
 
 #: templates/sat_website/features.html:74
 msgid ""
-"Communicate with other networks using different protocoles. with SàT and "
+"Communicate with other networks using different protocols. With SàT and "
 "XMPP, you'll not stay behind closed walls."
 msgstr ""
 "Vous pouvez communiquer avec d'autres réseaux utilisant des protocoles "
@@ -362,8 +369,8 @@
 msgstr "Jeux"
 
 #: templates/sat_website/features.html:90
-msgid "Play with your friends or other people"
-msgstr "Jouez avec vos amis ou des étrangers"
+msgid "Play with your friends or other people."
+msgstr "Jouez avec vos amis ou des étrangers."
 
 #: templates/sat_website/features.html:95
 #, python-format
@@ -382,9 +389,9 @@
 "Thanks to it's IMAP/SMTP plugin, you can use any e-mail client to "
 "communicate through SàT. Combinate this with the gateway feature, and you "
 "can send message with it to any network (including traditional e-mail "
-"netwwork). One of the goal of SàT is to allow easy transition to Jabber as "
-"an alternative to classical e-mail network, with a better protection to SPAM "
-"and identity spoofing."
+"network). One of the goal of SàT is to allow easy transition to Jabber as an "
+"alternative to classical e-mail network, with a better protection against "
+"SPAM and identity spoofing."
 msgstr ""
 "Grâce à ses greffons IMAP et SMTP, vous pouvez utiliser n'importe quel "
 "client courriel pour communiquer via SàT. Ajoutez à ça les transports, et "
@@ -405,7 +412,7 @@
 
 #: templates/sat_website/features.html:106
 msgid ""
-"This is a feature for power-user: SàT allow to send command-line tools' "
+"This is a feature for power-user: SàT allows to send command-line tools' "
 "stdout to your contacts. This actually is as easy as knowing the name of "
 "your contact."
 msgstr ""
@@ -435,6 +442,23 @@
 "transports)."
 
 #: templates/sat_website/features.html:119
+msgctxt "Url need to point to the localised one"
+msgid ""
+"<a href=\"http://blog.goffi.org/post/2014/02/18/A-universal-remote-for-your-"
+"softwares\">Ad-Hoc commands</a>"
+msgstr ""
+"<a href=\"http://blog.goffi.org/post/2014/02/18/A-universal-remote-for-your-"
+"softwares\">Commandes ad-hoc</a>"
+
+#: templates/sat_website/features.html:122
+msgid ""
+"You can remotely control your XMPP entities and all the softwares that offer "
+"DBus services. "
+msgstr ""
+"Vous pouvez télécommander vos entités XMPP et tous les logiciels qui offres "
+"des services DBus."
+
+#: templates/sat_website/features.html:127
 #, python-format
 msgctxt "Url need to point to the localised one"
 msgid ""
@@ -444,22 +468,22 @@
 "<a href=\"http://www.goffi.org/post/2012/02/02/Radio-collective\">Radio "
 "collective</a>"
 
-#: templates/sat_website/features.html:122
+#: templates/sat_website/features.html:130
 msgid ""
 "Experiment music with your friends: in a multi-user room, you share a "
-"playlist; everybody can add songs to it, and everybody listen the same music "
-"at the same time. Good way to share your taste and discover new songs."
+"playlist; everybody can add songs to it, and everybody listens the same "
+"music at the same time. Good way to share your taste and discover new songs."
 msgstr ""
 "Écoutez de la musique avec vos amis: dans un salon de discussion, vous "
 "partagez une liste de lecture; chacun peut ajouter un morceau, et tout le "
 "monde écoute la même musique en même temps. C'est une bonne façon de faire "
 "connaître vos goûts et de découvrir de nouveaux artistes."
 
-#: templates/sat_website/features.html:127
+#: templates/sat_website/features.html:135
 msgid "Multi-platforms"
 msgstr "Multi plate-formes"
 
-#: templates/sat_website/features.html:130
+#: templates/sat_website/features.html:138
 msgid ""
 "Since its begining, the SàT project was made with other platforms in mind. "
 "It's only avaible on Gnu/Linux so far (except of course Libervia, the web "
@@ -471,7 +495,7 @@
 "Libervia, l'interface web, qui est disponible depuis tout butineur avec "
 "javascript), mais d'autres systèmes prévus."
 
-#: templates/sat_website/features.html:138
+#: templates/sat_website/features.html:146
 #, python-format
 msgid ""
 "Not exactly a feature, but certainly one of the most important point: a "
@@ -490,7 +514,7 @@
 msgstr "Les frontaux de SàT"
 
 #: templates/sat_website/frontends.html:26
-msgid "SàT is multi-frontends: use the one that best fit your needs"
+msgid "SàT is multi-frontends: use the one that best fits your needs"
 msgstr ""
 "SàT est multi-interfaces: utilisez celle qui correspond le mieux à vos "
 "besoins"
@@ -573,7 +597,7 @@
 #, python-format
 msgid ""
 "SàT can be used with %(frontends_prefix)sdifferent interfaces"
-"%(frontends_suffix)s, the heart of the software is independent. That mean "
+"%(frontends_suffix)s, the heart of the software is independent. That means "
 "that you can use SàT:"
 msgstr ""
 "SàT peut être utilisé avec %(frontends_prefix)sdifférentes interfaces"
@@ -655,7 +679,7 @@
 "n'importe quel réseau supporté"
 
 #: templates/sat_website/overview.html:55
-msgid "and many, many other features (it's extensible !)"
+msgid "and many, many other features (it's extensible!)"
 msgstr "et de très nombreuses autres fonctionnalités (c'est extensible !)"
 
 #: templates/sat_website/overview.html:61
@@ -664,7 +688,7 @@
 
 #: templates/sat_website/overview.html:62
 msgid ""
-"Salut à Toi is Libre (free as in freedom), that means that it follow the "
+"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."
 msgstr ""
@@ -674,7 +698,7 @@
 
 #: templates/sat_website/overview.html:63
 msgid ""
-"In addition, Salut à Toi follow a <strong>social contract</strong>: a moral "
+"In addition, Salut à Toi follows a <strong>social contract</strong>: a moral "
 "engagment with the user."
 msgstr ""
 "En outre, Salut à Toi suit un <strong>contrat social</strong>: un engagement "
@@ -687,11 +711,11 @@
 #: templates/sat_website/overview.html:67
 #, python-format
 msgid ""
-"By being based on %(xmpp)s SàT is naturally decentralised. That mean that "
-"there is not one big server somewhere where all the data are staying. That's "
+"By being based on %(xmpp)s, 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 ?)."
+"be in the hands of an untrusted commercial company, do you?)."
 msgstr ""
 "En étant basé sur %(xmpp)s, SàT est naturellement décentralisé. Cela "
 "signifie qu'ile n'y a pas un unique serveur géant quelque part où sont "
@@ -711,7 +735,7 @@
 "tested, well documented. Every change is discussed publicly, there are "
 "debates on the best way to do things, and the %(xsf)s is the guarantor of "
 "the evolution and stability of the protocol. That means that SàT can "
-"communicate easily with other %(xmpp)s projects: the way it \"talk\" to "
+"communicate easily with other %(xmpp)s projects: the way it \"talks\" to "
 "others is fully documented."
 msgstr ""
 "Utiliser un protocole standard est un point clef: c'est robuste, largement "
@@ -733,7 +757,7 @@
 "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;!"
+"your borders!"
 msgstr ""
 "La fédération signifie que SàT est ouvert au monde: il peut parler sur le "
 "réseau global Jabber. Vous pouvez bien sûr faire votre propre réseau privé "
--- a/sat_website/screenshots.py	Tue Oct 29 15:34:04 2013 +0100
+++ b/sat_website/screenshots.py	Thu Jun 26 09:07:11 2014 +0200
@@ -42,6 +42,7 @@
     VideoDesc("videos/screencasts/présentation_SàT_4_copie_et_pipe.webm", _(u"How to copy and pipe streams over XMPP"), "videos/screencasts/posters/présentation_SàT_4.jpg"),
     VideoDesc("videos/screencasts/présentation_SàT_5_radio_collective.webm", _(u"Demo of the new Libervia UI, and of the collective radio feature"), "videos/screencasts/posters/radiocol.jpg"),
     VideoDesc("videos/screencasts/présentation_SàT_6_export_commande.webm", _(u"Exporting a command: an FTP client is exported to a Gajim contact"), "videos/screencasts/posters/présentation_SàT_6_export_commande.jpg"),
+    VideoDesc("videos/screencasts/présentation_SàT_7_télécommande_universelle.webm", _(u"Use ad-hoc commands to control a VLC player from Libervia"), "videos/screencasts/posters/présentation_SàT_7_télécommande_universelle.png"),
     ]
 
 
Binary file static/images/screenshots/libervia/libervia_mix.png has changed
Binary file static/videos/screencasts/présentation_SàT_7_télécommande_universelle.webm has changed
--- a/templates/sat_website/features.html	Tue Oct 29 15:34:04 2013 +0100
+++ b/templates/sat_website/features.html	Thu Jun 26 09:07:11 2014 +0200
@@ -31,7 +31,7 @@
 			<a href="frontends">{% trans "Multi-frontends" %}</a>
 		</div>
 		<div class="span7 feature">
-			{% blocktrans %}SàT is multi-frontends: the heart of the software is independant from its view, that mean that you can have differents interfaces adapted to specifics usages.{% endblocktrans %}
+			{% blocktrans %}SàT is multi-frontends: the heart of the software is independant from its display, that means that you can have different interfaces adapted to specific usages.{% endblocktrans %}
 		</div>
 	</div>
 	<div class="row">
@@ -39,7 +39,7 @@
 			<strong>{% trans "Microblogging" %}</strong>
 		</div>
 		<div class="span7 feature">
-			{% blocktrans %}Share your thought either publicly and privatly (see below), thanks to the microblogging feature. With the decentralised nature of XMPP, you don't have to rely on one specific server, so you can stay master of your data, and avoir censorship.{% endblocktrans %}
+			{% blocktrans %}Share your thought either publicly or privately (see below), thanks to the microblogging feature. With the decentralised nature of XMPP, you don't have to rely on one specific server, so you can stay master of your data, and avoir censorship.{% endblocktrans %}
 		</div>
 	</div>
 	<div class="row">
@@ -47,7 +47,7 @@
 			<strong>{% trans "Group permissions" %}</strong>
 		</div>
 		<div class="span7 feature">
-			{% blocktrans %}Keep access to private data only for the people you choose. SàT use groups to manage your permissions, and avoid your coworker to see your party pictures.{% endblocktrans %}
+			{% blocktrans %}Keep access to private data only for the people you choose. SàT uses groups to manage your permissions, and avoid your coworker to see your party pictures.{% endblocktrans %}
 		</div>
 	</div>
 	<div class="row">
@@ -55,7 +55,7 @@
 			<strong>{% trans "Advanced chat and group chat" %}</strong>
 		</div>
 		<div class="span7 feature">
-			{% blocktrans %}XMPP is one of the best (and probably the best) instant messaging protocole ever made. There are plenty of things you can do, far too much to detail everything here. In addition, you can join muli-user room, and discuss with tons of people.{% endblocktrans %}
+			{% blocktrans %}XMPP is one of the best (and probably the best) instant messaging protocol ever made. There are plenty of things you can do, far too much to detail everything here. In addition, you can join muli-user rooms, and discuss with tons of people.{% endblocktrans %}
 		</div>
 	</div>
 	<div class="row">
@@ -63,7 +63,7 @@
 			<strong>{% trans "Heavy messaging" %}</strong>
 		</div>
 		<div class="span7 feature">
-			{% blocktrans %}With XMPP, you are not limited to chat or short messages: you have no size limit, and if you want to write essays or to highly detail your last holidays, you can.{% endblocktrans %}
+			{% blocktrans %}With XMPP, you are not limited to chat or short messages: you have no size limit, and if you want to write essays or to highly detail your last holidays, you can. SàT also handles rich text syntaxes like XHTML and Markdown.{% endblocktrans %}
 		</div>
 	</div>
 	<div class="row">
@@ -71,7 +71,7 @@
 			<strong>{% trans "Gateways" %}</strong>
 		</div>
 		<div class="span7 feature">
-			{% blocktrans %}Communicate with other networks using different protocoles. with SàT and XMPP, you'll not stay behind closed walls.{% endblocktrans %}
+			{% blocktrans %}Communicate with other networks using different protocols. With SàT and XMPP, you'll not stay behind closed walls.{% endblocktrans %}
 		</div>
 	</div>
 	<div class="row">
@@ -87,7 +87,7 @@
 			<strong>{% trans "Games" %}</strong>
 		</div>
 		<div class="span7 feature">
-			{% blocktrans %}Play with your friends or other people{% endblocktrans %}
+			{% blocktrans %}Play with your friends or other people.{% endblocktrans %}
 		</div>
 	</div>
 	<div class="row">
@@ -95,7 +95,7 @@
 			{% blocktrans context "Url need to point to the localised one" %}<a href="http://www.goffi.org/post/2011/01/18/Recevez-et-envoyez-vos-messages-XMPP/Jabber-avec-votre-lecteur-de-courriel-gr%C3%A2ce-%C3%A0-Salut-%C3%A0-Toi-%21">E-mail clients interactions</a>{% endblocktrans %}
 		</div>
 		<div class="span7 feature">
-			{% blocktrans %}Thanks to it's IMAP/SMTP plugin, you can use any e-mail client to communicate through SàT. Combinate this with the gateway feature, and you can send message with it to any network (including traditional e-mail netwwork). One of the goal of SàT is to allow easy transition to Jabber as an alternative to classical e-mail network, with a better protection to SPAM and identity spoofing.{% endblocktrans %}
+			{% blocktrans %}Thanks to it's IMAP/SMTP plugin, you can use any e-mail client to communicate through SàT. Combinate this with the gateway feature, and you can send message with it to any network (including traditional e-mail network). One of the goal of SàT is to allow easy transition to Jabber as an alternative to classical e-mail network, with a better protection against SPAM and identity spoofing.{% endblocktrans %}
 		</div>
 	</div>
 	<div class="row">
@@ -103,7 +103,7 @@
 			{% blocktrans context "Url need to point to the localised one" %}<a href="http://www.goffi.org/post/2011/10/07/Shell%3A-pipe-you-commands-out-via-XMPP-with-S%C3%A0T">Pipe over XMPP</a>{% endblocktrans %}
 		</div>
 		<div class="span7 feature">
-			{% blocktrans %}This is a feature for power-user: SàT allow to send command-line tools' stdout to your contacts. This actually is as easy as knowing the name of your contact.{% endblocktrans %}
+			{% blocktrans %}This is a feature for power-user: SàT allows to send command-line tools' stdout to your contacts. This actually is as easy as knowing the name of your contact.{% endblocktrans %}
 		</div>
 	</div>
 	<div class="row">
@@ -114,12 +114,20 @@
 			{% blocktrans %}An other feature for power-user: you can export input/outputs of an Unix CLI command to any contact (using any XMPP client or even other protocols through gateways).{% endblocktrans %}
 		</div>
 	</div>
+    <div class="row">
+        <div class="span2">
+            {% blocktrans context "Url need to point to the localised one" %}<a href="http://blog.goffi.org/post/2014/02/18/A-universal-remote-for-your-softwares">Ad-Hoc commands</a>{% endblocktrans %}
+        </div>
+        <div class="span7 feature">
+            {% blocktrans %}You can remotely control your XMPP entities and all the softwares that offer DBus services. {% endblocktrans %}
+        </div>
+    </div>
 	<div class="row">
 		<div class="span2">
 			{% blocktrans context "Url need to point to the localised one" %}<a href="http://www.goffi.org/post/2012/02/02/Collective-radio-%28with-video%29">Collective radio</a>{% endblocktrans %}
 		</div>
 		<div class="span7 feature">
-			{% blocktrans %}Experiment music with your friends: in a multi-user room, you share a playlist; everybody can add songs to it, and everybody listen the same music at the same time. Good way to share your taste and discover new songs.{% endblocktrans %}
+			{% blocktrans %}Experiment music with your friends: in a multi-user room, you share a playlist; everybody can add songs to it, and everybody listens the same music at the same time. Good way to share your taste and discover new songs.{% endblocktrans %}
 		</div>
 	</div>
 	<div class="row">
--- a/templates/sat_website/frontends.html	Tue Oct 29 15:34:04 2013 +0100
+++ b/templates/sat_website/frontends.html	Thu Jun 26 09:07:11 2014 +0200
@@ -23,7 +23,7 @@
 {% load i18n %}
 {% load staticfiles %}
 {% block headline %}{% trans "Salut à Toi's frontends" %}{% endblock %}
-{% block subtext %}{% trans "SàT is multi-frontends: use the one that best fit your needs" %}{% endblock %}
+{% block subtext %}{% trans "SàT is multi-frontends: use the one that best fits your needs" %}{% endblock %}
 {# {% block extra %}<span class="label label-success">{% trans "Click on the frontend screenshot to have a more detailed description" %}</span>{% endblock %} #}
 {% block main_container %}
 <div class="row">
--- 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>