Mercurial > sat_legacy_website

changeset 53:84c2e20d3de1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
include some corrections suggested by Goffi
author souliane <souliane@mailoo.org>
date Tue, 05 May 2015 09:47:55 +0200
parents cc099372a9ac
children d54f2f09a73a
files locale/fr/LC_MESSAGES/django.po templates/sat_website/adhesion.html templates/sat_website/features.html templates/sat_website/principles.html templates/sat_website/screenshots.html
diffstat 5 files changed, 50 insertions(+), 54 deletions(-) [+]
line wrap: on
line diff
--- a/locale/fr/LC_MESSAGES/django.po	Mon May 04 15:35:23 2015 +0200
+++ b/locale/fr/LC_MESSAGES/django.po	Tue May 05 09:47:55 2015 +0200
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-04 15:33+0200\n"
-"PO-Revision-Date: 2015-05-04 15:34+0100\n"
+"POT-Creation-Date: 2015-05-05 09:41+0200\n"
+"PO-Revision-Date: 2015-05-05 09:48+0100\n"
 "Last-Translator: Salut à Toi <contact@salut-a-toi.org>\n"
 "Language-Team: français <goffi@goffi.org>\n"
 "Language: fr\n"
@@ -332,13 +332,13 @@
 "for developing, promoting and financing the software. The association is non-"
 "profit, self-managed and open for everybody to join. The managing instance "
 "is a college which is today composed by the two main developers: Jérôme who "
-"started this as a personal project in 2009 and Adrien who joined him in 2013."
+"started this as a personal project in 2008 and Adrien who joined him in 2013."
 msgstr ""
 "L'association Salut à Toi a été créée en juin 2014 et s'occupe du "
 "développement, de la promotion et du financement du logiciel. C'est une "
 "association à but non-lucrative, auto-gérée et ouverte à tous. Le bureau de "
 "gestion est collégiale, il est actuellement composé des deux développeurs "
-"principaux : Jérôme qui commença le développement dès 2009 en tant que "
+"principaux : Jérôme qui commença le développement dès 2008 en tant que "
 "projet personnel, et Adrien qui l'a rejoint en 2013."
 
 #: templates/sat_website/adhesion.html:35
@@ -351,21 +351,21 @@
 "keep on doing it. We are now trying to raise enough money to see if we could "
 "let the association hire us (we made apropriate research about that and we "
 "know that the 1901 French law makes it possible). Our financial model is "
-"very simple: the software should always be free, we are totally against "
-"advertisement and we believe in mutual help. We are confident that the "
-"people who enjoy what we do will be numerous enough and happy to support us, "
-"via joining the association and paying a cotisation."
+"very simple: the software should always be libre, ethical and free, we are "
+"totally against advertisement and we believe in mutual help. We are "
+"confident that the people who enjoy what we do will be numerous enough and "
+"happy to support us, via joining the association and paying a cotisation."
 msgstr ""
 "Nous travaillons sur Salut à Toi à plein temps depuis un moment, et nous "
 "espérons pouvoir continuer de le faire. Nous essayons maintenant de "
 "collecter suffisamment d'argent pour permettre à l'association de nous "
 "embaucher (contrairement aux idées reçues, ceci est permis par la loi sur "
 "les associations de 1901). Notre modèle financier est très simple : le "
-"logiciel doit toujours rester gratuit, nous sommes absolument opposés à la "
-"publicité commerciale et nous croyons en l'aide mutuelle. Nous espérons que "
-"les gens qui apprécient ce que l'on fait serons suffisamment nombreux et "
-"nous supporterons avec plaisir, en rejoignant l'association et en payant une "
-"cotisation."
+"logiciel doit toujours rester libre, éthique et gratuit, nous sommes "
+"absolument opposés à la publicité commerciale et nous croyons en l'aide "
+"mutuelle. Nous espérons que les gens qui apprécient ce que l'on fait seront "
+"suffisamment nombreux et nous supporteront avec plaisir, en rejoignant "
+"l'association et en payant une cotisation."
 
 #: templates/sat_website/adhesion.html:38
 #, python-format
