From ed46a0917f1090f722d4a6d21191454f2978b5a9 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Mon, 14 Oct 2019 12:23:17 +0200
Subject: [PATCH] Improve registration page sentences

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 js/src/i18n/en_US.json         |  9 +++++----
 js/src/i18n/fr_FR.json         |  9 +++++----
 js/src/i18n/oc.json            |  4 ----
 js/src/views/User/Register.vue | 15 ++++++++-------
 4 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/js/src/i18n/en_US.json b/js/src/i18n/en_US.json
index 4e85f5c1b..b97834166 100644
--- a/js/src/i18n/en_US.json
+++ b/js/src/i18n/en_US.json
@@ -13,6 +13,7 @@
 	"Add": "Add",
 	"Additional comments": "Additional comments",
 	"Administration": "Administration",
+	"All data will be deleted every 48 hours, so please don't use this for anything real.": "All data will be deleted every 48 hours, so please don't use this for anything real.",
 	"All the places have already been taken": "All the places have been taken|One place is still available|{places} places are still available",
 	"Allow all comments": "Allow all comments",
 	"An error has occurred.": "An error has occurred.",
@@ -48,12 +49,13 @@
 	"Create a new event": "Create a new event",
 	"Create a new group": "Create a new group",
 	"Create a new identity": "Create a new identity",
+	"Create and manage several identities from the same account": "Create and manage several identities from the same account",
 	"Create group": "Create group",
 	"Create my event": "Create my event",
 	"Create my group": "Create my group",
 	"Create my profile": "Create my profile",
 	"Create token": "Create token",
-	"Create your communities and your events": "Create your communities and your events",
+	"Create, edit or delete events": "Create, edit or delete events",
 	"Create": "Create",
 	"Creator": "Creator",
 	"Current identity has been changed to {identityName} in order to manage this event.": "Current identity has been changed to {identityName} in order to manage this event.",
@@ -75,6 +77,7 @@
 	"Either the account is already validated, either the validation token is incorrect.": "Either the account is already validated, either the validation token is incorrect.",
 	"Email": "Email",
 	"Ends on…": "Ends on…",
+	"Enjoy discovering Mobilizon!": "Enjoy discovering Mobilizon!",
 	"Enter the link URL": "Enter the link URL",
 	"Error while communicating with the server.": "Error while communicating with the server.",
 	"Error while saving report.": "Error while saving report.",
@@ -161,7 +164,6 @@
 	"Organized by {name}": "Organized by {name}",
 	"Organized": "Organized",
 	"Organizer": "Organizer",
-	"Other stuff…": "Other stuff…",
 	"Otherwise this identity will just be removed from the group administrators.": "Otherwise this identity will just be removed from the group administrators.",
 	"Page limited to my group (asks for auth)": "Page limited to my group (asks for auth)",
 	"Page not found": "Page not found",
@@ -177,7 +179,6 @@
 	"Password": "Password",
 	"Past events": "Passed events",
 	"Pick an identity": "Pick an identity",
-	"Please be nice to each other": "Please be nice to each other",
 	"Please check your spam folder if you didn't receive the email.": "Please check your spam folder if you didn't receive the email.",
 	"Please contact this instance's Mobilizon admin if you think this is a mistake.": "Please contact this instance's Mobilizon admin if you think this is a mistake.",
 	"Please make sure the address is correct and that the page hasn't been moved.": "Please make sure the address is correct and that the page hasn't been moved.",
@@ -198,6 +199,7 @@
 	"Read Framasoft’s statement of intent on the Framablog": "Read Framasoft’s statement of intent on the Framablog",
 	"Region": "Region",
 	"Register an account on Mobilizon!": "Register an account on Mobilizon!",
+	"Register for an event by choosing one of your identities": "Register for an event by choosing one of your identities",
 	"Register": "Register",
 	"Registration is currently closed.": "Registration is currently closed.",
 	"Reject": "Reject",
@@ -296,7 +298,6 @@
 	"iCal Feed": "iCal Feed",
 	"interconnect with others like it": "interconnect with others like it",
 	"its source code is public": "its source code is public",
