Mercurial > sat_legacy_website

changeset 109:bcee810025dd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
reverted patch 2f9417f5e9c4
author Goffi <goffi@goffi.org>
date Sat, 17 Oct 2015 17:52:40 +0200
parents 1da8a1885fbf
children f3b907d0e5ab
files locale/fr/LC_MESSAGES/django.po templates/sat_website/association.html
diffstat 2 files changed, 62 insertions(+), 83 deletions(-) [+]
line wrap: on
line diff
--- a/locale/fr/LC_MESSAGES/django.po	Sat Oct 17 16:59:15 2015 +0200
+++ b/locale/fr/LC_MESSAGES/django.po	Sat Oct 17 17:52:40 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 11:59+0200\n"
-"PO-Revision-Date: 2015-10-17 12:03+0100\n"
+"POT-Creation-Date: 2015-10-09 13:00+0200\n"
+"PO-Revision-Date: 2015-10-09 12:56+0100\n"
 "Last-Translator: Salut à Toi <contact@salut-a-toi.org>\n"
 "Language-Team: français <goffi@goffi.org>\n"
 "Language: fr\n"
@@ -221,71 +221,60 @@
 msgid "Membership campaign for Libervia"
 msgstr "Campagne d'adhésion pour Libervia"
 
-#: sat_website/media.py:62 sat_website/media.py:67 sat_website/media.py:70
-#: sat_website/media.py:72 sat_website/media.py:74 sat_website/media.py:76
-#: sat_website/media.py:81 sat_website/media.py:84 sat_website/media.py:86
-#: sat_website/media.py:88 sat_website/media.py:93 sat_website/media.py:100
-#: sat_website/media.py:105 sat_website/media.py:108 sat_website/media.py:113
-#: sat_website/media.py:118 sat_website/media.py:123 sat_website/media.py:126
-#: sat_website/media.py:128 sat_website/media.py:133 sat_website/media.py:138
+#: sat_website/media.py:62 sat_website/media.py:65 sat_website/media.py:67
+#: sat_website/media.py:69 sat_website/media.py:74 sat_website/media.py:77
+#: sat_website/media.py:79 sat_website/media.py:81 sat_website/media.py:86
+#: sat_website/media.py:91 sat_website/media.py:96 sat_website/media.py:101
+#: sat_website/media.py:106 sat_website/media.py:109 sat_website/media.py:111
+#: sat_website/media.py:116 sat_website/media.py:121
 msgid "version"
 msgstr "version"
 
-#: sat_website/media.py:62 sat_website/media.py:67 sat_website/media.py:70
-#: sat_website/media.py:72 sat_website/media.py:74 sat_website/media.py:76
-#: sat_website/media.py:81 sat_website/media.py:84 sat_website/media.py:86
-#: sat_website/media.py:88 sat_website/media.py:93 sat_website/media.py:100
-#: sat_website/media.py:105 sat_website/media.py:108 sat_website/media.py:113
-#: sat_website/media.py:118 sat_website/media.py:123 sat_website/media.py:126
-#: sat_website/media.py:128 sat_website/media.py:133 sat_website/media.py:138
+#: sat_website/media.py:62 sat_website/media.py:65 sat_website/media.py:67
+#: sat_website/media.py:69 sat_website/media.py:74 sat_website/media.py:77
+#: sat_website/media.py:79 sat_website/media.py:81 sat_website/media.py:86
+#: sat_website/media.py:91 sat_website/media.py:96 sat_website/media.py:101
+#: sat_website/media.py:106 sat_website/media.py:109 sat_website/media.py:111
+#: sat_website/media.py:116 sat_website/media.py:121
 msgid "year"
 msgstr "année"
 
-#: sat_website/media.py:65
-msgid "Demo of the blogging feature"
-msgstr "Démo de la fonctionnalité de blogage"
+#: sat_website/media.py:64
+msgid "Overview"
+msgstr "Aperçu"
 
