# HG changeset patch # User Goffi # Date 1445100871 -7200 # Node ID b96dbc7b6c616b8b06a0573e629b26665e1cb89e # Parent b82eb3264142ebdeafd926d786c3eaaa1aa37e2b use of “libre” in english version is replaced by “free (libre)” or “free (as in freedom)” to avoid miscomprehension diff -r b82eb3264142 -r b96dbc7b6c61 locale/fr/LC_MESSAGES/django.po --- 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 18:54:31 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:42+0200\n" -"PO-Revision-Date: 2015-10-17 17:50+0200\n" +"POT-Creation-Date: 2015-10-17 18:51+0200\n" +"PO-Revision-Date: 2015-10-17 18:52+0200\n" "Last-Translator: Jérôme Poisson \n" "Language-Team: français \n" "Language: fr\n" @@ -495,22 +495,21 @@ #: 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." +#| "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." 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 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 " +"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." msgstr "" @@ -551,11 +550,16 @@ "sur le site du projet." #: 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)." 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)." +"(assistance, customisation or features development released under a free (as " +"in “freedom”) license)." msgstr "" "Nous cherchons également d'autre moyens de financement qui sont compatibles " "avec notre contrat social et notre éthique ; nous pensons en particulier à " @@ -1454,8 +1458,11 @@ msgstr "Salut à Toi" #: templates/sat_website/overview.html:37 +#| msgid "" +#| "Multipurpose, multi frontend, libre and decentralised communication tool." msgid "" -"Multipurpose, multi frontend, libre and decentralised communication tool." +"Multipurpose, multi frontend, free (libre) and decentralised communication " +"tool." msgstr "" "l'outil de communication multi-usages, multi-interfaces, libre et " "décentralisé" @@ -1742,8 +1749,11 @@ msgstr "Quelques mots techniques pour expliquer le projet." #: templates/sat_website/principles.html:31 +#| msgid "" +#| "We usually present SàT as a multipurpose, multi frontend, libre and " +#| "decentralised communication tool... Let us explain what we mean:" msgid "" -"We usually present SàT as a multipurpose, multi frontend, libre and " +"We usually present SàT as a multipurpose, multi frontend, free (libre) and " "decentralised communication tool... Let us explain what we mean:" msgstr "" "Nous présentons généralement SàT comme étant un outil de communication multi-" diff -r b82eb3264142 -r b96dbc7b6c61 templates/sat_website/association.html --- 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 @@
{% trans "Funding" %}
-

{% 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 %}

+

{% 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 %}

{% 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 %}

{% trans "Membership" %}

-

{% 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 %}

+

{% 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 %}

diff -r b82eb3264142 -r b96dbc7b6c61 templates/sat_website/overview.html --- a/templates/sat_website/overview.html Sat Oct 17 17:52:43 2015 +0200 +++ b/templates/sat_website/overview.html Sat Oct 17 18:54:31 2015 +0200 @@ -34,7 +34,7 @@
{% trans "Salut à Toi" %} -
{% blocktrans %}Multipurpose, multi frontend, libre and decentralised communication tool.{% endblocktrans %}
+
{% blocktrans %}Multipurpose, multi frontend, free (libre) and decentralised communication tool.{% endblocktrans %}
diff -r b82eb3264142 -r b96dbc7b6c61 templates/sat_website/principles.html --- a/templates/sat_website/principles.html Sat Oct 17 17:52:43 2015 +0200 +++ b/templates/sat_website/principles.html Sat Oct 17 18:54:31 2015 +0200 @@ -28,7 +28,7 @@ {% block main_container %}
- {% trans "We usually present SàT as a multipurpose, multi frontend, libre and decentralised communication tool... Let us explain what we mean:" %} + {% trans "We usually present SàT as a multipurpose, multi frontend, free (libre) and decentralised communication tool... Let us explain what we mean:" %}