# HG changeset patch # User souliane # Date 1446801039 -3600 # Node ID c0dbe7ad54c817d100b304c3a9ce00db95702ba8 # Parent d4ec0092daa024474feafabd8c4c038453c9c110 add a question "what is the Libervia demo version?" to the FAQ diff -r d4ec0092daa0 -r c0dbe7ad54c8 locale/fr/LC_MESSAGES/django.po --- a/locale/fr/LC_MESSAGES/django.po Fri Nov 06 09:24:51 2015 +0100 +++ b/locale/fr/LC_MESSAGES/django.po Fri Nov 06 10:10:39 2015 +0100 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: 0.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-06 09:22+0100\n" -"PO-Revision-Date: 2015-11-06 09:23+0100\n" +"POT-Creation-Date: 2015-11-06 10:09+0100\n" +"PO-Revision-Date: 2015-11-06 10:08+0100\n" "Last-Translator: Salut à Toi \n" "Language-Team: français \n" "Language: fr\n" @@ -888,12 +888,30 @@ #: templates/sat_website/faq.html:33 #, python-format +msgid "What is the \"Libervia demo version\" on %(demo)s?" +msgstr "Qu'est-ce que cette « démo de Libervia » sur %(demo)s?" + +#: templates/sat_website/faq.html:35 +msgid "" +"This is a demonstration version that you can try to get an idea about how " +"Libervia will look like. You have to keep in mind that this is a development " +"version. We will take care to improve the user interface and to fix a lot of " +"bugs before launching the \"general public\" version." +msgstr "" +"C'est une version de démonstration, que vous pouvez essayer pour vous faire " +"une idée de ce à quoi ressemblera Libervia. Il faut garder à l'esprit qu'il " +"s'agit d'une version de développement. Nous prendrons soin d'améliorer " +"l'interface utilisateur ainsi que de corriger le maximum de bogues avant " +"d'annoncer la sortie de la version « grand public »." + +#: templates/sat_website/faq.html:40 +#, python-format msgid "What is the security warning when I visit %(demo_http)s?" msgstr "" "Qu'est-ce que cet avertissement de sécurité qui s'affiche quand je visite " "%(demo_http)s ?" -#: templates/sat_website/faq.html:35 +#: templates/sat_website/faq.html:42 #, python-format msgid "" "This message advices you to use Libervia with HTTPS instead of HTTP. The " @@ -908,14 +926,14 @@ "recommandé lorsque vous devez taper un mot de passe. Vous devriez toujours " "utiliser %(demo_https)s et non pas %(demo_http)s." -#: templates/sat_website/faq.html:40 +#: templates/sat_website/faq.html:47 #, python-format msgid "My browser says that %(demo_https)s is unsecure. What does it mean?" msgstr "" "Mon navigateur me dit que la connexion à %(demo_https)s n'est pas certifiée. " "Qu'est-ce que cela signifie?" -#: templates/sat_website/faq.html:42 +#: templates/sat_website/faq.html:49 #, python-format msgid "" "The issue here is that %(cacert)s, the certification authority that we use " @@ -936,7 +954,7 @@ "par tous les navigateurs, nous préférons supporter un service communautaire " "et transparent tel que CAcert." -#: templates/sat_website/faq.html:43 +#: templates/sat_website/faq.html:50 #, python-format msgid "" "So for this time, even if you don't know what's going on, please trust us " @@ -950,12 +968,12 @@ "embêtera plus quand vous vous connecterez à %(demo_https)s. Si vous utilisez " "Mozilla Firefox, suivez ces instructions :" -#: templates/sat_website/faq.html:49 +#: templates/sat_website/faq.html:56 msgid "Click \"I Understand the Risks\" and then \"Add Exception\"." msgstr "" "Cliquez sur « Je comprends les risques » puis sur « Ajouter une exception »." -#: templates/sat_website/faq.html:57 +#: templates/sat_website/faq.html:64 msgid "" "Click \"View\" and check that the fingerprint matches, then click \"Confirm " "Security Exception\"." @@ -963,7 +981,7 @@ "Cliquez sur « Voir » et vérifiez que l'empreinte correspond, ensuite cliquez " "sur « Confirmer l'exception de sécurité »." -#: templates/sat_website/faq.html:60 +#: templates/sat_website/faq.html:67 #, python-format msgid "" "The SHA-256 fingerprint must be %(fingerprint)s. If this is not the case, " @@ -972,7 +990,7 @@ "L'empreinte numérique SHA-256 doit être %(fingerprint)s. Si ce n'est pas le " "cas, ne confirmez pas l'exception et inquiétez-vous ! " -#: templates/sat_website/faq.html:61 +#: templates/sat_website/faq.html:68 #, python-format msgid "" "Alternatively, you can import the CAcert root certificate to your browser. " @@ -991,7 +1009,7 @@ "directement sur %(cacert_wiki)s. Ça parait un peu compliqué mais ça ne l'est " "pas, par exemple pour Firefox il suffit d'installer un module (plugin)." -#: templates/sat_website/faq.html:62 +#: templates/sat_website/faq.html:69 #, python-format msgid "" "PS: we will soon replace our CAcert certificate with one from %(url)s, and " diff -r d4ec0092daa0 -r c0dbe7ad54c8 templates/sat_website/faq.html --- a/templates/sat_website/faq.html Fri Nov 06 09:24:51 2015 +0100 +++ b/templates/sat_website/faq.html Fri Nov 06 10:10:39 2015 +0100 @@ -30,6 +30,13 @@
+ {% blocktrans with demo="libervia.org" %}What is the "Libervia demo version" on {{demo}}?{% endblocktrans %} +
+

{% blocktrans %}This is a demonstration version that you can try to get an idea about how Libervia will look like. You have to keep in mind that this is a development version. We will take care to improve the user interface and to fix a lot of bugs before launching the "general public" version.{% endblocktrans %}

+
+ +
+
{% blocktrans with demo_http="http://libervia.org" %}What is the security warning when I visit {{demo_http}}?{% endblocktrans %}

{% blocktrans with demo_http="http://libervia.org" demo_https="https://libervia.org" %}This message advices you to use Libervia with HTTPS instead of HTTP. The difference between the two is that HTTPS is more secure because the connection between your browser and the server is encrypted. This is especially recommended when you have to type a password. You should always use {{demo_https}} instead of {{demo_http}}.{% endblocktrans %}