Mercurial > sat_legacy_website

diff templates/sat_website/principles.html @ 60:0d20fb28c32e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
many small changes: - set opacity 0.85 to libervia screenshot on the main page - remove videos from the repository (stored on external ftp) - more details in the README concerning the i18n - settings can be overriden by an external file (for the stats) - add in basic features.html a button to experimental features - add a link to the SàT MUC in downloads section - add link to bugzilla + improve other links in dev/community - add + symbol for projects using standard blogging system - add ~ symbol for projects being no communication tool - save subscription form results to a text file - update press.py and links.py
author souliane <souliane@mailoo.org>
date Fri, 15 May 2015 17:15:40 +0200
parents 84c2e20d3de1
children ae46991a3489
line wrap: on
line diff
--- a/templates/sat_website/principles.html	Thu May 14 23:42:25 2015 +0200
+++ b/templates/sat_website/principles.html	Fri May 15 17:15:40 2015 +0200
@@ -29,6 +29,7 @@
 
 <div>
     {% trans "We usually present SàT as a multipurpose, multi frontend, libre and decentralised communication tool... let us explain what we mean." %}
+</div>
 
 <div class="row">
     <h5 class="alert alert-success">
@@ -80,8 +81,8 @@
     </h5>
     <div class="info">
 	    <p>
-		    {% blocktrans with xmpp="<abbr title=\"eXtensible Messaging and Presence Protocol\">XMPP</abbr>" isp="<abbr title=\"Internet Service Provider\">ISP</abbr>"%}
-		    This is the most complicated aspect to understand, yet a crucial one. Being based on {{ xmpp }}, SàT is immediately decentralised (federated). But what does it mean? To get this point, we need to imagine the Internet as a set of layers. To make it easier, let's say there are only two layers: the physical and the logical one. On the physical layer, you are directly connected to your {{ isp }}, and indirectly to all the rest of the world.
+		    {% blocktrans with xmpp="<abbr title=\"eXtensible Messaging and Presence Protocol\">XMPP</abbr>" %}
+		    This is the most complicated aspect to understand, yet a crucial one. Being based on {{ xmpp }}, SàT is immediately decentralised (federated). But what does it mean? To get this point, we need to imagine the Internet as a set of layers. To make it easier, let's say there are only two layers: the physical and the logical one. On the physical layer, you are directly connected to your service provider, and indirectly to all the rest of the world.
 		    {% endblocktrans %}
 		    <div class="thumbnail">
 		        <img src="{% static "images/decentralisation/1_physical.png" %}" ><br/>
@@ -92,7 +93,7 @@
 	    </p>
 	    <p>
 		    {% blocktrans %}
-		    On the logical layer, you are directly connected to your favorite social network, and since it's centralised, all its users are directly connected to it: it can access and own all the data, it can unilaterally decide to censor or exclude a user... it has too much power.
+		    On the logical layer, you are directly connected to your usual "social network", and since it's centralised, all its users are directly connected to it: it can access and own all the data, it can unilaterally decide to censor or exclude a user... it has too much power.
 	        {% endblocktrans %}
 		    <div class="thumbnail">
 		        <img src="{% static "images/decentralisation/2_logical_centralised.png" %}" ><br/>
@@ -103,7 +104,7 @@
 	    </p>
 	    <p>
 		    {% blocktrans %}
-		    Now what if your favorite social network is decentralised? The main difference is that there's not a single entity to manage all the connections and all the data, but a lot of them.
+		    Now what if your usual "social network" is decentralised? The main difference is that there's not a single entity to manage all the connections and all the data, but a lot of them.
 	        All the users are connected to the same network, but each of them can decide which server they want to connect to. As a result, the data and the network administration's tasks are shared between all the servers. Is it possible to do that on the Internet? Yes, this is how the Email works! That's decentralisation.
 		    {% endblocktrans %}
 	        <div class="thumbnail">