diff templates/sat_website/association.html @ 113:b96dbc7b6c61

use of “libre” in english version is replaced by “free (libre)” or “free (as in freedom)” to avoid miscomprehension
author Goffi <goffi@goffi.org>
date Sat, 17 Oct 2015 18:54:31 +0200
parents b82eb3264142
children e45031dd7a0d
line wrap: on
line diff
--- a/templates/sat_website/association.html	Sat Oct 17 17:52:43 2015 +0200
+++ b/templates/sat_website/association.html	Sat Oct 17 18:54:31 2015 +0200
@@ -42,10 +42,10 @@
 
     <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 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. 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 %}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>
+        <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>
 
     </div>