diff -r 3e460ca969d2 -r 3b4ba14d1e26 templates/sat_website/downloads.html --- a/templates/sat_website/downloads.html Sun May 03 22:36:27 2015 +0200 +++ b/templates/sat_website/downloads.html Sun May 03 22:39:02 2015 +0200 @@ -63,8 +63,10 @@

{% trans "To ease the procedure, you can also install the last SàT packages from PyPI, the Python Package Index." %}

{% trans "Thanks to the maintainers of SàT packages, you might even find some really easy to install packages in your distribution repositories!" %}

{% trans "Thanks to the maintainers of SàT packages, you might even find some really-easy-to-install packages in your distribution repositories!" %}

{% trans "Packages in Debian sid" %}

{% trans "But after all... the easiest is probably to run the Docker images :-)" %}

{% trans "Docker installation" %}

{% trans "Some complementary information are given on the wiki." %}

{% trans "Visit the wiki" %}

diff -r 3e460ca969d2 -r 3b4ba14d1e26 templates/sat_website/features.html --- a/templates/sat_website/features.html Sun May 03 22:36:27 2015 +0200 +++ b/templates/sat_website/features.html Sun May 03 22:39:02 2015 +0200 @@ -24,65 +24,80 @@ {% load staticfiles %} {% block headline %}{% trans "Salut à Toi's features" %}{% endblock %} -{% block subtext %}{% trans "SàT is a feature rich XMPP client, here is a round up of them." %}{% endblock %} -{% block extra %}{% trans "Click on the feature name to have a more detailed description" %}{% endblock %} {% block main_container %} -

- {% trans "Blogging" %} -

- {% blocktrans %}Share your thought with microblogs or write longer articles with rich text blog messages. Together with a picture manager (not available yet, but you can still link external pictures), this covers some of the most popular Internet usecases. The big difference with other popular services is that you can easily decide who will be able to read your messages and you can keep the full control over your data. Better host it yourself, or let it done by an entity you really trust.{% endblocktrans %} -

+ {% trans "Short overview" %} +

+ {% trans "Blogging" %} +

+ {% blocktrans %}Share your thought with microblogs or write longer articles with rich text blog messages. Together with a picture manager (not available yet, but you can still link external pictures), this covers some of the most popular Internet usecases. The big difference with other popular services is that you can easily decide who will be able to read your messages and you can keep the full control over your data. Better host it yourself, or let it done by an entity you really trust.{% endblocktrans %} +

+ {% trans "Chat" %} +

+ {% blocktrans %}SàT is build above several bricks that together compose one of the richest chat system ever imagined. You can talk with one person or follow a group discussion, invite people, record your communication history... If you need to exchange sensitive information - like a password - you can encrypt your messages to ensure that nobody but the person you chose will be able to read it.{% endblocktrans %} +

+ {% trans "Activities" %} +

+ {% blocktrans %}On top of the multi-user chat, you can play games and participate to activities. This is done in the same interface with nothing extra to install. For now we only offer a French card game (tarot) and an online radio system that allows you to share some music with your friends and hear it at the same time.{% endblocktrans %} +

+ {% trans "File sharing" %} +

+ {% blocktrans %}Easily send files to your contacts. For media content that support it, you can also stream them. Later we would like to implement a decentralised file sharing system so you could create a private Bitorrent-like network within a group a friends.{% endblocktrans %} +

+ {% blocktrans %}Email interaction{% endblocktrans %} +

+ {% blocktrans %}SàT communicates with the email network, so you can use your favorite client to send or receive messages. One goal of SàT is to offer an alternative to the classical email network, with a better protection against SPAM and identity spoofing. Gateways can also be installed to send messages to any other network.{% endblocktrans %} +

+ {% trans "Multiplatform" %} +

+ {% blocktrans %}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 interface, which is available from any modern browser), but other platforms are planned.{% endblocktrans %} +

+ {% trans "Social contract" %} +

+ {% blocktrans with social_prefix="" social_suffix="" %}Not really a feature, but certainly one of the most important point: a {{ social_prefix }}social contract{{ social_suffix }} has been written, this is a moral engagement that we are due to follow - we also refer to it in the statutes of the association. SàT is not made for money or trap people, it's a project about freedom and sharing.{% endblocktrans %} +

- {% trans "Chat" %} -

- {% blocktrans %}SàT is build above several bricks that together compose one of the richest chat system ever imagined. You can talk with one person or follow a group discussion, invite people, record your communication history... If you need to exchange sensitive information - like a password - you can encrypt your messages to ensure that nobody but the person you chose will be able to read it.{% endblocktrans %} -

- {% trans "Activities" %} -

