Mercurial > sat_legacy_website

changeset 121:544859115f88

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
advice to read the FAQ before trying out Libervia demo (regarding security warning)
author souliane <souliane@mailoo.org>
date Fri, 06 Nov 2015 09:17:42 +0100
parents 80a0f195231a
children d4ec0092daa0
files locale/fr/LC_MESSAGES/django.po templates/sat_website/overview.html
diffstat 2 files changed, 50 insertions(+), 38 deletions(-) [+]
line wrap: on
line diff
--- a/locale/fr/LC_MESSAGES/django.po	Fri Nov 06 09:07:12 2015 +0100
+++ b/locale/fr/LC_MESSAGES/django.po	Fri Nov 06 09:17:42 2015 +0100
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-03 17:01+0100\n"
-"PO-Revision-Date: 2015-11-03 17:01+0100\n"
+"POT-Creation-Date: 2015-11-06 09:13+0100\n"
+"PO-Revision-Date: 2015-11-06 09:16+0100\n"
 "Last-Translator: Salut à Toi <contact@salut-a-toi.org>\n"
 "Language-Team: français <goffi@goffi.org>\n"
 "Language: fr\n"
@@ -353,11 +353,11 @@
 msgid "Presentation"
 msgstr "Présentation"
 
-#: sat_website/views.py:33 templates/sat_website/overview.html:66
+#: sat_website/views.py:33 templates/sat_website/overview.html:92
 msgid "Features"
 msgstr "Fonctionnalités"
 
-#: sat_website/views.py:34 templates/sat_website/overview.html:77
+#: sat_website/views.py:34 templates/sat_website/overview.html:103
 #: templates/sat_website/principles.html:60
 msgid "Frontends"
 msgstr "Interfaces"
@@ -379,7 +379,7 @@
 msgstr "Spécifications"
 
 #: sat_website/views.py:40 templates/sat_website/downloads.html:27
-#: templates/sat_website/overview.html:113
+#: templates/sat_website/overview.html:139
 msgid "Downloads"
 msgstr "Téléchargements"
 
@@ -412,12 +412,12 @@
 msgstr "FAQ"
 
 #: sat_website/views.py:52 templates/sat_website/association.html:47
-#: templates/sat_website/overview.html:104
+#: templates/sat_website/overview.html:130
 msgid "Membership"
 msgstr "Adhésion"
 
 #: sat_website/views.py:53 templates/sat_website/features.html:76
-#: templates/sat_website/overview.html:85
+#: templates/sat_website/overview.html:111
 #: templates/sat_website/principles.html:74
 msgid "Social contract"
 msgstr "Contrat social"
@@ -572,35 +572,37 @@
 msgid "Salut à Toi: the multi frontend, multipurpose communication tool"
 msgstr "Salut à Toi: l'outil de communication multi-interfaces et multi-usages"
 
-#: templates/sat_website/base.html:59 templates/sat_website/membership.html:61
+#: templates/sat_website/base.html:61 templates/sat_website/membership.html:61
+#: templates/sat_website/overview.html:59
 msgid " days"
 msgstr " jours"
 
-#: templates/sat_website/base.html:59 templates/sat_website/membership.html:61
+#: templates/sat_website/base.html:61 templates/sat_website/membership.html:61
+#: templates/sat_website/overview.html:59
 msgid "day"
 msgstr "jour"
 
-#: templates/sat_website/base.html:60
+#: templates/sat_website/base.html:62
 msgid "left to support our"
 msgstr "restants pour supporter notre"
 
-#: templates/sat_website/base.html:61
+#: templates/sat_website/base.html:63
 msgid "crowdfunding campaign"
 msgstr "campagne de financement participatif"
 
-#: templates/sat_website/base.html:62
+#: templates/sat_website/base.html:64
 msgid "for an Android interface!"
 msgstr "pour une interface Android !"
 
-#: templates/sat_website/base.html:105
+#: templates/sat_website/base.html:107
 msgid "Set language"
 msgstr "Changer la langue"
 
-#: templates/sat_website/base.html:115
+#: templates/sat_website/base.html:117
 msgid "\"Salut à Toi\" association"
 msgstr "Association « Salut à Toi »"
 