-	"meditate a bit": "meditate a bit",
 	"on our blog": "on our blog",
 	"respect of the fundamental freedoms": "respect of the fundamental freedoms",
 	"with another identity…": "with another identity…",
diff --git a/js/src/i18n/fr_FR.json b/js/src/i18n/fr_FR.json
index 3932fb1ef..c32cc06b8 100644
--- a/js/src/i18n/fr_FR.json
+++ b/js/src/i18n/fr_FR.json
@@ -13,6 +13,7 @@
     "Add": "Ajouter",
     "Additional comments": "Commentaires additionnels",
     "Administration": "Administration",
+    "All data will be deleted every 48 hours, so please don't use this for anything real.": "Toutes les données seront effacées toutes les 48 heures, donc n'utilisez pas ce site à des fins autres que de démonstration.",
     "All the places have already been taken": "Toutes les places ont été prises|Une place est encore disponible|{places} places sont encore disponibles",
     "Allow all comments": "Autoriser tous les commentaires",
     "An error has occurred.": "Une erreur est survenue.",
@@ -48,12 +49,13 @@
     "Create a new event": "Créer un nouvel événement",
     "Create a new group": "Créer un nouveau groupe",
     "Create a new identity": "Créer une nouvelle identité",
+    "Create and manage several identities from the same account": "Créer et gérer plusieurs identités sur un même compte",
     "Create group": "Créer un groupe",
     "Create my event": "Créer mon événement",
     "Create my group": "Créer mon groupe",
     "Create my profile": "Créer mon profil",
     "Create token": "Créer un jeton",
-    "Create your communities and your events": "Créer vos communautés et vos événements",
+    "Create, edit or delete events": "Créer, modifier ou supprimer des événements",
     "Create": "Créer",
     "Creator": "Créateur",
     "Current identity has been changed to {identityName} in order to manage this event.": "L'identité actuelle a été changée à {identityName} pour pouvoir gérer cet événement.",
@@ -75,6 +77,7 @@
     "Either the account is already validated, either the validation token is incorrect.": "Soit le compte est déjà validé, soit le jeton de validation est incorrect.",
     "Email": "Email",
     "Ends on…": "Se termine le…",
+    "Enjoy discovering Mobilizon!": "Amusez-vous bien en découvrant Mobilizon !",
     "Enter the link URL": "Entrez l'URL du lien",
     "Error while communicating with the server.": "Erreur de communication avec le serveur.",
     "Error while saving report.": "Erreur lors de l'enregistrement du signalement.",
@@ -161,7 +164,6 @@
     "Organized by {name}": "Organisé par {name}",
     "Organized": "Organisés",
     "Organizer": "Organisateur",
-    "Other stuff…": "Autres trucs…",
     "Otherwise this identity will just be removed from the group administrators.": "Sinon cette identité sera juste supprimée des administrateurs du groupe.",
     "Page limited to my group (asks for auth)": "Accès limité à mon groupe (demande authentification)",
     "Page not found": "Page non trouvée",
@@ -177,7 +179,6 @@
     "Password": "Mot de passe",
     "Past events": "Événements passés",
     "Pick an identity": "Choisissez une identité",
-    "Please be nice to each other": "Soyez sympas entre vous",
     "Please check your spam folder if you didn't receive the email.": "Merci de vérifier votre dossier des indésirables si vous n'avez pas reçu l'email.",
     "Please contact this instance's Mobilizon admin if you think this is a mistake.": "Veuillez contacter l'administrateur de cette instance Mobilizon si vous pensez qu’il s’agit d’une erreur.",
     "Please make sure the address is correct and that the page hasn't been moved.": "Assurez‐vous que l’adresse est correcte et que la page n’a pas été déplacée.",
@@ -198,6 +199,7 @@
     "Read Framasoft’s statement of intent on the Framablog": "Lire la note d’intention de Framasoft sur le Framablog",
     "Region": "Région",
     "Register an account on Mobilizon!": "S'inscrire sur Mobilizon !",
