# HG changeset patch # User souliane # Date 1432770497 -7200 # Node ID 085280c4836361e6b4c39dedf7df6f5e20e69999 # Parent 651c4049f32b176a85ca4bd388dc4f8975ec3e02 update decentralisation schemas after Simona's suggestions diff -r 651c4049f32b -r 085280c48363 locale/fr/LC_MESSAGES/django.po --- a/locale/fr/LC_MESSAGES/django.po Thu May 28 01:46:45 2015 +0200 +++ b/locale/fr/LC_MESSAGES/django.po Thu May 28 01:48:17 2015 +0200 @@ -1596,17 +1596,7 @@ "indirectement connecté au reste du monde.\n" "\t\t " -#: templates/sat_website/principles.html:90 -msgid "" -"The dots represents Internet users, the lines represents physical links - " -"server-to-server links for the central triangle, client-to-server links for " -"the rest." -msgstr "" -"Les points représentent les utilisateurs d'Internet, les lignes représentent " -"les connexions physiques (serveur-serveur pour le triangle central, client-" -"serveur pour le reste)." - -#: templates/sat_website/principles.html:95 +#: templates/sat_website/principles.html:92 msgid "" "\n" "\t\t On the logical layer, you are directly connected to your usual " @@ -1623,7 +1613,7 @@ "utilisateur... il a trop de pouvoir.\n" "\t " -#: templates/sat_website/principles.html:101 +#: templates/sat_website/principles.html:98 msgid "" "Centralised communication system on top of the physical layer - note that " "one user on the right who refuses to use such a system." @@ -1631,7 +1621,7 @@ "Système de communication centralisé par dessus la couche physique (remarquez " "l'utilisateur à droite qui refuse d'utiliser un tel système)." -#: templates/sat_website/principles.html:106 +#: templates/sat_website/principles.html:103 msgid "" "\n" "\t\t Now what if your usual \"social network\" is decentralised? The main " @@ -1657,7 +1647,7 @@ "décentralisation.\n" "\t\t " -#: templates/sat_website/principles.html:113 +#: templates/sat_website/principles.html:110 msgid "" "Decentralised communication system on top the physical layer - the user on " "the right is still resisting." @@ -1665,7 +1655,7 @@ "Système de communication décentralisé par dessus la couche physique " "(l'utilisateur à droite résiste toujours)." -#: templates/sat_website/principles.html:118 +#: templates/sat_website/principles.html:115 #, python-format msgid "" "\n" @@ -1687,17 +1677,21 @@ "de %(xmpp)s qui permet cela).\n" "\t\t " -#: templates/sat_website/principles.html:124 +#: templates/sat_website/principles.html:121 +#| msgid "" +#| "Decentralised communication system with self-hosting ability - the dot on " +#| "the right is still an Internet user, but for the service it's both a user " +#| "and a server." msgid "" "Decentralised communication system with self-hosting ability - the dot on " -"the right is still an Internet user, but for the service it's both a user " -"and a server." +"the right is still an Internet user, but for the communication service it's " +"both a user and a server." msgstr "" "Système de communication décentralisé avec possibilité d'auto-hébergement " "(l'utilisateur à droite est toujours un utilisateur d'Internet, mais pour le " -"service il est à la fois utilisateur et serveur)." +"service de communication il est à la fois utilisateur et serveur)." -#: templates/sat_website/principles.html:129 +#: templates/sat_website/principles.html:126 #, python-format msgid "" "\n" @@ -1720,7 +1714,7 @@ "détails !\n" "\t\t " -#: templates/sat_website/principles.html:134 +#: templates/sat_website/principles.html:131 #, python-format msgid "" "\n" @@ -1738,11 +1732,11 @@ "bon début.\n" "\t\t\t" -#: templates/sat_website/principles.html:143 +#: templates/sat_website/principles.html:140 msgid "Standard" msgstr "Standard" -#: templates/sat_website/principles.html:147 +#: templates/sat_website/principles.html:144 #, python-format msgid "" "Using a standard protocol is a key point: it's robust, widely used, tested " @@ -1755,7 +1749,7 @@ "publiquement, il y a des débats pour faire les choses de la meilleure façon, " "et la %(xsf)s est la garante de l'évolution et de la stabilité du protocole." -#: templates/sat_website/principles.html:150 +#: templates/sat_website/principles.html:147 #, python-format msgid "" "\n" @@ -1775,11 +1769,11 @@ "leurs utilisateurs. Ouvrez vos frontières !\n" "\t" -#: templates/sat_website/principles.html:159 +#: templates/sat_website/principles.html:156 msgid "Multiplatform" msgstr "Multiplate-forme" -#: templates/sat_website/principles.html:163 +#: templates/sat_website/principles.html:160 msgid "" "Since its beginning, the SàT project was made with other platforms in mind. " "It's only available on GNU/Linux so far (except of course Libervia, the web " @@ -2209,3 +2203,12 @@ msgstr "" "Merci de le lire attentivement, il contient les informations pour compléter " "votre adhésion." + +#~ msgid "" +#~ "The dots represents Internet users, the lines represents physical links - " +#~ "server-to-server links for the central triangle, client-to-server links " +#~ "for the rest." +#~ msgstr "" +#~ "Les points représentent les utilisateurs d'Internet, les lignes " +#~ "représentent les connexions physiques (serveur-serveur pour le triangle " +#~ "central, client-serveur pour le reste)." diff -r 651c4049f32b -r 085280c48363 static/css/sat_website.css --- a/static/css/sat_website.css Thu May 28 01:46:45 2015 +0200 +++ b/static/css/sat_website.css Thu May 28 01:48:17 2015 +0200 @@ -245,4 +245,8 @@ .banner a { float: right; +} + +.schema { + width: 500px; } \ No newline at end of file diff -r 651c4049f32b -r 085280c48363 static/images/decentralisation/1_physical.png Binary file static/images/decentralisation/1_physical.png has changed diff -r 651c4049f32b -r 085280c48363 static/images/decentralisation/1_physical.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/static/images/decentralisation/1_physical.svg Thu May 28 01:48:17 2015 +0200 @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Internet user (client) + + + Internet service provider (server) + + + client-to-server physical link + + + server-to-server physical link + + + + + diff -r 651c4049f32b -r 085280c48363 static/images/decentralisation/2_logical_centralised.png Binary file static/images/decentralisation/2_logical_centralised.png has changed diff -r 651c4049f32b -r 085280c48363 static/images/decentralisation/2_logical_centralised.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/static/images/decentralisation/2_logical_centralised.svg Thu May 28 01:48:17 2015 +0200 @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + client-to-server logical link (centralised) + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 651c4049f32b -r 085280c48363 static/images/decentralisation/3_logical_decentralised.png Binary file static/images/decentralisation/3_logical_decentralised.png has changed diff -r 651c4049f32b -r 085280c48363 static/images/decentralisation/3_logical_decentralised.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/static/images/decentralisation/3_logical_decentralised.svg Thu May 28 01:48:17 2015 +0200 @@ -0,0 +1,147 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + client-to-server logical link (decentralised) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + server-to-server logical link (decentralised) + + + + + + + + + + + + + + + + + diff -r 651c4049f32b -r 085280c48363 static/images/decentralisation/4_logical_decentralised_self_hosting.png Binary file static/images/decentralisation/4_logical_decentralised_self_hosting.png has changed diff -r 651c4049f32b -r 085280c48363 static/images/decentralisation/4_logical_decentralised_self_hosting.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/static/images/decentralisation/4_logical_decentralised_self_hosting.svg Thu May 28 01:48:17 2015 +0200 @@ -0,0 +1,160 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Internet user hosting his own communication server + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 651c4049f32b -r 085280c48363 templates/sat_website/principles.html --- a/templates/sat_website/principles.html Thu May 28 01:46:45 2015 +0200 +++ b/templates/sat_website/principles.html Thu May 28 01:48:17 2015 +0200 @@ -85,10 +85,7 @@ 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 %}
-
-
- {% trans "The dots represents Internet users, the lines represents physical links - server-to-server links for the central triangle, client-to-server links for the rest." %} -
+

@@ -96,7 +93,7 @@ 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 %}

-
+
{% trans "Centralised communication system on top of the physical layer - note that one user on the right who refuses to use such a system." %}
@@ -108,7 +105,7 @@ 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 %}
-
+
{% trans "Decentralised communication system on top the physical layer - the user on the right is still resisting." %}
@@ -119,9 +116,9 @@ Now what if you don't trust anybody? Then you are free to host your own server at home, via an association or in your work office. Is this possible too?! Yes, this is also how the email works! And this is what we did for our server libervia.org and without asking anybody's permission - the {{ xmpp }} interdomain {{ federation_prefix }}federation{{ federation_suffix }} makes it possible. {% endblocktrans %}
- +
- {% trans "Decentralised communication system with self-hosting ability - the dot on the right is still an Internet user, but for the service it's both a user and a server." %} + {% trans "Decentralised communication system with self-hosting ability - the dot on the right is still an Internet user, but for the communication service it's both a user and a server." %}