Mercurial > sat_legacy_website

changeset 144:d4512788d251

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove banner for the crowdfunding campaign + add LinuxDays Prag in the press section
author souliane <souliane@mailoo.org>
date Tue, 13 Dec 2016 19:41:07 +0100
parents ce6b0b84e054
children bb392a2dc07b
files locale/fr/LC_MESSAGES/django.po templates/sat_website/overview.html templates/sat_website/press.html
diffstat 3 files changed, 78 insertions(+), 87 deletions(-) [+]
line wrap: on
line diff
--- a/locale/fr/LC_MESSAGES/django.po	Tue May 03 21:27:35 2016 +0200
+++ b/locale/fr/LC_MESSAGES/django.po	Tue Dec 13 19:41:07 2016 +0100
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-03 20:58+0200\n"
+"POT-Creation-Date: 2016-12-13 19:38+0100\n"
 "PO-Revision-Date: 2016-05-03 20:59+0100\n"
 "Last-Translator: Salut à Toi <contact@salut-a-toi.org>\n"
 "Language-Team: français <goffi@goffi.org>\n"
@@ -364,11 +364,11 @@
 msgid "Presentation"
 msgstr "Présentation"
 
-#: sat_website/views.py:33 templates/sat_website/overview.html:86
+#: sat_website/views.py:33 templates/sat_website/overview.html:67
 msgid "Features"
 msgstr "Fonctionnalités"
 
-#: sat_website/views.py:34 templates/sat_website/overview.html:97
+#: sat_website/views.py:34 templates/sat_website/overview.html:78
 #: templates/sat_website/principles.html:60
 msgid "Frontends"
 msgstr "Interfaces"
@@ -394,7 +394,7 @@
 msgstr "Spécifications"
 
 #: sat_website/views.py:41 templates/sat_website/downloads.html:27
-#: templates/sat_website/overview.html:133
+#: templates/sat_website/overview.html:114
 msgid "Downloads"
 msgstr "Téléchargements"
 
@@ -427,12 +427,12 @@
 msgstr "FAQ"
 
 #: sat_website/views.py:53 templates/sat_website/association.html:47
-#: templates/sat_website/overview.html:124
+#: templates/sat_website/overview.html:105
 msgid "Membership"
 msgstr "Adhésion"
 
 #: sat_website/views.py:54 templates/sat_website/features.html:76
-#: templates/sat_website/overview.html:105
+#: templates/sat_website/overview.html:86
 #: templates/sat_website/principles.html:74
 msgid "Social contract"
 msgstr "Contrat social"
@@ -1344,24 +1344,7 @@
 "l'outil de communication multi-usages, multi-interfaces, libre et "
 "décentralisé"
 
-#: templates/sat_website/overview.html:48 templates/sat_website/press.html:37
-msgid "en"
-msgstr "fr"
-
-#: templates/sat_website/overview.html:54
-msgid ""
-"The crowdfunding campaign for a desktop and Android interface finished on "
-"December 6th and it was successful."
-msgstr ""
-"La campagne de financement participatif pour l'interface bureau et Android "
-"s'est achevée avec succès le 6 décembre."
-
-#: templates/sat_website/overview.html:57
-#: templates/sat_website/thank_you.html:27
-msgid "Thank you!"
-msgstr "Merci !"
-
-#: templates/sat_website/overview.html:65
+#: templates/sat_website/overview.html:46
 msgid ""
 "SàT includes several sub-projects. Libervia, a web interface to discuss and "
 "blog with the persons of your choice, is one of them:"
@@ -1370,32 +1353,32 @@
 "discuter et bloguer uniquement avec les personnes de votre choix, est l'une "
 "d'elle :"
 
-#: templates/sat_website/overview.html:68
+#: templates/sat_website/overview.html:49
 #, python-format
 msgid "Please read our %(faq)s before trying out"
 msgstr "Lisez s'il vous plait notre %(faq)s avant d'essayer la"
 
-#: templates/sat_website/overview.html:69
+#: templates/sat_website/overview.html:50
 msgid "Libervia demo version"
 msgstr "Démo de Libervia"
 
-#: templates/sat_website/overview.html:77
+#: templates/sat_website/overview.html:58
 #: templates/sat_website/principles.html:36
 msgid "Multipurpose"
 msgstr "Multi-usages"
 
