# HG changeset patch # User souliane # Date 1431762071 -7200 # Node ID b09c26afea5f9ce8c0a24ba0473abd78b62aa65e # Parent c902ce09d4ed896e9122d79b094c43269a31134e fixes typos and small changes diff -r c902ce09d4ed -r b09c26afea5f locale/fr/LC_MESSAGES/django.po --- a/locale/fr/LC_MESSAGES/django.po Fri May 15 17:26:32 2015 +0200 +++ b/locale/fr/LC_MESSAGES/django.po Sat May 16 09:41:11 2015 +0200 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: 0.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-15 16:58+0200\n" -"PO-Revision-Date: 2015-05-15 17:11+0100\n" +"POT-Creation-Date: 2015-05-16 09:37+0200\n" +"PO-Revision-Date: 2015-05-16 09:38+0100\n" "Last-Translator: Salut à Toi \n" "Language-Team: français \n" "Language: fr\n" @@ -661,33 +661,32 @@ #: templates/sat_website/community.html:44 #, python-format +#| msgid "" +#| "In the blog of the main developer you'll have recent informations/" +#| "reflections abouts features or more general ones: %(blog)s" msgid "" -"In the blog of the main developer you'll have recent informations/" -"reflections abouts features or more general ones: %(blog)s" +"On the main developer's blog, you'll get recent information/reflections " +"about SàT features (and more general ones): %(blog)s" msgstr "" -"Dans le blog du développeur principal vous trouverez des informations/" -"réflexions sur des nouvelles fonctionnalités ou des choses plus générales: " -"%(blog)s" +"Dans le blog du développeur principal, vous trouverez des informations/" +"réflexions sur des nouvelles fonctionnalités (et des choses plus " +"générales) : %(blog)s" #: templates/sat_website/community.html:45 #, python-format #| msgid "" -#| "You can subscribe to the mailing list to follow the progression, you're " -#| "welcome to give your opinion (and to contribute): %(mailing_list)s" +#| "You can subscribe to the users mailing list to follow the progression, " +#| "you're also welcome to give your opinion (and to contribute): " +#| "%(mailing_list)s" msgid "" -"You can subscribe to the users mailing list to follow the progression, " -"you're also welcome to give your opinion (and to contribute): " -"%(mailing_list)s" +"You can subscribe to the users mailing list to follow the progression, give " +"your opinion and contribute: %(mailing_list)s" msgstr "" "Vous pouvez vous inscrire à la liste de diffusion « utilisateurs » pour " -"suivre l'évolution, vous êtes aussi encouragés à donner votre avis (et à " -"contribuer) : %(mailing_list)s" +"suivre l'évolution, donner votre avis et contribuer : %(mailing_list)s" #: templates/sat_website/community.html:46 #, python-format -#| msgid "" -#| "You'll find user documentation and more technical one on the wiki: " -#| "%(wiki)s" msgid "You'll find some user documentation on the wiki: %(wiki)s" msgstr "Vous trouverez les documentations utilisateur sur le wiki: %(wiki)s" @@ -732,9 +731,6 @@ #: templates/sat_website/developers.html:44 #, python-format -#| msgid "" -#| "You'll find the mercurial repository of SàT on %(repos_sat)s, satellite " -#| "project are also available on %(repos)s" msgid "" "You'll find the mercurial repository of SàT on %(repos_sat)s, satellite " "projects are also available on %(repos)s" @@ -759,9 +755,6 @@ #: templates/sat_website/developers.html:54 #, python-format -#| msgid "" -#| "The documentation is available on the wiki: %(wiki)s (don't hesitate to " -#| "improve it)" msgid "" "The documentation is available on the wiki (feel free to improve it): " "%(wiki)s" @@ -771,8 +764,6 @@ #: templates/sat_website/developers.html:55 #, python-format -#| msgid "" -#| "You'll also find a dedicated page for developers: %(developers_page)s" msgid "" "You'll also find a dedicated section for developers: %(developers_page)s" msgstr "" @@ -791,8 +782,6 @@ #: templates/sat_website/developers.html:66 #, python-format -#| msgid "" -#| "If you need help, you can also check the mailing list: %(mailing_list)s" msgid "" "If you need help, you can also write to our dev mailing list: " "%(mailing_list)s" @@ -1043,7 +1032,6 @@ #: templates/sat_website/features.html:92 #: templates/sat_website/specifications.html:49 -#| msgid "Experimental and non-standard features" msgid "Experimental and/or non-standard features" msgstr "Fonctionnalités expérimentales et/ou non standardes" @@ -1158,19 +1146,19 @@ 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." +"concerning the development of SàT, please check the \"credits\" section of " +"our %(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. " +"l'inspiration dans 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/links.html:34 -#| msgid "Decentralised" -msgid "Decentralised and standard" -msgstr "Décentralisé et standard" +#, python-format +msgid "Decentralised and %(xmpp)s-based " +msgstr "Décentralisé et basé sur %(xmpp)s" #: templates/sat_website/links.html:36 msgid "" @@ -1188,9 +1176,9 @@ msgstr "messagerie instantanée seulement" #: templates/sat_website/links.html:58 -#| msgid "Experimental and non-standard features" -msgid "Decentralised and/or non-standard" -msgstr "Décentralisé et/ou non standard" +#, python-format +msgid "Non %(xmpp)s-based " +msgstr "Non basé sur %(xmpp)s" #: templates/sat_website/links.html:60 msgid "" @@ -1205,19 +1193,16 @@ msgstr "microblogage centralisé" #: templates/sat_website/links.html:82 -#| msgid "Other projects" -msgid "Other IT projects" -msgstr "Autres projets informatiques" +msgid "Other softwares" +msgstr "Autres logiciels" #: templates/sat_website/links.html:92 -#| msgid "Statutes of the association" msgid "software to manage an association" msgstr "logiciel pour gérer une association" #: templates/sat_website/links.html:99 -#| msgid "Other projects" -msgid "Non IT projects" -msgstr "Autres projets divers" +msgid "Associations" +msgstr "Associations" #: templates/sat_website/links.html:103 msgid "French association to promote free software accessibility" @@ -1428,19 +1413,20 @@ #: templates/sat_website/press.html:46 #, python-format -#| msgid "%(author)s for %(magazine)s" msgid "%(magazine)s" msgstr "%(magazine)s" #: templates/sat_website/press.html:46 -#| msgid "Subscription to Salut à Toi" msgid "articles about Salut à Toi" msgstr "articles sur Salut à Toi" #: templates/sat_website/press.html:51 #, python-format +#| msgid "" +#| "If you want to write an article about Salut à Toi, we would be please to " +#| "answer your questions. Please send them to %(email)s" msgid "" -"If you want to write an article about Salut à Toi, we would be please to " +"If you want to write an article about Salut à Toi, we would be pleased to " "answer your questions. Please send them to %(email)s" msgstr "" "Si vous souhaitez écrire un article sur Salut à Toi, nous répondrons à vos " @@ -1451,12 +1437,10 @@ msgstr "" #: templates/sat_website/press.html:69 -#| msgid "Reference" msgid "Conferences" msgstr "Conférences" #: templates/sat_website/press.html:76 templates/sat_website/press.html:109 -#| msgid "Software Version" msgid "Libre Software Meeting" msgstr "Rencontres Mondiales du Logiciel Libre" @@ -1470,8 +1454,8 @@ msgstr "partie" #: templates/sat_website/press.html:118 -msgid "Bruxelles" -msgstr "" +msgid "Brussels" +msgstr "Bruxelles" #: templates/sat_website/press.html:118 msgid "English" @@ -1570,16 +1554,6 @@ #: templates/sat_website/principles.html:84 #, python-format -#| msgid "" -#| "\n" -#| "\t\t This is the most complicated aspect to understand, yet a crucial " -#| "one. Being based on %(xmpp)s, SàT is immediately decentralised " -#| "(federated). But what does it mean? To get this point, we need to imagine " -#| "the Internet as a set of layers. To make it easier, let's say there are " -#| "only two layers: the physical and the logical one. On the physical layer, " -#| "you are directly connected to your %(isp)s, and indirectly to all the " -#| "rest of the world.\n" -#| "\t\t " msgid "" "\n" "\t\t This is the most complicated aspect to understand, yet a crucial " @@ -1612,13 +1586,6 @@ "serveur pour le reste)." #: templates/sat_website/principles.html:95 -#| msgid "" -#| "\n" -#| "\t\t On the logical layer, you are directly connected to your favorite " -#| "social network, and since it's centralised, all its users are directly " -#| "connected to it: it can access and own all the data, it can unilaterally " -#| "decide to censor or exclude a user... it has too much power.\n" -#| "\t " msgid "" "\n" "\t\t On the logical layer, you are directly connected to your usual " @@ -1644,17 +1611,6 @@ "l'utilisateur à droite qui refuse d'utiliser un tel système)." #: templates/sat_website/principles.html:106 -#| msgid "" -#| "\n" -#| "\t\t Now what if your favorite social network is decentralised? The " -#| "main difference is that there's not a single entity to manage all the " -#| "connections and all the data, but a lot of them.\n" -#| "\t All the users are connected to the same network, but each of " -#| "them can decide which server they want to connect to. As a result, the " -#| "data and the network administration's tasks are shared between all the " -#| "servers. Is it possible to do that on the Internet? Yes, this is how the " -#| "Email works! That's decentralisation.\n" -#| "\t\t " msgid "" "\n" "\t\t Now what if your usual \"social network\" is decentralised? The main " @@ -1875,10 +1831,6 @@ "suivantes :" #: templates/sat_website/specifications.html:52 -#| msgid "" -#| "This table lists the non-standard features. Some of them can't be " -#| "standardised because they are too specific, some others might become new " -#| "standards in the future." msgid "" "Some of these features can't be standardised because they are too specific, " "some others might become new standards in the future." @@ -1888,10 +1840,6 @@ "standards dans le futur." #: templates/sat_website/specifications_exp.html:33 -#| msgctxt "Url need to point to the localised one" -#| msgid "" -#| "Ad-Hoc commands" msgctxt "Url need to point to the localised one" msgid "" "* 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 *. 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." - -#~ msgid "Press files" -#~ msgstr "Dossier de presse" - -#~ msgid "They write about it" -#~ msgstr "Articles" - -#~ msgid "We talk about it" -#~ msgstr "Conférences" - -#~ msgid "%(author)s at the 15th Libre Software Meeting, Montpellier, 2014:" -#~ msgstr "" -#~ "%(author)s aux 15èmes Rencontres Mondiales du Logiciel Libre, " -#~ "Montpellier, 2014 :" - -#~ msgid "%(author)s at Pas Sage en Seine #6, Paris, 2014:" -#~ msgstr "%(author)s à Pas Sage en Seine #6, Paris, 2014:" - -#~ 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 :" - -#~ 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 :" - -#~ msgid "No" -#~ msgstr "non" - -#~ msgid "Please add me to the adherents newsletter." -#~ msgstr "Je souhaite recevoir la lettre d'information." - -#~ msgid "Name" -#~ msgstr "Prénom" - -#~ msgid "Surname" -#~ msgstr "Nom" - -#~ msgid "Your subscription has been registered." -#~ msgstr "Votre adhésion a été enregistrée." - -#~ msgid "" -#~ "\n" -#~ "\tYou chose to pay your annual subscription of %(amount)s € via " -#~ "%(method)s.
You should receive in a couple of minutes an email from " -#~ "us containing all the details to proceed with the payment.\n" -#~ "\t" -#~ msgstr "" -#~ "\n" -#~ "\tVous avez choisie de payer une cotisation annuelle de %(amount)s € par " -#~ "%(method)s.
Vous devriez recevoir sous peu un courriel de notre part " -#~ "contenant tous les détails pour procéder au règlement.\n" -#~ "\t" - -#~ msgid "" -#~ "You should receive in a couple of minutes a confirmation email from us." -#~ msgstr "" -#~ "Vous devriez recevoir sous peu un courriel de confirmation de notre part." - -#~ msgid "Funding the software" -#~ msgstr "Financement du logiciel" - -#~ msgid "subtext" -#~ msgstr "sous-titre" - -#~ msgid "Subtitle 1" -#~ msgstr "sous-titres" - -#~ msgid "Salut à Toi (SàT) is currently under development." -#~ msgstr "Salut à Toi (SàT) est actuellement en développement." diff -r c902ce09d4ed -r b09c26afea5f templates/sat_website/community.html --- a/templates/sat_website/community.html Fri May 15 17:26:32 2015 +0200 +++ b/templates/sat_website/community.html Sat May 16 09:41:11 2015 +0200 @@ -41,8 +41,8 @@ {% trans "Follow the development, learn" %}
-

