Mercurial > sat_legacy_website

changeset 114:e45031dd7a0d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
avoid two levels of parenthesis + remove one occurence of the email contact which is already in the footer
author souliane <souliane@mailoo.org>
date Sun, 18 Oct 2015 13:29:48 +0200
parents b96dbc7b6c61
children bd30a18690e7
files locale/fr/LC_MESSAGES/django.po templates/sat_website/association.html templates/sat_website/press.html
diffstat 3 files changed, 12 insertions(+), 32 deletions(-) [+]
line wrap: on
line diff
--- a/locale/fr/LC_MESSAGES/django.po	Sat Oct 17 18:54:31 2015 +0200
+++ b/locale/fr/LC_MESSAGES/django.po	Sun Oct 18 13:29:48 2015 +0200
@@ -7,16 +7,16 @@
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \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 <goffi@goffi.org>\n"
+"POT-Creation-Date: 2015-10-18 13:27+0200\n"
+"PO-Revision-Date: 2015-10-18 13:28+0100\n"
+"Last-Translator: Salut à Toi <contact@salut-a-toi.org>\n"
 "Language-Team: français <goffi@goffi.org>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Gtranslator 2.91.7\n"
+"X-Generator: Poedit 1.6.10\n"
 
 #: sat_website/forms.py:86
 msgid "Identity"
@@ -494,15 +494,6 @@
 msgstr "Financement"
 
 #: 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 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 "
@@ -550,16 +541,11 @@
 "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 free (as "
-"in “freedom”) 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 à "
@@ -1231,7 +1217,8 @@
 msgstr "Votre idée ici"
 
 #: templates/sat_website/gallery.html:40
-#: templates/sat_website/membership.html:38 templates/sat_website/video.html:35
+#: templates/sat_website/membership.html:38
+#: templates/sat_website/video.html:35
 #, python-format
 msgid ""
 "Your browser doesn't manage the « video » tag, you should update, e.g. with "
@@ -1458,8 +1445,6 @@
 msgstr "Salut à Toi"
 
 #: templates/sat_website/overview.html:37
-#| msgid ""
-#| "Multipurpose, multi frontend, libre and decentralised communication tool."
 msgid ""
 "Multipurpose, multi frontend, free (libre) and decentralised communication "
 "tool."
@@ -1690,14 +1675,12 @@
 msgstr "articles sur Salut à Toi"
 
 #: 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 (replace invalid by org)"
+"answer your questions. Please contact us."
 msgstr ""
 "Si vous souhaitez écrire un article sur Salut à Toi, nous répondrons à vos "
-"questions avec plaisir. Merci de les adresser à %(email)s (remplacez invalid "
-"par org)"
+"questions avec plaisir. Merci de nous contacter."
 
 #: templates/sat_website/press.html:65
 msgid "Radio"
@@ -1749,9 +1732,6 @@
 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, free (libre) and "
 "decentralised communication tool... Let us explain what we mean:"
--- a/templates/sat_website/association.html	Sat Oct 17 18:54:31 2015 +0200
+++ b/templates/sat_website/association.html	Sun Oct 18 13:29:48 2015 +0200
@@ -45,7 +45,7 @@
         <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 free (as in “freedom”) 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>
     
--- a/templates/sat_website/press.html	Sat Oct 17 18:54:31 2015 +0200
+++ b/templates/sat_website/press.html	Sun Oct 18 13:29:48 2015 +0200
@@ -57,7 +57,7 @@
     </div>
     <div class="info">
         <div class="row">
-            <div class="col-md-12">{% blocktrans with email="contact \"at\" salut-a-toi.invalid"%}If you want to write an article about Salut à Toi, we would be pleased to answer your questions. Please send them to {{email}} (replace invalid by org){% endblocktrans %}</div>
+            <div class="col-md-12">{% blocktrans %}If you want to write an article about Salut à Toi, we would be pleased to answer your questions. Please contact us.{% endblocktrans %}</div>
         </div>
     </div>