Mercurial > sat_legacy_website

changeset 45:62c23067e86e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
improve English texts following recommandations from Florian
author souliane <souliane@mailoo.org>
date Mon, 27 Apr 2015 16:21:45 +0200
parents d721c8ffa22a
children a18800261cf6
files sat_website/forms.py templates/sat_website/base.html templates/sat_website/features.html templates/sat_website/frontends.html templates/sat_website/overview.html templates/sat_website/principles.html templates/sat_website/specifications.html
diffstat 7 files changed, 28 insertions(+), 29 deletions(-) [+]
line wrap: on
line diff
--- 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)
--- 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 @@
     <link rel="stylesheet" href="{% static "bootstrap/css/bootstrap-theme.min.css" %}">
     <link rel="stylesheet" href="{% static "css/sat_website.css" %}">
     <link rel="icon" type="image/png" href="{% static "images/sat_logo_32.png" %}">
-    <title>{% block title %}{% trans "Salut à Toi: the multi-frontends, multi-purposes communication tool" %}{% endblock %}</title>
+    <title>{% block title %}{% trans "Salut à Toi: the multi frontend, multipurpose communication tool" %}{% endblock %}</title>
 </head>
 <body role="document">
     <nav class="navbar navbar-inverse navbar-fixed-top">
--- 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 @@
 	</div>
 	<div class="row">
 		<div class="col-md-2">
-			<strong>{% trans "Multi-platforms" %}</strong>
+			<strong>{% trans "Multiplatform" %}</strong>
 		</div>
 		<div class="col-md-7 feature">
 			{% 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 %}
--- 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 %}
 
 <div class="row">
--- 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 @@
 	            </div>
 	            <div class="col-md-11">
 	                Salut à Toi (SàT) is currently under development.
-	                <div class="lead">{% blocktrans %}Multi-purposes, multi-frontends, libre and decentralised communication tool.{% endblocktrans %}</div>
+	                <div class="lead">{% blocktrans %}Multipurpose, multi frontend, libre and decentralised communication tool.{% endblocktrans %}</div>
 	            </div>
             </div>
         </h1>
@@ -54,7 +54,7 @@
 
         <div class="row">
             <div class="col-md-6">
-                <h3>{% trans "Multi-purposes" %}</h3>
+                <h3>{% trans "Multipurpose" %}</h3>
                 SàT covers a large spectrum of the Internet usages:
                 <ul>
                     <li>{%blocktrans %}<strong>chat</strong> with one or many contacts, in public or private rooms{% endblocktrans %}</li>
@@ -66,14 +66,14 @@
                 <p><a class="btn btn-default" href="features.html" role="button">{% trans "Features" %}</a></p>
             </div>
             <div class="col-md-6">
-                <h3>{% trans "Multi-frontends" %}</h3>
+                <h3>{% trans "Multi frontend" %}</h3>
                 {% 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 %}
                 <ul>
                     <li>{% blocktrans %}with a browser through the <strong>web</strong> interface Libervia{% endblocktrans %}</li>
                     <li>{% blocktrans %}inside a <strong>console</strong> user interface{% endblocktrans %}</li>
                     <li>{% blocktrans %}through a <strong>command line</strong>{% endblocktrans %}</li> 
-                    <li>{% blocktrans %}other frontends are planed (telephones, desktop){% endblocktrans %}</li>
                 </ul>
+                {% blocktrans %}Other frontends are planned (telephones, desktop).{% endblocktrans %}
                 <p><a class="btn btn-default" href="frontends.html" role="button">{% trans "Frontends" %}</a></p>
             </div>
         </div>
@@ -81,12 +81,12 @@
         <div class="row">
             <div class="col-md-6">
                 <h3>{% trans "Libre" %}</h3>
-                <p>{% 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 %}</p>
+                <p>{% 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 %}</p>
                 <p><a class="btn btn-default" href="social_contract.html" role="button">{% trans "Social contract" %}</a></p>
             </div>
             <div class="col-md-6">
                 <h3>{% trans "Decentralised" %}</h3>
