changeset 112:b82eb3264142

updated association page to adapt to the coming campaing
author Goffi <goffi@goffi.org>
date Sat, 17 Oct 2015 17:52:43 +0200
parents 0a5fc5982ade
children b96dbc7b6c61
files locale/fr/LC_MESSAGES/django.po templates/sat_website/association.html
diffstat 2 files changed, 48 insertions(+), 29 deletions(-) [+]
line wrap: on
line diff
--- a/locale/fr/LC_MESSAGES/django.po	Sat Oct 17 17:52:43 2015 +0200
+++ b/locale/fr/LC_MESSAGES/django.po	Sat Oct 17 17:52:43 2015 +0200
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-17 17:08+0200\n"
-"PO-Revision-Date: 2015-10-17 17:12+0200\n"
+"POT-Creation-Date: 2015-10-17 17:42+0200\n"
+"PO-Revision-Date: 2015-10-17 17:50+0200\n"
 "Last-Translator: Jérôme Poisson <goffi@goffi.org>\n"
 "Language-Team: français <goffi@goffi.org>\n"
 "Language: fr\n"
@@ -494,26 +494,35 @@
 msgstr "Financement"
 
 #: templates/sat_website/association.html:45
+#| msgid ""
+#| "We have been working full time on Salut à Toi for a while and we plan to "
+#| "continue. We are now trying to raise enough money to see if we could let "
+#| "the association hire us (we made the appropriate 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, by joining the association and paying a "
+#| "membership fee."
 msgid ""
-"We have been working full time on Salut à Toi for a while and we plan to "
-"continue. We are now trying to raise enough money to see if we could let the "
-"association hire us (we made the appropriate 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, by joining the association and paying a membership fee."
+"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 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."
 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 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."
+"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 "
+"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."
 
 #: templates/sat_website/association.html:46
 #, python-format
@@ -541,19 +550,31 @@
 "commerciale s'empare du projet et nous n'ajouterons le logo d'aucun donateur "
 "sur le site du projet."
 
-#: templates/sat_website/association.html:50
+#: templates/sat_website/association.html:48
+msgid ""
+"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 libre "
+"license)."
+msgstr ""
+"Nous cherchons également d'autre moyens de financement qui sont compatibles "
+"avec notre contrat social et notre éthique ; nous pensons en particulier à "
+"du service technique (assistance, adaptation ou développement de "
+"fonctionnalités réalisées sous une licence libre)."
+
+#: templates/sat_website/association.html:52
 msgid "Official documents"
 msgstr "Documents officiels"
 
-#: templates/sat_website/association.html:52
+#: templates/sat_website/association.html:54
 msgid "Statutes of the association"
 msgstr "Statuts de l'association"
 
-#: templates/sat_website/association.html:53
+#: templates/sat_website/association.html:55
 msgid "Rules of the association"
 msgstr "Règlement intérieur de l'association"
 
-#: templates/sat_website/association.html:54
+#: templates/sat_website/association.html:56
 msgid "Minutes"
 msgstr "Comptes rendus"
 
@@ -578,7 +599,6 @@
 msgstr "Association « Salut à Toi »"
 
 #: templates/sat_website/base.html:100 templates/sat_website/community.html:35
-#| msgid "(replace xyz with org)"
 msgid "(replace invalid with org)"
 msgstr "(remplacez invalid par org)"
 
@@ -1664,9 +1684,6 @@
 
 #: templates/sat_website/press.html:60
 #, python-format
-#| msgid ""
-#| "If you want to write an article about Salut à Toi, we would be pleased to "
-#| "answer your questions. Please send them to %(email)s"
 msgid ""
 "If you want to write an article about Salut à Toi, we would be pleased to "
 "answer your questions. Please send them to %(email)s (replace invalid by org)"
--- a/templates/sat_website/association.html	Sat Oct 17 17:52:43 2015 +0200
+++ b/templates/sat_website/association.html	Sat Oct 17 17:52:43 2015 +0200
@@ -42,9 +42,11 @@
 
     <h5 class="alert alert-success">{% trans "Funding" %}</h5>
     <div class="info">
-        <p>{% blocktrans %}We have been working full time on Salut à Toi for a while and we plan to continue. We are now trying to raise enough money to see if we could let the association hire us (we made the appropriate 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, 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. We are exploring different approachs to let the association hire us, and our current crowdfunding campain is a test. The software should always be 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 %}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 will never add any donator's 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 libre license).{% endblocktrans %}</p>
+
     </div>
     
     <h5 class="alert alert-success">{% trans "Official documents" %}</h5>