Mercurial > sat_legacy_website
changeset 56:01e9c646999f
add links to other projects and press files
author | souliane <souliane@mailoo.org> |
---|---|
date | Sun, 10 May 2015 15:48:04 +0200 |
parents | a1e457ac6871 |
children | bfa8009f0769 |
files | locale/fr/LC_MESSAGES/django.po sat_website/views.py templates/sat_website/association.html templates/sat_website/links.html templates/sat_website/press.html |
diffstat | 5 files changed, 264 insertions(+), 55 deletions(-) [+] |
line wrap: on
line diff
--- a/locale/fr/LC_MESSAGES/django.po Tue May 05 15:02:50 2015 +0200 +++ b/locale/fr/LC_MESSAGES/django.po Sun May 10 15:48:04 2015 +0200 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: 0.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-05 15:01+0200\n" -"PO-Revision-Date: 2015-05-05 15:01+0100\n" +"POT-Creation-Date: 2015-05-10 15:38+0200\n" +"PO-Revision-Date: 2015-05-10 15:44+0100\n" "Last-Translator: Salut à Toi <contact@salut-a-toi.org>\n" "Language-Team: français <goffi@goffi.org>\n" "Language: fr\n" @@ -286,35 +286,39 @@ msgid "Links" msgstr "Liens" -#: sat_website/views.py:49 templates/sat_website/association.html:42 +#: sat_website/views.py:46 +msgid "Press" +msgstr "Presse" + +#: sat_website/views.py:50 templates/sat_website/association.html:47 #: templates/sat_website/overview.html:100 msgid "Adhesion" msgstr "Adhésion" -#: sat_website/views.py:50 templates/sat_website/features.html:76 +#: sat_website/views.py:51 templates/sat_website/features.html:76 #: templates/sat_website/overview.html:85 #: templates/sat_website/principles.html:73 msgid "Social contract" msgstr "Contrat social" -#: sat_website/views.py:55 +#: sat_website/views.py:56 msgid "contains the backend, Primitivus and Jp" msgstr "contient le backend, Primitivus et Jp" -#: sat_website/views.py:56 +#: sat_website/views.py:57 msgid "Images and other media needed to launch SàT" msgstr "images et autres média nécessaires au lancement de SàT" -#: sat_website/views.py:57 +#: sat_website/views.py:58 msgid "console display library needed by Primitivus" msgstr "bibliothèque pour l'affichage en console de Primitivus" -#: sat_website/views.py:58 +#: sat_website/views.py:59 msgid "PubSub server component needed for SàT experimental blogging features" msgstr "" "composant serveur PubSub pour les fonctionnalités expérimentales de blogage" -#: sat_website/views.py:59 +#: sat_website/views.py:60 msgid "Libervia frontend (web server and client)" msgstr "interface Libervia (serveur web et partie cliente)" @@ -393,12 +397,6 @@ msgstr "Adhérer gratuitement ou procéder par virement" #: templates/sat_website/adhesion.html:59 -#| msgid "" -#| "By clicking the button below, you will be redirected to a secure paiement " -#| "service hosted by our bank (Crédit Mutuel - CIC Paiement). We can " -#| "unfortunately not pre-fill the form fields. Please enter a positive " -#| "amount from those defined in the Rules of Procedure: 10, 20, 30, 50, 80 " -#| "or 100." msgid "" "If you prefer to proceed by card, you can directly use a secure paiement " "service hosted by our bank (Crédit Mutuel - CIC Paiement). We can " @@ -438,23 +436,42 @@ #: templates/sat_website/association.html:35 msgid "" "The Salut à Toi association has been created in june 2014 and is responsible " -"for developing, promoting and funding the software. The association is non-" -"profit, self-managed and open for everybody to join. The managing instance " -"is a college which is today composed by the two main developers: Jérôme who " -"started this as a personal project in 2008 and Adrien who joined him in 2013." +"for developing, promoting and funding the software. More generally, its goal " +"is to create free, independant and controllable communication tools. " +"\"Controllable\" has to be understood this way: the tool is doing exactly " +"what you want and it will stay under your control. So it applies both to " +"present and future." msgstr "" "L'association Salut à Toi a été créée en juin 2014 et s'occupe du " -"développement, de la promotion et du financement du logiciel. C'est une " -"association à but non-lucrative, auto-gérée et ouverte à tous. Le bureau de " -"gestion est collégiale, il est actuellement composé des deux développeurs " -"principaux : Jérôme qui commença le développement dès 2008 en tant que " -"projet personnel, et Adrien qui l'a rejoint en 2013." +"développement, de la promotion et du financement du logiciel. Plus " +"généralement, elle a pour mission de créer des outils de communication " +"libres, indépendants et maîtrisables. \"Maîtrisable\" concerne ici le " +"présent et le futur : l'outil fait exactement ce que vous attendez de lui et " +"il ne doit pas échapper à votre contrôle." #: templates/sat_website/association.html:38 +msgid "Organisation" +msgstr "" + +#: templates/sat_website/association.html:40 +msgid "" +"The association is non-profit, self-managed and open for everybody to join. " +"There is no designated president, secretary or treasurer, the administrating " +"entity is a college which is today composed by the two main developers: " +"Jérôme who started this as a personal project in 2008 and Adrien who joined " +"him in 2013." +msgstr "" +"L'association est à but non-lucratif, auto-gérée et ouverte à tous. Nous ne " +"fonctionnons pas avec la structure classique : président, secrétaire et " +"trésorier. Le bureau de gestion est collégiale, il est actuellement composé " +"des deux développeurs principaux : Jérôme qui commença le développement dès " +"2008 en tant que projet personnel, et Adrien qui l'a rejoint en 2013." + +#: templates/sat_website/association.html:43 msgid "Funding" msgstr "Financement" -#: templates/sat_website/association.html:40 +#: templates/sat_website/association.html:45 msgid "" "We have been working full time on Salut à Toi for a while and we plan to " "keep on doing it. We are now trying to raise enough money to see if we could " @@ -476,7 +493,7 @@ "suffisamment nombreux et nous supporteront avec plaisir, en rejoignant " "l'association et en payant une cotisation." -#: templates/sat_website/association.html:41 +#: templates/sat_website/association.html:46 #, python-format msgid "" "Because the money should not operate any separation between us, the people " @@ -502,19 +519,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:45 +#: templates/sat_website/association.html:50 msgid "Official documents" msgstr "Documents officiels" -#: templates/sat_website/association.html:47 +#: templates/sat_website/association.html:52 msgid "Statutes of the association" msgstr "Statuts de l'association" -#: templates/sat_website/association.html:48 +#: templates/sat_website/association.html:53 msgid "Rules of the association" msgstr "Règlement intérieur de l'association" -#: templates/sat_website/association.html:49 +#: templates/sat_website/association.html:54 msgid "Minutes" msgstr "Comptes rendus" @@ -996,9 +1013,45 @@ msgstr "Liens et projets amis" #: templates/sat_website/links.html:31 -msgid "Similar projects" +#| msgid "Similar projects" +msgid "Comparable projects" msgstr "Projets comparables" +#: templates/sat_website/links.html:34 +msgid "" +"The following projects have something in common with SàT: we all believe " +"that the combination of free software and decentralisation is the answer to " +"many issues. The projects that are using the same network as SàT are " +"signaled with a <b>*</b> symbol. It means that you can use the same account " +"with all of them. It doesn't mean that the compatibility with the the other " +"projects could not be achieved, but it's not built-in." +msgstr "" +"Les projets suivants ont quelque chose en commun avec SàT : nous pensons " +"tous que les logiciels libres et la décentralisation sont la solution à " +"plusieurs problèmes. Les projets qui utilisent le même réseau que SàT sont " +"signalés avec le symbole <b>*</b>. Cela signifie que vous pouvez utiliser le " +"même compte avec chacun d'entre eux. La compatibilité avec les autres " +"projets n'est pas directe mais peut être atteinte à l'aide de passerelles." + +#: templates/sat_website/links.html:63 +#| msgid "Similar projects" +msgid "Other projects" +msgstr "Autres projets" + +#: templates/sat_website/links.html:66 +#, python-format +msgid "" +"We use - and sometimes contribute -, take ideas and inspiration from many " +"projects that can not all be listed here. For the projects directly " +"concerning the development of the software, please check the \"credits\" " +"section of SàT's %(readme_prefix)sREADME%(readme_suffix)s file." +msgstr "" +"Nous utilisons et contribuons parfois, récupérons des idées et trouvons de " +"l'inspiration de plusieurs projets qui ne peuvent pas tous être cités ici. " +"Pour les projets qui concernent directement le développement du logiciel, " +"merci de consulter la section \"crédits\" du fichier %(readme_prefix)sREADME" +"%(readme_suffix)s de SàT." + #: templates/sat_website/overview.html:36 msgid "Salut à Toi" msgstr "Salut à Toi" @@ -1174,6 +1227,56 @@ "Notre but n'est pas d'héberger tous les comptes sur notre serveur... on ne " "veut pas de vos données, gardez-les !" +#: templates/sat_website/press.html:26 +msgid "Press files" +msgstr "Dossier de presse" + +#: templates/sat_website/press.html:31 +msgid "They write about it" +msgstr "Articles" + +#: templates/sat_website/press.html:35 templates/sat_website/press.html:38 +#, python-format +msgid "%(author)s for %(magazine)s" +msgstr "%(author)s pour %(magazine)s" + +#: templates/sat_website/press.html:35 templates/sat_website/press.html:47 +#: templates/sat_website/press.html:50 templates/sat_website/press.html:53 +#: templates/sat_website/press.html:56 +msgid "French" +msgstr "Français" + +#: templates/sat_website/press.html:38 +msgid "German" +msgstr "Allemand" + +#: templates/sat_website/press.html:43 +msgid "We talk about it" +msgstr "Conférences" + +#: templates/sat_website/press.html:47 +#, python-format +msgid "%(author)s at the 15th Libre Software Meeting, Montpellier, 2014:" +msgstr "" +"%(author)s aux 15èmes Rencontres Mondiales du Logiciel Libre, Montpellier, " +"2014 :" + +#: templates/sat_website/press.html:50 +#, python-format +msgid "%(author)s at Pas Sage en Seine #6, Paris, 2014:" +msgstr "%(author)s à Pas Sage en Seine #6, Paris, 2014:" + +#: templates/sat_website/press.html:53 +#, python-format +msgid "%(author)s at the 13th Libre Software Meeting, Genève, 2012:" +msgstr "" +"%(author)s aux 13èmes Rencontres Mondiales du Logiciel Libre, Genève, 2012 :" + +#: templates/sat_website/press.html:56 +#, python-format +msgid "%(author)s at the 15th Journées du Logiciel Libre, Lyon, 2012:" +msgstr "%(author)s aux 15èmes Journées du Logiciel Libre, Lyon, 2012 :" + #: templates/sat_website/principles.html:27 msgid "Some technical words to explain the project." msgstr "Quelques mots techniques pour expliquer le projet." @@ -1783,7 +1886,7 @@ #: templates/sat_website/specifications_xep.html:46 msgid "In-Band Bytestreams" -msgstr "" +msgstr "Flux d'octets « in-band »" #: templates/sat_website/specifications_xep.html:50 msgid "Bookmarks" @@ -1791,7 +1894,7 @@ #: templates/sat_website/specifications_xep.html:54 msgid "Private XML Storage" -msgstr "" +msgstr "Sauvegarde XML privée" #: templates/sat_website/specifications_xep.html:58 msgid "Ad-Hoc Commands" @@ -1799,7 +1902,7 @@ #: templates/sat_website/specifications_xep.html:62 msgid "vcard-temp" -msgstr "" +msgstr "vcard (temporaire)" #: templates/sat_website/specifications_xep.html:66 msgid "Jabber Search" @@ -1807,27 +1910,27 @@ #: templates/sat_website/specifications_xep.html:70 msgid "Result Set Management" -msgstr "" +msgstr "Gestion des jeux de résultats" #: templates/sat_website/specifications_xep.html:74 msgid "Publish-Subscribe" -msgstr "" +msgstr "Publication et abonnement" #: templates/sat_website/specifications_xep.html:78 msgid "SOCKS5 Bytestreams" -msgstr "" +msgstr "Flux d'octets SOCKS5" #: templates/sat_website/specifications_xep.html:82 msgid "XHTML-IM" -msgstr "" +msgstr "XHTML-IM (XHTML pour messagerie instantanée)" #: templates/sat_website/specifications_xep.html:86 msgid "In-Band Registration" -msgstr "" +msgstr "Enregistrement « in-band »" #: templates/sat_website/specifications_xep.html:90 msgid "Chat State Notifications" -msgstr "" +msgstr "Notifications des états de discussion instantanée" #: templates/sat_website/specifications_xep.html:94 msgid "Software Version" @@ -1835,31 +1938,31 @@ #: templates/sat_website/specifications_xep.html:98 msgid "Stream Initiation" -msgstr "" +msgstr "Initiation de flux" #: templates/sat_website/specifications_xep.html:102 msgid "SI File Transfer" -msgstr "" +msgstr "Initiation de flux pour transfert de fichier" #: templates/sat_website/specifications_xep.html:106 msgid "Gateway Interaction" -msgstr "" +msgstr "Interaction avec des passerelles" #: templates/sat_website/specifications_xep.html:110 msgid "Entity Capabilities" -msgstr "" +msgstr "Fonctionnalités de l'entité" #: templates/sat_website/specifications_xep.html:114 msgid "Personal Eventing Protocol" -msgstr "" +msgstr "Protocole d'événement personnel" #: templates/sat_website/specifications_xep.html:118 msgid "Delayed Delivery" -msgstr "" +msgstr "Livraison différée" #: templates/sat_website/specifications_xep.html:122 msgid "Direct MUC Invitations" -msgstr "" +msgstr "Invitation dans un groupe de discussion" #: templates/sat_website/specifications_xep.html:126 msgid "Microblogging over XMPP" @@ -1867,15 +1970,15 @@ #: templates/sat_website/specifications_xep.html:130 msgid "Stanza Forwarding" -msgstr "" +msgstr "Transfert de stanza" #: templates/sat_website/specifications_xep.html:134 msgid "Message Archive Management" -msgstr "" +msgstr "Gestion des archives de message" #: templates/sat_website/specifications_xep.html:138 msgid "Message Processing Hints" -msgstr "" +msgstr "Recommandations pour le traitement des messages" #: templates/sat_website/thank_you.html:27 msgid "Thank you!"
--- a/sat_website/views.py Tue May 05 15:02:50 2015 +0200 +++ b/sat_website/views.py Sun May 10 15:48:04 2015 +0200 @@ -43,6 +43,7 @@ OrderedDict([("community", _(u"Get in touch")), ("association", _(u"Association")), ("links", _(u"Links")), + ("press", _(u"Press")), ]))), ])
--- a/templates/sat_website/association.html Tue May 05 15:02:50 2015 +0200 +++ b/templates/sat_website/association.html Sun May 10 15:48:04 2015 +0200 @@ -32,7 +32,12 @@ <h5 class="alert alert-success">{% trans "Mission" %}</h5> <div class="info"> - <p>{% blocktrans %}The Salut à Toi association has been created in june 2014 and is responsible for developing, promoting and funding the software. The association is non-profit, self-managed and open for everybody to join. The managing instance is a college which is today composed by the two main developers: Jérôme who started this as a personal project in 2008 and Adrien who joined him in 2013.{% endblocktrans %}</p> + <p>{% blocktrans %}The Salut à Toi association has been created in june 2014 and is responsible for developing, promoting and funding the software. More generally, its goal is to create free, independant and controllable communication tools. "Controllable" has to be understood this way: the tool is doing exactly what you want and it will stay under your control. So it applies both to present and future.{% endblocktrans %}</p> + </div> + + <h5 class="alert alert-success">{% trans "Organisation" %}</h5> + <div class="info"> + <p>{% blocktrans %}The association is non-profit, self-managed and open for everybody to join. There is no designated president, secretary or treasurer, the administrating entity is a college which is today composed by the two main developers: Jérôme who started this as a personal project in 2008 and Adrien who joined him in 2013.{% endblocktrans %}</p> </div> <h5 class="alert alert-success">{% trans "Funding" %}</h5>
--- a/templates/sat_website/links.html Tue May 05 15:02:50 2015 +0200 +++ b/templates/sat_website/links.html Sun May 10 15:48:04 2015 +0200 @@ -3,6 +3,7 @@ {% comment %} SàT website: Salut à Toi's presentation website Copyright (C) 2012 Jérôme Poisson (goffi@goffi.org) +Copyright (C) 2015 Adrien Cossa (souliane@mailoo.org) This file is part of SàT website. @@ -28,16 +29,52 @@ <div class="row"> <h5 class="alert alert-success"> - {% trans "Similar projects" %} + {% trans "Comparable projects" %} </h5> <div class="info"> - <a href="https://movim.eu/" target="#">Movim</a> + {% trans "The following projects have something in common with SàT: we all believe that the combination of free software and decentralisation is the answer to many issues. The projects that are using the same network as SàT are signaled with a <b>*</b> symbol. It means that you can use the same account with all of them. It doesn't mean that the compatibility with the the other projects could not be achieved, but it's not built-in." %} </div> <div class="info"> - <a href="https://habahaba.im/" target="#">Live Jabber</a> + <div class="row"> + <div class="col-md-12"><a href="https://movim.eu/" target="#">Movim</a> <b>*</b></div> + </div> + <div class="row"> + <div class="col-md-12"><a href="https://habahaba.im/" target="#">Live Jabber</a> <b>*</b></div> + </div> + <div class="row"> + <div class="col-md-12"><a href="https://jappix.org/" target="#">Jappix</a> <b>*</b></div> + </div> + <div class="row"> + <div class="col-md-12"><a href="http://buddycloud.com/" target="#">Buddycloud</a> <b>*</b></div> + </div> + <div class="row"> + <div class="col-md-12"><a href="https://diasporafoundation.org/" target="#">Diaspora</a></div> + </div> + <div class="row"> + <div class="col-md-12"><a href="http://friendica.com/" target="#">Friendica</a></div> + </div> + <div class="row"> + <div class="col-md-12"><a href="http://redmatrix.me/" target="#">RedMatrix</a></div> + </div> + </div> +</div> + +<div class="row"> + <h5 class="alert alert-success"> + {% trans "Other projects" %} + </h5> + <div class="info"> + {% blocktrans with readme_prefix='<a href="http://repos.goffi.org/sat/file/tip/README" target="#">' readme_suffix='</a>' %}We use - and sometimes contribute -, take ideas and inspiration from many projects that can not all be listed here. For the projects directly concerning the development of the software, please check the "credits" section of SàT's {{ readme_prefix }}README{{ readme_suffix }} file.{% endblocktrans %} </div> <div class="info"> - <a href="https://jappix.org/" target="#">Jappix</a> + <div class="row"> + <div class="col-md-12"><a href="http://liberte0.org/" target="#">Liberté #0</a></div> + </div> + <div class="row"> + <div class="col-md-12"><a href="http://dev.kd2.org/garradin/" target="#">Garradin</a></div> + </div> + <div class="row"> + <div class="col-md-12"><a href="http://diekulturvermittlung.at" target="#">dieKulturvermittlung</a></div> </div> </div>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/templates/sat_website/press.html Sun May 10 15:48:04 2015 +0200 @@ -0,0 +1,63 @@ +{% extends "sat_website/category.html" %} + +{% comment %} +SàT website: Salut à Toi's presentation website +Copyright (C) 2012 Jérôme Poisson (goffi@goffi.org) +Copyright (C) 2015 Adrien Cossa (souliane@mailoo.org) + +This file is part of SàT website. + +SàT website is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +Foobar is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with Foobar. If not, see <http://www.gnu.org/licenses/>. +{% endcomment %} + +{% load i18n %} +{% load staticfiles %} + +{% block headline %}{% trans "Press files" %}{% endblock %} +{% block main_container %} + +<div class="row"> + <h5 class="alert alert-success"> + {% trans "They write about it" %} + </h5> + <div class="info"> + <div class="row"> + <div class="col-md-12">{% blocktrans with author="Drapher" magazine="Reflets.info" %}{{ author }} for {{ magazine }}{% endblocktrans %}, 2014, <a href="https://reflets.info/sat-le-couteau-suisse-libre-et-open-source-de-la-communication/" target="#">SàT : le couteau suisse Libre et open source de la communication</a> ({% trans "French" %})</div> + </div> + <div class="row"> + <div class="col-md-12">{% blocktrans with author="Mathias Huber" magazine="Linux-Magazin Online" %}{{ author }} for {{ magazine }}{% endblocktrans %}, 2014, <a href="http://www.linux-magazin.de/NEWS/Salut-a-Toi-Verbesserter-XMPP-Client" target="#">Salut à Toi; Verbesserter XMPP-Client</a> ({% trans "German" %})</div> + </div> + </div> + + <h5 class="alert alert-success"> + {% trans "We talk about it" %} + </h5> + <div class="info"> + <div class="row"> + <div class="col-md-12">{% blocktrans with author="Goffi" %}{{ author }} at the 15th Libre Software Meeting, Montpellier, 2014:{% endblocktrans %} <a href="http://video.rmll.info/videos/salut-a-toi-et-si-on-repolitisait-tout-ca/" target="#">Salut à Toi : et si on repolitisait tout ça ?</a> ({% trans "French" %})</div> + </div> + <div class="row"> + <div class="col-md-12">{% blocktrans with author="Goffi" %}{{ author }} at Pas Sage en Seine #6, Paris, 2014:{% endblocktrans %} <a href="http://numaparis.ubicast.tv/videos/salut-a-toi-1-partie-1/" target="#">Salut à Toi : et si on repolitisait tout ça ?</a> + <a href="http://numaparis.ubicast.tv/videos/salut-a-toi-1-partie-2/" target="#">part 2</a> ({% trans "French" %})</div> + </div> + <div class="row"> + <div class="col-md-12">{% blocktrans with author="Goffi" %}{{ author }} at the 13th Libre Software Meeting, Genève, 2012:{% endblocktrans %} <a href="http://video.rmll.info/videos/salut-a-toi-communication-libre-federee-decentralisee-et-standard/" target="#">Salut à Toi : communication Libre, Fédérée, Décentralisée et Standard</a> ({% trans "French" %})</div> + </div> + <div class="row"> + <div class="col-md-12">{% blocktrans with author="Goffi" %}{{ author }} at the 15th Journées du Logiciel Libre, Lyon, 2012:{% endblocktrans %} <a href="http://www.goffi.org/videos/conf%c3%a9rence%20S%c3%a0T%20JDLL%202012.webm" target="#">Salut à Toi</a> ({% trans "French" %})</div> + </div> + </div> + +</div> + +{% endblock %}