+    "Register for an event by choosing one of your identities": "S'inscrire à un événement en choisissant une de vos identités",
     "Register": "S'inscrire",
     "Registration is currently closed.": "Les inscriptions sont actuellement fermées.",
     "Reject": "Rejetter",
@@ -296,7 +298,6 @@
     "iCal Feed": "Flux iCal",
     "interconnect with others like it": "s’interconnecter simplement avec d’autres",
     "its source code is public": "son code source est public",
-    "meditate a bit": "méditez un peu",
     "on our blog": "sur notre blog",
     "respect of the fundamental freedoms": "le respect des libertés fondamentales",
     "with another identity…": "avec une autre identité…",
diff --git a/js/src/i18n/oc.json b/js/src/i18n/oc.json
index 38996af7b..0de484561 100644
--- a/js/src/i18n/oc.json
+++ b/js/src/i18n/oc.json
@@ -49,7 +49,6 @@
     "Password": "Senhal",
     "Password (confirmation)": "Senhal (confirmacion)",
     "Participants": "Participants",
-    "Other stuff…": "Autras causas…",
     "Organized": "Organizats",
     "Organized by {name}": "Organizat per {name}",
     "Number of places": "Nombre de plaças",
@@ -120,7 +119,6 @@
     "{count} requests waiting": "Una demanda en espèra|{count} demandas en espèra",
     "{count} participants": "Un participant|{count} participants",
     "{approved} / {total} seats": "{approved} / {total} plaças",
-    "meditate a bit": "meditatz un pauc",
     "You need to login.": "Vos cal vos connectar.",
     "You are an organizer.": "Sètz un organizaire.",
     "You are already logged-in.": "Sètz ja connectat.",
@@ -150,7 +148,6 @@
     "Reset my password": "Reïnicializar mon senhal",
     "Resend confirmation email": "Tornar enviar lo corrièl de confirmacion",
     "Public comment moderation": "Moderacion dels comentaris publics",
-    "Please be nice to each other": "Siatz polits",
     "Password reset": "Reïnicializar del senhal",
     "Participation approval": "Validacion dels participants",
     "Page limited to my group (asks for auth)": "Accès limitat a mon grop (demanda d’autentificacion)",
@@ -197,7 +194,6 @@
     "Delete this identity": "Suprimir aquesta identitat",
     "Delete event": "Suprimir un eveniment",
     "Creator": "Creator",
-    "Create your communities and your events": "Creatz vòstra comunitat e vòstres eveniments",
     "Create token": "Crear un geton",
     "Create my profile": "Crear mon perfil",
     "Create my group": "Crear mon grop",
diff --git a/js/src/views/User/Register.vue b/js/src/views/User/Register.vue
index cdc45ba29..b0ab3d1a9 100644
--- a/js/src/views/User/Register.vue
+++ b/js/src/views/User/Register.vue
@@ -13,8 +13,9 @@
           <div class="content">
             <h2 class="title">{{ $t('Features') }}</h2>
             <ul>
-              <li>{{ $t('Create your communities and your events') }}</li>
-              <li>{{ $t('Other stuff…') }}</li>
+              <li>{{ $t('Create and manage several identities from the same account') }}</li>
+              <li>{{ $t('Create, edit or delete events') }}</li>
+              <li>{{ $t('Register for an event by choosing one of your identities') }}</li>
             </ul>
           </div>
           <router-link :to="{ name: RouteName.ABOUT }">
@@ -27,12 +28,12 @@
               {{ $t("Your local administrator resumed it's policy:") }}
             </p>
             <ul>
-              <li>{{ $t('Please be nice to each other') }}</li>
-              <li>{{ $t('meditate a bit') }}</li>
+              <li>{{ $t('Enjoy discovering Mobilizon!') }}</li>
+              <li>{{ $t("All data will be deleted every 48 hours, so please don't use this for anything real.") }}</li>
             </ul>
-            <p>
-              {{ $t('Please read the full rules') }}
-            </p>
+<!--            <p>-->
+<!--              {{ $t('Please read the full rules') }}-->
+<!--            </p>-->
           </div>
         </div>
         <div class="column">