-#: templates/sat_website/overview.html:78
+#: templates/sat_website/overview.html:59
 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:80
+#: templates/sat_website/overview.html:61
 msgid ""
 "<strong>Chat</strong> with one or many contacts, in public or private rooms."
 msgstr ""
 "<strong>discuter</strong> instantanément avec un ou plusieurs contacts, dans "
 "des salons privés ou publics ;"
 
-#: templates/sat_website/overview.html:81
+#: templates/sat_website/overview.html:62
 msgid ""
 "Organize <strong>contact groups</strong> and restrict the visibility of your "
 "messages."
@@ -1403,14 +1386,14 @@
 "gérer des <strong>groupes de contacts</strong> et restreignez la lisibilité "
 "de vos messages ;"
 
-#: templates/sat_website/overview.html:82
+#: templates/sat_website/overview.html:63
 msgid ""
 "End-to-end <strong>encryption</strong> makes your communications private."
 msgstr ""
 "le <strong>chiffrement</strong> de bout en bout rend vos conversations "
 "vraiment privées ;"
 
-#: templates/sat_website/overview.html:83
+#: templates/sat_website/overview.html:64
 msgid ""
 "<strong>Blogging</strong> system to share instant thoughts or write longer "
 "articles."
@@ -1418,17 +1401,17 @@
 "système de <strong>blogage</strong> pour partager vos réflexions du moment "
 "ou écrire de plus longs articles ;"
 
-#: templates/sat_website/overview.html:84
+#: templates/sat_website/overview.html:65
 msgid "File sharing, games, interaction with other networks."
 msgstr ""
 "partage de fichier, jeux, interaction avec d'autres réseaux et beaucoup plus."
 
-#: templates/sat_website/overview.html:89
+#: templates/sat_website/overview.html:70
 #: templates/sat_website/principles.html:52
 msgid "Multi frontend"
 msgstr "Multi-interfaces"
 
-#: templates/sat_website/overview.html:90
+#: templates/sat_website/overview.html:71
 msgid ""
 "SàT can be used via different interfaces, each of them being a sub-project, "
 "but the heart of the software remains the same. You can use SàT:"
@@ -1437,28 +1420,28 @@
 "sous-projet, mais le cœur du logiciel reste le même. Cela signifie que vous "
 "pouvez utiliser SàT:"
 
-#: templates/sat_website/overview.html:92
+#: templates/sat_website/overview.html:73
 msgid "with a browser through the <strong>web</strong> interface Libervia"
 msgstr "avec un navigateur à travers l'interface <strong>web</strong> ;"
 
-#: templates/sat_website/overview.html:93
+#: templates/sat_website/overview.html:74
 msgid "inside a <strong>console</strong> user interface"
 msgstr "dans une interface <strong>console</strong> ;"
 
-#: templates/sat_website/overview.html:94
+#: templates/sat_website/overview.html:75
 msgid "through a <strong>command line</strong>"
 msgstr "à travers la <strong>ligne de commande</strong>."
 
-#: templates/sat_website/overview.html:96
+#: templates/sat_website/overview.html:77
 msgid "Other frontends are planned (telephones, desktop)."
 msgstr "D'autres interfaces sont prévues (téléphones, bureau)."
 
-#: templates/sat_website/overview.html:103
+#: templates/sat_website/overview.html:84
 #: templates/sat_website/principles.html:66
 msgid "Libre"
 msgstr "Libre"
 
-#: templates/sat_website/overview.html:104
+#: templates/sat_website/overview.html:85
 msgid ""
 "SàT is not only open source, it's Libre and follows the free software "
 "philosophy (\"free\" as in freedom) because it's the best way to develop a "
@@ -1469,12 +1452,12 @@
 "Libres, non seulement parce que c'est la meilleure façon de développer des "
 "logiciels, mais aussi (et surtout) pour l'esprit de partage et de liberté."
 
-#: templates/sat_website/overview.html:108
+#: templates/sat_website/overview.html:89
 #: templates/sat_website/principles.html:80
 msgid "Decentralised"
 msgstr "Décentralisé"
 
-#: templates/sat_website/overview.html:109
+#: templates/sat_website/overview.html:90
 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 "
@@ -1490,11 +1473,11 @@
 "souhaitez pas confier vos photos privées et messages intimes à des "
 "entreprises commerciales non fiables, n'est-ce pas ?"
 