-#: sat_website/media.py:67 sat_website/media.py:70 sat_website/media.py:72
-#: sat_website/media.py:74 sat_website/media.py:76 sat_website/media.py:81
-#: sat_website/media.py:84 sat_website/media.py:86 sat_website/media.py:88
-#: sat_website/media.py:93 sat_website/media.py:100 sat_website/media.py:105
-#: sat_website/media.py:108 sat_website/media.py:128
+#: sat_website/media.py:65 sat_website/media.py:67 sat_website/media.py:69
+#: sat_website/media.py:74 sat_website/media.py:77 sat_website/media.py:79
+#: sat_website/media.py:81 sat_website/media.py:86 sat_website/media.py:91
+#: sat_website/media.py:111
 msgid "frontend"
 msgstr "interface"
 
-#: sat_website/media.py:69
-msgid "Public blog message"
-msgstr "Message de blog public"
-
-#: sat_website/media.py:71
-msgid "Overview"
-msgstr "Aperçu"
-
-#: sat_website/media.py:73
+#: sat_website/media.py:66
 msgid "Optional security check"
 msgstr "Vérification de sécurité (optionnelle)"
 
-#: sat_website/media.py:75
+#: sat_website/media.py:68
 msgid "Rich text editor"
 msgstr "Éditeur de texte riche"
 
-#: sat_website/media.py:79
+#: sat_website/media.py:72
 msgid "Demo of the new Libervia UI, and of the collective radio feature"
 msgstr "Démo de la nouvelle interface de Libervia, et de la radio collective"
 
-#: sat_website/media.py:83
+#: sat_website/media.py:76
 msgid "Libervia's login page"
 msgstr "Page d'identification de Libervia"
 
-#: sat_website/media.py:85 templates/sat_website/frontends.html:34
+#: sat_website/media.py:78 templates/sat_website/frontends.html:34
 msgid "Libervia's main view"
 msgstr "Vue principale de Libervia"
 
-#: sat_website/media.py:87
+#: sat_website/media.py:80
 msgid "Wix showing a french Tarot play"
 msgstr "Wix montrant un jeu de tarot"
 
-#: sat_website/media.py:91
+#: sat_website/media.py:84
 msgid ""
 "This video focuses on Libervia. The UI is really outdated, but we can see "
 "some features"
@@ -293,51 +282,43 @@
 "Cette vidéo se concentre sur Libervia. C'est une vieille interface, mais on "
 "peut voir quelques fonctionnalités"
 
-#: sat_website/media.py:98
-msgid "Demo of the end-to-end chat encryption feature"
-msgstr "Démo du chiffrement pair à pair de la messagerie instantanée"
-
-#: sat_website/media.py:103
-msgid "Demo of the tarot game"
-msgstr "Démo du jeu de tarot"
-
-#: sat_website/media.py:107
+#: sat_website/media.py:90
 msgid "Server administration from the web frontend Libervia."
 msgstr "Administration du serveur depuis l'interface web Libervia."
 
-#: sat_website/media.py:111
+#: sat_website/media.py:94
 msgid "Use ad-hoc commands to control a VLC player from Libervia"
 msgstr ""
 "Utilisation des commandes ad-hoc pour contrôler un lecteur VLC depuis "
 "Libervia"
 
-#: sat_website/media.py:116
+#: sat_website/media.py:99
 msgid "Exporting a command: an FTP client is exported to a Gajim contact"
 msgstr ""
 "Export de commande: un client FTP est exporté à un contact utilisant Gajim"
 
-#: sat_website/media.py:121
+#: sat_website/media.py:104
 msgid "How to copy and pipe streams over XMPP"
 msgstr "Comment copier et transférer des flux de tubes (pipes) via XMPP"
 
-#: sat_website/media.py:123 sat_website/templatetags/utils.py:103
+#: sat_website/media.py:106 sat_website/templatetags/utils.py:103
 msgid "language"
 msgstr "langue"
 
-#: sat_website/media.py:125
+#: sat_website/media.py:108
 msgid "Cowsay sent in conversation through jp"
 msgstr "« Cowsay » envoyé dans une discussion via jp"
 