{% blocktrans with blog="http://www.goffi.org" %}In the blog of the main developer you'll have recent informations/reflections abouts features or more general ones: {{ blog }}{% endblocktrans %}

-

{% blocktrans with mailing_list="http://lists.goffi.org/listinfo/users" %}You can subscribe to the users mailing list to follow the progression, you're also welcome to give your opinion (and to contribute): {{ mailing_list }}{% endblocktrans %}

+

{% blocktrans with blog="http://www.goffi.org" %}On the main developer's blog, you'll get recent information/reflections about SàT features (and more general ones): {{ blog }}{% endblocktrans %}

+

{% blocktrans with mailing_list="http://lists.goffi.org/listinfo/users" %}You can subscribe to the users mailing list to follow the progression, give your opinion and contribute: {{ mailing_list }}{% endblocktrans %}

{% blocktrans with wiki="http://wiki.goffi.org/wiki/Catégorie:Documentation_utilisateur" %}You'll find some user documentation on the wiki: {{ wiki }}{% endblocktrans %}

diff -r c902ce09d4ed -r b09c26afea5f templates/sat_website/links.html --- a/templates/sat_website/links.html Fri May 15 17:26:32 2015 +0200 +++ b/templates/sat_website/links.html Sat May 16 09:41:11 2015 +0200 @@ -27,11 +27,11 @@ {% block headline %}{% trans "Other projects" %}{% endblock %} {% block main_container %} -
{% blocktrans with readme_prefix='' readme_suffix='' %}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 %}
+
{% blocktrans with readme_prefix='' readme_suffix='' %}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 SàT, please check the "credits" section of our {{ readme_prefix }}README{{ readme_suffix }} file.{% endblocktrans %}
- {% trans "Decentralised and standard" %} + {% blocktrans with xmpp="XMPP" %}Decentralised and {{xmpp}}-based {% endblocktrans %}

