changeset 142:3b9f30a201cd

update association section
author souliane <souliane@mailoo.org>
date Tue, 03 May 2016 20:59:31 +0200
parents ebd55a28b6d2
children ce6b0b84e054
files locale/fr/LC_MESSAGES/django.po templates/sat_website/association.html
diffstat 2 files changed, 12 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/locale/fr/LC_MESSAGES/django.po	Tue May 03 20:55:45 2016 +0200
+++ b/locale/fr/LC_MESSAGES/django.po	Tue May 03 20:59:31 2016 +0200
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-03 20:53+0200\n"
-"PO-Revision-Date: 2016-05-03 20:54+0100\n"
+"POT-Creation-Date: 2016-05-03 20:58+0200\n"
+"PO-Revision-Date: 2016-05-03 20:59+0100\n"
 "Last-Translator: Salut à Toi <contact@salut-a-toi.org>\n"
 "Language-Team: français <goffi@goffi.org>\n"
 "Language: fr\n"
@@ -511,23 +511,18 @@
 #: templates/sat_website/association.html:45
 msgid ""
 "We have put a lot of time and energy on “Salut à Toi” and we hope to be able "
-"to continue. We are exploring different approachs to let the association "
-"hire us, and our current crowdfunding campain is a test. The software should "
-"always be free (libre) and ethical; 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, either with the "
-"crowdfunding campain or by joining the association and paying a membership "
-"fee."
+"to continue. The software should always be free (libre) and ethical; 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 by joining the association and paying a membership fee."
 msgstr ""
 "Nous avons mis beaucoup de temps et d'énergie dans « Salut à Toi », et nous "
-"espérons pouvoir continuer de le faire. Nous explorons différentes approches "
-"pour permettre à l'association de nous embaucher, et notre campagne de "
-"financement participatif actuelle est un essai. Le logiciel doit toujours "
-"rester libre et éthique, nous sommes absolument opposés à la publicité et "
-"nous croyons en l'aide mutuelle. Nous avons bon espoir que les gens qui "
+"espérons pouvoir continuer de le faire. Le logiciel doit toujours rester "
+"libre et éthique, nous sommes absolument opposés à la publicité et nous "
+"croyons en l'aide mutuelle. Nous avons bon espoir que les gens qui "
 "apprécient ce que l'on fait seront suffisamment nombreux et nous "
-"soutiendrons avec plaisir, soit à travers le financement participatif, soit "
-"en rejoignant l'association et en payant une cotisation."
+"soutiendrons avec plaisir, en rejoignant l'association et en payant une "
+"cotisation."
 
 #: templates/sat_website/association.html:46
 #, python-format
--- a/templates/sat_website/association.html	Tue May 03 20:55:45 2016 +0200
+++ b/templates/sat_website/association.html	Tue May 03 20:59:31 2016 +0200
@@ -42,7 +42,7 @@
 
     <h5 class="alert alert-success">{% trans "Funding" %}</h5>
     <div class="info">
-        <p>{% blocktrans %}We have put a lot of time and energy on “Salut à Toi” and we hope to be able to continue. We are exploring different approachs to let the association hire us, and our current crowdfunding campain is a test. The software should always be free (libre) and ethical; 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, either with the crowdfunding campain or by joining the association and paying a membership fee.{% endblocktrans %}</p>
+        <p>{% blocktrans %}We have put a lot of time and energy on “Salut à Toi” and we hope to be able to continue. The software should always be free (libre) and ethical; 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 by joining the association and paying a membership fee.{% endblocktrans %}</p>
         <p>{% blocktrans %}Because the money should not create any separation between us, the people who cannot or who do not want to participate financially can still join the association for free and as moral support. The French law doesn't allow members to decide the amount of payment, 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 membership fee). In that case, please contact us. As we want to stay 100% independent and autonomous, we won't allow any company to hi-jack the project and we won't add any commercial logo to the website.{% endblocktrans %}</p>
         <p><a class="btn btn-default" href="membership.html" role="button">{% trans "Membership" %}</a></p>
         <p>{% blocktrans %}We also think about other funding sources that are compatible with our social contract and ethical view, in particular technical services (assistance, customisation or features development released under a free - as in “freedom” - license).{% endblocktrans %}</p>