-                <p>{% 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 %}</p>
+                <p>{% 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 %}</p>
                 <p><a class="btn btn-default" href="principles.html" role="button">{% trans "Principles" %}</a></p>
             </div>
         </div>
--- 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 @@
 
 	<div class="row">
 		<div class="col-md-6">
-			<h2>{% trans "Multi-purposes" %}</h2>
-			{% blocktrans with xmpp="<abbr title=\"eXtensible Messaging and Presence Protocol\">XMPP</abbr>" features_prefix="<a href=\"features.html\">" features_suffix="</a>" %} 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 %}
+			<h2>{% trans "Multipurpose" %}</h2>
+			{% blocktrans with xmpp="<abbr title=\"eXtensible Messaging and Presence Protocol\">XMPP</abbr>" features_prefix="<a href=\"features.html\">" features_suffix="</a>" %} 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 %}
 			<ul>
 				<li>{% blocktrans %}Microblogging: share your thoughts instantaneously{% endblocktrans %}</li>
 				<li>{% blocktrans %}Group permissions: share what you want with only the people you want{% endblocktrans %}</li>
-				<li>{% blocktrans %}File Sharing{% endblocktrans %}</li>
+				<li>{% blocktrans %}File sharing{% endblocktrans %}</li>
 				<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 %}Interaction with other networks: chat with your friends on IRC, StatusNet, other XMPP networks and 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 messages on any supported network{% endblocktrans %}</li>
 			</ul>
             <p><a class="btn btn-default" href="features.html" role="button">{% trans "Tell me more" %}</a></p>
 		</div>
         <div class="col-md-6">
-            <h2>{% trans "Multi-frontends" %}</h2>
-            {% 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 %}
+            <h2>{% trans "Multi frontend" %}</h2>
+            {% 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 being independent. This 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>
                 <li>{% blocktrans %}inside a <strong>console</strong> user interface{% endblocktrans %}</li>
                 <li>{% blocktrans %}through a <strong>command line</strong>{% endblocktrans %}</li> 
-                <li>{% blocktrans %}other frontends are planed (e.g.: small screens), and it's always possible to adapt one to fit your needs{% endblocktrans %}</li>
-            </ul>
+                </ul>
+                {% blocktrans %}Other frontends are planned (e.g.: small screens) and it's always possible to adapt one to fit your needs.{% endblocktrans %}
             <p><a class="btn btn-default" href="frontends.html" role="button">{% trans "Tell me more" %}</a></p>
         </div>
 	</div>
 	<div class="row">
 		<div class="col-md-3">
 			<h3>{% trans "Libre" %}</h3>
-			{% 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 %} 
+			{% 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 %}<br>
+			{% blocktrans %}In addition, SàT follows a <strong>social contract</strong>: a moral engagment with the user.{% endblocktrans %} 
 		</div>
 		<div class="col-md-3">
 			<h3>{% trans "Decentralised" %}</h3>
-			{% 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 %}
+			{% blocktrans with xmpp="<abbr title=\"eXtensible Messaging and Presence Protocol\">XMPP</abbr>" %}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 %}
 		</div>
 		<div class="col-md-3">
 			<h3>{% trans "Standard" %}</h3>
-			{% 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 %}
+			{% 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, 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 %}
 		</div>
 		<div class="col-md3">
    				<h3>{% trans "Federated" %}</h3>
-			{% 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 %} 
 		</div>
 	</div>
 
--- 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 @@
 
     <div class="row">
         <div class="col-md-2">
-            <a href="frontends">{% trans "Multi-frontends" %}</a>
+            <a href="frontends">{% trans "Multi frontend" %}</a>
         </div>
         <div class="col-md-7 feature">
-            {% 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 %}
         </div>
     </div>
     <div class="row">
@@ -135,7 +135,7 @@
     </div>
     <div class="row">
         <div class="col-md-2">
-            <strong>{% trans "Multi-platforms" %}</strong>
+            <strong>{% trans "Multiplatform" %}</strong>
         </div>
         <div class="col-md-7 feature">
             {% 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 %}