@@ -406,7 +406,7 @@
 "                <li>miscellaneous extra costs (printing...).</li>\n"
 "            </ul>\n"
 "            Which makes, with an average annual contribution of 10 € per "
-"subscription, %(asso_members_target)s members before July, 31st 2015!\n"
+"subscription, %(asso_members_target)s members before December, 31st 2015!\n"
 "            "
 msgstr ""
 "Pour 2015, nous nécessitons d'environ %(asso_finance_target)s € pour:\n"
@@ -419,7 +419,7 @@
 "                <li>frais divers (impression...).</li>\n"
 "            </ul>\n"
 "            Ce qui fait, pour une cotisation annuelle moyenne de 10 €, "
-"%(asso_members_target)s adhésions avant le 31 juillet 2015 !\n"
+"%(asso_members_target)s adhésions avant le 31 décembre 2015 !\n"
 "            "
 
 #: templates/sat_website/adhesion.html:50
@@ -788,19 +788,15 @@
 
 #: templates/sat_website/features.html:47
 msgid ""
-"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."
+"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."
 msgstr ""
-"SàT est bâti à l'aide de plusieurs briques qui, ensemble, forment l'un des "
-"plus riches systèmes de messagerie instantanée jamais imaginé. Vous pouvez "
-"parler avec une personne ou suivre une discussion de groupe, inviter des "
-"gens, sauvegarder l'historique de vos communications... Si vous devez "
-"échanger des informations confidentielles (comme un mot de passe), vous "
-"pouvez chiffrer vos messages pour être sûr que personne d'autre que la "
+"Vous pouvez parler avec une personne ou suivre une discussion de groupe, "
+"inviter des gens, sauvegarder l'historique de vos communications... Si vous "
+"devez échanger des informations confidentielles (comme un mot de passe), "
+"vous pouvez chiffrer vos messages pour être sûr que personne d'autre que la "
 "personne choisir pourra être en mesure de les lire."
 
 #: templates/sat_website/features.html:52
@@ -811,15 +807,15 @@
 msgid ""
 "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."
+"install. For now we 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."
 msgstr ""
 "Par-dessus la messagerie instantanée de groupe, vous pouvez jouer à des jeux "
 "et participer à des activités. Ceci fonctionne avec la même interface et "
-"sans n'avoir rien à installer. Pour l'instant, nous offrons seulement un jeu "
-"de tarot and une radio collective qui permet de partager de la musique avec "
-"vos amis, et de l'écouter tous en même temps."
+"sans n'avoir rien à installer. Pour l'instant, nous offrons un jeu de tarot "
+"et une radio collective qui permet de partager de la musique avec vos amis, "
+"et de l'écouter tous en même temps."
 
 #: templates/sat_website/features.html:60
 msgid "File sharing"
@@ -829,13 +825,13 @@
 msgid ""
 "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 "
+"sharing system so you could create a private peer-to-peer network within a "
 "group a friends."
 msgstr ""
 "Envoyez facilement des fichiers à vos contacts. Pour les contenus qui le "
 "supporte, vous pouvez aussi les « streamer ». Plus tard, nous implanterons "
 "un système de partage de fichier décentralisé pour vous permettre de créer "
-"un réseau privé similaire à Bittorrent, seulement entre amis."
+"un réseau pair à pair privé, seulement entre amis."
 
 #: templates/sat_website/features.html:68
 msgid "Email interaction"
@@ -845,14 +841,14 @@
 msgid ""
 "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 "
+"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."
 msgstr ""
 "SàT communique avec le réseau courriel, vous pouvez utiliser votre logiciel "
 "de courrier électronique préféré pour envoyer et recevoir des messages. Un "
 "de nos buts est d'offrir une alternative au réseau courriel classique, avec "
-"une meilleure protection contre le SPAM et l'usurpation d'identité. Des "
+"une meilleure protection contre le pourriel et l'usurpation d'identité. Des "
 "passerelles peuvent aussi être installées pour envoyer des messages sur "
 "n'importe quel autre réseau."
 
