Mercurial > sat_legacy_website

changeset 119:b9db98c5a007

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
don't exclude to put logos of other associations
author souliane <souliane@mailoo.org>
date Tue, 03 Nov 2015 17:04:20 +0100
parents 3247b461e105
children 80a0f195231a
files locale/fr/LC_MESSAGES/django.po templates/sat_website/association.html
diffstat 2 files changed, 40 insertions(+), 39 deletions(-) [+]
line wrap: on
line diff
--- a/locale/fr/LC_MESSAGES/django.po	Mon Nov 02 11:17:56 2015 +0100
+++ b/locale/fr/LC_MESSAGES/django.po	Tue Nov 03 17:04:20 2015 +0100
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-20 11:07+0200\n"
-"PO-Revision-Date: 2015-10-20 11:13+0100\n"
+"POT-Creation-Date: 2015-11-03 17:01+0100\n"
+"PO-Revision-Date: 2015-11-03 17:01+0100\n"
 "Last-Translator: Salut à Toi <contact@salut-a-toi.org>\n"
 "Language-Team: français <goffi@goffi.org>\n"
 "Language: fr\n"
@@ -379,7 +379,7 @@
 msgstr "Spécifications"
 
 #: sat_website/views.py:40 templates/sat_website/downloads.html:27
-#: templates/sat_website/overview.html:110
+#: templates/sat_website/overview.html:113
 msgid "Downloads"
 msgstr "Téléchargements"
 
@@ -412,7 +412,7 @@
 msgstr "FAQ"
 
 #: sat_website/views.py:52 templates/sat_website/association.html:47
-#: templates/sat_website/overview.html:101
+#: templates/sat_website/overview.html:104
 msgid "Membership"
 msgstr "Adhésion"
 
@@ -525,7 +525,7 @@
 "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."
+"project and we won't add any commercial logo to the website."
 msgstr ""
 "Parce que l'argent ne doit opérer aucune séparation entre nous, les "
 "personnes qui ne peuvent pas ou qui ne veulent pas participer financièrement "
@@ -537,7 +537,7 @@
 "don (ce n'est pas la même chose qu'une cotisation). Dans ce cas, merci de "
 "bien vouloir nous contacter. Parce que nous souhaitons rester 100%% "
 "indépendant et autonome, nous n'accepterons pas qu'une entreprise "
-"commerciale s'empare du projet et nous n'ajouterons le logo d'aucun donateur "
+"commerciale s'empare du projet et nous n'ajouterons aucun logo commercial "
 "sur le site du projet."
 
 #: templates/sat_website/association.html:48
@@ -1594,11 +1594,11 @@
 "la cotisation est laissé à votre choix, entre 0 et 100 €. Adhérer "
 "gratuitement signifie aussi quelque chose, c'est un soutien moral !"
 
-#: templates/sat_website/overview.html:108
+#: templates/sat_website/overview.html:111
 msgid "Run it yourself!"
 msgstr "Lancez-le vous même !"
 
-#: templates/sat_website/overview.html:109
+#: templates/sat_website/overview.html:112
 msgid ""
 "If you enjoyed testing our demonstration version of Libervia and if you have "
 "the technical knowledge to do it, you can download the software and run it "
@@ -1643,36 +1643,37 @@
 msgstr "Articles"
 
 #: templates/sat_website/press.html:46 templates/sat_website/press.html:49
+#: templates/sat_website/press.html:55 templates/sat_website/press.html:58
+#: templates/sat_website/press.html:72 templates/sat_website/press.html:76
+#: templates/sat_website/press.html:89 templates/sat_website/press.html:95
+#: templates/sat_website/press.html:101 templates/sat_website/press.html:102
+#: templates/sat_website/press.html:108 templates/sat_website/press.html:109
+#: templates/sat_website/press.html:115 templates/sat_website/press.html:116
+#: templates/sat_website/press.html:117 templates/sat_website/press.html:125
+#: templates/sat_website/press.html:133 templates/sat_website/press.html:141
+#: templates/sat_website/press.html:142
+msgid "French"
+msgstr "Français"
+
+#: templates/sat_website/press.html:49 templates/sat_website/press.html:52
 #, python-format
 msgid "%(author)s for %(magazine)s"
 msgstr "%(author)s pour %(magazine)s"
 
