{% block title %}{% trans "Salut à Toi: the multi-frontends, multi-purposes communication tool" %}{% endblock %}

# HG changeset patch # User souliane # Date 1430144505 -7200 # Node ID 62c23067e86eabd99c752a404d71b914d3ae148d # Parent d721c8ffa22a3be5c3eb62d7c4a26213f060b7f6 improve English texts following recommandations from Florian diff -r d721c8ffa22a -r 62c23067e86e sat_website/forms.py --- a/sat_website/forms.py Tue Jan 27 18:28:06 2015 +0100 +++ b/sat_website/forms.py Mon Apr 27 16:21:45 2015 +0200 @@ -182,6 +182,6 @@ if not self.is_valid(): return # send email to user - send_mail(_(u'Inscription à Salut à Toi'), self.result_as_string(True), settings.EMAIL_BACKEND, [self['email'].value()], fail_silently=False) + send_mail(_(u'Subscription to Salut à Toi'), self.result_as_string(True), settings.EMAIL_BACKEND, [self['email'].value()], fail_silently=False) # send email to admins - send_mail(_(u'Inscription à Salut à Toi'), self.result_as_string(False), settings.EMAIL_BACKEND, [email for name, email in settings.ADMINS], fail_silently=False) + send_mail(_(u'Subscription to Salut à Toi'), self.result_as_string(False), settings.EMAIL_BACKEND, [email for name, email in settings.ADMINS], fail_silently=False) diff -r d721c8ffa22a -r 62c23067e86e templates/sat_website/base.html --- a/templates/sat_website/base.html Tue Jan 27 18:28:06 2015 +0100 +++ b/templates/sat_website/base.html Mon Apr 27 16:21:45 2015 +0200 @@ -32,7 +32,7 @@ - {% block title %}{% trans "Salut à Toi: the multi-frontends, multi-purposes communication tool" %}{% endblock %} + {% block title %}{% trans "Salut à Toi: the multi frontend, multipurpose communication tool" %}{% endblock %}

diff -r d721c8ffa22a -r 62c23067e86e templates/sat_website/features.html --- a/templates/sat_website/features.html Tue Jan 27 18:28:06 2015 +0100 +++ b/templates/sat_website/features.html Mon Apr 27 16:21:45 2015 +0200 @@ -102,7 +102,7 @@