--- a/templates/sat_website/adhesion.html	Mon May 04 15:35:23 2015 +0200
+++ b/templates/sat_website/adhesion.html	Tue May 05 09:47:55 2015 +0200
@@ -30,11 +30,11 @@
 <div class="row">
     <h5 class="alert alert-success">{% trans "Mission" %}</h5>
     <div class="info">
-        <p>{% blocktrans %}The Salut à Toi association has been created in june 2014 and is responsible for developing, promoting and financing the software. The association is non-profit, self-managed and open for everybody to join. The managing instance is a college which is today composed by the two main developers: Jérôme who started this as a personal project in 2009 and Adrien who joined him in 2013.{% endblocktrans %}</p>
+        <p>{% blocktrans %}The Salut à Toi association has been created in june 2014 and is responsible for developing, promoting and financing the software. The association is non-profit, self-managed and open for everybody to join. The managing instance is a college which is today composed by the two main developers: Jérôme who started this as a personal project in 2008 and Adrien who joined him in 2013.{% endblocktrans %}</p>
     </div>
     <h5 class="alert alert-success">{% trans "Financing the software" %}</h5>
     <div class="info">
-        <p>{% blocktrans %}We have been working full time on Salut à Toi for a while and we plan to keep on doing it. We are now trying to raise enough money to see if we could let the association hire us (we made apropriate research about that and we know that the 1901 French law makes it possible). Our financial model is very simple: the software should always be free, we are totally against advertisement and we believe in mutual help. We are confident that the people who enjoy what we do will be numerous enough and happy to support us, via joining the association and paying a cotisation.{% endblocktrans %}</p>
+        <p>{% blocktrans %}We have been working full time on Salut à Toi for a while and we plan to keep on doing it. We are now trying to raise enough money to see if we could let the association hire us (we made apropriate research about that and we know that the 1901 French law makes it possible). Our financial model is very simple: the software should always be libre, ethical and free, we are totally against advertisement and we believe in mutual help. We are confident that the people who enjoy what we do will be numerous enough and happy to support us, via joining the association and paying a cotisation.{% endblocktrans %}</p>
         <p>{% blocktrans %}Because the money should not operate any separation between us, the people who can not or who do not want to participate financially can still join the association for free and as a moral support. The French law doesn't allow the member to decide the amount of his cotisation, so we had to fix several amounts in the Rules of Procedure: 0, 10, 20, 30, 50, 80 or 100. If you want to raise over 100 €, it is possible to do it as a donation (which is not the same as a cotisation). In that case, please contact us. Because we want to stay 100% indepedent and autonomous, we won't allow any company to hi-jack the project and we will never add any donator's logo to the website.{% endblocktrans %}</p>
         <p>{% blocktrans %}For 2015, we roughly need {{ asso_finance_target }} € for:
             <ul>
@@ -43,7 +43,7 @@
                 <li>fees for the association's bank account;</li>
                 <li>miscellaneous extra costs (printing...).</li>
             </ul>
-            Which makes, with an average annual contribution of 10 € per subscription, {{ asso_members_target }} members before July, 31st 2015!
+            Which makes, with an average annual contribution of 10 € per subscription, {{ asso_members_target }} members before December, 31st 2015!
             {% endblocktrans %}
         </p>
         {% include "sat_website/finance.html" %}
--- a/templates/sat_website/features.html	Mon May 04 15:35:23 2015 +0200
+++ b/templates/sat_website/features.html	Tue May 05 09:47:55 2015 +0200
@@ -28,7 +28,7 @@
 
 <div class="row">
     <h5 class="alert alert-success">
-        <a name="screenshots">{% trans "Short overview" %}</a>
+        <a name="screenshots"></a>{% trans "Short overview" %}
     </h5>
     <div class="info">
 	    <div class="row">
@@ -44,7 +44,7 @@
 	            <strong>{% trans "Chat" %}</strong>
 	        </div>
 	        <div class="col-md-7 feature">
-	            {% 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 %}
+	            {% blocktrans %}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 %}
 	        </div>
 	    </div>
 	    <div class="row">
@@ -52,7 +52,7 @@
 	            <strong>{% trans "Activities" %}</strong>
 	        </div>
 	        <div class="col-md-7 feature">