-#: templates/sat_website/base.html:116 templates/sat_website/community.html:35
+#: templates/sat_website/base.html:118 templates/sat_website/community.html:35
 msgid "(replace invalid with org)"
 msgstr "(remplacez invalid par org)"
 
@@ -1347,6 +1349,7 @@
 msgstr "Adhérez à l'association"
 
 #: templates/sat_website/membership.html:56
+#: templates/sat_website/overview.html:54
 msgid ""
 "We are curently running a crowdfunding campaign for the development of an "
 "<b>Android application</b> (frontend for smartphones)."
@@ -1355,6 +1358,7 @@
 "développement d'une <b>interface Android</b> (pour les <i>smartphones</i>)."
 
 #: templates/sat_website/membership.html:57
+#: templates/sat_website/overview.html:55
 msgid ""
 "During this period, we would kindly ask you to support the campaign instead "
 "of paying a membership fee. It is still and always possible to join the "
@@ -1367,10 +1371,12 @@
 "contribue au succès de la campagne. <b>Merci !</b>"
 
 #: templates/sat_website/membership.html:62
+#: templates/sat_website/overview.html:60
 msgid "left!"
 msgstr "restants !"
 
 #: templates/sat_website/membership.html:65
+#: templates/sat_website/overview.html:63
 msgid "Crowdfunding campaign"
 msgstr "Campagne de financement participatif"
 
@@ -1450,7 +1456,7 @@
 "l'outil de communication multi-usages, multi-interfaces, libre et "
 "décentralisé"
 
-#: templates/sat_website/overview.html:46
+#: templates/sat_website/overview.html:71
 msgid ""
 "SàT includes several sub-projects. Libervia, a web interface to discuss and "
 "blog with the persons of your choice, is one of them:"
@@ -1459,27 +1465,32 @@
 "discuter et bloguer uniquement avec les personnes de votre choix, est l'une "
 "d'elle :"
 
-#: templates/sat_website/overview.html:49
+#: templates/sat_website/overview.html:74
+#, python-format
+msgid "Please read our %(faq)s before trying out"
+msgstr "Lisez s'il vous plait notre %(faq)s avant d'essayer la"
+
+#: templates/sat_website/overview.html:75
 msgid "Libervia demo version"
 msgstr "Démo de Libervia"
 
-#: templates/sat_website/overview.html:57
+#: templates/sat_website/overview.html:83
 #: templates/sat_website/principles.html:36
 msgid "Multipurpose"
 msgstr "Multi-usages"
 
-#: templates/sat_website/overview.html:58
+#: templates/sat_website/overview.html:84
 msgid "SàT covers a large spectrum of the Internet functions and uses:"
 msgstr "SàT couvre un large champ des utilisations d'Internet :"
 
-#: templates/sat_website/overview.html:60
+#: templates/sat_website/overview.html:86
 msgid ""
 "<strong>Chat</strong> with one or many contacts, in public or private rooms."
 msgstr ""
 "<strong>discuter</strong> instantanément avec un ou plusieurs contacts, dans "
 "des salons privés ou publics ;"
 
-#: templates/sat_website/overview.html:61
+#: templates/sat_website/overview.html:87
 msgid ""
 "Organize <strong>contact groups</strong> and restrict the visibility of your "
 "messages."
@@ -1487,14 +1498,14 @@
 "gérer des <strong>groupes de contacts</strong> et restreignez la lisibilité "
 "de vos messages ;"
 
-#: templates/sat_website/overview.html:62
+#: templates/sat_website/overview.html:88
 msgid ""
 "End-to-end <strong>encryption</strong> makes your communications private."
 msgstr ""
 "le <strong>chiffrement</strong> de bout en bout rend vos conversations "
 "vraiment privées ;"
 
-#: templates/sat_website/overview.html:63
+#: templates/sat_website/overview.html:89
 msgid ""
 "<strong>Blogging</strong> system to share instant thoughts or write longer "
 "articles."
@@ -1502,17 +1513,17 @@
 "système de <strong>blogage</strong> pour partager vos réflexions du moment "
 "ou écrire de plus longs articles ;"
 
-#: templates/sat_website/overview.html:64
+#: templates/sat_website/overview.html:90
 msgid "File sharing, games, interaction with other networks."
 msgstr ""
 "partage de fichier, jeux, interaction avec d'autres réseaux et beaucoup plus."
 