-#: templates/sat_website/overview.html:116
+#: templates/sat_website/overview.html:97
 msgid "The association"
 msgstr "L'association"
 
-#: templates/sat_website/overview.html:117
+#: templates/sat_website/overview.html:98
 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 "
@@ -1510,11 +1493,11 @@
 "la cotisation est laissé à votre choix, entre 0 et 100 €. Adhérer "
 "gratuitement signifie aussi quelque chose, c'est un soutien moral !"
 
-#: templates/sat_website/overview.html:131
+#: templates/sat_website/overview.html:112
 msgid "Run it yourself!"
 msgstr "Lancez-le vous même !"
 
-#: templates/sat_website/overview.html:132
+#: templates/sat_website/overview.html:113
 msgid ""
 "If you enjoyed testing our demonstration version of Libervia and if you have "
 "the technical knowledge to do it, you can download the software and run it "
@@ -1538,6 +1521,10 @@
 msgstr "26 octobre - 05 décembre 2015"
 
 #: templates/sat_website/press.html:37
+msgid "en"
+msgstr "fr"
+
+#: templates/sat_website/press.html:37
 msgid "Crowdfunding campaign on Arizuka"
 msgstr "Campagne de financement participatif sur Arizuka"
 
@@ -1574,13 +1561,13 @@
 #: templates/sat_website/press.html:55 templates/sat_website/press.html:58
 #: templates/sat_website/press.html:64 templates/sat_website/press.html:67
 #: templates/sat_website/press.html:81 templates/sat_website/press.html:85
-#: templates/sat_website/press.html:104 templates/sat_website/press.html:110
-#: templates/sat_website/press.html:116 templates/sat_website/press.html:117
-#: templates/sat_website/press.html:123 templates/sat_website/press.html:124
-#: templates/sat_website/press.html:130 templates/sat_website/press.html:131
-#: templates/sat_website/press.html:132 templates/sat_website/press.html:140
-#: templates/sat_website/press.html:148 templates/sat_website/press.html:156
-#: templates/sat_website/press.html:157
+#: templates/sat_website/press.html:110 templates/sat_website/press.html:116
+#: templates/sat_website/press.html:122 templates/sat_website/press.html:123
+#: templates/sat_website/press.html:129 templates/sat_website/press.html:130
+#: templates/sat_website/press.html:136 templates/sat_website/press.html:137
+#: templates/sat_website/press.html:138 templates/sat_website/press.html:146
+#: templates/sat_website/press.html:154 templates/sat_website/press.html:162
+#: templates/sat_website/press.html:163
 msgid "French"
 msgstr "Français"
 
@@ -1615,40 +1602,45 @@
 msgstr "Conférences"
 
 #: templates/sat_website/press.html:98
-msgid "LinuxWochen"
+msgid "LinuxDays"
 msgstr ""
 
-#: templates/sat_website/press.html:98 templates/sat_website/press.html:165
+#: templates/sat_website/press.html:98 templates/sat_website/press.html:104
+#: templates/sat_website/press.html:171
 msgid "English"
 msgstr "anglais"
 
-#: templates/sat_website/press.html:98 templates/sat_website/press.html:104
-#: templates/sat_website/press.html:110 templates/sat_website/press.html:116
-#: templates/sat_website/press.html:117 templates/sat_website/press.html:123
-#: templates/sat_website/press.html:124 templates/sat_website/press.html:148
-#: templates/sat_website/press.html:156
+#: templates/sat_website/press.html:104
+msgid "Linuxwochen"
+msgstr ""
+
+#: templates/sat_website/press.html:104 templates/sat_website/press.html:110
+#: templates/sat_website/press.html:116 templates/sat_website/press.html:122
+#: templates/sat_website/press.html:123 templates/sat_website/press.html:129
+#: templates/sat_website/press.html:130 templates/sat_website/press.html:154
+#: templates/sat_website/press.html:162
 msgid "video"
 msgstr "vidéo"
 
-#: templates/sat_website/press.html:102
+#: templates/sat_website/press.html:108
 msgid "Round table on new media"
 msgstr "Table ronde sur les nouveaux médias"
 