-#: sat_website/media.py:127 templates/sat_website/frontends.html:41
+#: sat_website/media.py:110 templates/sat_website/frontends.html:41
 msgid "Primitivus showing a french Tarot play"
 msgstr "Primitivus montrant un jeu de tarot"
 
-#: sat_website/media.py:131
+#: sat_website/media.py:114
 msgid "This video shows french Tarot game, and how to use Thunderbird with SàT"
 msgstr ""
 "Cette vidéo montre un jeu de tarot, et comment utiliser Thunderbird avec SàT"
 
-#: sat_website/media.py:136
+#: sat_website/media.py:119
 msgid "The first video shows wix, primitivus and jp"
 msgstr "La première vidéo montre Wix, Primitivus et Jp"
 
@@ -411,7 +392,7 @@
 msgid "FAQ"
 msgstr ""
 
-#: sat_website/views.py:51 templates/sat_website/association.html:48
+#: sat_website/views.py:51 templates/sat_website/association.html:47
 #: templates/sat_website/base.html:47 templates/sat_website/overview.html:101
 msgid "Membership"
 msgstr "Adhésion"
@@ -495,12 +476,21 @@
 
 #: templates/sat_website/association.html:45
 msgid ""
-"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 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."
 msgstr ""
-"Le logiciel doit toujours rester libre, éthique et gratuit, nous sommes "
+"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 "
@@ -532,30 +522,19 @@
 "commerciale s'empare du projet et nous n'ajouterons le logo d'aucun donateur "
 "sur le site du projet."
 
-#: templates/sat_website/association.html:47
-msgid ""
-"Other funding sources that are compatible with our social contract are "
-"regular crowdfunding campaigns and technical services (assistance, "
-"customisations or developments that are released under a free license)."
-msgstr ""
-"D'autres sources de financement qui sont compatibles avec notre contrat "
-"social sont des campagnes de financement participatif ordinaires et du "
-"service technique (assistance, adaptations ou développements qui sont "
-"publiés sous licence libre)."
-
-#: templates/sat_website/association.html:51
+#: templates/sat_website/association.html:50
 msgid "Official documents"
 msgstr "Documents officiels"
 
-#: templates/sat_website/association.html:53
+#: templates/sat_website/association.html:52
 msgid "Statutes of the association"
 msgstr "Statuts de l'association"
 
-#: templates/sat_website/association.html:54
+#: templates/sat_website/association.html:53
 msgid "Rules of the association"
 msgstr "Règlement intérieur de l'association"
 
-#: templates/sat_website/association.html:55
+#: templates/sat_website/association.html:54
 msgid "Minutes"
 msgstr "Comptes rendus"
 
@@ -580,8 +559,8 @@
 msgstr "Association « Salut à Toi »"
 
 #: templates/sat_website/base.html:100 templates/sat_website/community.html:35
-msgid "(replace xxx with org)"
-msgstr "(remplacez xxx par org)"
+msgid "(replace xyz with org)"
+msgstr "(remplacez xyz par org)"
 
 #: templates/sat_website/community.html:26
 msgid "Salut à Toi's community"
@@ -1665,12 +1644,13 @@
 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 contact us."
+"answer your questions. Please send them to %(email)s"
 msgstr ""
 "Si vous souhaitez écrire un article sur Salut à Toi, nous répondrons à vos "
-"questions avec plaisir. Merci de nous contacter."
+"questions avec plaisir. Merci de les adresser à %(email)s"
 
 #: templates/sat_website/press.html:65
 msgid "Radio"
--- a/templates/sat_website/association.html	Sat Oct 17 16:59:15 2015 +0200
+++ b/templates/sat_website/association.html	Sat Oct 17 17:52:40 2015 +0200
@@ -42,10 +42,9 @@
 
     <h5 class="alert alert-success">{% trans "Funding" %}</h5>
     <div class="info">
-        <p>{% blocktrans %}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 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 %}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 %}Other funding sources that are compatible with our social contract are regular crowdfunding campaigns and technical services (assistance, customisations or developments that are released under a free license).{% endblocktrans %}</p>
     </div>
     
     <h5 class="alert alert-success">{% trans "Official documents" %}</h5>