- {% blocktrans %}On top of the multi-user chat, you can play games and participate to activities. This is done in the same interface with nothing extra to install. For now we only offer a French card game (tarot) and an online radio system that allows you to share some music with your friends and hear it at the same time.{% endblocktrans %} -

- {% trans "File sharing" %} -

- {% blocktrans %}Easily send files to your contacts. For media content that support it, you can also stream them. Later we would like to implement a decentralised file sharing system so you could create a private Bitorrent-like network within a group a friends.{% endblocktrans %} -

+ +

+ {% trans "Details and advanced features" %} +

{% trans "For a complete listing of the features implemented by SàT, please visit the technical area." %} +

{% trans "Specifications" %}

- {% blocktrans context "Url need to point to the localised one" %}Email interaction{% endblocktrans %} -

- {% blocktrans %}SàT communicates with the email network, so you can use your favorite client to send or receive messages. One goal of SàT is to offer an alternative to the classical email network, with a better protection against SPAM and identity spoofing. Gateways can also be installed to send messages to any other network.{% endblocktrans %} -

- {% trans "Multiplatform" %} -

- {% blocktrans %}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 interface, which is available from any modern browser), but other platforms are planned.{% endblocktrans %} -

- {% trans "Social contract" %} -

- {% blocktrans with social_prefix="" social_suffix="" %}Not really a feature, but certainly one of the most important point: a {{ social_prefix }}social contract{{ social_suffix }} has been written, this is a moral engagement that we are due to follow - we also refer to it in the statutes of the association. SàT is not made for money or trap people, it's a project about freedom and sharing.{% endblocktrans %} -

{% endblock %} diff -r 3e460ca969d2 -r 3b4ba14d1e26 templates/sat_website/frontends.html --- a/templates/sat_website/frontends.html Sun May 03 22:36:27 2015 +0200 +++ b/templates/sat_website/frontends.html Sun May 03 22:39:02 2015 +0200 @@ -24,27 +24,27 @@ {% load staticfiles %} {% block headline %}{% trans "Salut à Toi's frontends" %}{% endblock %} -{% block subtext %}{% trans "SàT is multi frontend: use the one that best fits your needs" %}{% endblock %} +{% block subtext %}{% trans "SàT is multi frontend: use the one that best fits your needs." %}{% endblock %} {% block main_container %}

{% trans "Libervia" %} {% trans "web frontend" %}

+ +

{% trans "Primitivus" %} {% trans "console interface" %}

- +

{% trans "Libervia" %} {% trans "web frontend" %}

- -

{% trans "Jp" %} {% trans "command line" %}

- +

@@ -58,17 +58,17 @@

{% blocktrans %}Bellaciao will be a full-featured desktop frontend that intends to be really flexible: you'll be able to adapt it to your taste.{% endblocktrans %}

{% trans "Your idea here" %}

{% trans "Cagou" %} {% trans "mobile devices" %}

{% trans "[PLANNED]" %}

{% blocktrans %}There are ideas about an application that would run on both destkop and mobile devices (phones and tablets).{% endblocktrans %}

{% trans "Your idea here" %}

{% endblock %} diff -r 3e460ca969d2 -r 3b4ba14d1e26 templates/sat_website/overview.html --- a/templates/sat_website/overview.html Sun May 03 22:36:27 2015 +0200 +++ b/templates/sat_website/overview.html Sun May 03 22:39:02 2015 +0200 @@ -86,8 +86,7 @@

{% trans "Decentralised" %}

{% blocktrans %}SàT is fully decentralised. There is no big server where all the data is kept. This is the only way to fight against censorship, to hinder governmental surveillance and to keep control of your data - you don't want your private pictures or intimate messages to be in the hands of an untrusted commercial company, do you?{% endblocktrans %}

{% trans "Principles" %}

{% blocktrans %}SàT has many similarities with the Email network. For instance, there is no big server where all the data is kept, but many servers managed by different entities. This is the only way to fight against censorship, to hinder governmental surveillance and to keep control of your data - you don't want your private pictures or intimate messages to be in the hands of an untrusted commercial company, do you?{% endblocktrans %}

- {% trans "Join us on Jabber :)" %} + {% trans "Enter the chat room" %}

+ {% trans "Short overview" %} +

+ {% trans "Details and advanced features" %} +

{% trans "Libervia" %} {% trans "web frontend" %}

{% trans "Primitivus" %} {% trans "console interface" %}

{% trans "Libervia" %} {% trans "web frontend" %}

{% trans "Jp" %} {% trans "command line" %}

{% trans "Your idea here" %}

{% trans "Cagou" %} {% trans "mobile devices" %}

{% trans "[PLANNED]" %}

{% trans "Your idea here" %}

{% trans "Decentralised" %}