-#: templates/sat_website/press.html:46 templates/sat_website/press.html:52
-#: templates/sat_website/press.html:55 templates/sat_website/press.html:69
-#: templates/sat_website/press.html:73 templates/sat_website/press.html:86
-#: templates/sat_website/press.html:92 templates/sat_website/press.html:98
-#: templates/sat_website/press.html:99 templates/sat_website/press.html:105
-#: templates/sat_website/press.html:106 templates/sat_website/press.html:112
-#: templates/sat_website/press.html:113 templates/sat_website/press.html:114
-#: templates/sat_website/press.html:122 templates/sat_website/press.html:130
-#: templates/sat_website/press.html:138 templates/sat_website/press.html:139
-msgid "French"
-msgstr "Français"
-
-#: templates/sat_website/press.html:49
+#: templates/sat_website/press.html:52
 msgid "German"
 msgstr "Allemand"
 
-#: templates/sat_website/press.html:55
+#: templates/sat_website/press.html:58
 #, python-format
 msgid "%(magazine)s"
 msgstr "%(magazine)s"
 
-#: templates/sat_website/press.html:55
+#: templates/sat_website/press.html:58
 msgid "articles about Salut à Toi"
 msgstr "articles sur Salut à Toi"
 
-#: templates/sat_website/press.html:60
+#: templates/sat_website/press.html:63
 msgid ""
 "If you want to write an article about Salut à Toi, we would be pleased to "
 "answer your questions. Please contact us."
@@ -1680,44 +1681,44 @@
 "Si vous souhaitez écrire un article sur Salut à Toi, nous répondrons à vos "
 "questions avec plaisir. Merci de nous contacter."
 
-#: templates/sat_website/press.html:65
+#: templates/sat_website/press.html:68
 msgid "Radio"
 msgstr "Radio"
 
-#: templates/sat_website/press.html:79
+#: templates/sat_website/press.html:82
 msgid "Conferences"
 msgstr "Conférences"
 
-#: templates/sat_website/press.html:84
+#: templates/sat_website/press.html:87
 msgid "Round table on new media"
 msgstr "Table ronde sur les nouveaux médias"
 
-#: templates/sat_website/press.html:86 templates/sat_website/press.html:92
-#: templates/sat_website/press.html:99 templates/sat_website/press.html:105
-#: templates/sat_website/press.html:138
+#: templates/sat_website/press.html:89 templates/sat_website/press.html:95
+#: templates/sat_website/press.html:102 templates/sat_website/press.html:108
+#: templates/sat_website/press.html:141
 msgid "Libre Software Meeting"
 msgstr "Rencontres Mondiales du Logiciel Libre"
 
-#: templates/sat_website/press.html:86 templates/sat_website/press.html:92
-#: templates/sat_website/press.html:98 templates/sat_website/press.html:99
-#: templates/sat_website/press.html:105 templates/sat_website/press.html:106
-#: templates/sat_website/press.html:130 templates/sat_website/press.html:138
+#: templates/sat_website/press.html:89 templates/sat_website/press.html:95
+#: templates/sat_website/press.html:101 templates/sat_website/press.html:102
+#: templates/sat_website/press.html:108 templates/sat_website/press.html:109
+#: templates/sat_website/press.html:133 templates/sat_website/press.html:141
 msgid "video"
 msgstr "vidéo"
 
-#: templates/sat_website/press.html:106
+#: templates/sat_website/press.html:109
 msgid "part"
 msgstr "partie"
 
-#: templates/sat_website/press.html:147
+#: templates/sat_website/press.html:150
 msgid "Brussels"
 msgstr "Bruxelles"
 
-#: templates/sat_website/press.html:147
+#: templates/sat_website/press.html:150
 msgid "English"
 msgstr "anglais"
 
-#: templates/sat_website/press.html:154
+#: templates/sat_website/press.html:157
 msgid ""
 "If you think that we could bring something interesting to an event "
 "(conference, stand...), feel free to contact us."
--- a/templates/sat_website/association.html	Mon Nov 02 11:17:56 2015 +0100
+++ b/templates/sat_website/association.html	Tue Nov 03 17:04:20 2015 +0100
@@ -43,7 +43,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 %}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>{% 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>