{% trans "You can use your the same account between SàT and any of these projects:" %}

@@ -55,7 +55,7 @@
- {% trans "Decentralised and/or non-standard" %} + {% blocktrans with xmpp="XMPP" %}Non {{xmpp}}-based {% endblocktrans %}

{% trans "Compatibility between SàT and these projects could be achieved, but it's not built-in:" %}

@@ -79,7 +79,7 @@
- {% trans "Other IT projects" %} + {% trans "Other softwares" %}
@@ -96,7 +96,7 @@
- {% trans "Non IT projects" %} + {% trans "Associations" %}
diff -r c902ce09d4ed -r b09c26afea5f templates/sat_website/press.html --- a/templates/sat_website/press.html Fri May 15 17:26:32 2015 +0200 +++ b/templates/sat_website/press.html Sat May 16 09:41:11 2015 +0200 @@ -48,7 +48,7 @@
-
{% blocktrans with email="contact \"at\" salut-a-toi.org"%}If you want to write an article about Salut à Toi, we would be please to answer your questions. Please send them to {{email}}{% endblocktrans %}
+
{% blocktrans with email="contact \"at\" salut-a-toi.org"%}If you want to write an article about Salut à Toi, we would be pleased to answer your questions. Please send them to {{email}}{% endblocktrans %}
@@ -115,7 +115,7 @@
Goffi, Salut à Toi : multi interface and multipurpose XMPP client
    -
  • FOSDEM, {% trans "Bruxelles" %}, 2012 ({% trans "English" %})
    • +
  • FOSDEM, {% trans "Brussels" %}, 2012 ({% trans "English" %})