-#: templates/sat_website/overview.html:69
+#: templates/sat_website/overview.html:95
 #: templates/sat_website/principles.html:52
 msgid "Multi frontend"
 msgstr "Multi-interfaces"
 
-#: templates/sat_website/overview.html:70
+#: templates/sat_website/overview.html:96
 msgid ""
 "SàT can be used via different interfaces, each of them being a sub-project, "
 "but the heart of the software remains the same. You can use SàT:"
@@ -1521,28 +1532,28 @@
 "sous-projet, mais le cœur du logiciel reste le même. Cela signifie que vous "
 "pouvez utiliser SàT:"
 
-#: templates/sat_website/overview.html:72
+#: templates/sat_website/overview.html:98
 msgid "with a browser through the <strong>web</strong> interface Libervia"
 msgstr "avec un navigateur à travers l'interface <strong>web</strong> ;"
 
-#: templates/sat_website/overview.html:73
+#: templates/sat_website/overview.html:99
 msgid "inside a <strong>console</strong> user interface"
 msgstr "dans une interface <strong>console</strong> ;"
 
-#: templates/sat_website/overview.html:74
+#: templates/sat_website/overview.html:100
 msgid "through a <strong>command line</strong>"
 msgstr "à travers la <strong>ligne de commande</strong>."
 
-#: templates/sat_website/overview.html:76
+#: templates/sat_website/overview.html:102
 msgid "Other frontends are planned (telephones, desktop)."
 msgstr "D'autres interfaces sont prévues (téléphones, bureau)."
 
-#: templates/sat_website/overview.html:83
+#: templates/sat_website/overview.html:109
 #: templates/sat_website/principles.html:66
 msgid "Libre"
 msgstr "Libre"
 
-#: templates/sat_website/overview.html:84
+#: templates/sat_website/overview.html:110
 msgid ""
 "SàT is not only open source, it's Libre and follows the free software "
 "philosophy (\"free\" as in freedom) because it's the best way to develop a "
@@ -1553,12 +1564,12 @@
 "Libres, non seulement parce que c'est la meilleure façon de développer des "
 "logiciels, mais aussi (et surtout) pour l'esprit de partage et de liberté."
 
-#: templates/sat_website/overview.html:88
+#: templates/sat_website/overview.html:114
 #: templates/sat_website/principles.html:80
 msgid "Decentralised"
 msgstr "Décentralisé"
 
-#: templates/sat_website/overview.html:89
+#: templates/sat_website/overview.html:115
 msgid ""
 "SàT has many similarities with the email network. For instance, there is no "
 "big server where all the data is kept, but many servers managed by different "
@@ -1574,11 +1585,11 @@
 "souhaitez pas confier vos photos privées et messages intimes à des "
 "entreprises commerciales non fiables, n'est-ce pas ?"
 
-#: templates/sat_website/overview.html:96
+#: templates/sat_website/overview.html:122
 msgid "The association"
 msgstr "L'association"
 
-#: templates/sat_website/overview.html:97
+#: templates/sat_website/overview.html:123
 msgid ""
 "Salut à Toi and Libervia are developed by a non-profit and self-managed "
 "association. We are fighting against the hold-up of the Internet by private "
@@ -1594,11 +1605,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:111
+#: templates/sat_website/overview.html:137
 msgid "Run it yourself!"
 msgstr "Lancez-le vous même !"
 
-#: templates/sat_website/overview.html:112
+#: templates/sat_website/overview.html:138
 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 "
--- a/templates/sat_website/overview.html	Fri Nov 06 09:07:12 2015 +0100
+++ b/templates/sat_website/overview.html	Fri Nov 06 09:17:42 2015 +0100
@@ -70,6 +70,7 @@
             <p class="text-center">{% trans "SàT includes several sub-projects. Libervia, a web interface to discuss and blog with the persons of your choice, is one of them:" %}</p>
             <img class="thumbnail img-thumbnail" src="{% static "images/screenshots/libervia/libervia_overview.png" %}" >
             <p class="text-center">
+				{% blocktrans with faq='<a href="faq.html" target="_blank">FAQ</a>' %}Please read our {{faq}} before trying out{% endblocktrans %}<br />
                 <a class="btn btn-primary btn-lg" href="{{ libervia_demo_url }}" target="#" role="button">{% trans "Libervia demo version" %}</a>
             </p>
         </div>