- {% trans "Multi-platforms" %} + {% 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 every javascript powered browser), but other platforms are planed.{% endblocktrans %} diff -r d721c8ffa22a -r 62c23067e86e templates/sat_website/frontends.html --- a/templates/sat_website/frontends.html Tue Jan 27 18:28:06 2015 +0100 +++ b/templates/sat_website/frontends.html Mon Apr 27 16:21:45 2015 +0200 @@ -24,7 +24,7 @@ {% load staticfiles %} {% block headline %}{% trans "Salut à Toi's frontends" %}{% endblock %} -{% block subtext %}{% trans "SàT is multi-frontends: 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 %}

diff -r d721c8ffa22a -r 62c23067e86e templates/sat_website/overview.html --- a/templates/sat_website/overview.html Tue Jan 27 18:28:06 2015 +0100 +++ b/templates/sat_website/overview.html Mon Apr 27 16:21:45 2015 +0200 @@ -34,7 +34,7 @@

Salut à Toi (SàT) is currently under development. -

{% blocktrans %}Multi-purposes, multi-frontends, libre and decentralised communication tool.{% endblocktrans %}

{% blocktrans %}Multipurpose, multi frontend, libre and decentralised communication tool.{% endblocktrans %}

@@ -54,7 +54,7 @@

{% trans "Multi-purposes" %}

{% trans "Multipurpose" %}

SàT covers a large spectrum of the Internet usages:

{%blocktrans %}chat with one or many contacts, in public or private rooms{% endblocktrans %}

{% trans "Features" %}

{% trans "Multi-frontends" %}

{% trans "Multi frontend" %}

{% blocktrans %}SàT can be used with different interfaces, each of them being a sub-project, but the heart of the software stays the same. You can use SàT:{% endblocktrans %}

{% blocktrans %}with a browser through the web interface Libervia{% endblocktrans %}
{% blocktrans %}inside a console user interface{% endblocktrans %}
{% blocktrans %}through a command line{% endblocktrans %}
{% blocktrans %}other frontends are planed (telephones, desktop){% endblocktrans %}

+ {% blocktrans %}Other frontends are planned (telephones, desktop).{% endblocktrans %}

{% trans "Frontends" %}

@@ -81,12 +81,12 @@

{% trans "Libre" %}

{% blocktrans %}SàT is not only open source, it's Libre and follows the free software philosophy (free as in freedom). Not only because it's the best way to develop a software, but also for the sharing and freedom spirit. In addition, SàT follows a social contract: a moral engagment with the user.{% endblocktrans %}

{% blocktrans %}SàT is not only open source, it's Libre and follows the free software philosophy (free as in freedom). Not only because it's the best way to develop a software, but also in the spirit of sharing and freedom. In addition, SàT follows a social contract: a moral engagment with the user.{% endblocktrans %}

{% trans "Social contract" %}

{% trans "Decentralised" %}

{% blocktrans %}SàT is fully decentralised. There is no big server where all the data are stored. That's 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 %}

{% 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" %}

diff -r d721c8ffa22a -r 62c23067e86e templates/sat_website/principles.html --- a/templates/sat_website/principles.html Tue Jan 27 18:28:06 2015 +0100 +++ b/templates/sat_website/principles.html Mon Apr 27 16:21:45 2015 +0200 @@ -28,49 +28,48 @@

{% trans "Multi-purposes" %}

- {% blocktrans with xmpp="XMPP" features_prefix="" features_suffix="" %} Based on the powerful {{ xmpp }} standard, SàT can do instant messaging of course, but also many other things (and still counting). Here are some of the {{ features_prefix }}features{{ features_suffix }}:{% endblocktrans %} +

{% trans "Multipurpose" %}

+ {% blocktrans with xmpp="XMPP" features_prefix="" features_suffix="" %} Based on the powerful {{ xmpp }} standard, SàT can obviously be used for instant messaging. Here are some of the other key {{ features_prefix }}features{{ features_suffix }}:{% endblocktrans %}

{% blocktrans %}Microblogging: share your thoughts instantaneously{% endblocktrans %}
{% blocktrans %}Group permissions: share what you want with only the people you want{% endblocktrans %}
{% blocktrans %}File Sharing{% endblocktrans %}
{% blocktrans %}File sharing{% endblocktrans %}
{% blocktrans %}Games{% endblocktrans %}
{% blocktrans %}Interaction with other networks: talk to your friends on IRC, StatusNet, other XMPP networks, or potentially any network{% endblocktrans %}
{% blocktrans with mua="MUA" %}Email client access: connect directly with any email client ({{ mua }}) like KMail or Thunderbird, and send message on any supported network{% endblocktrans %}
{% blocktrans %}and many, many other features (it's extensible!){% endblocktrans %}
{% blocktrans %}Interaction with other networks: chat with your friends on IRC, StatusNet, other XMPP networks and potentially any network{% endblocktrans %}
{% blocktrans with mua="MUA" %}Email client access: connect directly with any email client ({{ mua }}) like KMail or Thunderbird, and send messages on any supported network{% endblocktrans %}

{% trans "Tell me more" %}

{% trans "Multi-frontends" %}

- {% blocktrans with frontends_prefix="" frontends_suffix=""%}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 %} +

{% trans "Multi frontend" %}

+ {% blocktrans with frontends_prefix="" frontends_suffix=""%}SàT can be used with {{ frontends_prefix }}different interfaces{{ frontends_suffix }}, the heart of the software being independent. This means that you can use SàT:{% endblocktrans %}

{% blocktrans %}with a browser though the web interface{% endblocktrans %}
{% blocktrans %}on your desktop, with the power of a native, integrated application{% endblocktrans %}
{% blocktrans %}inside a console user interface{% endblocktrans %}
{% blocktrans %}through a command line{% endblocktrans %}
{% blocktrans %}other frontends are planed (e.g.: small screens), and it's always possible to adapt one to fit your needs{% endblocktrans %}

+ + {% blocktrans %}Other frontends are planned (e.g.: small screens) and it's always possible to adapt one to fit your needs.{% endblocktrans %}

{% trans "Tell me more" %}

{% trans "Libre" %}

- {% 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 %}
- {% blocktrans %}In addition, Salut à Toi follows a social contract: a moral engagment with the user.{% endblocktrans %} + {% blocktrans %}SàT is Libre (free as in freedom), which means that it follows the free software philosophy, not only because it's the best way to develop a software, but also in the spirit of sharing and freedom.{% endblocktrans %}
+ {% blocktrans %}In addition, SàT follows a social contract: a moral engagment with the user.{% endblocktrans %}

{% trans "Decentralised" %}

- {% blocktrans with xmpp="XMPP" %}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 %} + {% blocktrans with xmpp="XMPP" %}By being based on {{ xmpp }}, SàT is naturally decentralised. There is no big server where all the data is kept. This is the only 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 %}

{% trans "Standard" %}

- {% blocktrans with xsf="XSF" xmpp="XMPP" %}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 %} + {% blocktrans with xsf="XSF" xmpp="XMPP" %}Using a standard protocol is a key point: it's robust, widely used, tested and well documented. Every change is discussed publicly, there are debates on the best way to achieve goals and the {{ xsf }} is the guarantor of the evolution and stability of the protocol. SàT can communicate easily with other {{xmpp}} projects: the way it "talks" to others is fully documented.{% endblocktrans %}

{% trans "Federated" %}

- {% 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 %} + {% blocktrans %}Federation means that SàT is open on the world. It can communicate on the global Jabber network. You can of course create your own private network, but you have the ability to send messages to somebody on an other server, using a different client, as well. That is taking the opposite road to some proprietary and commercial networks which tend to lock their users up. Open your borders!{% endblocktrans %}

diff -r d721c8ffa22a -r 62c23067e86e templates/sat_website/specifications.html --- a/templates/sat_website/specifications.html Tue Jan 27 18:28:06 2015 +0100 +++ b/templates/sat_website/specifications.html Mon Apr 27 16:21:45 2015 +0200 @@ -31,10 +31,10 @@

- {% trans "Multi-frontends" %} + {% trans "Multi frontend" %}

- {% 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 %} + {% blocktrans %}The heart of the software being independent from its display, you can have different interfaces adapted to specific usages.{% endblocktrans %}

@@ -135,7 +135,7 @@

- {% trans "Multi-platforms" %} + {% trans "Multiplatform" %}