-#: templates/sat_website/press.html:104 templates/sat_website/press.html:110
-#: templates/sat_website/press.html:117 templates/sat_website/press.html:123
-#: templates/sat_website/press.html:156
+#: templates/sat_website/press.html:110 templates/sat_website/press.html:116
+#: templates/sat_website/press.html:123 templates/sat_website/press.html:129
+#: templates/sat_website/press.html:162
 msgid "Libre Software Meeting"
 msgstr "Rencontres Mondiales du Logiciel Libre"
 
-#: templates/sat_website/press.html:124
+#: templates/sat_website/press.html:130
 msgid "part"
 msgstr "partie"
 
-#: templates/sat_website/press.html:165
+#: templates/sat_website/press.html:171
 msgid "Brussels"
 msgstr "Bruxelles"
 
-#: templates/sat_website/press.html:172
+#: templates/sat_website/press.html:178
 msgid ""
 "If you think that we could bring something interesting to an event "
 "(conference, stand...), feel free to contact us."
@@ -2392,6 +2384,10 @@
 msgid "HTTP File Upload"
 msgstr "Téléversement de fichier HTTP"
 
+#: templates/sat_website/thank_you.html:27
+msgid "Thank you!"
+msgstr "Merci !"
+
 #: templates/sat_website/thank_you.html:31
 msgid "Below a copy of the email we just sent to you."
 msgstr "Ci-dessous une copie du courriel que nous venons de vous envoyer."
@@ -2404,6 +2400,13 @@
 "Merci de le lire attentivement, il contient les informations pour compléter "
 "votre adhésion."
 
+#~ msgid ""
+#~ "The crowdfunding campaign for a desktop and Android interface finished on "
+#~ "December 6th and it was successful."
+#~ msgstr ""
+#~ "La campagne de financement participatif pour l'interface bureau et "
+#~ "Android s'est achevée avec succès le 6 décembre."
+
 #~ msgid "[PLANNED]"
 #~ msgstr "[PRÉVU]"
 
--- a/templates/sat_website/overview.html	Tue May 03 21:27:35 2016 +0200
+++ b/templates/sat_website/overview.html	Tue Dec 13 19:41:07 2016 +0100
@@ -40,24 +40,6 @@
         </h1>
         </header>
 
-		{% comment %}FIXME: remove when the campaign is over{% endcomment %}
-		<div class="row">
-			<div class="alert alert-info">
-				<p style="text-align: center">
-					<a href="http://www.arizuka.com/{% trans "en" %}/projects/libervia/" target="#">
-						<img src="{% static "images/misc/campagne_android.png" %}" style="max-width:100%;" />
-					</a>
-				</p>
-				<p>&nbsp;</p>
-				<p style="max-width: 754px; text-align: justify; margin: auto">
-					{% trans "The crowdfunding campaign for a desktop and Android interface finished on December 6th and it was successful." %}
-			    </p>
-				<p style="text-align: center; font-size: x-large">
-                    {% trans "Thank you!" %}
-				</p>
-			</div>
-		</div>
-
         <div class="overview_spacer"></div>
 
         <div>
--- a/templates/sat_website/press.html	Tue May 03 21:27:35 2016 +0200
+++ b/templates/sat_website/press.html	Tue Dec 13 19:41:07 2016 +0100
@@ -93,9 +93,15 @@
     <div class="info">
         <div class="row">
           <div class="col-md-12">
+              Goffi, <span class="presstitle">Technology is not neutral: meet Libervia and Cagou (Salut à Toi) - free and ethical communication tools</span>
+              <ul>
+                <li>{% trans "LinuxDays" %}, Prag, 2016 ({% trans "English" %})</li>
+              </ul>
+          </div>
+          <div class="col-md-12">
               Goffi, Souliane, <span class="presstitle">Salut à Toi and Libervia</span>
               <ul>
-                <li>{% trans "LinuxWochen" %}, Wien, 2016 ({% trans "English" %}) - <a href="http://meetings-archive.debian.net/pub/debian-meetings/2016/mini-debconf-vienna/webm/Salut_%c3%a0_Toi_and_Libervia.webm" target="#" >{% trans "video" %}</a></li>
+                <li>{% trans "Linuxwochen" %}, Wien, 2016 ({% trans "English" %}) - <a href="http://meetings-archive.debian.net/pub/debian-meetings/2016/mini-debconf-vienna/webm/Salut_%c3%a0_Toi_and_Libervia.webm" target="#" >{% trans "video" %}</a></li>
               </ul>
           </div>
           <div class="col-md-12">