Mercurial > sat_legacy_website
changeset 67:ae46991a3489
English correction (typos and improvements) by Florian and Rachelle
| author | souliane <souliane@mailoo.org> |
|---|---|
| date | Tue, 26 May 2015 21:23:56 +0200 |
| parents | 64977f537e9b |
| children | c46cd6dbf407 |
| files | locale/fr/LC_MESSAGES/django.po templates/sat_website/adhesion.html templates/sat_website/association.html templates/sat_website/community.html templates/sat_website/features.html templates/sat_website/links.html templates/sat_website/overview.html templates/sat_website/principles.html templates/sat_website/specifications_exp.html |
| diffstat | 9 files changed, 383 insertions(+), 155 deletions(-) [+] |
line wrap: on
line diff
--- a/locale/fr/LC_MESSAGES/django.po Sat May 16 18:45:05 2015 +0200 +++ b/locale/fr/LC_MESSAGES/django.po Tue May 26 21:23:56 2015 +0200 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: 0.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-16 18:25+0200\n" -"PO-Revision-Date: 2015-05-16 18:27+0100\n" +"POT-Creation-Date: 2015-05-26 21:26+0200\n" +"PO-Revision-Date: 2015-05-26 21:32+0100\n" "Last-Translator: Salut à Toi <contact@salut-a-toi.org>\n" "Language-Team: français <goffi@goffi.org>\n" "Language: fr\n" @@ -128,12 +128,6 @@ #: sat_website/forms.py:214 #, python-brace-format -#| msgid "" -#| "Tank you, {name}!\n" -#| " \n" -#| "We received your submission and we are happy to count you in the members " -#| "of the association.\n" -#| "\n" msgid "" "Thank you, {name}!\n" "\n" @@ -446,19 +440,35 @@ #: templates/sat_website/adhesion.html:41 #, python-format +#| msgid "" +#| "For 2015, we need about %(asso_finance_target)s € for:\n" +#| " <ul>\n" +#| " <li>two full-time pays based on the French minimal salary;" +#| "</li>\n" +#| " <li>hosting this web site and the Libervia demo, " +#| "registering the domain names;</li>\n" +#| " <li>fees for the association's bank account and the " +#| "online payment system (apayer.fr);</li>\n" +#| " <li>miscellaneous extra costs (printing...).</li>\n" +#| " </ul>\n" +#| " Which makes, with an average annual contribution of 10 € per " +#| "subscription, %(asso_members_target)s members before December, 31st " +#| "2015!\n" +#| " " msgid "" "For 2015, we need about %(asso_finance_target)s € for:\n" " <ul>\n" -" <li>two full-time pays based on the French minimal salary;</" -"li>\n" -" <li>hosting this web site and the Libervia demo, registering " -"the domain names;</li>\n" +" <li>two full-time salaries based on the French minimal " +"salary;</li>\n" +" <li>hosting this web site and the Libervia demo and " +"registering the domain names;</li>\n" " <li>fees for the association's bank account and the online " "payment system (apayer.fr);</li>\n" -" <li>miscellaneous extra costs (printing...).</li>\n" +" <li>miscellaneous extra costs such as printing.</li>\n" " </ul>\n" " Which makes, with an average annual contribution of 10 € per " -"subscription, %(asso_members_target)s members before December, 31st 2015!\n" +"subscription, %(asso_members_target)s members before December, 31<sup>st</" +"sup> 2015!\n" " " msgstr "" "Pour 2015, nous nécessitons environ %(asso_finance_target)s € pour:\n" @@ -475,10 +485,14 @@ " " #: templates/sat_website/adhesion.html:52 +#| msgid "" +#| "The adhesion last exactly one year and isn't automatically renewed: you " +#| "have to renew it yourself and you can change the amount of your " +#| "cotisation every year." msgid "" -"The adhesion last exactly one year and isn't automatically renewed: you have " -"to renew it yourself and you can change the amount of your cotisation every " -"year." +"The membership lasts exactly one year and isn't automatically renewed: you " +"have to renew it yourself and you can change the amount of your subscription " +"every year." msgstr "" "L'adhésion dure une année et n'est pas tacitement renouvelable : vous devez " "la renouveler vous-même et vous pouvez modifier le montant de votre " @@ -497,9 +511,14 @@ msgstr "Adhérer gratuitement ou procéder par virement" #: templates/sat_website/adhesion.html:59 +#| msgid "" +#| "If you prefer to proceed by card, you can directly use a secure paiement " +#| "service hosted by our bank. 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. We can unfortunately not pre-fill the form " +"If you prefer to proceed by card, you can directly use a secure payment " +"service hosted by our bank. We unfortunately cannot 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." msgstr "" @@ -534,13 +553,20 @@ msgstr "Mission" #: 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. 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." msgid "" -"The Salut à Toi association has been created in june 2014 and is responsible " +"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. " +"is to create free, independent 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." +"what you want and it will stay under your control. So it applies both to the " +"present and the 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. Plus " @@ -554,10 +580,16 @@ 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." 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: " +"entity is a college that 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 "" @@ -572,15 +604,25 @@ msgstr "Financement" #: 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 let the association hire us (we made apropriate 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, via joining the association and paying a " +#| "cotisation." 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 " -"let the association hire us (we made apropriate 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 " +"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, via joining the association and paying a cotisation." +"happy to support us, by joining the association and paying a membership fee." msgstr "" "Nous travaillons sur Salut à Toi à plein temps depuis un moment, et nous " "espérons pouvoir continuer de le faire. Nous essayons maintenant de " @@ -595,16 +637,27 @@ #: templates/sat_website/association.html:46 #, python-format +#| msgid "" +#| "Because the money should not operate any separation between us, the " +#| "people who can not or who do not want to participate financially can " +#| "still join the association for free and as a moral support. The French " +#| "law doesn't allow the member to decide the amount of his cotisation, 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 cotisation). In that case, " +#| "please contact us. Because we want to stay 100%% indepedent 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." msgid "" -"Because the money should not operate any separation between us, the people " -"who can not or who do not want to participate financially can still join the " -"association for free and as a moral support. The French law doesn't allow " -"the member to decide the amount of his cotisation, 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 cotisation). In that case, please contact us. Because we want to " -"stay 100%% indepedent 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." +"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." msgstr "" "Parce que l'argent ne doit opérer aucune séparation entre nous, les " "personnes qui ne peuvent pas ou qui ne veulent pas participer financièrement " @@ -644,32 +697,41 @@ msgstr "La communauté Salut à Toi" #: templates/sat_website/community.html:27 -msgid "Join us to talk, contribute, share around Salut à Toi" +#| msgid "Join us to talk, contribute, share around Salut à Toi" +msgid "Join us to talk, contribute or share about Salut à Toi" msgstr "" "Rejoignez nous pour discuter, contribuer et partager autour de Salut à Toi" #: templates/sat_website/community.html:32 -msgid "Enter the chat room" +#| msgid "Enter the chat room" +msgid "Enter the chat room." msgstr "Rejoignez le salon de discussion" #: templates/sat_website/community.html:35 #, python-format +#| msgid "" +#| "Salut à Toi's multi-user chat room is <strong>*the*</strong> place to " +#| "discuss about the project: %(sat_muc)s" msgid "" "Salut à Toi's multi-user chat room is <strong>*the*</strong> place to " -"discuss about the project: %(sat_muc)s" +"discuss the project: %(sat_muc)s" msgstr "" "Le salon de discussion de Salut à Toi est <strong>*le*</strong> lieu pour " "discuter du projet: %(sat_muc)s" #: templates/sat_website/community.html:41 -msgid "Follow the development, learn" +#| msgid "Follow the development, learn" +msgid "Follow the development and learn." msgstr "Suivre le développement, apprendre" #: templates/sat_website/community.html:44 #, python-format +#| msgid "" +#| "On the main developer's blog, you'll get recent information/reflections " +#| "about SàT features (and more general ones): %(blog)s" msgid "" "On the main developer's blog, you'll get recent information/reflections " -"about SàT features (and more general ones): %(blog)s" +"about SàT's features (and also more general ones): %(blog)s" msgstr "" "Dans le blog du développeur principal, vous trouverez des informations/" "réflexions sur des nouvelles fonctionnalités (et des choses plus " @@ -694,9 +756,15 @@ msgstr "Participez !" #: templates/sat_website/community.html:56 +#| msgid "" +#| "SàT is an open project: come and discuss, give your opinion, share your " +#| "thoughts. The more people will participate, the better the project will " +#| "be. Share your view not only on technical points, but also on " +#| "philosophical or political ones. And if you are around, come to have a " +#| "talk in real life :)" msgid "" -"SàT is an open project: come and discuss, give your opinion, share your " -"thoughts. The more people will participate, the better the project will be. " +"SàT is an open project: come and discuss, give your opinion and share your " +"thoughts. The more people that participate, the better the project will be. " "Share your view not only on technical points, but also on philosophical or " "political ones. And if you are around, come to have a talk in real life :)" msgstr "" @@ -911,14 +979,22 @@ msgstr "Blogage" #: templates/sat_website/features.html:39 +#| msgid "" +#| "Share your thought with microblogs or write longer articles with rich " +#| "text blog messages. Together with a picture manager (not available yet, " +#| "but you can still link external pictures), this covers some of the most " +#| "popular Internet usecases. The big difference with other popular services " +#| "is that you can easily decide who will be able to read your messages and " +#| "you can keep the full control over your data. Better host it yourself, or " +#| "let it done by an entity you really trust." msgid "" "Share your thought with microblogs or write longer articles with rich text " "blog messages. Together with a picture manager (not available yet, but you " "can still link external pictures), this covers some of the most popular " -"Internet usecases. The big difference with other popular services is that " -"you can easily decide who will be able to read your messages and you can " -"keep the full control over your data. Better host it yourself, or let it " -"done by an entity you really trust." +"Internet usages. The big difference from other popular services is that you " +"can easily decide who will be able to read your messages and you can keep " +"the full control over your data. Better host it yourself, or let it be done " +"by an entity you really trust." msgstr "" "Partagez vos moindres pensées avec des microblogs, ou bien écrivez de longs " "articles avec du texte riche. Associés à un gestionnaire d'images (pas " @@ -934,11 +1010,16 @@ msgstr "Messagerie instantanée" #: templates/sat_website/features.html:47 +#| msgid "" +#| "You can talk with one person or follow a group discussion, invite people, " +#| "record your communication history... If you need to exchange sensitive " +#| "information - like a password - you can encrypt your messages to ensure " +#| "that nobody but the person you chose will be able to read it." msgid "" -"You can talk with one person or follow a group discussion, invite people, " +"You can talk with one person or follow a group discussion, invite people and " "record your communication history... If you need to exchange sensitive " "information - like a password - you can encrypt your messages to ensure that " -"nobody but the person you chose will be able to read it." +"nobody but the chosen person will be able to read it." msgstr "" "Vous pouvez parler avec une personne ou suivre une discussion de groupe, " "inviter des gens, sauvegarder l'historique de vos communications... Si vous " @@ -951,12 +1032,18 @@ msgstr "Activités" #: templates/sat_website/features.html:55 +#| msgid "" +#| "On top of the multi-user chat, you can play games and participate to " +#| "activities. This is done in the same interface with nothing extra to " +#| "install. For now we offer a French card game (tarot) and an online radio " +#| "system that allows you to share some music with your friends and hear it " +#| "at the same time." msgid "" -"On top of the multi-user chat, you can play games and participate to " +"On top of the multi-user chat, you can play games and participate in " "activities. This is done in the same interface with nothing extra to " -"install. For now we offer a French card game (tarot) and an online radio " -"system that allows you to share some music with your friends and hear it at " -"the same time." +"install. For now, we offer a French card game (tarot) and an online radio " +"system that allows you to share some music with your friends and listen to " +"it at the same time." msgstr "" "Par-dessus la messagerie instantanée de groupe, vous pouvez jouer à des jeux " "et participer à des activités. Ceci fonctionne avec la même interface et " @@ -969,10 +1056,14 @@ msgstr "Partage de fichiers" #: templates/sat_website/features.html:63 +#| msgid "" +#| "Easily send files to your contacts. Later we would like to implement a " +#| "decentralised file sharing system so you could create a private peer-to-" +#| "peer network within a group a friends." msgid "" "Easily send files to your contacts. Later we would like to implement a " -"decentralised file sharing system so you could create a private peer-to-peer " -"network within a group a friends." +"decentralised file sharing system so you can create a private peer-to-peer " +"network within a group of friends." msgstr "" "Envoyez facilement des fichiers à vos contacts. Plus tard, nous implanterons " "un système de partage de fichier décentralisé pour vous permettre de créer " @@ -999,12 +1090,18 @@ #: templates/sat_website/features.html:79 #, python-format +#| msgid "" +#| "Not really a feature, but certainly one of the most important point: a " +#| "%(social_prefix)ssocial contract%(social_suffix)s has been written, this " +#| "is a moral engagement that we are due to follow - we also refer to it in " +#| "the statutes of the association. SàT is not made for money or trap " +#| "people, it's a project about freedom and sharing." msgid "" "Not really a feature, but certainly one of the most important point: a " "%(social_prefix)ssocial contract%(social_suffix)s has been written, this is " "a moral engagement that we are due to follow - we also refer to it in the " -"statutes of the association. SàT is not made for money or trap people, it's " -"a project about freedom and sharing." +"statutes of the association. SàT is not made for money or to trap people, " +"it's a project about freedom and sharing." msgstr "" "Pas vraiment une fonctionnalité, mais certainement un des points les plus " "importants: un %(social_prefix)scontrat social%(social_suffix)s a été écrit, " @@ -1142,8 +1239,13 @@ #: templates/sat_website/links.html:30 #, 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 SàT, please check the \"credits\" section " +#| "of our %(readme_prefix)sREADME%(readme_suffix)s file." msgid "" -"We use - and sometimes contribute -, take ideas and inspiration from many " +"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)sREADME%(readme_suffix)s file." @@ -1242,42 +1344,55 @@ msgstr "Multi-usages" #: templates/sat_website/overview.html:58 -msgid "SàT covers a large spectrum of the Internet usages:" +#| msgid "SàT covers a large spectrum of the Internet usages:" +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 +#| msgid "" +#| "<strong>chat</strong> with one or many contacts, in public or private " +#| "rooms" msgid "" -"<strong>chat</strong> with one or many contacts, in public or private rooms" +"<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 +#| msgid "" +#| "organize <strong>contact groups</strong> and restrict your messages " +#| "visibility" msgid "" -"organize <strong>contact groups</strong> and restrict your messages " -"visibility" +"Organize <strong>contact groups</strong> and restrict the visibility of your " +"messages." msgstr "" "gérer des <strong>groupes de contacts</strong> et restreignez la lisibilité " "de vos messages ;" #: templates/sat_website/overview.html:62 +#| msgid "" +#| "end-to-end <strong>encryption</strong> makes your communications really " +#| "private" msgid "" -"end-to-end <strong>encryption</strong> makes your communications really " -"private" +"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 +#| msgid "" +#| "<strong>blogging</strong> system to share instant thoughs or write longer " +#| "articles" msgid "" -"<strong>blogging</strong> system to share instant thoughs or write longer " -"articles" +"<strong>Blogging</strong> system to share instant thoughts or write longer " +"articles." msgstr "" "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 -msgid "file sharing, games, interaction with other networks and much more" +#| msgid "file sharing, games, interaction with other networks and much more" +msgid "File sharing, games, interaction with other networks." msgstr "" "partage de fichier, jeux, interaction avec d'autres réseaux et beaucoup plus." @@ -1287,9 +1402,12 @@ msgstr "Multi-interfaces" #: templates/sat_website/overview.html:70 +#| msgid "" +#| "SàT can be used with different interfaces, each of them being a sub-" +#| "project, but the heart of the software stays the same. You can use SàT:" msgid "" -"SàT can be used with different interfaces, each of them being a sub-project, " -"but the heart of the software stays the same. You can use SàT:" +"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:" msgstr "" "SàT peut être utilisé avec différentes interfaces, chacune d'elle étant un " "sous-projet, mais le cœur du logiciel reste le même. Cela signifie que vous " @@ -1317,11 +1435,16 @@ msgstr "Libre" #: templates/sat_website/overview.html:84 +#| msgid "" +#| "SàT is not only open source, it's Libre and follows the free software " +#| "philosophy (free as in freedom). Not only because it's the best way to " +#| "develop a software, but also in the spirit of sharing and freedom. In " +#| "addition, SàT follows a social contract: a moral engagment with the user." msgid "" "SàT is not only open source, it's Libre and follows the free software " -"philosophy (free as in freedom). Not only because it's the best way to " -"develop a software, but also in the spirit of sharing and freedom. In " -"addition, SàT follows a social contract: a moral engagment with the user." +"philosophy (\"free\" as in freedom) because it's the best way to develop a " +"software, but also in the spirit of sharing. In addition, SàT follows a " +"social contract: a moral engagement with the user." msgstr "" "Salut à Toi est Libre, cela signifie qu'il suit la philosophie des Logiciels " "Libres, non seulement parce que c'est la meilleure façon de développer des " @@ -1333,8 +1456,15 @@ msgstr "Décentralisé" #: templates/sat_website/overview.html:89 +#| 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 entities. This is the only way to fight against censorship, to " +#| "hinder governmental surveillance and to keep control of your data - you " +#| "don't want your private pictures or intimate messages to be in the hands " +#| "of an untrusted commercial company, do you?" msgid "" -"SàT has many similarities with the Email network. For instance, there is no " +"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 " "entities. This is the only way to fight against censorship, to hinder " "governmental surveillance and to keep control of your data - you don't want " @@ -1353,13 +1483,20 @@ msgstr "L'association" #: templates/sat_website/overview.html:97 +#| 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 corporations and its abusive governmental control. Do you want to " +#| "help us? The adhesion is open to everybody and the amount of the " +#| "cotisation is up to you, from 0 to 100€. To join for free means something " +#| "to us, it's a moral support! " 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 " -"corporations and its abusive governmental control. Do you want to help us? " -"The adhesion is open to everybody and the amount of the cotisation is up to " -"you, from 0 to 100€. To join for free means something to us, it's a moral " -"support! " +"corporations and abusive governmental control. Do you want to help us? The " +"membership is open to everybody and the amount of the contribution is up to " +"you, from 0 to 100€. Even joining for free means something to us, it is " +"moral support! " msgstr "" "Salut à Toi et Libervia sont développés par une association à but non-" "lucratif et auto-gérée. Nous nous opposons à la main-mise des entreprises " @@ -1471,9 +1608,12 @@ msgstr "Quelques mots techniques pour expliquer le projet." #: templates/sat_website/principles.html:31 +#| msgid "" +#| "We usually present SàT as a multipurpose, multi frontend, libre and " +#| "decentralised communication tool... let us explain what we mean." msgid "" "We usually present SàT as a multipurpose, multi frontend, libre and " -"decentralised communication tool... let us explain what we mean." +"decentralised communication tool... Let us explain what we mean:" msgstr "" "Nous présentons généralement SàT comme étant un outil de communication multi-" "usages, multi-interfaces, libre et décentralisé... voici quelques " @@ -1481,14 +1621,27 @@ #: templates/sat_website/principles.html:40 #, python-format +#| msgid "" +#| "\n" +#| "\t Based on the powerful %(xmpp)s standard, SàT can obviously be used " +#| "for instant messaging... and much more!\n" +#| "\t Blogging and microblogging, file sharing, games are other possible " +#| "usage.... Using gateways, you can also communicate with other networks " +#| "like IRC or StatusNet. It is also possible to redirect your XMPP messages " +#| "to your email adress, or to send an email that would be delivered on " +#| "XMPP.\n" +#| "\t The \"X\" of XMPP stands for eXtensible: our features list is also " +#| "extensible! Check the specifications page for a current status of what " +#| "we've been doing.\n" +#| "\t " msgid "" "\n" "\t Based on the powerful %(xmpp)s standard, SàT can obviously be used for " -"instant messaging... and much more!\n" +"instant messaging and much more!\n" "\t Blogging and microblogging, file sharing, games are other possible " "usage.... Using gateways, you can also communicate with other networks like " "IRC or StatusNet. It is also possible to redirect your XMPP messages to your " -"email adress, or to send an email that would be delivered on XMPP.\n" +"email address, or to send an email that would be delivered on XMPP.\n" "\t The \"X\" of XMPP stands for eXtensible: our features list is also " "extensible! Check the specifications page for a current status of what we've " "been doing.\n" @@ -1508,15 +1661,25 @@ "\t " #: templates/sat_website/principles.html:56 +#| msgid "" +#| "\n" +#| "\t SàT has been developped since the beginning with an idea in mind: " +#| "it should be useable from the command line, with a console or desktop " +#| "interface, from a web browser... The backend of the software manages the " +#| "communication with your XMPP server and do most of the processing. On top " +#| "of that, you are free to use the frontend of your choice. If you would " +#| "like to help the project, a great thing would be to developp a new " +#| "frontend: don't hesitate to contact us!\n" +#| "\t " msgid "" "\n" "\t SàT has been developped since the beginning with an idea in mind: it " "should be useable from the command line, with a console or desktop " -"interface, from a web browser... The backend of the software manages the " -"communication with your XMPP server and do most of the processing. On top of " -"that, you are free to use the frontend of your choice. If you would like to " -"help the project, a great thing would be to developp a new frontend: don't " -"hesitate to contact us!\n" +"interface, from a web browser. The backend of the software manages the " +"communication with your XMPP server and does most of the processing. On top " +"of that, you are free to use the frontend of your choice. If you would like " +"to help the project, a great thing would be to develop a new frontend so " +"don't hesitate to contact us!\n" "\t " msgstr "" "\n" @@ -1530,13 +1693,22 @@ "\t " #: templates/sat_website/principles.html:70 +#| msgid "" +#| "\n" +#| "\t We exclusively use and developp free and open-source software. It " +#| "is not only free for you to get and run it, but you can analyse it, " +#| "modify it, redistribute it. Since this is enough to free a program but " +#| "not the person who uses it, we wrote a social contract - a moral " +#| "engagement with the user - that is also mentionned in the Statutes of the " +#| "association.\n" +#| "\t " msgid "" "\n" -"\t We exclusively use and developp free and open-source software. It is " -"not only free for you to get and run it, but you can analyse it, modify it, " -"redistribute it. Since this is enough to free a program but not the person " -"who uses it, we wrote a social contract - a moral engagement with the user - " -"that is also mentionned in the Statutes of the association.\n" +"\t We exclusively use and develop free and open-source software. It is " +"not only free for you to get and run it, but you can also analyse it, modify " +"it or redistribute it. Since this is enough to free a program but not the " +"person who uses it, we wrote a social contract - a moral engagement with the " +"user - that is also mentioned in the statutes of the association.\n" "\t " msgstr "" "\n" @@ -1582,12 +1754,20 @@ "serveur pour le reste)." #: templates/sat_website/principles.html:95 +#| msgid "" +#| "\n" +#| "\t\t On the logical layer, you are directly connected to your usual " +#| "\"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 " "\"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" +"decide to censor or exclude a user. It has too much power.\n" "\t " msgstr "" "\n" @@ -1607,6 +1787,17 @@ "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 usual \"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 " @@ -1615,7 +1806,7 @@ "\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! " +"possible to do that on the Internet? Yes, this is how the email works! " "That's decentralisation.\n" "\t\t " msgstr "" @@ -1642,13 +1833,22 @@ #: templates/sat_website/principles.html:118 #, python-format +#| msgid "" +#| "\n" +#| "\t\t Now what if you don't trust anybody? Then you are free to host " +#| "your own server at home, via an association or in your working office... " +#| "and this is possible too?! Yes, this is also how the Email works! And " +#| "this is what we did for our server libervia.org and without asking the " +#| "permission to anybody - the %(xmpp)s interdomain " +#| "%(federation_prefix)sfederation%(federation_suffix)s makes it possible.\n" +#| "\t\t " msgid "" "\n" "\t\t Now what if you don't trust anybody? Then you are free to host your " -"own server at home, via an association or in your working office... and this " -"is possible too?! Yes, this is also how the Email works! And this is what we " -"did for our server libervia.org and without asking the permission to anybody " -"- the %(xmpp)s interdomain %(federation_prefix)sfederation" +"own server at home, via an association or in your work office. Is this " +"possible too?! Yes, this is also how the email works! And this is what we " +"did for our server libervia.org and without asking anybody's permission - " +"the %(xmpp)s interdomain %(federation_prefix)sfederation" "%(federation_suffix)s makes it possible.\n" "\t\t " msgstr "" @@ -1674,13 +1874,22 @@ #: templates/sat_website/principles.html:129 #, python-format +#| msgid "" +#| "\n" +#| "\t\t So... to put it in a nutshell: decentralisation is like the Email " +#| "works. There are many servers, you can use the one you want and if you " +#| "want to help the decentralisation, you can also add a new server by " +#| "yourself. It requires some technical knowledge but it doesn't cost much " +#| "and it gives more freedom, feel free to %(contact_prefix)scontact us" +#| "%(contact_suffix)s if you need some details!\n" +#| "\t\t " msgid "" "\n" -"\t\t So... to put it in a nutshell: decentralisation is like the Email " -"works. There are many servers, you can use the one you want and if you want " -"to help the decentralisation, you can also add a new server by yourself. It " -"requires some technical knowledge but it doesn't cost much and it gives more " -"freedom, feel free to %(contact_prefix)scontact us%(contact_suffix)s if you " +"\t\t So... in a nutshell: decentralisation is like how the email works. " +"There are many servers, you can use the one you want and if you want to help " +"the decentralisation, you can also add a new server by yourself. It requires " +"some technical knowledge but it doesn't cost much and it allows more " +"freedom. Feel free to %(contact_prefix)scontact us%(contact_suffix)s if you " "need some details!\n" "\t\t " msgstr "" @@ -1732,13 +1941,22 @@ #: templates/sat_website/principles.html:150 #, python-format +#| msgid "" +#| "\n" +#| "\t As a consequence, SàT communicates with other %(xmpp)s " +#| "projects: the way we \"talk\" together is fully documented. For the user, " +#| "this means you can switch from one %(xmpp)s client to another using the " +#| "same account. This is taking the opposite direction to some proprietary " +#| "and commercial networks which tend to lock their users up. Open your " +#| "borders!\n" +#| "\t " msgid "" "\n" -"\t As a consequence, SàT communicates with other %(xmpp)s projects: " -"the way we \"talk\" together is fully documented. For the user, this means " -"you can switch from one %(xmpp)s client to another using the same account. " -"This is taking the opposite direction to some proprietary and commercial " -"networks which tend to lock their users up. Open your borders!\n" +"\t As a consequence, SàT communicates with other %(xmpp)s projects " +"and the way we \"talk\" together is fully documented. For the user, this " +"means you can switch from one %(xmpp)s client to another using the same " +"account. This is taking the opposite direction to some proprietary and " +"commercial networks which tend to lock their users up. Open your borders!\n" "\t " msgstr "" "\n" @@ -1755,9 +1973,14 @@ msgstr "Multiplate-forme" #: templates/sat_website/principles.html:163 +#| msgid "" +#| "Since its begining, the SàT project was made with other platforms in " +#| "mind. It's only avaible on GNU/Linux so far (except of course Libervia, " +#| "the web interface, which is available from any modern browser), but other " +#| "platforms are planned." msgid "" -"Since its begining, the SàT project was made with other platforms in mind. " -"It's only avaible on GNU/Linux so far (except of course Libervia, the web " +"Since its beginning, the SàT project was made with other platforms in mind. " +"It's only available on GNU/Linux so far (except of course Libervia, the web " "interface, which is available from any modern browser), but other platforms " "are planned." msgstr "" @@ -1975,8 +2198,13 @@ "\">Radio collective</a>" #: templates/sat_website/specifications_exp.html:66 +#| msgid "" +#| "Experiment music with your friends: in a multi-user chat, you share a " +#| "playlist; everybody can add songs to it, and everybody listens to the " +#| "same music at the same time. A nice way to share your taste and discover " +#| "new songs." msgid "" -"Experiment music with your friends: in a multi-user chat, you share a " +"Experience music with your friends: in a multi-user chat, you share a " "playlist; everybody can add songs to it, and everybody listens to the same " "music at the same time. A nice way to share your taste and discover new " "songs."
--- a/templates/sat_website/adhesion.html Sat May 16 18:45:05 2015 +0200 +++ b/templates/sat_website/adhesion.html Tue May 26 21:23:56 2015 +0200 @@ -40,23 +40,23 @@ <div class="info"> <p>{% blocktrans %}For 2015, we need about {{ asso_finance_target }} € for: <ul> - <li>two full-time pays based on the French minimal salary;</li> - <li>hosting this web site and the Libervia demo, registering the domain names;</li> + <li>two full-time salaries based on the French minimal salary;</li> + <li>hosting this web site and the Libervia demo and registering the domain names;</li> <li>fees for the association's bank account and the online payment system (apayer.fr);</li> - <li>miscellaneous extra costs (printing...).</li> + <li>miscellaneous extra costs such as printing.</li> </ul> - Which makes, with an average annual contribution of 10 € per subscription, {{ asso_members_target }} members before December, 31st 2015! + Which makes, with an average annual contribution of 10 € per subscription, {{ asso_members_target }} members before December, 31<sup>st</sup> 2015! {% endblocktrans %} </p> {% include "sat_website/finance.html" %} - <p>{% trans "The adhesion last exactly one year and isn't automatically renewed: you have to renew it yourself and you can change the amount of your cotisation every year." %}</p> + <p>{% trans "The membership lasts exactly one year and isn't automatically renewed: you have to renew it yourself and you can change the amount of your subscription every year." %}</p> <p> {% trans "To join the association without paying any subscription or to proceed with a bank transfer, please use our internal form:" %} </p> <p class="text-center"> <a class="btn btn-primary btn-lg" href="adhesion_form" role="button">{% trans "Join for free or proceed with a transfer" %}</a> </p> - <p>{% trans "If you prefer to proceed by card, you can directly use a secure paiement service hosted by our bank. 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." %} + <p>{% trans "If you prefer to proceed by card, you can directly use a secure payment service hosted by our bank. We unfortunately cannot 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." %} </p> <p class="text-center"> <a class="btn btn-primary btn-lg" href="https://www.apayer.fr/salut-a-toi" target="#" role="button">{% trans "Join and proceed by card" %}</a>
--- a/templates/sat_website/association.html Sat May 16 18:45:05 2015 +0200 +++ b/templates/sat_website/association.html Tue May 26 21:23:56 2015 +0200 @@ -32,18 +32,18 @@ <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. 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> + <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, independent 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 the present and the 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> + <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 that 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> <div class="info"> - <p>{% blocktrans %}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 let the association hire us (we made apropriate 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, via joining the association and paying a cotisation.{% endblocktrans %}</p> - <p>{% blocktrans %}Because the money should not operate any separation between us, the people who can not or who do not want to participate financially can still join the association for free and as a moral support. The French law doesn't allow the member to decide the amount of his cotisation, 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 cotisation). In that case, please contact us. Because we want to stay 100% indepedent 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>{% 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="adhesion.html" role="button">{% trans "Adhesion" %}</a></p> </div>
--- a/templates/sat_website/community.html Sat May 16 18:45:05 2015 +0200 +++ b/templates/sat_website/community.html Tue May 26 21:23:56 2015 +0200 @@ -24,24 +24,24 @@ {% load staticfiles %} {% block headline %}{% trans "Salut à Toi's community" %}{% endblock %} -{% block subtext %}{% trans "Join us to talk, contribute, share around Salut à Toi" %}{% endblock %} +{% block subtext %}{% trans "Join us to talk, contribute or share about Salut à Toi" %}{% endblock %} {% block main_container %} <div class="row"> <h5 class="alert alert-success"> - {% trans "Enter the chat room" %} + {% trans "Enter the chat room." %} </h5> <div class="info"> - <p>{% blocktrans with sat_muc="<a target=\"#\" href=\"xmpp:sat@chat.jabberfr.org?join\">sat@chat.jabberfr.org</a>" %}Salut à Toi's multi-user chat room is <strong>*the*</strong> place to discuss about the project: {{ sat_muc }}{% endblocktrans %}</p> + <p>{% blocktrans with sat_muc="<a target=\"#\" href=\"xmpp:sat@chat.jabberfr.org?join\">sat@chat.jabberfr.org</a>" %}Salut à Toi's multi-user chat room is <strong>*the*</strong> place to discuss the project: {{ sat_muc }}{% endblocktrans %}</p> </div> </div> <div class="row"> <h5 class="alert alert-success"> - {% trans "Follow the development, learn" %} + {% trans "Follow the development and learn." %} </h5> <div class="info"> - <p>{% blocktrans with blog="<a target=\"#\" href=\"http://www.goffi.org\">http://www.goffi.org</a>" %}On the main developer's blog, you'll get recent information/reflections about SàT features (and more general ones): {{ blog }}{% endblocktrans %}</p> + <p>{% blocktrans with blog="<a target=\"#\" href=\"http://www.goffi.org\">http://www.goffi.org</a>" %}On the main developer's blog, you'll get recent information/reflections about SàT's features (and also more general ones): {{ blog }}{% endblocktrans %}</p> <p>{% blocktrans with mailing_list="<a target=\"#\" href=\"http://lists.goffi.org/listinfo/users\">http://lists.goffi.org/listinfo/users</a>" %}You can subscribe to the users mailing list to follow the progression, give your opinion and contribute: {{ mailing_list }}{% endblocktrans %}</p> <p>{% blocktrans with wiki="<a target=\"#\" href=\"http://wiki.goffi.org/wiki/Cat%C3%A9gorie:Documentation_utilisateur\">http://wiki.goffi.org/wiki/Catégorie:Documentation_utilisateur</a>" %}You'll find some user documentation on the wiki: {{ wiki }}{% endblocktrans %}</p> </div> @@ -53,7 +53,7 @@ {% trans "Participate !" %} </h5> <div class="info"> - <p>{% blocktrans %}SàT is an open project: come and discuss, give your opinion, share your thoughts. The more people will participate, the better the project will be. Share your view not only on technical points, but also on philosophical or political ones. And if you are around, come to have a talk in real life :){% endblocktrans %}</p> + <p>{% blocktrans %}SàT is an open project: come and discuss, give your opinion and share your thoughts. The more people that participate, the better the project will be. Share your view not only on technical points, but also on philosophical or political ones. And if you are around, come to have a talk in real life :){% endblocktrans %}</p> </div> </div>
--- a/templates/sat_website/features.html Sat May 16 18:45:05 2015 +0200 +++ b/templates/sat_website/features.html Tue May 26 21:23:56 2015 +0200 @@ -36,7 +36,7 @@ <strong>{% trans "Blogging" %}</strong> </div> <div class="col-md-7 feature"> - {% blocktrans %}Share your thought with microblogs or write longer articles with rich text blog messages. Together with a picture manager (not available yet, but you can still link external pictures), this covers some of the most popular Internet usecases. The big difference with other popular services is that you can easily decide who will be able to read your messages and you can keep the full control over your data. Better host it yourself, or let it done by an entity you really trust.{% endblocktrans %} + {% blocktrans %}Share your thought with microblogs or write longer articles with rich text blog messages. Together with a picture manager (not available yet, but you can still link external pictures), this covers some of the most popular Internet usages. The big difference from other popular services is that you can easily decide who will be able to read your messages and you can keep the full control over your data. Better host it yourself, or let it be done by an entity you really trust.{% endblocktrans %} </div> </div> <div class="row"> @@ -44,7 +44,7 @@ <strong>{% trans "Chat" %}</strong> </div> <div class="col-md-7 feature"> - {% blocktrans %}You can talk with one person or follow a group discussion, invite people, record your communication history... If you need to exchange sensitive information - like a password - you can encrypt your messages to ensure that nobody but the person you chose will be able to read it.{% endblocktrans %} + {% blocktrans %}You can talk with one person or follow a group discussion, invite people and record your communication history... If you need to exchange sensitive information - like a password - you can encrypt your messages to ensure that nobody but the chosen person will be able to read it.{% endblocktrans %} </div> </div> <div class="row"> @@ -52,7 +52,7 @@ <strong>{% trans "Activities" %}</strong> </div> <div class="col-md-7 feature"> - {% blocktrans %}On top of the multi-user chat, you can play games and participate to activities. This is done in the same interface with nothing extra to install. For now we offer a French card game (tarot) and an online radio system that allows you to share some music with your friends and hear it at the same time.{% endblocktrans %} + {% blocktrans %}On top of the multi-user chat, you can play games and participate in activities. This is done in the same interface with nothing extra to install. For now, we offer a French card game (tarot) and an online radio system that allows you to share some music with your friends and listen to it at the same time.{% endblocktrans %} </div> </div> <div class="row"> @@ -60,7 +60,7 @@ <strong>{% trans "File sharing" %}</strong> </div> <div class="col-md-7 feature"> - {% blocktrans %}Easily send files to your contacts. Later we would like to implement a decentralised file sharing system so you could create a private peer-to-peer network within a group a friends.{% endblocktrans %} + {% blocktrans %}Easily send files to your contacts. Later we would like to implement a decentralised file sharing system so you can create a private peer-to-peer network within a group of friends.{% endblocktrans %} </div> </div> <div class="row"> @@ -76,7 +76,7 @@ <a href="social_contract.html">{% trans "Social contract" %}</a> </div> <div class="col-md-7 feature"> - {% blocktrans with social_prefix="<a href=\"social_contract\">" social_suffix="</a>" %}Not really a feature, but certainly one of the most important point: a {{ social_prefix }}social contract{{ social_suffix }} has been written, this is a moral engagement that we are due to follow - we also refer to it in the statutes of the association. SàT is not made for money or trap people, it's a project about freedom and sharing.{% endblocktrans %} + {% blocktrans with social_prefix="<a href=\"social_contract\">" social_suffix="</a>" %}Not really a feature, but certainly one of the most important point: a {{ social_prefix }}social contract{{ social_suffix }} has been written, this is a moral engagement that we are due to follow - we also refer to it in the statutes of the association. SàT is not made for money or to trap people, it's a project about freedom and sharing.{% endblocktrans %} </div> </div> </div>
--- a/templates/sat_website/links.html Sat May 16 18:45:05 2015 +0200 +++ b/templates/sat_website/links.html Tue May 26 21:23:56 2015 +0200 @@ -27,7 +27,7 @@ {% block headline %}{% trans "Other projects" %}{% endblock %} {% block main_container %} -<div>{% 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 SàT, please check the "credits" section of our {{ readme_prefix }}README{{ readme_suffix }} file.{% endblocktrans %}</div> +<div>{% 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 SàT, please check the "credits" section of our {{ readme_prefix }}README{{ readme_suffix }} file.{% endblocktrans %}</div> <div class="row"> <h5 class="alert alert-success">
--- a/templates/sat_website/overview.html Sat May 16 18:45:05 2015 +0200 +++ b/templates/sat_website/overview.html Tue May 26 21:23:56 2015 +0200 @@ -55,19 +55,19 @@ <div class="row"> <div class="col-md-6"> <h3>{% trans "Multipurpose" %}</h3> - {% trans "SàT covers a large spectrum of the Internet usages:" %} + {% trans "SàT covers a large spectrum of the Internet functions and uses:" %} <ul> - <li>{%blocktrans %}<strong>chat</strong> with one or many contacts, in public or private rooms{% endblocktrans %}</li> - <li>{% blocktrans %}organize <strong>contact groups</strong> and restrict your messages visibility{% endblocktrans %}</li> - <li>{% blocktrans %}end-to-end <strong>encryption</strong> makes your communications really private{% endblocktrans %}</li> - <li>{% blocktrans %}<strong>blogging</strong> system to share instant thoughs or write longer articles{% endblocktrans %}</li> - <li>{% blocktrans %}file sharing, games, interaction with other networks and much more{% endblocktrans %}</li> + <li>{%blocktrans %}<strong>Chat</strong> with one or many contacts, in public or private rooms.{% endblocktrans %}</li> + <li>{% blocktrans %}Organize <strong>contact groups</strong> and restrict the visibility of your messages.{% endblocktrans %}</li> + <li>{% blocktrans %}End-to-end <strong>encryption</strong> makes your communications private.{% endblocktrans %}</li> + <li>{% blocktrans %}<strong>Blogging</strong> system to share instant thoughts or write longer articles.{% endblocktrans %}</li> + <li>{% blocktrans %}File sharing, games, interaction with other networks.{% endblocktrans %}</li> </ul> <p><a class="btn btn-default" href="features.html" role="button">{% trans "Features" %}</a></p> </div> <div class="col-md-6"> <h3>{% trans "Multi frontend" %}</h3> - {% blocktrans %}SàT can be used with different interfaces, each of them being a sub-project, but the heart of the software stays the same. You can use SàT:{% endblocktrans %} + {% blocktrans %}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:{% endblocktrans %} <ul> <li>{% blocktrans %}with a browser through the <strong>web</strong> interface Libervia{% endblocktrans %}</li> <li>{% blocktrans %}inside a <strong>console</strong> user interface{% endblocktrans %}</li> @@ -81,12 +81,12 @@ <div class="row"> <div class="col-md-6"> <h3>{% trans "Libre" %}</h3> - <p>{% blocktrans %}SàT is not only open source, it's Libre and follows the free software philosophy (free as in freedom). Not only because it's the best way to develop a software, but also in the spirit of sharing and freedom. In addition, SàT follows a social contract: a moral engagment with the user.{% endblocktrans %}</p> + <p>{% blocktrans %}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 software, but also in the spirit of sharing. In addition, SàT follows a social contract: a moral engagement with the user.{% endblocktrans %}</p> <p><a class="btn btn-default" href="social_contract.html" role="button">{% trans "Social contract" %}</a></p> </div> <div class="col-md-6"> <h3>{% trans "Decentralised" %}</h3> - <p>{% blocktrans %}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 entities. This is the only way to fight against censorship, to hinder governmental surveillance and to keep control of your data - you don't want your private pictures or intimate messages to be in the hands of an untrusted commercial company, do you?{% endblocktrans %}</p> + <p>{% blocktrans %}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 entities. This is the only way to fight against censorship, to hinder governmental surveillance and to keep control of your data - you don't want your private pictures or intimate messages to be in the hands of an untrusted commercial company, do you?{% endblocktrans %}</p> </div> </div> @@ -94,7 +94,7 @@ <div class="well"> <h4>{% trans "The association" %}</h4> - <p>{% blocktrans %}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 corporations and its abusive governmental control. Do you want to help us? The adhesion is open to everybody and the amount of the cotisation is up to you, from 0 to 100€. To join for free means something to us, it's a moral support! {% endblocktrans %}</p> + <p>{% blocktrans %}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 corporations and abusive governmental control. Do you want to help us? The membership is open to everybody and the amount of the contribution is up to you, from 0 to 100€. Even joining for free means something to us, it is moral support! {% endblocktrans %}</p> {% include "sat_website/finance.html" %} <p> <a class="btn btn-default" href="adhesion.html" role="button">{% trans "Adhesion" %}</a>
--- a/templates/sat_website/principles.html Sat May 16 18:45:05 2015 +0200 +++ b/templates/sat_website/principles.html Tue May 26 21:23:56 2015 +0200 @@ -28,7 +28,7 @@ {% block main_container %} <div> - {% trans "We usually present SàT as a multipurpose, multi frontend, libre and decentralised communication tool... let us explain what we mean." %} + {% trans "We usually present SàT as a multipurpose, multi frontend, libre and decentralised communication tool... Let us explain what we mean:" %} </div> <div class="row"> @@ -38,8 +38,8 @@ <div class="info"> <p> {% blocktrans with xmpp="<abbr title=\"eXtensible Messaging and Presence Protocol\">XMPP</abbr>" %} - Based on the powerful {{ xmpp }} standard, SàT can obviously be used for instant messaging... and much more! - Blogging and microblogging, file sharing, games are other possible usage.... Using gateways, you can also communicate with other networks like IRC or StatusNet. It is also possible to redirect your XMPP messages to your email adress, or to send an email that would be delivered on XMPP. + Based on the powerful {{ xmpp }} standard, SàT can obviously be used for instant messaging and much more! + Blogging and microblogging, file sharing, games are other possible usage.... Using gateways, you can also communicate with other networks like IRC or StatusNet. It is also possible to redirect your XMPP messages to your email address, or to send an email that would be delivered on XMPP. The "X" of XMPP stands for eXtensible: our features list is also extensible! Check the specifications page for a current status of what we've been doing. {% endblocktrans %} </p> @@ -54,7 +54,7 @@ <div class="info"> <p> {% blocktrans %} - SàT has been developped since the beginning with an idea in mind: it should be useable from the command line, with a console or desktop interface, from a web browser... The backend of the software manages the communication with your XMPP server and do most of the processing. On top of that, you are free to use the frontend of your choice. If you would like to help the project, a great thing would be to developp a new frontend: don't hesitate to contact us! + SàT has been developped since the beginning with an idea in mind: it should be useable from the command line, with a console or desktop interface, from a web browser. The backend of the software manages the communication with your XMPP server and does most of the processing. On top of that, you are free to use the frontend of your choice. If you would like to help the project, a great thing would be to develop a new frontend so don't hesitate to contact us! {% endblocktrans %} </p> <p><a class="btn btn-default" href="frontends.html" role="button">{% trans "Frontends" %}</a></p> @@ -68,7 +68,7 @@ <div class="info"> <p> {% blocktrans %} - We exclusively use and developp free and open-source software. It is not only free for you to get and run it, but you can analyse it, modify it, redistribute it. Since this is enough to free a program but not the person who uses it, we wrote a social contract - a moral engagement with the user - that is also mentionned in the Statutes of the association. + We exclusively use and develop free and open-source software. It is not only free for you to get and run it, but you can also analyse it, modify it or redistribute it. Since this is enough to free a program but not the person who uses it, we wrote a social contract - a moral engagement with the user - that is also mentioned in the statutes of the association. {% endblocktrans %} </p> <p><a class="btn btn-default" href="social_contract.html" role="button">{% trans "Social contract" %}</a></p> @@ -93,7 +93,7 @@ </p> <p> {% blocktrans %} - On the logical layer, you are directly connected to your usual "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. + On the logical layer, you are directly connected to your usual "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. {% endblocktrans %} <div class="thumbnail"> <img src="{% static "images/decentralisation/2_logical_centralised.png" %}" ><br/> @@ -105,7 +105,7 @@ <p> {% blocktrans %} Now what if your usual "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. - 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. + 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. {% endblocktrans %} <div class="thumbnail"> <img src="{% static "images/decentralisation/3_logical_decentralised.png" %}" ><br/> @@ -116,7 +116,7 @@ </p> <p> {% blocktrans with xmpp="<abbr title=\"eXtensible Messaging and Presence Protocol\">XMPP</abbr>" federation_prefix='<a href="#federated">' federation_suffix='</a>' %} - Now what if you don't trust anybody? Then you are free to host your own server at home, via an association or in your working office... and this is possible too?! Yes, this is also how the Email works! And this is what we did for our server libervia.org and without asking the permission to anybody - the {{ xmpp }} interdomain {{ federation_prefix }}federation{{ federation_suffix }} makes it possible. + Now what if you don't trust anybody? Then you are free to host your own server at home, via an association or in your work office. Is this possible too?! Yes, this is also how the email works! And this is what we did for our server libervia.org and without asking anybody's permission - the {{ xmpp }} interdomain {{ federation_prefix }}federation{{ federation_suffix }} makes it possible. {% endblocktrans %} <div class="thumbnail"> <img src="{% static "images/decentralisation/4_logical_decentralised_self_hosting.png" %}" > @@ -127,7 +127,7 @@ </p> <p> {% blocktrans with contact_prefix='<a href="community.html">' contact_suffix='</a>' %} - So... to put it in a nutshell: decentralisation is like the Email works. There are many servers, you can use the one you want and if you want to help the decentralisation, you can also add a new server by yourself. It requires some technical knowledge but it doesn't cost much and it gives more freedom, feel free to {{ contact_prefix }}contact us{{ contact_suffix }} if you need some details! + So... in a nutshell: decentralisation is like how the email works. There are many servers, you can use the one you want and if you want to help the decentralisation, you can also add a new server by yourself. It requires some technical knowledge but it doesn't cost much and it allows more freedom. Feel free to {{ contact_prefix }}contact us{{ contact_suffix }} if you need some details! {% endblocktrans %} </p> <div class="alert alert-info"> @@ -148,7 +148,7 @@ </p> <p> {% blocktrans with xmpp="<abbr title=\"eXtensible Messaging and Presence Protocol\">XMPP</abbr>" %} - As a consequence, SàT communicates with other {{xmpp}} projects: the way we "talk" together is fully documented. For the user, this means you can switch from one {{ xmpp }} client to another using the same account. This is taking the opposite direction to some proprietary and commercial networks which tend to lock their users up. Open your borders! + As a consequence, SàT communicates with other {{xmpp}} projects and the way we "talk" together is fully documented. For the user, this means you can switch from one {{ xmpp }} client to another using the same account. This is taking the opposite direction to some proprietary and commercial networks which tend to lock their users up. Open your borders! {% endblocktrans %} </p> </div> @@ -160,7 +160,7 @@ </h5> <div class="info"> <p> - {% blocktrans %}Since its begining, the SàT project was made with other platforms in mind. It's only avaible on GNU/Linux so far (except of course Libervia, the web interface, which is available from any modern browser), but other platforms are planned.{% endblocktrans %} + {% blocktrans %}Since its beginning, the SàT project was made with other platforms in mind. It's only available on GNU/Linux so far (except of course Libervia, the web interface, which is available from any modern browser), but other platforms are planned.{% endblocktrans %} </p> </div> </div>
--- a/templates/sat_website/specifications_exp.html Sat May 16 18:45:05 2015 +0200 +++ b/templates/sat_website/specifications_exp.html Tue May 26 21:23:56 2015 +0200 @@ -63,7 +63,7 @@ </div> <div class="row"> <div class="col-md-2">{% blocktrans context "Url need to point to the localised one" %}<a href="http://www.goffi.org/post/2012/02/02/Collective-radio-%28with-video%29" target="#">Collective radio</a>{% endblocktrans %}</div> - <div class="col-md-7 feature">{% blocktrans %}Experiment music with your friends: in a multi-user chat, you share a playlist; everybody can add songs to it, and everybody listens to the same music at the same time. A nice way to share your taste and discover new songs.{% endblocktrans %}</div> + <div class="col-md-7 feature">{% blocktrans %}Experience music with your friends: in a multi-user chat, you share a playlist; everybody can add songs to it, and everybody listens to the same music at the same time. A nice way to share your taste and discover new songs.{% endblocktrans %}</div> </div> <div class="row"> <div class="col-md-2">{% trans "Register Account Plugin" %}</div>