-	            {% 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 %}
+	            {% 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 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 %}
 	        </div>
 	    </div>
 	    <div class="row">
@@ -60,7 +60,7 @@
 	            <strong>{% trans "File sharing" %}</strong>
 	        </div>
 	        <div class="col-md-7 feature">
-	            {% 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 %}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 peer-to-peer network within a group a friends.{% endblocktrans %}
 	        </div>
 	    </div>
 	    <div class="row">
@@ -68,7 +68,7 @@
 	            <strong>{% blocktrans %}Email interaction{% endblocktrans %}</strong>
 	        </div>
 	        <div class="col-md-7 feature">
-	            {% 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 %}
+	            {% 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 %}
 	        </div>
 	    </div>
 	    <div class="row">
@@ -84,7 +84,7 @@
 
 <div class="row">
     <h5 class="alert alert-success">
-        <a name="screenshots">{% trans "Details and advanced features" %}</a>
+        <a name="details"></a>{% trans "Details and advanced features" %}
     </h5>
     <div class="info">
 	    <p>{% trans "For a complete listing of the features implemented by SàT, please visit the technical area." %}
--- a/templates/sat_website/principles.html	Mon May 04 15:35:23 2015 +0200
+++ b/templates/sat_website/principles.html	Tue May 05 09:47:55 2015 +0200
@@ -32,7 +32,7 @@
 
 <div class="row">
     <h5 class="alert alert-success">
-        <a name="multipurpose">{% trans "Multipurpose" %}</a>
+        <a name="multipurpose"></a>{% trans "Multipurpose" %}
     </h5>
     <div class="info">
         <p>
@@ -48,7 +48,7 @@
 
 <div class="row">
     <h5 class="alert alert-success">
-         <a name="multifrontend">{% trans "Multi frontend" %}</a>
+         <a name="multifrontend"></a>{% trans "Multi frontend" %}
     </h5>
     <div class="info">
         <p>
@@ -62,7 +62,7 @@
 
 <div class="row">
     <h5 class="alert alert-success">
-         <a name="libre">{% trans "Libre" %}</a>
+         <a name="libre"></a>{% trans "Libre" %}
     </h5>
     <div class="info">
         <p>
@@ -76,7 +76,7 @@
 
 <div class="row">
     <h5 class="alert alert-success">
-         <a name="decentralised">{% trans "Decentralised" %}</a>
+         <a name="decentralised"></a>{% trans "Decentralised" %}
     </h5>
     <div class="info">
 	    <p>
@@ -139,7 +139,7 @@
 
 <div class="row">
     <h5 class="alert alert-success">
-         <a name="standard">{% trans "Standard" %}</a>
+         <a name="standard"></a>{% trans "Standard" %}
     </h5>
     <div class="info">
 	    <p>
@@ -155,7 +155,7 @@
 
 <div class="row">
     <h5 class="alert alert-success">
-         <a name="standard">{% trans "Multiplatform" %}</a>
+         <a name="multiplatform"></a>{% trans "Multiplatform" %}
     </h5>
     <div class="info">
         <p>
--- a/templates/sat_website/screenshots.html	Mon May 04 15:35:23 2015 +0200
+++ b/templates/sat_website/screenshots.html	Tue May 05 09:47:55 2015 +0200
@@ -26,7 +26,7 @@
 
 <div class="row">
     <h5 class="alert alert-success">
-        <a name="screenshots">{% trans "Basic usage" %}</a>
+        <a name="screenshots"></a>{% trans "Basic usage" %}
     </h5>
     <div class="info">
         {% trans "These media concern the basic utilisation SàT through graphical frontends like Libervia." %}
@@ -36,7 +36,7 @@
 
 <div class="row">
     <h5 class="alert alert-success">
-        <a name="screenshots_tech">{% trans "Advanced usage" %}</a>
+        <a name="screenshots_tech"></a>{% trans "Advanced usage" %}
     </h5>
     <div class="info">
         {% trans "These media concern the advanced utilisation and frontends of SàT, including administration tasks and experimental features." %}